add tests

Author: yarinvak

src/main/java/graphql/annotations/processor/GraphQLAnnotations.java

@@ -158,7 +158,6 @@ public GraphQLDirective directive(Class<?> object) throws GraphQLAnnotationsExce
         }
     }
 
-    //todo: add tests
     public GraphQLDirective directiveViaAnnotation(Class<?> annotationClass) {
         if (!annotationClass.isAnnotationPresent(GraphQLDirectiveDefinition.class) || !annotationClass.isAnnotationPresent(Retention.class)){
             throw new GraphQLAnnotationsException(String.format("The supplied class %s is not annotated with a GraphQLDirectiveDefinition and/or Retention annotation", annotationClass.getSimpleName()), null);
@@ -176,7 +175,6 @@ public GraphQLDirective directiveViaAnnotation(Class<?> annotationClass) {
         }
     }
 
-    //todo: add tests
     public Set<GraphQLDirective> directives(Class<?> directivesDeclarationClass) {
         Method[] methods = directivesDeclarationClass.getMethods();
         Set<GraphQLDirective> directiveSet = new HashSet<>();

src/test/java/graphql/annotations/GraphQLDirectivesViaAnnotationDefinitionTest.java

@@ -41,8 +41,6 @@ public void setUp() {
         GraphQLObjectType object = this.graphQLAnnotations.object(Query.class);
         GraphQLCodeRegistry codeRegistry = graphQLAnnotations.getContainer().getCodeRegistryBuilder().build();
         this.schema = newSchema().query(object).codeRegistry(codeRegistry).build();
-
-
     }
 
     /**

src/test/java/graphql/annotations/GraphQLDirectivesViaClassDefinitionTest.java

@@ -168,35 +168,8 @@ public static String nameWithInputObject(@GraphQLName("inputObject") InputObject
     }
 
 
-    public static class QueryAlternative {
-        @GraphQLName("suffix")
-        @GraphQLDirectiveDefinition(wiring = SuffixWiring.class)
-        @DirectiveLocations({Introspection.DirectiveLocation.FIELD_DEFINITION, Introspection.DirectiveLocation.ARGUMENT_DEFINITION})
-        public static void suffixDirective(@GraphQLName("suffix") String suffix) {
-
-        }
-
-        @GraphQLField
-        @GraphQLDirectives({
-                @Directive(name = "suffix", argumentsValues = {"coolSuffix"})})
-        public static String name() {
-            return "yarin";
-        }
-    }
 
 
-    @Test
-    public void queryName_directivesInAlternativeWayCreation_wiringIsActivated() throws Exception {
-        this.graphQLAnnotations.directives(QueryAlternative.class);
-        GraphQLObjectType object = this.graphQLAnnotations.object(QueryAlternative.class);
-        GraphQLCodeRegistry codeRegistry = graphQLAnnotations.getContainer().getCodeRegistryBuilder().build();
-
-        GraphQLSchema schema = newSchema().query(object).codeRegistry(codeRegistry).build();
-
-        ExecutionResult result = GraphQL.newGraphQL(schema).build().execute("query { name }");
-        assertTrue(result.getErrors().isEmpty());
-        assertEquals(((Map<String, String>) result.getData()).get("name").toString(), "yarincoolSuffix");
-    }
 
 
     @Test

src/test/java/graphql/annotations/GraphQLDirectivesViaMethodDefinitionTest.java

@@ -0,0 +1,64 @@
+package graphql.annotations;
+
+import graphql.ExecutionResult;
+import graphql.GraphQL;
+import graphql.annotations.annotationTypes.GraphQLField;
+import graphql.annotations.annotationTypes.GraphQLName;
+import graphql.annotations.annotationTypes.directives.activation.Directive;
+import graphql.annotations.annotationTypes.directives.activation.GraphQLDirectives;
+import graphql.annotations.annotationTypes.directives.definition.DirectiveLocations;
+import graphql.annotations.annotationTypes.directives.definition.GraphQLDirectiveDefinition;
+import graphql.annotations.processor.GraphQLAnnotations;
+import graphql.introspection.Introspection;
+import graphql.schema.GraphQLCodeRegistry;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLSchema;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+import static graphql.schema.GraphQLSchema.newSchema;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class GraphQLDirectivesViaMethodDefinitionTest {
+    private GraphQLAnnotations graphQLAnnotations;
+    private GraphQLSchema schema;
+
+    public static class DirectivesContainer {
+        @GraphQLName("suffix")
+        @GraphQLDirectiveDefinition(wiring = GraphQLDirectivesViaClassDefinitionTest.SuffixWiring.class)
+        @DirectiveLocations({Introspection.DirectiveLocation.FIELD_DEFINITION, Introspection.DirectiveLocation.ARGUMENT_DEFINITION})
+        public static void suffixDirective(@GraphQLName("suffix") String suffix) {
+
+        }
+
+        @GraphQLField
+        @GraphQLDirectives({
+                @Directive(name = "suffix", argumentsValues = {"coolSuffix"})})
+        public static String name() {
+            return "yarin";
+        }
+    }
+
+
+    @BeforeMethod
+    public void setUp() {
+        this.graphQLAnnotations = new GraphQLAnnotations();
+        this.graphQLAnnotations.directives(DirectivesContainer.class);
+        GraphQLObjectType object = this.graphQLAnnotations.object(DirectivesContainer.class);
+        GraphQLCodeRegistry codeRegistry = graphQLAnnotations.getContainer().getCodeRegistryBuilder().build();
+        this.schema = newSchema().query(object).codeRegistry(codeRegistry).build();
+
+    }
+
+    @Test
+    public void queryName_directivesInAlternativeWayCreation_wiringIsActivated() throws Exception {
+        // Act
+        ExecutionResult result = GraphQL.newGraphQL(schema).build().execute("query { name }");
+        // Assert
+        assertTrue(result.getErrors().isEmpty());
+        assertEquals(((Map<String, String>) result.getData()).get("name").toString(), "yarincoolSuffix");
+    }
+}