webflux testing

Author: andimarek

graphql-java-spring-boot-starter-webflux/src/main/java/graphql/spring/web/reactive/GraphQLEndpointConfiguration.java

@@ -1,6 +1,6 @@
 package graphql.spring.web.reactive;
 
-import graphql.spring.web.reactive.controller.GraphQLController;
+import graphql.spring.web.reactive.components.GraphQLController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.ApplicationContext;

graphql-java-spring-webflux/build.gradle

@@ -10,5 +10,7 @@ dependencies {
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile "org.springframework:spring-test:$springVersion"
+    testCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
+    testCompile group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0'
     testCompile "org.mockito:mockito-core:2.+"
 }

graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/DefaultExecutionResultHandler.java renamed to graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/components/DefaultExecutionResultHandler.java

@@ -1,7 +1,8 @@
-package graphql.spring.web.reactive;
+package graphql.spring.web.reactive.components;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.ExecutionResult;
+import graphql.spring.web.reactive.ExecutionResultHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.stereotype.Component;

graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/DefaultGraphQLInvocation.java renamed to graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/components/DefaultGraphQLInvocation.java

@@ -1,9 +1,11 @@
-package graphql.spring.web.reactive;
+package graphql.spring.web.reactive.components;
 
 import graphql.ExecutionInput;
 import graphql.ExecutionResult;
 import graphql.GraphQL;
 import graphql.Internal;
+import graphql.spring.web.reactive.GraphQLInvocation;
+import graphql.spring.web.reactive.GraphQLInvocationData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.WebRequest;

graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/controller/GraphQLController.java renamed to graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/components/GraphQLController.java

@@ -1,4 +1,4 @@
-package graphql.spring.web.reactive.controller;
+package graphql.spring.web.reactive.components;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -39,13 +39,12 @@ public class GraphQLController {
             consumes = MediaType.APPLICATION_JSON_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     public Object graphqlPOST(@RequestBody GraphQLRequestBody body,
-                              WebRequest webRequest,
                               ServerHttpResponse serverHttpResponse) {
         String query = body.getQuery();
         if (query == null) {
             query = "";
         }
-        Mono<ExecutionResult> executionResult = graphQLInvocation.invoke(new GraphQLInvocationData(query, body.getOperationName(), body.getVariables()), webRequest);
+        Mono<ExecutionResult> executionResult = graphQLInvocation.invoke(new GraphQLInvocationData(query, body.getOperationName(), body.getVariables()), null);
         return executionResultHandler.handleExecutionResult(executionResult, serverHttpResponse);
     }
 

graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/controller/GraphQLRequestBody.java renamed to graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/components/GraphQLRequestBody.java

@@ -1,4 +1,4 @@
-package graphql.spring.web.reactive.controller;
+package graphql.spring.web.reactive.components;
 
 import graphql.Internal;
 

graphql-java-spring-webflux/src/test/java/graphql/spring/web/reactive/components/GraphQLControllerTest.java

@@ -0,0 +1,56 @@
+package graphql.spring.web.reactive.components;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import reactor.core.publisher.Mono;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static org.hamcrest.CoreMatchers.is;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {TestAppConfig.class})
+@WebAppConfiguration
+public class GraphQLControllerTest {
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    private WebTestClient client;
+
+    @Before
+    public void setup() {
+        client = WebTestClient.bindToApplicationContext(applicationContext).build();
+    }
+
+
+    @Test
+    public void testVariableJson() throws Exception {
+        Map<String, Object> request = new LinkedHashMap<>();
+        client.post().uri("/graphql")
+                .body(Mono.just(request), Map.class)
+                .accept(MediaType.APPLICATION_JSON_UTF8)
+                .exchange()
+                .expectStatus().isOk()
+                .expectBody()
+                .jsonPath("data", is("foo"));
+//        String query = "{foo}";
+//        String variablesJson = "{\"key\":\"value\"}";
+//        MvcResult mvcResult = this.mockMvc.perform(get("/graphql")
+//                .param("query", query)
+//                .param("variables", variablesJson))
+//                .andDo(print()).andExpect(status().isOk())
+//                .andReturn();
+
+    }
+
+}

graphql-java-spring-webflux/src/test/java/graphql/spring/web/reactive/controller/TestAppConfig.java renamed to graphql-java-spring-webflux/src/test/java/graphql/spring/web/reactive/components/TestAppConfig.java

@@ -1,4 +1,4 @@
-package graphql.spring.web.reactive.controller;
+package graphql.spring.web.reactive.components;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.ExecutionInput;
@@ -9,6 +9,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.reactive.config.EnableWebFlux;
 
 import java.util.concurrent.CompletableFuture;
@@ -35,4 +36,9 @@ public ObjectMapper objectMapper() {
         return new ObjectMapper();
     }
 
+    @Bean
+    public WebRequest webRequest() {
+        return Mockito.mock(WebRequest.class);
+    }
+
 }