All tests now passing

Author: bbakerman

src/test/groovy/graphql/validation/constraints/BaseConstraintTestSupport.groovy

@@ -108,7 +108,7 @@ class BaseConstraintTestSupport extends Specification {
         ruleEnvironment
     }
 
-    ValidationEnvironment buildEnvForField(String targetDirective, GraphQLSchema schema, Map<String, Object> arguments) {
+    ValidationEnvironment buildEnvForField(DirectiveConstraint targetDirective, GraphQLSchema schema, Map<String, Object> arguments) {
         GraphQLFieldsContainer fieldsContainer = schema.getObjectType("Query") as GraphQLFieldsContainer
         GraphQLFieldDefinition fieldDefinition = fieldsContainer.getFieldDefinition("field")
 
@@ -120,7 +120,8 @@ class BaseConstraintTestSupport extends Specification {
                 .executionPath(path)
                 .validatedElement(ValidationEnvironment.ValidatedElement.FIELD)
                 .validatedPath(path)
-                .context(GraphQLDirective.class, fieldDefinition.getDirective(targetDirective))
+                .directives(fieldDefinition.getDirectives())
+                .context(GraphQLDirective.class, fieldDefinition.getDirective(targetDirective.name))
                 .messageInterpolator(interpolator)
                 .build()
         ruleEnvironment

src/test/groovy/graphql/validation/constraints/standard/ExpressionConstraintTest.groovy

@@ -14,12 +14,11 @@ class ExpressionConstraintTest extends BaseConstraintTestSupport {
 
         DirectiveConstraint ruleUnderTest = new ExpressionConstraint()
 
-
         expect:
 
         def schema = buildSchema(ruleUnderTest.getDocumentation().getDirectiveSDL(), fieldDeclaration, "")
 
-        ValidationEnvironment validationEnvironment = buildEnvForField(ruleUnderTest.name, schema, args)
+        ValidationEnvironment validationEnvironment = buildEnvForField(ruleUnderTest, schema, args)
 
         def errors = ruleUnderTest.runValidation(validationEnvironment)
 
@@ -42,19 +41,14 @@ class ExpressionConstraintTest extends BaseConstraintTestSupport {
 
         expect:
 
-        def fieldDeclaration = "field( arg : String $expression ) : ID"
-        def schema = buildSchema(ruleUnderTest.getDocumentation().getDirectiveSDL(), fieldDeclaration, "")
-
-        ValidationEnvironment validationEnvironment = buildEnv(ruleUnderTest.name, schema, "arg", argVal)
-
-        def errors = ruleUnderTest.runValidation(validationEnvironment)
-
+        def fieldDeclaration = "field( arg : String $expressionDirective ) : ID"
+        def errors = runValidation(ruleUnderTest, fieldDeclaration, "arg", argVal)
         assertErrors(errors, expectedMessage)
 
         where:
 
 
-        expression                                                    | argVal | expectedMessage
+        expressionDirective                                           | argVal | expectedMessage
         '''@Expression(value : "${validatedValue.length() > 10}" )''' | "ABC"  | "Expression;path=/arg;val:ABC;\t"
         '''@Expression(value : "${validatedValue.length() > 3}" )'''  | "ABC"  | "Expression;path=/arg;val:ABC;\t"
         '''@Expression(value : "${validatedValue.length() > 2}" )'''  | "ABC"  | ""

src/test/groovy/graphql/validation/interpolation/ResourceBundleMessageInterpolatorTest.groovy

@@ -46,12 +46,12 @@ class ResourceBundleMessageInterpolatorTest extends Specification {
     def schema = TestUtil.schema(sdl)
 
     @Unroll
-    def "can interpolate things"() {
+    def "can interpolate things : #messageTemplate"() {
 
         def interpolatorUnderTest = new ResourceBundleMessageInterpolator()
 
         def validatedValue = [zig: "zag"]
-        def messageParams = ["validatedValue": validatedValue, "p1": "pv1", "p2": "pv2", "min": "5", "max": "10"]
+        def messageParams = ["validatedValue": validatedValue, "p1": "pv1", "p2": "pv2", "min": "5", "max": "10", path : "a/b/c"]
         ValidationEnvironment validationEnvironment = buildEnv(schema, "arg", validatedValue, interpolatorUnderTest, null)
 
         expect:
@@ -65,7 +65,7 @@ class ResourceBundleMessageInterpolatorTest extends Specification {
         // resource bundle finding
         'graphql.test.message'            | 'Test message with expressions : zag and replacements : pv1'
         // system level message finding from graphql.validation
-        'graphql.validation.Size.message' | 'size must be between 5 and 10'
+        'graphql.validation.Size.message' | 'a/b/c size must be between 5 and 10'
         // expressions
         'Could not ${validatedValue.zig}' | 'Could not zag'
         // message param replacement