Use type names in PossibleFragmentSpreads message format to make it more readable (was toString() on types which includes typeResolver etc.)

jimkyndemeyer · bbakerman · commit 1171c95e6dd7 · 2018-05-22T19:43:39.000+10:00
diff --git a/src/main/java/graphql/validation/rules/PossibleFragmentSpreads.java b/src/main/java/graphql/validation/rules/PossibleFragmentSpreads.java
@@ -34,7 +34,7 @@ public void checkInlineFragment(InlineFragment inlineFragment) {
         if (fragType == null || parentType == null) return;
         if (!doTypesOverlap(fragType, parentType)) {
             String message = String.format("Fragment cannot be spread here as objects of " +
-                    "type %s can never be of type %s", parentType, fragType);
+                    "type %s can never be of type %s", parentType.getName(), fragType.getName());
             addError(ValidationErrorType.InvalidFragmentType, inlineFragment.getSourceLocation(), message);
 
         }
@@ -50,7 +50,7 @@ public void checkFragmentSpread(FragmentSpread fragmentSpread) {
 
         if (!doTypesOverlap(typeCondition, parentType)) {
             String message = String.format("Fragment %s cannot be spread here as objects of " +
-                    "type %s can never be of type %s", fragmentSpread.getName(), parentType, typeCondition);
+                    "type %s can never be of type %s", fragmentSpread.getName(), parentType.getName(), typeCondition.getName());
             addError(ValidationErrorType.InvalidFragmentType, fragmentSpread.getSourceLocation(), message);
         }
     }
diff --git a/src/test/groovy/graphql/validation/rules/PossibleFragmentSpreadsTest.groovy b/src/test/groovy/graphql/validation/rules/PossibleFragmentSpreadsTest.groovy
@@ -179,6 +179,7 @@ class PossibleFragmentSpreadsTest extends Specification {
 
         then:
         errorCollector.getErrors().size() == 1
+        errorCollector.getErrors().get(0).message == 'Validation error of type InvalidFragmentType: Fragment cannot be spread here as objects of type Cat can never be of type Dog @ \'invalidObjectWithinObjectAnon\''
     }
 
     def 'object into not implementing interface'() {
@@ -191,6 +192,7 @@ class PossibleFragmentSpreadsTest extends Specification {
 
         then:
         errorCollector.getErrors().size() == 1
+        errorCollector.getErrors().get(0).message == 'Validation error of type InvalidFragmentType: Fragment humanFragment cannot be spread here as objects of type Pet can never be of type Human @ \'invalidObjectWithinInterface\''
     }
 
     def 'object into not containing union'() {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void checkInlineFragment(InlineFragment inlineFragment) {`
`34`	`34`	`if (fragType == null \|\| parentType == null) return;`
`35`	`35`	`if (!doTypesOverlap(fragType, parentType)) {`
`36`	`36`	`String message = String.format("Fragment cannot be spread here as objects of " +`
`37`		`- "type %s can never be of type %s", parentType, fragType);`
	`37`	`+ "type %s can never be of type %s", parentType.getName(), fragType.getName());`
`38`	`38`	`addError(ValidationErrorType.InvalidFragmentType, inlineFragment.getSourceLocation(), message);`
`39`	`39`
`40`	`40`	`}`
`@@ -50,7 +50,7 @@ public void checkFragmentSpread(FragmentSpread fragmentSpread) {`
`50`	`50`
`51`	`51`	`if (!doTypesOverlap(typeCondition, parentType)) {`
`52`	`52`	`String message = String.format("Fragment %s cannot be spread here as objects of " +`
`53`		`- "type %s can never be of type %s", fragmentSpread.getName(), parentType, typeCondition);`
	`53`	`+ "type %s can never be of type %s", fragmentSpread.getName(), parentType.getName(), typeCondition.getName());`
`54`	`54`	`addError(ValidationErrorType.InvalidFragmentType, fragmentSpread.getSourceLocation(), message);`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,7 @@ class PossibleFragmentSpreadsTest extends Specification {`
`179`	`179`
`180`	`180`	`then:`
`181`	`181`	`errorCollector.getErrors().size() == 1`
	`182`	`+ errorCollector.getErrors().get(0).message == 'Validation error of type InvalidFragmentType: Fragment cannot be spread here as objects of type Cat can never be of type Dog @ \'invalidObjectWithinObjectAnon\''`
`182`	`183`	`}`
`183`	`184`
`184`	`185`	`def 'object into not implementing interface'() {`
`@@ -191,6 +192,7 @@ class PossibleFragmentSpreadsTest extends Specification {`
`191`	`192`
`192`	`193`	`then:`
`193`	`194`	`errorCollector.getErrors().size() == 1`
	`195`	`+ errorCollector.getErrors().get(0).message == 'Validation error of type InvalidFragmentType: Fragment humanFragment cannot be spread here as objects of type Pet can never be of type Human @ \'invalidObjectWithinInterface\''`
`194`	`196`	`}`
`195`	`197`
`196`	`198`	`def 'object into not containing union'() {`