Merge pull request #40 from jhgg/master

More clean-ups

Author: dittos

tests/core_validation/test_fields_on_correct_type.py

@@ -3,7 +3,7 @@
 from utils import expect_passes_rule, expect_fails_rule
 
 
-def error(field, type, line, column):
+def undefined_field(field, type, line, column):
     return {
         'message': FieldsOnCorrectType.undefined_field_message(field, type),
         'locations': [SourceLocation(line, column)]
@@ -66,7 +66,9 @@ def test_field_not_defined_on_fragment():
       fragment fieldNotDefined on Dog {
         meowVolume
       }
-    ''', [error('meowVolume', 'Dog', 3, 9)])
+    ''', [
+        undefined_field('meowVolume', 'Dog', 3, 9)
+    ])
 
 
 def test_field_not_defined_deeply_only_reports_first():
@@ -76,7 +78,9 @@ def test_field_not_defined_deeply_only_reports_first():
           deeper_unknown_field
         }
       }
-    ''', [error('unknown_field', 'Dog', 3, 9)])
+    ''', [
+        undefined_field('unknown_field', 'Dog', 3, 9)
+    ])
 
 
 def test_sub_field_not_defined():
@@ -86,7 +90,9 @@ def test_sub_field_not_defined():
           unknown_field
         }
       }
-    ''', [error('unknown_field', 'Pet', 4, 11)])
+    ''', [
+        undefined_field('unknown_field', 'Pet', 4, 11)
+    ])
 
 
 def test_field_not_defined_on_inline_fragment():
@@ -96,39 +102,49 @@ def test_field_not_defined_on_inline_fragment():
           meowVolume
         }
       }
-    ''', [error('meowVolume', 'Dog', 4, 11)])
+    ''', [
+        undefined_field('meowVolume', 'Dog', 4, 11)
+    ])
 
 
 def test_aliased_field_target_not_defined():
     expect_fails_rule(FieldsOnCorrectType, '''
       fragment aliasedFieldTargetNotDefined on Dog {
         volume : mooVolume
       }
-    ''', [error('mooVolume', 'Dog', 3, 9)])
+    ''', [
+        undefined_field('mooVolume', 'Dog', 3, 9)
+    ])
 
 
 def test_aliased_lying_field_target_not_defined():
     expect_fails_rule(FieldsOnCorrectType, '''
       fragment aliasedLyingFieldTargetNotDefined on Dog {
         barkVolume : kawVolume
       }
-    ''', [error('kawVolume', 'Dog', 3, 9)])
+    ''', [
+        undefined_field('kawVolume', 'Dog', 3, 9)
+    ])
 
 
 def test_not_defined_on_interface():
     expect_fails_rule(FieldsOnCorrectType, '''
       fragment notDefinedOnInterface on Pet {
         tailLength
       }
-    ''', [error('tailLength', 'Pet', 3, 9)])
+    ''', [
+        undefined_field('tailLength', 'Pet', 3, 9)
+    ])
 
 
 def test_defined_on_implementors_but_not_on_interface():
     expect_fails_rule(FieldsOnCorrectType, '''
       fragment definedOnImplementorsButNotInterface on Pet {
         nickname
       }
-    ''', [error('nickname', 'Pet', 3, 9)])
+    ''', [
+        undefined_field('nickname', 'Pet', 3, 9)
+    ])
 
 
 def test_meta_field_selection_on_union():
@@ -144,15 +160,19 @@ def test_direct_field_selection_on_union():
       fragment directFieldSelectionOnUnion on CatOrDog {
         directField
       }
-    ''', [error('directField', 'CatOrDog', 3, 9)])
+    ''', [
+        undefined_field('directField', 'CatOrDog', 3, 9)
+    ])
 
 
 def test_defined_on_implementors_queried_on_union():
     expect_fails_rule(FieldsOnCorrectType, '''
       fragment definedOnImplementorsQueriedOnUnion on CatOrDog {
         name
       }
-    ''', [error('name', 'CatOrDog', 3, 9)])
+    ''', [
+        undefined_field('name', 'CatOrDog', 3, 9)
+    ])
 
 
 def test_valid_field_in_inline_fragment():

tests/core_validation/test_fragments_on_composite_types.py

@@ -3,13 +3,20 @@
 from utils import expect_passes_rule, expect_fails_rule
 
 
-def error(frag_name, type_name, line, column):
+def fragment_on_non_composite_error(frag_name, type_name, line, column):
     return {
         'message': FragmentsOnCompositeTypes.fragment_on_non_composite_error_message(frag_name, type_name),
         'locations': [SourceLocation(line, column)]
     }
 
 
+def inline_fragment_on_non_composite_error(type_name, line, column):
+    return {
+        'message': FragmentsOnCompositeTypes.inline_fragment_on_non_composite_error_message(type_name),
+        'locations': [SourceLocation(line, column)]
+    }
+
+
 def test_object_is_valid_fragment_type():
     expect_passes_rule(FragmentsOnCompositeTypes, '''
       fragment validFragment on Dog {
@@ -49,23 +56,29 @@ def test_scalar_is_invalid_fragment_type():
       fragment scalarFragment on Boolean {
         bad
       }
-    ''', [error('scalarFragment', 'Boolean', 2, 34)])
+    ''', [
+        fragment_on_non_composite_error('scalarFragment', 'Boolean', 2, 34)
+    ])
 
 
 def test_enum_is_invalid_fragment_type():
     expect_fails_rule(FragmentsOnCompositeTypes, '''
       fragment scalarFragment on FurColor {
         bad
       }
-    ''', [error('scalarFragment', 'FurColor', 2, 34)])
+    ''', [
+        fragment_on_non_composite_error('scalarFragment', 'FurColor', 2, 34)
+    ])
 
 
 def test_input_object_is_invalid_fragment_type():
     expect_fails_rule(FragmentsOnCompositeTypes, '''
       fragment inputFragment on ComplexInput {
         stringField
       }
