testing

Author: andimarek

.gitignore

@@ -1,3 +1,4 @@
 build
 .gradle
 .idea/
+out

graphql-java-spring-boot-starter-webmvc/build.gradle

@@ -1,9 +1,11 @@
-
 version = "1.0"
 
 def springBootVersion = "2.1.0.RELEASE"
 
 dependencies {
     compile "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion"
     compile project(':graphql-java-spring-webmvc')
+
+    testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
+    testCompile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
 }

graphql-java-spring-boot-starter-webmvc/src/test/java/graphql/spring/web/servlet/IntegrationTest.java

@@ -0,0 +1,48 @@
+package graphql.spring.web.servlet;
+
+import graphql.ExecutionInput;
+import graphql.ExecutionResultImpl;
+import graphql.GraphQL;
+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.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.UnsupportedEncodingException;
+import java.util.concurrent.CompletableFuture;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = IntegrationTestConfig.class)
+@RunWith(SpringRunner.class)
+public class IntegrationTest {
+
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+    @Autowired
+    GraphQL graphql;
+
+    @Test
+    public void endpointIsAvailable() throws UnsupportedEncodingException {
+        String query = "{foo}";
+
+        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);
+
+        String body = this.restTemplate.getForObject("/graphql?query={query}", String.class, query);
+
+        assertThat(body, is("{\"data\":\"bar\"}"));
+        assertThat(captor.getValue().getQuery(), is(query));
+    }
+
+}

graphql-java-spring-boot-starter-webmvc/src/test/java/graphql/spring/web/servlet/IntegrationTestConfig.java

@@ -0,0 +1,18 @@
+package graphql.spring.web.servlet;
+
+import graphql.GraphQL;
+import org.mockito.Mockito;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+@SpringBootApplication
+public class IntegrationTestConfig {
+
+
+    @Bean
+    public GraphQL graphQL() {
+        return Mockito.mock(GraphQL.class);
+    }
+
+}
+

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

@@ -17,6 +17,7 @@
 import org.springframework.web.context.request.WebRequest;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
@@ -60,6 +61,7 @@ public Object graphqlGET(
     }
 
     private Map<String, Object> convertVariablesJson(String jsonMap) {
+        if (jsonMap == null) return Collections.emptyMap();
         try {
             return objectMapper.readValue(jsonMap, Map.class);
         } catch (IOException e) {

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

@@ -142,4 +142,34 @@ public void testGetRequest() throws Exception {
 
     }
 
+    @Test
+    public void testSimpleGetRequest() throws Exception {
+        String query = "{foo}";
+
+        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);
+
+
+        MvcResult mvcResult = this.mockMvc.perform(get("/graphql")
+                .param("query", query))
+                .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("bar")))
+                .andReturn();
+
+        assertThat(captor.getAllValues().size(), is(1));
+
+        assertThat(captor.getValue().getQuery(), is(query));
+
+    }
+
 }