update unit tests for databind.core

Author: NiklasRosenstein

databind.core/pyproject.toml

@@ -48,7 +48,7 @@ isort = "isort --check-only src/"
 flake8 = "flake8 src/"
 
 [tool.slap.run]
-fmt = "black src/ tests/ && isort src/ tests/"
+fmt = "black src/ && isort src/"
 
 [tool.mypy]
 python_version = "3.6"

databind.core/src/databind/core/schema.py

@@ -21,10 +21,7 @@
     from types import GenericAlias
 
 if t.TYPE_CHECKING:
-
-    class Constructor(t.Protocol):
-        def __call__(self, **kwargs: t.Any) -> t.Any:
-            ...
+    Constructor = t.Callable[..., t.Any]
 
 
 __all__ = [
@@ -257,7 +254,7 @@ class A(Generic[T]):
     return Schema(fields, t.cast("Constructor", dataclass_type), dataclass_type)
 
 
-def convert_typed_dict_to_schema(typed_dict: TypedDictProtocol) -> Schema:
+def convert_typed_dict_to_schema(typed_dict: t.Union[TypedDictProtocol, t.Type[t.Any], TypeHint]) -> Schema:
     """Converts the definition of a #typing.TypedDict to a #Schema.
 
     !!! note
@@ -292,6 +289,11 @@ class Movie(typing.TypedDict):
     ```
     """
 
+    if isinstance(typed_dict, TypeHint):
+        if not isinstance(typed_dict, ClassTypeHint):
+            raise TypeError(f"expected ClassTypeHint, got {typed_dict}")
+        typed_dict = typed_dict.type
+
     assert is_typed_dict(typed_dict), typed_dict
 
     eval_context = vars(sys.modules[typed_dict.__module__])

databind.core/src/databind/core/tests/context_test.py

@@ -6,11 +6,11 @@
 from databind.core.settings import Settings
 
 
-def test_format_context_trace():
+def test_format_context_trace() -> None:
     settings = Settings()
     location = Location.EMPTY
 
-    def no_convert(*a):
+    def no_convert(*a: t.Any) -> None:
         raise NotImplementedError
 
     ctx1 = Context(

databind.core/src/databind/core/tests/schema_docspec_example_test.py

@@ -22,7 +22,7 @@ class Module(HasMembers):
     members: t.List["Module"]
 
 
-def test__convert_dataclass_to_schema__multiple_levels_of_inheritance():
+def test__convert_dataclass_to_schema__multiple_levels_of_inheritance() -> None:
     assert convert_dataclass_to_schema(ApiObject) == Schema(
         {
             "location": Field(TypeHint(str), True),

databind.core/src/databind/core/tests/schema_test.py

@@ -16,7 +16,7 @@
 from databind.core.utils import T, U
 
 
-def test_convert_to_schema_dataclass():
+def test_convert_to_schema_dataclass() -> None:
     # Test dataclass detection
     @dataclasses.dataclass
     class A:
@@ -58,7 +58,7 @@ class Movie(te.TypedDict):
     )
 
 
-def test_get_fields_expanded():
+def test_get_fields_expanded() -> None:
     class Dict1(te.TypedDict):
         a: int
         b: str
@@ -105,7 +105,7 @@ class Class4:
     }
 
 
-def test_convert_dataclass_to_schema_simple():
+def test_convert_dataclass_to_schema_simple() -> None:
     @dataclasses.dataclass
     class A:
         a: int
@@ -144,7 +144,7 @@ class A:
 #     )
 
 
-def test_convert_dataclass_to_schema_with_defaults():
+def test_convert_dataclass_to_schema_with_defaults() -> None:
     @dataclasses.dataclass
     class A:
         a: int = 42
@@ -162,7 +162,7 @@ class A:
     )
 
 
-def test_convert_dataclass_with_optional_field_has_none_as_default():
+def test_convert_dataclass_with_optional_field_has_none_as_default() -> None:
     @dataclasses.dataclass
     class A:
         a: t.Optional[int]
@@ -187,7 +187,7 @@ class A:
     )
 
 
-def test_convert_dataclass_to_schema_nested():
+def test_convert_dataclass_to_schema_nested() -> None:
     @dataclasses.dataclass
     class A:
         a: int
@@ -207,7 +207,7 @@ class B:
     )
 
 
-def test_convert_dataclass_to_schema_inheritance():
+def test_convert_dataclass_to_schema_inheritance() -> None:
     @dataclasses.dataclass
     class A:
         a: int
