Updates docstrings and tests

Author: chalmerlowe

google/cloud/bigquery/external_config.py

@@ -496,9 +496,9 @@ def source_column_match(self) -> Optional[SourceColumnMatch]:
         """
 
         value = self._properties.get("sourceColumnMatch")
-        if value is not None:
-            return SourceColumnMatch(value)
-        return None
+        # if value is not None:
+        return SourceColumnMatch(value) if value is not None else None
+        # return None
 
     @source_column_match.setter
     def source_column_match(self, value: Optional[SourceColumnMatch]):

tests/unit/test_external_config.py

@@ -144,20 +144,6 @@ def test_schema_empty(self):
         want = {"sourceFormat": "", "schema": {"fields": []}}
         self.assertEqual(got, want)
 
-    def test_source_column_match_None(self):
-        ec = external_config.ExternalConfig("")
-        ec.source_column_match = None
-        expected = None
-        result = ec.source_column_match
-        self.assertEqual(expected, result)
-
-    def test_source_column_match_valid_input(self):
-        ec = external_config.ExternalConfig("")
-        ec.source_column_match = SourceColumnMatch.NAME
-        expected = "NAME"
-        result = ec.source_column_match
-        self.assertEqual(expected, result)
-
     def _verify_base(self, ec):
         self.assertEqual(ec.autodetect, True)
         self.assertEqual(ec.compression, "compression")
@@ -900,7 +886,7 @@ def test_to_api_repr(self):
         )
 
 
-class CSVOptions(unittest.TestCase):
+class TestCSVOptions(unittest.TestCase):
     SOURCE_COLUMN_MATCH = SourceColumnMatch.NAME
 
     def test_to_api_repr(self):
@@ -930,6 +916,28 @@ def test_to_api_repr(self):
             },
         )
 
+    def test_source_column_match_None(self):
+        ec = external_config.CSVOptions()
+        ec.source_column_match = None
+        expected = None
+        result = ec.source_column_match
+        self.assertEqual(expected, result)
+
+    def test_source_column_match_valid_input(self):
+        ec = external_config.CSVOptions()
+        ec.source_column_match = SourceColumnMatch.NAME
+        expected = "NAME"
+        result = ec.source_column_match
+        self.assertEqual(expected, result)
+
+    def test_source_column_match_invalid_input(self):
+        ec = external_config.CSVOptions()
+        with self.assertRaisesRegex(
+            TypeError,
+            "value must be a google.cloud.bigquery.enums.SourceColumnMatch or None",
+        ):
+            ec.source_column_match = "neither None or enum value"
+
 
 class TestGoogleSheetsOptions(unittest.TestCase):
     def test_to_api_repr(self):