-    ''', [error('inputFragment', 'ComplexInput', 2, 33)])
+    ''', [
+        fragment_on_non_composite_error('inputFragment', 'ComplexInput', 2, 33)
+    ])
 
 
 def test_scalar_is_invalid_inline_fragment_type():
@@ -75,7 +88,6 @@ def test_scalar_is_invalid_inline_fragment_type():
           barks
         }
       }
-    ''', [{
-        'message': FragmentsOnCompositeTypes.inline_fragment_on_non_composite_error_message('String'),
-        'locations': [SourceLocation(3, 16)]
-    }])
+    ''', [
+        inline_fragment_on_non_composite_error('String', 3, 16)
+    ])

tests/core_validation/test_known_argument_names.py

@@ -12,8 +12,7 @@ def unknown_arg(arg_name, field_name, type_name, line, column):
 
 def unknown_directive_arg(arg_name, directive_name, line, column):
     return {
-        'message': KnownArgumentNames.unknown_directive_arg_message(
-            arg_name, directive_name),
+        'message': KnownArgumentNames.unknown_directive_arg_message(arg_name, directive_name),
         'locations': [SourceLocation(line, column)]
     }
 
@@ -88,24 +87,30 @@ def test_undirective_args_are_invalid():
       {
         dog @skip(unless: true)
       }
-    ''', [unknown_directive_arg('unless', 'skip', 3, 19)])
+    ''', [
+        unknown_directive_arg('unless', 'skip', 3, 19)
+    ])
 
 
 def test_invalid_arg_name():
     expect_fails_rule(KnownArgumentNames, '''
       fragment invalidArgName on Dog {
         doesKnowCommand(unknown: true)
       }
-    ''', [unknown_arg('unknown', 'doesKnowCommand', 'Dog', 3, 25)])
+    ''', [
+        unknown_arg('unknown', 'doesKnowCommand', 'Dog', 3, 25)
+    ])
 
 
 def test_unknown_args_amongst_known_args():
     expect_fails_rule(KnownArgumentNames, '''
       fragment oneGoodArgOneInvalidArg on Dog {
         doesKnowCommand(whoknows: 1, dogCommand: SIT, unknown: true)
       }
-    ''', [unknown_arg('whoknows', 'doesKnowCommand', 'Dog', 3, 25),
-          unknown_arg('unknown', 'doesKnowCommand', 'Dog', 3, 55)])
+    ''', [
+        unknown_arg('whoknows', 'doesKnowCommand', 'Dog', 3, 25),
+        unknown_arg('unknown', 'doesKnowCommand', 'Dog', 3, 55)
+    ])
 
 
 def test_unknown_args_deeply():
@@ -122,5 +127,7 @@ def test_unknown_args_deeply():
           }
         }
       }
-    ''', [unknown_arg('unknown', 'doesKnowCommand', 'Dog', 4, 27),
-          unknown_arg('unknown', 'doesKnowCommand', 'Dog', 9, 31)])
+    ''', [
+        unknown_arg('unknown', 'doesKnowCommand', 'Dog', 4, 27),
+        unknown_arg('unknown', 'doesKnowCommand', 'Dog', 9, 31)
+    ])

tests/core_validation/test_known_directives.py

@@ -12,8 +12,7 @@ def unknown_directive(directive_name, line, column):
 
 def misplaced_directive(directive_name, placement, line, column):
     return {
-        'message': KnownDirectives.misplaced_directive_message(directive_name,
-                                                               placement),
+        'message': KnownDirectives.misplaced_directive_message(directive_name, placement),
         'locations': [SourceLocation(line, column)]
     }
 
