fixes test with version update

engagingspaces · Oct 9, 2017 · d8579b8 · d8579b8
1 parent bd8e279
commit d8579b8
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ publishing {
 
 ext {
     vertxVersion = '3.4.2'
-    graphqlVersion = '4.2'
+    graphqlVersion = '5.0'
 
 
     junitVersion = '4.12'

diff --git a/...er/src/test/java/io/engagingspaces/graphql/servicediscovery/client/GraphQLClientTest.java b/...er/src/test/java/io/engagingspaces/graphql/servicediscovery/client/GraphQLClientTest.java
@@ -35,9 +35,23 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import graphql.ExecutionInput;
+import graphql.ExecutionResult;
+import graphql.GraphQL;
+import graphql.Scalars;
+import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLNonNull;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLSchema;
+
 import static org.example.graphql.testdata.droids.DroidsSchema.droidsSchema;
 import static org.junit.Assert.*;
 
+import java.util.HashMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+
 /**
  * Tests for the {@link GraphQLClient}.
  *
@@ -148,9 +162,76 @@ public void should_Fail_Execute_Query_With_Required_Variable_Missing(TestContext
         GraphQLClient.executeQuery(discovery, record, DROIDS_VARIABLES_QUERY, variables,
                 context.asyncAssertFailure(ex -> {
                     assertNotNull(ex.getMessage());
-                    assertTrue(ex.getMessage().startsWith("Null value for NonNull type GraphQLNonNull"));
+                    assertTrue(ex.getMessage().startsWith("Variable 'id' has coerced Null value for NonNull type 'String!'"));
                 }));
     }
+
+    @Test
+	public void testSchemaValidation(TestContext context) {
+
+        Async async = context.async();
+
+		GraphQLObjectType droidType = GraphQLObjectType.newObject()
+	            .name("Droid")
+	            .description("A mechanical creature in the Star Wars universe.")
+	            .field(GraphQLFieldDefinition.newFieldDefinition()
+	                    .name("id")
+	                    .description("The id of the droid.")
+	                    .type(new GraphQLNonNull(Scalars.GraphQLString))
+	                    .build()).build();
+
+
+		GraphQLObjectType query = GraphQLObjectType.newObject()
+	            .name("DroidQueries")
+	            .field(GraphQLFieldDefinition.newFieldDefinition()
+	                    .name("droid")
+	                    .type(droidType)
+	                    .argument(GraphQLArgument.newArgument()
+	                            .name("id")
+	                            .description("id of the droid")
+	                            .type(new GraphQLNonNull(Scalars.GraphQLString))
+	                            .build())
+	                    .build())
+	            .build();
+
+		GraphQLSchema schema = GraphQLSchema.newSchema()
+	            .query(query)
+	            .build();
+
+		String DROIDS_VARIABLES_QUERY =
+	            "        query GetDroidNameR2($id: String!) {\n" +
+	            "            droid(id: $id) {\n" +
+	            "                id\n" +
+	            "            }\n" +
+	            "        }";
+
+		GraphQL graphQL = new GraphQL.Builder(schema).build();
+
+		ExecutionInput.Builder asyncExecBuilder = ExecutionInput.newExecutionInput().query(DROIDS_VARIABLES_QUERY);
+
+		HashMap<String, Object> variables = new HashMap<String, Object>();
+		variables.put("nonsense", "xxx");
+
+		asyncExecBuilder.variables(variables);
+
+		try {
+        CompletableFuture<ExecutionResult> promise = graphQL.executeAsync(asyncExecBuilder.build());
+
+        promise.thenAccept(new Consumer<ExecutionResult>() {
+
+			@Override
+			public void accept(ExecutionResult result) {
+				context.assertFalse(true);
+
+				async.complete();
+
+
+		}});
+		} catch (Exception e ) {
+			context.assertTrue(true);
+			async.complete();
+		}
+	}
 
     @Test
     public void should_Find_Service_Proxy_From_Valid_Filter(TestContext context) {

diff --git a/graphql-service-publisher/bin/META-INF/services/io.vertx.servicediscovery.spi.ServiceType b/graphql-service-publisher/bin/META-INF/services/io.vertx.servicediscovery.spi.ServiceType
@@ -0,0 +1,2 @@
+
+io.engagingspaces.graphql.servicediscovery.service.impl.GraphQLServiceImpl