webmvc testing

Author: andimarek

graphql-java-spring-boot-starter-webmvc/src/main/java/graphql/spring/web/servlet/GraphQLEndpointConfiguration.java

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

graphql-java-spring-webmvc/build.gradle

@@ -11,5 +11,6 @@ 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-webmvc/src/main/java/graphql/spring/web/servlet/ExecutionResultHandler.java

@@ -2,12 +2,11 @@
 
 import graphql.ExecutionResult;
 import graphql.PublicSpi;
-import org.springframework.http.server.ServerHttpResponse;
 
 import java.util.concurrent.CompletableFuture;
 
 @PublicSpi
 public interface ExecutionResultHandler {
 
-    Object handleExecutionResult(CompletableFuture<ExecutionResult> executionResultCF, ServerHttpResponse serverHttpResponse);
+    Object handleExecutionResult(CompletableFuture<ExecutionResult> executionResultCF);
 }

graphql-java-spring-webmvc/src/main/java/graphql/spring/web/servlet/DefaultExecutionResultHandler.java renamed to graphql-java-spring-webmvc/src/main/java/graphql/spring/web/servlet/components/DefaultExecutionResultHandler.java

@@ -1,9 +1,9 @@
-package graphql.spring.web.servlet;
+package graphql.spring.web.servlet.components;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.ExecutionResult;
+import graphql.spring.web.servlet.ExecutionResultHandler;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.stereotype.Component;
 
 import java.util.concurrent.CompletableFuture;
@@ -15,11 +15,11 @@ public class DefaultExecutionResultHandler implements ExecutionResultHandler {
     ObjectMapper objectMapper;
 
     @Override
-    public Object handleExecutionResult(CompletableFuture<ExecutionResult> executionResultMono, ServerHttpResponse serverHttpResponse) {
-        return executionResultMono.thenApply(executionResult -> handleImpl(executionResult, serverHttpResponse));
+    public Object handleExecutionResult(CompletableFuture<ExecutionResult> executionResultMono) {
+        return executionResultMono.thenApply(executionResult -> handleImpl(executionResult));
     }
 
-    private Object handleImpl(ExecutionResult executionResult, ServerHttpResponse serverHttpResponse) {
+    private Object handleImpl(ExecutionResult executionResult) {
         return executionResult.toSpecification();
     }
 }

graphql-java-spring-webmvc/src/main/java/graphql/spring/web/servlet/DefaultGraphQLInvocation.java renamed to graphql-java-spring-webmvc/src/main/java/graphql/spring/web/servlet/components/DefaultGraphQLInvocation.java

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

graphql-java-spring-webmvc/src/main/java/graphql/spring/web/servlet/controller/GraphQLController.java renamed to graphql-java-spring-webmvc/src/main/java/graphql/spring/web/servlet/components/GraphQLController.java

@@ -1,4 +1,4 @@
-package graphql.spring.web.servlet.controller;
+package graphql.spring.web.servlet.components;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -9,7 +9,6 @@
 import graphql.spring.web.servlet.GraphQLInvocationData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -37,29 +36,27 @@ public class GraphQLController {
     @RequestMapping(value = "${graphql.url:graphql}",
             method = RequestMethod.POST,
             consumes = MediaType.APPLICATION_JSON_VALUE,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+            produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object graphqlPOST(@RequestBody GraphQLRequestBody body,
-                              WebRequest webRequest,
-                              ServerHttpResponse serverHttpResponse) {
+                              WebRequest webRequest) {
         String query = body.getQuery();
         if (query == null) {
             query = "";
         }
         CompletableFuture<ExecutionResult> executionResult = graphQLInvocation.invoke(new GraphQLInvocationData(query, body.getOperationName(), body.getVariables()), webRequest);
-        return executionResultHandler.handleExecutionResult(executionResult, serverHttpResponse);
+        return executionResultHandler.handleExecutionResult(executionResult);
     }
 
     @RequestMapping(value = "${graphql.url:graphql}",
             method = RequestMethod.GET,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+            produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object graphqlGET(
             @RequestParam("query") String query,
             @RequestParam(value = "operationName", required = false) String operationName,
             @RequestParam(value = "variables", required = false) String variablesJson,
-            WebRequest webRequest,
-            ServerHttpResponse serverHttpResponse) {
+            WebRequest webRequest) {
         CompletableFuture<ExecutionResult> executionResult = graphQLInvocation.invoke(new GraphQLInvocationData(query, operationName, convertVariablesJson(variablesJson)), webRequest);
-        return executionResultHandler.handleExecutionResult(executionResult, serverHttpResponse);
+        return executionResultHandler.handleExecutionResult(executionResult);
     }
 
     private Map<String, Object> convertVariablesJson(String jsonMap) {

graphql-java-spring-webmvc/src/main/java/graphql/spring/web/servlet/controller/GraphQLRequestBody.java renamed to graphql-java-spring-webmvc/src/main/java/graphql/spring/web/servlet/components/GraphQLRequestBody.java

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

graphql-java-spring-webmvc/src/test/java/graphql/spring/web/servlet/controller/GraphQLControllerTest.java renamed to graphql-java-spring-webmvc/src/test/java/graphql/spring/web/servlet/components/GraphQLControllerTest.java

@@ -1,9 +1,10 @@
-package graphql.spring.web.servlet.controller;
+package graphql.spring.web.servlet.components;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -12,8 +13,13 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -31,15 +37,22 @@ public void setup() throws Exception {
         this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
     }
 
-
     @Test
-    public void testVariableJson() throws Exception {
+    public void testGetRequest() throws Exception {
         String query = "{foo}";
         String variablesJson = "{\"key\":\"value\"}";
+
         MvcResult mvcResult = this.mockMvc.perform(get("/graphql")
                 .param("query", query)
                 .param("variables", variablesJson))
+                .andExpect(status().isOk())
+                .andExpect(request().asyncStarted())
+                .andReturn();
+
+        this.mockMvc.perform(asyncDispatch(mvcResult))
                 .andDo(print()).andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+                .andExpect(jsonPath("data", is("foo")))
                 .andReturn();
 
     }

graphql-java-spring-webmvc/src/test/java/graphql/spring/web/servlet/controller/TestAppConfig.java renamed to graphql-java-spring-webmvc/src/test/java/graphql/spring/web/servlet/components/TestAppConfig.java

@@ -1,4 +1,4 @@
-package graphql.spring.web.servlet.controller;
+package graphql.spring.web.servlet.components;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.ExecutionInput;