@@ -226,7 +226,7 @@ class B(A):
     )
 
 
-def test_convert_dataclass_to_schema_generic():
+def test_convert_dataclass_to_schema_generic() -> None:
     @dataclasses.dataclass
     class A(t.Generic[T]):
         a: T
@@ -247,20 +247,20 @@ class A(t.Generic[T]):
     )
 
 
-def test_convert_dataclass_overriden_field_type():
+def test_convert_dataclass_overriden_field_type() -> None:
     @dataclasses.dataclass
     class A:
         a: int
         b: str
 
     @dataclasses.dataclass
     class B(A):
-        a: str
+        a: str  # type: ignore[assignment]
 
     assert convert_dataclass_to_schema(B) == Schema({"a": Field(TypeHint(str)), "b": Field(TypeHint(str))}, B, B)
 
 
-def test_convert_dataclass_to_schema_type_var_without_generic():
+def test_convert_dataclass_to_schema_type_var_without_generic() -> None:
     @dataclasses.dataclass
     class A:
         a: T  # type: ignore[valid-type]
@@ -287,7 +287,7 @@ class B(A, t.Generic[T]):
     )
 
 
-def test_convert_dataclass_to_schema_generic_nested():
+def test_convert_dataclass_to_schema_generic_nested() -> None:
     @dataclasses.dataclass
     class A(t.Generic[T]):
         a: T
@@ -312,7 +312,7 @@ class B2(t.Generic[U]):
     )
     assert convert_dataclass_to_schema(B2) == Schema(
         {
-            "a": Field(TypeHint(A[U])),
+            "a": Field(TypeHint(A[U])),  # type: ignore[valid-type]  # Type variable U is unbound
             "b": Field(TypeHint(str)),
         },
         B2,
@@ -328,7 +328,7 @@ class B2(t.Generic[U]):
     )
 
 
-def test_convert_dataclass_to_schema_generic_inheritance():
+def test_convert_dataclass_to_schema_generic_inheritance() -> None:
     @dataclasses.dataclass
     class A(t.Generic[T]):
         a: T
@@ -368,7 +368,7 @@ class B2(A[U], t.Generic[U]):
     )
 
 
-def test_convert_dataclass_with_mapping_member():
+def test_convert_dataclass_with_mapping_member() -> None:
     @dataclasses.dataclass
     class A:
         a: int
@@ -384,10 +384,10 @@ class A:
     )
 
 
-def test_convert_typed_dict_to_schema_total():
+def test_convert_typed_dict_to_schema_total() -> None:
     class Movie(te.TypedDict):
         name: str
-        year: int = 42  # type: ignore[misc]
+        year: int = 42  # type: ignore[misc]  # Right hand side values are not supported in TypedDict
 
     assert convert_typed_dict_to_schema(Movie) == Schema(
         {
@@ -399,9 +399,9 @@ class Movie(te.TypedDict):
     )
 
 
-def test_convert_typed_dict_to_schema_functional():
+def test_convert_typed_dict_to_schema_functional() -> None:
     Movie = te.TypedDict("Movie", {"name": str, "year": int})
-    Movie.year = 42
+    Movie.year = 42  # type: ignore[attr-defined]  # Type[Movie] has no attribute 'year'
     assert convert_typed_dict_to_schema(Movie) == Schema(
         {
             "name": Field(TypeHint(str)),
@@ -412,7 +412,7 @@ def test_convert_typed_dict_to_schema_functional():
     )
 
 
-def test_convert_typed_dict_to_schema_not_total():
+def test_convert_typed_dict_to_schema_not_total() -> None:
     class Movie(te.TypedDict, total=False):
         name: str
         year: int
@@ -427,7 +427,7 @@ class Movie(te.TypedDict, total=False):
     )
 
 
-def test_convert_typed_dict_with_optional_field_has_none_as_default():
+def test_convert_typed_dict_with_optional_field_has_none_as_default() -> None:
     class A(te.TypedDict, total=False):
         a: t.Optional[int]
         c: te.Annotated[t.Optional[int], "foo"]
@@ -450,7 +450,7 @@ class ClassWithForwardRef:
     b: t.List["int"]
 
 
-def test_parse_dataclass_with_forward_ref():
+def test_parse_dataclass_with_forward_ref() -> None:
     assert convert_dataclass_to_schema(ClassWithForwardRef) == Schema(
         {"a": Field(TypeHint(int), True), "b": Field(TypeHint(t.List[int]), True)},
         ClassWithForwardRef,