add tests

Author: yarinvak

README.md

@@ -573,6 +573,7 @@ We now wired the field "name" - so it will turn upper case when calling the fiel
 The ``Directive`` annotations requires the name of the directive, the wiring class (the ``UpperWiring`` class defined earlier), and the values of the arguments. If an argument has a default value, you don't have to supply a value in the arguments values.
 
 Notice that in any way, the directives are sequential, so the first annotated directive will happen before the second one.
+If put both java annotation directive and `@GraphQLDirectives` annotation directives, the java annotation directive will be applied first.
 
 ## Relay support
 

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DirectivesBuilder.java

@@ -35,7 +35,6 @@
 import static graphql.schema.GraphQLDirective.newDirective;
 
 
-//todo: add tests for other directive types
 public class DirectivesBuilder implements Builder<GraphQLDirective[]> {
     private AnnotatedElement object;
     private ProcessingElementsContainer container;
@@ -45,6 +44,40 @@ public DirectivesBuilder(AnnotatedElement object, ProcessingElementsContainer co
         this.container = container;
     }
 
+    @Override
+    public GraphQLDirective[] build() {
+        // building directives from directives java annotations
+        List<GraphQLDirective> graphQLDirectives = new ArrayList<>();
+        DirectiveJavaAnnotationUtil.getDirectiveAnnotations(object)
+                .forEach(annotation -> {
+                    String name = DirectiveJavaAnnotationUtil.getName(annotation);
+                    if (container.getDirectiveRegistry().containsKey(name)) {
+                        GraphQLDirective graphQLDirective = transformArgs(container.getDirectiveRegistry().get(name).getDirective(), annotation);
+                        graphQLDirectives.add(graphQLDirective);
+                    } else {
+                        throw new GraphQLAnnotationsException(String.format("No directive named %s is found in the directive registry", name), null);
+                    }
+                });
+
+        // building directives from graphql-java-annotations directive annotation
+        GraphQLDirectives directives = object.getAnnotation(GraphQLDirectives.class);
+        if (directives != null) {
+            List<GraphQLDirective> oldGraphQLDirectives = Arrays.stream(directives.value())
+                    .map(x -> {
+                                if (container.getDirectiveRegistry().containsKey(x.name())) {
+                                    return transformArgs(container.getDirectiveRegistry().get(x.name()).getDirective(), x.argumentsValues());
+                                } else {
+                                    throw new GraphQLAnnotationsException(String.format("No directive named %s is found in the directive registry", x.name()), null);
+                                }
+                            }
+                    ).collect(Collectors.toList());
+            graphQLDirectives.addAll(oldGraphQLDirectives);
+        }
+
+        return graphQLDirectives.toArray(new GraphQLDirective[graphQLDirectives.size()]);
+    }
+
+
     private GraphQLDirective transformArgs(GraphQLDirective graphQLDirective, Annotation annotation) {
         GraphQLDirective.Builder directiveBuilder = newDirective(graphQLDirective);
         directiveBuilder.clearArguments();
@@ -127,37 +160,4 @@ private void transformArgument(String[] argumentValues, GraphQLDirective.Builder
             }
         }));
     }
-
-    @Override
-    public GraphQLDirective[] build() {
-        // building directives from directives java annotations
-        List<GraphQLDirective> graphQLDirectives = new ArrayList<>();
-        DirectiveJavaAnnotationUtil.getDirectiveAnnotations(object)
-                .forEach(annotation -> {
-                    String name = DirectiveJavaAnnotationUtil.getName(annotation);
-                    if (container.getDirectiveRegistry().containsKey(name)) {
-                        GraphQLDirective graphQLDirective = transformArgs(container.getDirectiveRegistry().get(name).getDirective(), annotation);
-                        graphQLDirectives.add(graphQLDirective);
-                    } else {
-                        throw new GraphQLAnnotationsException(String.format("No directive named %s is found in the directive registry", name), null);
-                    }
-                });
-
-        // building directives from graphql-java-annotations directive annotation
-        GraphQLDirectives directives = object.getAnnotation(GraphQLDirectives.class);
-        if (directives != null) {
-            List<GraphQLDirective> oldGraphQLDirectives = Arrays.stream(directives.value())
-                    .map(x -> {
-                                if (container.getDirectiveRegistry().containsKey(x.name())) {
-                                    return transformArgs(container.getDirectiveRegistry().get(x.name()).getDirective(), x.argumentsValues());
-                                } else {
-                                    throw new GraphQLAnnotationsException(String.format("No directive named %s is found in the directive registry", x.name()), null);
-                                }
-                            }
-                    ).collect(Collectors.toList());
-            graphQLDirectives.addAll(oldGraphQLDirectives);
-        }
-
-        return graphQLDirectives.toArray(new GraphQLDirective[graphQLDirectives.size()]);
-    }
 }