Added offending name to exception to allow better debugging

bbakerman · bbakerman · commit 7845a700a56f · 2018-03-04T08:25:01.000+11:00
diff --git a/src/main/java/graphql/Assert.java b/src/main/java/graphql/Assert.java
@@ -40,7 +40,7 @@ public static void assertTrue(boolean condition, String format, Object... args)
         throw new AssertException(format(format, args));
     }
 
-    private static final String invalidNameErrorMessage = "Name must be non-null, non-empty and match [_A-Za-z][_0-9A-Za-z]*";
+    private static final String invalidNameErrorMessage = "Name must be non-null, non-empty and match [_A-Za-z][_0-9A-Za-z]* - was '%s'";
 
     /**
      * Validates that the Lexical token name matches the current spec.
@@ -54,7 +54,7 @@ public static String assertValidName(String name) {
         if (name != null && !name.isEmpty() && name.matches("[_A-Za-z][_0-9A-Za-z]*")) {
             return name;
         }
-        throw new AssertException(invalidNameErrorMessage);
+        throw new AssertException(String.format(invalidNameErrorMessage,name));
     }
 
 }
diff --git a/src/test/groovy/graphql/AssertTest.groovy b/src/test/groovy/graphql/AssertTest.groovy
@@ -142,7 +142,7 @@ class AssertTest extends Specification {
 
         then:
         def error = thrown(AssertException)
-        error.message == "Name must be non-null, non-empty and match [_A-Za-z][_0-9A-Za-z]*"
+        error.message == "Name must be non-null, non-empty and match [_A-Za-z][_0-9A-Za-z]* - was '${name}'"
 
         where:
         name   | _

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public static void assertTrue(boolean condition, String format, Object... args)`
`40`	`40`	`throw new AssertException(format(format, args));`
`41`	`41`	`}`
`42`	`42`
`43`		`- private static final String invalidNameErrorMessage = "Name must be non-null, non-empty and match [_A-Za-z][_0-9A-Za-z]*";`
	`43`	`+ private static final String invalidNameErrorMessage = "Name must be non-null, non-empty and match [_A-Za-z][_0-9A-Za-z]* - was '%s'";`
`44`	`44`
`45`	`45`	`/**`
`46`	`46`	`* Validates that the Lexical token name matches the current spec.`
`@@ -54,7 +54,7 @@ public static String assertValidName(String name) {`
`54`	`54`	`if (name != null && !name.isEmpty() && name.matches("[_A-Za-z][_0-9A-Za-z]*")) {`
`55`	`55`	`return name;`
`56`	`56`	`}`
`57`		`- throw new AssertException(invalidNameErrorMessage);`
	`57`	`+ throw new AssertException(String.format(invalidNameErrorMessage,name));`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`}`