added argument support to graphql schema checking on interfaces - with default value checks

bbakerman · bbakerman · commit 872ff2af8e0b · 2017-05-08T18:37:13.000+10:00
diff --git a/src/main/java/graphql/schema/validation/ObjectsImplementInterfaces.java b/src/main/java/graphql/schema/validation/ObjectsImplementInterfaces.java
@@ -8,6 +8,7 @@
 import graphql.schema.GraphQLType;
 
 import java.util.List;
+import java.util.Objects;
 
 import static graphql.schema.GraphQLTypeUtil.getUnwrappedTypeName;
 import static graphql.schema.validation.SchemaValidationErrorType.ObjectDoesNotImplementItsInterfaces;
@@ -84,16 +85,25 @@ private void checkFieldArgumentEquivalence(GraphQLObjectType objectTyoe, GraphQL
                 String interfaceArgStr = makeArgStr(interfaceArg);
                 String objectArgStr = makeArgStr(objectArg);
 
+                boolean same = true;
                 if (!interfaceArgStr.equals(objectArgStr)) {
+                    same = false;
+                }
+                if (!Objects.equals(interfaceArg.getDefaultValue(), objectArg.getDefaultValue())) {
+                    same = false;
+                }
+                if (!same) {
                     validationErrorCollector.addError(
                             error(format("object type '%s' does not implement interface '%s' because field '%s' argument '%s' is defined differently",
                                     objectTyoe.getName(), interfaceType.getName(), interfaceFieldDef.getName(), interfaceArg.getName())));
                 }
+
             }
         }
     }
 
     private String makeArgStr(GraphQLArgument argument) {
+        // we don't do default value checking because toString of getDefaultValue is not guaranteed to be stable
         return argument.getName() +
                 ":" +
                 getUnwrappedTypeName(argument.getType());
diff --git a/src/test/groovy/graphql/schema/validation/ObjectsImplementInterfacesTest.groovy b/src/test/groovy/graphql/schema/validation/ObjectsImplementInterfacesTest.groovy
@@ -35,6 +35,7 @@ class ObjectsImplementInterfacesTest extends Specification {
             .argument(newArgument().name("arg1").type(GraphQLString))
             .argument(newArgument().name("arg2").type(GraphQLInt))
             .argument(newArgument().name("arg3").type(GraphQLBoolean))
+            .argument(newArgument().name("arg4").type(GraphQLString).defaultValue("ABC"))
     )
 
             .field(newFieldDefinition().name("argField2").type(GraphQLString)
@@ -61,6 +62,7 @@ class ObjectsImplementInterfacesTest extends Specification {
                 .argument(newArgument().name("arg1").type(GraphQLInt))
                 .argument(newArgument().name("arg2").type(GraphQLInt))
                 .argument(newArgument().name("arg3").type(GraphQLInt))
+                .argument(newArgument().name("arg4").type(GraphQLString).defaultValue("XYZ"))
         )
 
                 .field(newFieldDefinition().name("argField2").type(GraphQLString)
@@ -76,7 +78,7 @@ class ObjectsImplementInterfacesTest extends Specification {
 
         errorCollector.containsValidationError(ObjectDoesNotImplementItsInterfaces)
         def errors = errorCollector.getErrors()
-        errors.size() == 6
+        errors.size() == 7
         errors.contains(new SchemaValidationError(ObjectDoesNotImplementItsInterfaces,
                 "object type 'obj' does not implement interface 'Interface' because field 'friends' is missing"))
         errors.contains(new SchemaValidationError(ObjectDoesNotImplementItsInterfaces,
@@ -87,6 +89,8 @@ class ObjectsImplementInterfacesTest extends Specification {
                 "object type 'obj' does not implement interface 'Interface' because field 'address' is defined as '[String!]' type and not as '[String]' type"))
         errors.contains(new SchemaValidationError(ObjectDoesNotImplementItsInterfaces,
                 "object type 'obj' does not implement interface 'Interface' because field 'argField1' argument 'arg1' is defined differently"))
+        errors.contains(new SchemaValidationError(ObjectDoesNotImplementItsInterfaces,
+                "object type 'obj' does not implement interface 'Interface' because field 'argField1' argument 'arg1' is defined differently"))
         errors.contains(new SchemaValidationError(ObjectDoesNotImplementItsInterfaces,
                 "object type 'obj' does not implement interface 'Interface' because field 'argField2' has a different number of arguments"))
     }
