Include field name in error description

fkorotkov · andimarek · commit e520be38bdad · 2017-06-21T07:52:53.000+02:00
diff --git a/src/main/java/graphql/validation/ValidationError.java b/src/main/java/graphql/validation/ValidationError.java
@@ -42,6 +42,10 @@ public String getMessage() {
         return String.format("Validation error of type %s: %s", validationErrorType, description);
     }
 
+    public String getDescription() {
+        return description;
+    }
+
     @Override
     public List<SourceLocation> getLocations() {
         return sourceLocations;
diff --git a/src/main/java/graphql/validation/ValidationErrorCollector.java b/src/main/java/graphql/validation/ValidationErrorCollector.java
@@ -20,9 +20,22 @@ public List<ValidationError> getErrors() {
     }
 
     public boolean containsValidationError(ValidationErrorType validationErrorType) {
+        return containsValidationError(validationErrorType, null);
+    }
+
+    public boolean containsValidationError(ValidationErrorType validationErrorType, String description) {
         for (ValidationError validationError : errors) {
-            if (validationError.getValidationErrorType() == validationErrorType) return true;
+            if (validationError.getValidationErrorType() == validationErrorType) {
+                return description == null || validationError.getDescription().equals(description);
+            }
         }
         return false;
     }
+
+    @Override
+    public String toString() {
+        return "ValidationErrorCollector{" +
+                "errors=" + errors +
+                '}';
+    }
 }
diff --git a/src/main/java/graphql/validation/rules/ScalarLeafs.java b/src/main/java/graphql/validation/rules/ScalarLeafs.java
@@ -20,12 +20,12 @@ public void checkField(Field field) {
         if (type == null) return;
         if (schemaUtil.isLeafType(type)) {
             if (field.getSelectionSet() != null) {
-                String message = String.format("Sub selection not allowed on leaf type %s", type.getName());
+                String message = String.format("Sub selection not allowed on leaf type %s of field %s", type.getName(), field.getName());
                 addError(new ValidationError(ValidationErrorType.SubSelectionNotAllowed, field.getSourceLocation(), message));
             }
         } else {
             if (field.getSelectionSet() == null) {
-                String message = String.format("Sub selection required for type %s", type.getName());
+                String message = String.format("Sub selection required for type %s of field %s", type.getName(), field.getName());
                 addError(new ValidationError(ValidationErrorType.SubSelectionRequired, field.getSourceLocation(), message));
             }
         }
diff --git a/src/test/groovy/graphql/validation/rules/ScalarLeafsTest.groovy b/src/test/groovy/graphql/validation/rules/ScalarLeafsTest.groovy
@@ -23,7 +23,10 @@ class ScalarLeafsTest extends Specification {
         scalarLeafs.checkField(field)
 
         then:
-        errorCollector.containsValidationError(ValidationErrorType.SubSelectionNotAllowed)
+        errorCollector.containsValidationError(
+            ValidationErrorType.SubSelectionNotAllowed,
+            "Sub selection not allowed on leaf type String of field hello"
+        )
     }
 
     def "sub selection required"() {
@@ -34,6 +37,9 @@ class ScalarLeafsTest extends Specification {
         scalarLeafs.checkField(field)
 
         then:
-        errorCollector.containsValidationError(ValidationErrorType.SubSelectionRequired)
+        errorCollector.containsValidationError(
+            ValidationErrorType.SubSelectionRequired,
+            "Sub selection required for type objectType of field hello"
+        )
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,22 @@ public List<ValidationError> getErrors() {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public boolean containsValidationError(ValidationErrorType validationErrorType) {`
	`23`	`+ return containsValidationError(validationErrorType, null);`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ public boolean containsValidationError(ValidationErrorType validationErrorType, String description) {`
`23`	`27`	`for (ValidationError validationError : errors) {`
`24`		`- if (validationError.getValidationErrorType() == validationErrorType) return true;`
	`28`	`+ if (validationError.getValidationErrorType() == validationErrorType) {`
	`29`	`+ return description == null \|\| validationError.getDescription().equals(description);`
	`30`	`+ }`
`25`	`31`	`}`
`26`	`32`	`return false;`
`27`	`33`	`}`
	`34`	`+`
	`35`	`+ @Override`
	`36`	`+ public String toString() {`
	`37`	`+ return "ValidationErrorCollector{" +`
	`38`	`+ "errors=" + errors +`
	`39`	`+ '}';`
	`40`	`+ }`
`28`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ public void checkField(Field field) {`
`20`	`20`	`if (type == null) return;`
`21`	`21`	`if (schemaUtil.isLeafType(type)) {`
`22`	`22`	`if (field.getSelectionSet() != null) {`
`23`		`- String message = String.format("Sub selection not allowed on leaf type %s", type.getName());`
	`23`	`+ String message = String.format("Sub selection not allowed on leaf type %s of field %s", type.getName(), field.getName());`
`24`	`24`	`addError(new ValidationError(ValidationErrorType.SubSelectionNotAllowed, field.getSourceLocation(), message));`
`25`	`25`	`}`
`26`	`26`	`} else {`
`27`	`27`	`if (field.getSelectionSet() == null) {`
`28`		`- String message = String.format("Sub selection required for type %s", type.getName());`
	`28`	`+ String message = String.format("Sub selection required for type %s of field %s", type.getName(), field.getName());`
`29`	`29`	`addError(new ValidationError(ValidationErrorType.SubSelectionRequired, field.getSourceLocation(), message));`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,10 @@ class ScalarLeafsTest extends Specification {`
`23`	`23`	`scalarLeafs.checkField(field)`
`24`	`24`
`25`	`25`	`then:`
`26`		`- errorCollector.containsValidationError(ValidationErrorType.SubSelectionNotAllowed)`
	`26`	`+ errorCollector.containsValidationError(`
	`27`	`+ ValidationErrorType.SubSelectionNotAllowed,`
	`28`	`+ "Sub selection not allowed on leaf type String of field hello"`
	`29`	`+ )`
`27`	`30`	`}`
`28`	`31`
`29`	`32`	`def "sub selection required"() {`
`@@ -34,6 +37,9 @@ class ScalarLeafsTest extends Specification {`
`34`	`37`	`scalarLeafs.checkField(field)`
`35`	`38`
`36`	`39`	`then:`
`37`		`- errorCollector.containsValidationError(ValidationErrorType.SubSelectionRequired)`
	`40`	`+ errorCollector.containsValidationError(`
	`41`	`+ ValidationErrorType.SubSelectionRequired,`
	`42`	`+ "Sub selection required for type objectType of field hello"`
	`43`	`+ )`
`38`	`44`	`}`
`39`	`45`	`}`