@@ -51,7 +50,9 @@ def test_with_unknown_directive():
           name
         }
       }
-    ''', [unknown_directive('unknown', 3, 13)])
+    ''', [
+        unknown_directive('unknown', 3, 13)
+    ])
 
 
 def test_with_many_unknown_directives():
@@ -67,9 +68,11 @@ def test_with_many_unknown_directives():
           }
         }
       }
-    ''', [unknown_directive('unknown', 3, 13),
-          unknown_directive('unknown', 6, 15),
-          unknown_directive('unknown', 8, 16)])
+    ''', [
+        unknown_directive('unknown', 3, 13),
+        unknown_directive('unknown', 6, 15),
+        unknown_directive('unknown', 8, 16)
+    ])
 
 
 def test_with_well_placed_directives():
@@ -89,4 +92,6 @@ def test_with_misplaced_directives():
         name
         ...Frag
       }
-    ''', [misplaced_directive('include', 'operation', 2, 17)])
+    ''', [
+        misplaced_directive('include', 'operation', 2, 17)
+    ])

tests/core_validation/test_known_fragment_names.py

@@ -51,5 +51,4 @@ def test_unknown_fragment_names_are_invalid():
         undefined_fragment('UnknownFragment1', 4, 16),
         undefined_fragment('UnknownFragment2', 6, 20),
         undefined_fragment('UnknownFragment3', 12, 12),
-
     ])

tests/core_validation/test_lone_anonymous_operation.py

@@ -71,4 +71,6 @@ def test_anon_operation_with_another_operation():
       mutation Foo {
         fieldB
       }
-    ''', [anon_not_alone(2, 7)])
+    ''', [
+        anon_not_alone(2, 7)
+    ])

tests/core_validation/test_scalar_leafs.py

@@ -30,15 +30,19 @@ def test_object_type_missing_selection():
       query directQueryOnObjectWithoutSubFields {
         human
       }
-    ''', [missing_obj_subselection('human', 'Human', 3, 9)])
+    ''', [
+        missing_obj_subselection('human', 'Human', 3, 9)
+    ])
 
 
 def test_interface_type_missing_selection():
     expect_fails_rule(ScalarLeafs, '''
       {
         human { pets }
       }
-    ''', [missing_obj_subselection('pets', '[Pet]', 3, 17)])
+    ''', [
+        missing_obj_subselection('pets', '[Pet]', 3, 17)
+    ])
 
 
 def test_valid_scalar_selection_with_args():
@@ -54,36 +58,46 @@ def test_scalar_selection_not_allowed_on_boolean():
       fragment scalarSelectionsNotAllowedOnBoolean on Dog {
         barks { sinceWhen }
       }
-    ''', [no_scalar_subselection('barks', 'Boolean', 3, 15)])
+    ''', [
+        no_scalar_subselection('barks', 'Boolean', 3, 15)
+    ])
 
 
 def test_scalar_selection_not_allowed_on_enum():
     expect_fails_rule(ScalarLeafs, '''
       fragment scalarSelectionsNotAllowedOnEnum on Cat {
         furColor { inHexdec }
       }
-    ''', [no_scalar_subselection('furColor', 'FurColor', 3, 18)])
+    ''', [
+        no_scalar_subselection('furColor', 'FurColor', 3, 18)
+    ])
 
 
 def test_scalar_selection_not_allowed_with_args():
     expect_fails_rule(ScalarLeafs, '''
       fragment scalarSelectionsNotAllowedWithArgs on Dog {
         doesKnowCommand(dogCommand: SIT) { sinceWhen }
       }
-    ''', [no_scalar_subselection('doesKnowCommand', 'Boolean', 3, 42)])
+    ''', [
+        no_scalar_subselection('doesKnowCommand', 'Boolean', 3, 42)
+    ])
 
 
 def test_scalar_selection_not_allowed_with_directives():
     expect_fails_rule(ScalarLeafs, '''
       fragment scalarSelectionsNotAllowedWithDirectives on Dog {
         name @include(if: true) { isAlsoHumanName }
       }
-    ''', [no_scalar_subselection('name', 'String', 3, 33)])
+    ''', [
+        no_scalar_subselection('name', 'String', 3, 33)
+    ])
 
 
 def test_scalar_selection_not_allowed_with_directives_and_args():
     expect_fails_rule(ScalarLeafs, '''
       fragment scalarSelectionsNotAllowedWithDirectivesAndArgs on Dog {
         doesKnowCommand(dogCommand: SIT) @include(if: true) { sinceWhen }
       }
-    ''', [no_scalar_subselection('doesKnowCommand', 'Boolean', 3, 61)])
+    ''', [
+        no_scalar_subselection('doesKnowCommand', 'Boolean', 3, 61)
+    ])