webflux testing

Author: andimarek

graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/GraphQLInvocation.java

@@ -2,12 +2,12 @@
 
 import graphql.ExecutionResult;
 import graphql.PublicApi;
-import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 @PublicApi
 public interface GraphQLInvocation {
 
-    Mono<ExecutionResult> invoke(GraphQLInvocationData invocationData, WebRequest webRequest);
+    Mono<ExecutionResult> invoke(GraphQLInvocationData invocationData, ServerWebExchange webRequest);
 
 }

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

@@ -8,7 +8,7 @@
 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;
+import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 @Component
@@ -19,7 +19,7 @@ public class DefaultGraphQLInvocation implements GraphQLInvocation {
     private GraphQL graphQL;
 
     @Override
-    public Mono<ExecutionResult> invoke(GraphQLInvocationData invocationData, WebRequest webRequest) {
+    public Mono<ExecutionResult> invoke(GraphQLInvocationData invocationData, ServerWebExchange serverWebExchange) {
         ExecutionInput executionInput = ExecutionInput.newExecutionInput()
                 .query(invocationData.getQuery())
                 .operationName(invocationData.getOperationName())

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

@@ -9,12 +9,12 @@
 import graphql.spring.web.reactive.GraphQLInvocationData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;
@@ -38,13 +38,13 @@ public class GraphQLController {
             consumes = MediaType.APPLICATION_JSON_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     public Object graphqlPOST(@RequestBody GraphQLRequestBody body,
-                              ServerHttpResponse serverHttpResponse) {
+                              ServerWebExchange serverWebExchange) {
         String query = body.getQuery();
         if (query == null) {
             query = "";
         }
-        Mono<ExecutionResult> executionResult = graphQLInvocation.invoke(new GraphQLInvocationData(query, body.getOperationName(), body.getVariables()), null);
-        return executionResultHandler.handleExecutionResult(executionResult, serverHttpResponse);
+        Mono<ExecutionResult> executionResult = graphQLInvocation.invoke(new GraphQLInvocationData(query, body.getOperationName(), body.getVariables()), serverWebExchange);
+        return executionResultHandler.handleExecutionResult(executionResult, serverWebExchange.getResponse());
     }
 
     @RequestMapping(value = "${graphql.url:graphql}",
@@ -54,9 +54,10 @@ public Object graphqlGET(
             @RequestParam("query") String query,
             @RequestParam(value = "operationName", required = false) String operationName,
             @RequestParam(value = "variables", required = false) String variablesJson,
-            ServerHttpResponse serverHttpResponse) {
-        Mono<ExecutionResult> executionResult = graphQLInvocation.invoke(new GraphQLInvocationData(query, operationName, convertVariablesJson(variablesJson)), null);
-        return executionResultHandler.handleExecutionResult(executionResult, serverHttpResponse);
+            ServerWebExchange serverWebExchange
+    ) {
+        Mono<ExecutionResult> executionResult = graphQLInvocation.invoke(new GraphQLInvocationData(query, operationName, convertVariablesJson(variablesJson)), serverWebExchange);
+        return executionResultHandler.handleExecutionResult(executionResult, serverWebExchange.getResponse());
     }
 
     private Map<String, Object> convertVariablesJson(String jsonMap) {

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

@@ -1,8 +1,13 @@
 package graphql.spring.web.reactive.components;
 
+import graphql.ExecutionInput;
+import graphql.ExecutionResultImpl;
+import graphql.GraphQL;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.MediaType;
@@ -15,8 +20,10 @@
 import java.net.URLEncoder;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
 
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = {TestAppConfig.class})
@@ -26,6 +33,9 @@ public class GraphQLControllerTest {
     @Autowired
     private ApplicationContext applicationContext;
 
+    @Autowired
+    GraphQL graphql;
+
     private WebTestClient client;
 
     @Before
@@ -37,37 +47,68 @@ public void setup() {
     @Test
     public void testPostRequest() throws Exception {
         Map<String, Object> request = new LinkedHashMap<>();
+        Map<String, Object> variables = new LinkedHashMap<>();
+        variables.put("variable", "variableValue");
+        String query = "query myQuery {foo}";
+        request.put("query", query);
+        request.put("variables", variables);
+        String operationName = "myQuery";
+        request.put("operationName", operationName);
+
+        ExecutionResultImpl executionResult = ExecutionResultImpl.newExecutionResult()
+                .data("bar")
+                .build();
+        CompletableFuture cf = CompletableFuture.completedFuture(executionResult);
+        ArgumentCaptor<ExecutionInput> captor = ArgumentCaptor.forClass(ExecutionInput.class);
+        Mockito.when(graphql.executeAsync(captor.capture())).thenReturn(cf);
+
         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();
+                .jsonPath("data", is("bar"));
 
+        assertThat(captor.getAllValues().size(), is(1));
+
+        assertThat(captor.getValue().getQuery(), is(query));
+        assertThat(captor.getValue().getVariables(), is(variables));
+        assertThat(captor.getValue().getOperationName(), is(operationName));
     }
 
     @Test
-    public void testGetRequestWithVariables() throws Exception {
-        String variablesJson = "{\"key\":\"value\"}";
+    public void testGetRequest() throws Exception {
+        String variablesJson = "{\"variable\":\"variableValue\"}";
         String variablesValue = URLEncoder.encode(variablesJson, "UTF-8");
-        String queryString = URLEncoder.encode("{foo}", "UTF-8");
+        String query = "query myQuery {foo}";
+        String queryString = URLEncoder.encode(query, "UTF-8");
+        String operationName = "myQuery";
+
+        ExecutionResultImpl executionResult = ExecutionResultImpl.newExecutionResult()
+                .data("bar")
+                .build();
+        CompletableFuture cf = CompletableFuture.completedFuture(executionResult);
+        ArgumentCaptor<ExecutionInput> captor = ArgumentCaptor.forClass(ExecutionInput.class);
+        Mockito.when(graphql.executeAsync(captor.capture())).thenReturn(cf);
+
         client.get().uri(uriBuilder -> uriBuilder.path("/graphql")
                 .queryParam("variables", variablesValue)
                 .queryParam("query", queryString)
+                .queryParam("operationName", operationName)
                 .build(variablesJson, queryString))
                 .accept(MediaType.APPLICATION_JSON_UTF8)
                 .exchange()
                 .expectStatus().isOk()
                 .expectBody()
                 .jsonPath("data", is("foo"));
 
+        assertThat(captor.getAllValues().size(), is(1));
+
+        Map<String, Object> variables = new LinkedHashMap<>();
+        variables.put("variable", "variableValue");
+        assertThat(captor.getValue().getQuery(), is(query));
+        assertThat(captor.getValue().getVariables(), is(variables));
+        assertThat(captor.getValue().getOperationName(), is(operationName));
     }
 }

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

@@ -1,19 +1,14 @@
 package graphql.spring.web.reactive.components;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import graphql.ExecutionInput;
-import graphql.ExecutionResultImpl;
 import graphql.GraphQL;
-import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 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;
-
 @Configuration
 @EnableWebFlux
 @ComponentScan(basePackageClasses = GraphQLController.class)
@@ -23,11 +18,6 @@ public class TestAppConfig {
     @Bean
     public GraphQL graphQL() {
         GraphQL graphql = Mockito.mock(GraphQL.class);
-        ExecutionResultImpl executionResult = ExecutionResultImpl.newExecutionResult()
-                .data("foo")
-                .build();
-        CompletableFuture cf = CompletableFuture.completedFuture(executionResult);
-        Mockito.when(graphql.executeAsync(ArgumentMatchers.<ExecutionInput>any())).thenReturn(cf);
         return graphql;
     }