Clean up some failing tests

Author: chalmerlowe

google/cloud/bigquery/schema.py

@@ -19,7 +19,7 @@
 import collections
 import copy
 import enum
-from typing import Any, cast, Dict, Iterable, Optional, Union, Mapping, List
+from typing import Any, cast, Dict, Iterable, Optional, Union, List
 
 from google.cloud.bigquery import _helpers
 from google.cloud.bigquery import standard_sql
@@ -264,11 +264,11 @@ def __init__(
             self._properties["fields"] = [field.to_api_repr() for field in fields]
 
     @classmethod
-    def from_api_repr(cls, api_repr: Mapping[str, Any]) -> "SchemaField":
+    def from_api_repr(cls, api_repr: Dict[str, Any]) -> "SchemaField":
         """Return a ``SchemaField`` object deserialized from a dictionary.
 
         Args:
-            api_repr (Mapping[str, str]): The serialized representation
+            api_repr (Dict[str, str]): The serialized representation
                 of the SchemaField, such as what is output by
                 :meth:`to_api_repr`.
 
@@ -514,7 +514,7 @@ def _build_schema_resource(fields):
 
 
 def _to_schema_fields(
-    schema: Union[Schema, List[Union[SchemaField, Mapping[str, Any]]]]
+    schema: Union[Schema, List[Union[SchemaField, Dict[str, Any]]]]
 ) -> Union[Schema, List[SchemaField]]:
     """Convert the input to either a Schema object OR a list of SchemaField objects.
 

tests/unit/test_schema.py

@@ -831,6 +831,12 @@ def test_build_schema_resource(self, fields, expected_resource):
 
 
 class TestToSchemaFields:  # Test class for _to_schema_fields
+    @staticmethod
+    def _call_fut(schema):
+        from google.cloud.bigquery.schema import _to_schema_fields
+
+        return _to_schema_fields(schema)
+
     def test_invalid_type(self):
         """Invalid list of tuples instead of list of mappings"""
         schema = [
@@ -956,7 +962,7 @@ def test_str(self):
         )
         assert (
             str(schema)
-            == "Schema([{'name': 'name', 'mode': 'NULLABLE', 'type': 'STRING'}], TestInfo)"
+            == "Schema([{'name': 'name', 'type': 'STRING', 'mode': 'NULLABLE'}], TestInfo)"
         )
 
     @pytest.mark.parametrize(
@@ -967,12 +973,12 @@ def test_str(self):
                     fields=[SchemaField("name", "STRING")],
                     foreign_type_info="TestInfo",
                 ),
-                "Schema([{'name': 'name', 'mode': 'NULLABLE', 'type': 'STRING'}], 'TestInfo')",
+                "Schema([{'name': 'name', 'type': 'STRING', 'mode': 'NULLABLE'}], 'TestInfo')",
                 id="repr with foreign type info",
             ),
             pytest.param(
                 Schema(fields=[SchemaField("name", "STRING")]),
-                "Schema([{'name': 'name', 'mode': 'NULLABLE', 'type': 'STRING'}], None)",
+                "Schema([{'name': 'name', 'type': 'STRING', 'mode': 'NULLABLE'}], None)",
                 id="repr without foreign type info",
             ),
         ],