Add type hints in several test files and cleanup

Replicates graphql/graphql-js@c1ca546

Author: Cito

tests/execution/test_abstract.py

@@ -1,4 +1,4 @@
-from collections import namedtuple
+from typing import NamedTuple
 
 from graphql import graphql_sync
 from graphql.error import format_error
@@ -13,9 +13,22 @@
     GraphQLUnionType,
 )
 
-Dog = namedtuple("Dog", "name woofs")
-Cat = namedtuple("Cat", "name meows")
-Human = namedtuple("Human", "name")
+
+class Dog(NamedTuple):
+
+    name: str
+    woofs: bool
+
+
+class Cat(NamedTuple):
+
+    name: str
+    meows: bool
+
+
+class Human(NamedTuple):
+
+    name: str
 
 
 def get_is_type_of(type_):
@@ -322,7 +335,7 @@ def returning_invalid_value_from_resolve_type_yields_useful_error():
             resolve_type=lambda *_args: [],
         )
 
-        fooObject = GraphQLObjectType(
+        foo_object = GraphQLObjectType(
             "FooObject", {"bar": GraphQLField(GraphQLString)}, interfaces=[fooInterface]
         )
 
@@ -331,7 +344,7 @@ def returning_invalid_value_from_resolve_type_yields_useful_error():
                 "Query",
                 {"foo": GraphQLField(fooInterface, resolve=lambda *_args: "dummy")},
             ),
-            types=[fooObject],
+            types=[foo_object],
         )
 
         result = graphql_sync(schema, "{ foo { bar } }")

tests/language/test_lexer.py

@@ -14,14 +14,14 @@ def assert_syntax_error(text, message, location):
     with raises(GraphQLSyntaxError) as exc_info:
         lex_one(text)
     error = exc_info.value
-    assert message in error.message
+    assert error.message == f"Syntax Error: {message}"
     assert error.locations == [location]
 
 
 def describe_lexer():
     def disallows_uncommon_control_characters():
         assert_syntax_error(
-            "\x07", "Cannot contain the invalid character '\\x07'", (1, 1)
+            "\x07", "Cannot contain the invalid character '\\x07'.", (1, 1)
         )
 
     # noinspection PyArgumentEqualDefault
@@ -141,8 +141,8 @@ def lex_reports_useful_string_errors():
             "Invalid character within String: '\\x00'.",
             (1, 19),
         )
-        assert_syntax_error('"multi\nline"', "Unterminated string", (1, 7))
-        assert_syntax_error('"multi\rline"', "Unterminated string", (1, 7))
+        assert_syntax_error('"multi\nline"', "Unterminated string.", (1, 7))
+        assert_syntax_error('"multi\rline"', "Unterminated string.", (1, 7))
         assert_syntax_error(
             '"bad \\x esc"', "Invalid character escape sequence: '\\x'.", (1, 7)
         )
@@ -258,7 +258,9 @@ def lex_reports_useful_number_errors():
         assert_syntax_error(
             "1.e1", "Invalid number, expected digit but got: 'e'.", (1, 3)
         )
-        assert_syntax_error(".123", "Cannot parse the unexpected character '.'", (1, 1))
+        assert_syntax_error(
+            ".123", "Cannot parse the unexpected character '.'.", (1, 1)
+        )
         assert_syntax_error(
             "1.A", "Invalid number, expected digit but got: 'A'.", (1, 3)
         )
@@ -289,13 +291,13 @@ def lexes_punctuation():
         assert lex_one("|") == Token(TokenKind.PIPE, 0, 1, 1, 1, None, None)
 
     def lex_reports_useful_unknown_character_error():
-        assert_syntax_error("..", "Cannot parse the unexpected character '.'", (1, 1))
-        assert_syntax_error("?", "Cannot parse the unexpected character '?'", (1, 1))
+        assert_syntax_error("..", "Cannot parse the unexpected character '.'.", (1, 1))
+        assert_syntax_error("?", "Cannot parse the unexpected character '?'.", (1, 1))
         assert_syntax_error(
-            "\u203B", "Cannot parse the unexpected character '\u203B'", (1, 1)
+            "\u203B", "Cannot parse the unexpected character '\u203B'.", (1, 1)
         )
         assert_syntax_error(
-            "\u200b", "Cannot parse the unexpected character '\\u200b'", (1, 1)
+            "\u200b", "Cannot parse the unexpected character '\\u200b'.", (1, 1)
         )
 
     # noinspection PyArgumentEqualDefault

tests/type/test_enum.py

@@ -5,6 +5,7 @@
     GraphQLArgument,
     GraphQLBoolean,
     GraphQLEnumType,
+    GraphQLEnumValue,
     GraphQLField,
     GraphQLInt,
     GraphQLObjectType,
@@ -300,10 +301,12 @@ def enum_inputs_may_be_nullable():
 
     def presents_a_values_property_for_complex_enums():
         values = ComplexEnum.values
-        assert len(values) == 2
         assert isinstance(values, dict)
-        assert values["ONE"].value is complex1
-        assert values["TWO"].value is complex2
+        assert all(isinstance(value, GraphQLEnumValue) for value in values.values())
+        assert {key: value.value for key, value in values.items()} == {
+            "ONE": complex1,
+            "TWO": complex2,
+        }
 
     def may_be_internally_represented_with_complex_values():
         result = execute_query(

tests/type/test_introspection.py

@@ -871,9 +871,7 @@ def introspects_on_input_object():
             "TestType",
             {
                 "field": GraphQLField(
-                    GraphQLString,
-                    args={"complex": GraphQLArgument(TestInputObject)},
-                    resolve=lambda obj, info, **args: repr(args.get("complex")),
+                    GraphQLString, args={"complex": GraphQLArgument(TestInputObject)}
                 )
             },
         )

tests/type/test_predicate.py

@@ -53,7 +53,7 @@
 )
 
 ObjectType = GraphQLObjectType("Object", {})
-InterfaceType = GraphQLInterfaceType("Interface")
+InterfaceType = GraphQLInterfaceType("Interface", {})
 UnionType = GraphQLUnionType("Union", types=[ObjectType])
 EnumType = GraphQLEnumType("Enum", values={"foo": {}})
 InputObjectType = GraphQLInputObjectType("InputObject", {})