refactor: test template refactoring, additional tests

Author: BlasiusSecundus

graphql-spring-boot-test/src/main/java/com/graphql/spring/boot/test/GraphQLTestTemplate.java

@@ -22,6 +22,7 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import static java.util.Objects.nonNull;
@@ -218,7 +219,7 @@ public GraphQLResponse perform(String graphqlResource) throws IOException {
      * @throws IOException if the resource cannot be loaded from the classpath
      */
     public GraphQLResponse perform(String graphqlResource, ObjectNode variables) throws IOException {
-        return perform(graphqlResource, null, variables);
+        return perform(graphqlResource, null, variables, Collections.emptyList());
     }
 
     /**
@@ -230,7 +231,7 @@ public GraphQLResponse perform(String graphqlResource, ObjectNode variables) thr
      * @throws IOException if the resource cannot be loaded from the classpath
      */
     public GraphQLResponse perform(String graphqlResource, String operationName) throws IOException {
-        return perform(graphqlResource, operationName, null);
+        return perform(graphqlResource, operationName, null, Collections.emptyList());
     }
 
     /**
@@ -243,9 +244,7 @@ public GraphQLResponse perform(String graphqlResource, String operationName) thr
      * @throws IOException if the resource cannot be loaded from the classpath
      */
     public GraphQLResponse perform(String graphqlResource, String operation, ObjectNode variables) throws IOException {
-        String graphql = loadQuery(graphqlResource);
-        String payload = createJsonQuery(graphql, operation, variables);
-        return post(payload);
+        return perform(graphqlResource, operation, variables, Collections.emptyList());
     }
 
     /**
@@ -288,7 +287,7 @@ public GraphQLResponse perform(String graphqlResource, String operationName, Obj
      * @throws IOException if the resource cannot be loaded from the classpath
      */
     public GraphQLResponse postForResource(String graphqlResource) throws IOException {
-        return perform(graphqlResource, (String) null, null);
+        return perform(graphqlResource, null, null, Collections.emptyList());
     }
 
     /**
@@ -301,7 +300,7 @@ public GraphQLResponse postForResource(String graphqlResource) throws IOExceptio
      * @throws IOException if the resource cannot be loaded from the classpath
      */
     public GraphQLResponse postForResource(String graphqlResource, List<String> fragmentResources) throws IOException {
-        return perform(graphqlResource, null, fragmentResources);
+        return perform(graphqlResource, null, null, fragmentResources);
     }
 
     public GraphQLResponse postMultipart(String query, String variables) {

graphql-spring-boot-test/src/test/java/com/graphql/spring/boot/test/GraphQLTestTemplateIntegrationTest.java

@@ -13,6 +13,7 @@
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.List;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class GraphQLTestTemplateIntegrationTest {
@@ -22,6 +23,8 @@ public class GraphQLTestTemplateIntegrationTest {
     private static final String TEST_FRAGMENT_FILE = "foo-bar-fragment.graphql";
     private static final String QUERY_WITH_VARIABLES = "query-with-variables.graphql";
     private static final String MULTIPLE_QUERIES = "multiple-queries.graphql";
+    private static final String INPUT_STRING_VALUE = "input-value";
+    private static final String INPUT_STRING_NAME = "input";
 
     @Autowired
     private ResourceLoader resourceLoader;
@@ -63,13 +66,41 @@ void testPostForResourceWithFragments() throws IOException {
     @DisplayName("Test perform with variables.")
     void testPerformWithVariables() throws IOException {
         // GIVEN
-        final String inputString = "test-input-string";
         final ObjectNode variables = objectMapper.createObjectNode();
-        variables.put("input", inputString);
+        variables.put(INPUT_STRING_NAME, INPUT_STRING_VALUE);
         // WHEN - THEN
         graphQLTestTemplate.perform(QUERY_WITH_VARIABLES, variables)
             .assertThatNoErrorsArePresent()
-            .assertThatField("$.data.queryWithVariables").asString().isEqualTo(inputString);
+            .assertThatField("$.data.queryWithVariables").asString().isEqualTo(INPUT_STRING_VALUE);
+    }
+
+    @Test
+    @DisplayName("Test perform with variables and operation name")
+    void testPerformWithOperationAndVariables() throws IOException {
+        // GIVEN
+        final ObjectNode variables = objectMapper.createObjectNode();
+        variables.put(INPUT_STRING_NAME, INPUT_STRING_VALUE);
+        // WHEN - THEN
+        graphQLTestTemplate.perform(MULTIPLE_QUERIES, "withVariable", variables)
+                .assertThatNoErrorsArePresent()
+                .assertThatField("$.data.queryWithVariables").asString().isEqualTo(INPUT_STRING_VALUE);
+    }
+
+    @Test
+    @DisplayName("Test perform with variables and fragments")
+    void testPerformWithVariablesAndFragments() throws IOException {
+        // GIVEN
+        final String customFoo = "custom-foo";
+        final String customBar = "custom-bar";
+        final ObjectNode variables = objectMapper.createObjectNode();
+        variables.put("foo", customFoo);
+        variables.put("bar", customBar);
+        final FooBar expected = new FooBar(customFoo, customBar);
+        // WHEN - THEN
+        graphQLTestTemplate.perform(SIMPLE_TEST_QUERY_WITH_FRAGMENTS, variables, List.of(TEST_FRAGMENT_FILE))
+                .assertThatNoErrorsArePresent()
+                .assertThatField("$.data.fooBar")
+                .as(FooBar.class).usingRecursiveComparison().ignoringAllOverriddenEquals().isEqualTo(expected);
     }
 
     @Test

graphql-spring-boot-test/src/test/java/com/graphql/spring/boot/test/beans/DummyQuery.java

@@ -3,6 +3,8 @@
 import graphql.kickstart.tools.GraphQLQueryResolver;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 @Service
 public class DummyQuery implements GraphQLQueryResolver {
 
@@ -14,8 +16,11 @@ public String otherQuery() {
         return "TEST";
     }
 
-    public FooBar fooBar() {
-        return FooBar.builder().bar("BAR").foo("FOO").build();
+    public FooBar fooBar(String foo, String bar) {
+        return FooBar.builder()
+                .bar(Optional.ofNullable(bar).orElse("BAR"))
+                .foo(Optional.ofNullable(foo).orElse("FOO"))
+                .build();
     }
 
     public String queryWithVariables(final String input) {

graphql-spring-boot-test/src/test/resources/multiple-queries.graphql

@@ -4,4 +4,8 @@ query testQuery1 {
 
 query testQuery2 {
     otherQuery
+}
+
+query withVariable($input: String!) {
+    queryWithVariables(input: $input)
 }

graphql-spring-boot-test/src/test/resources/simple-test-query-with-fragments.graphql

@@ -1,5 +1,5 @@
-query {
-    fooBar {
+query($foo: String, $bar: String) {
+    fooBar(foo: $foo, bar: $bar) {
         ...FooBarFragment
     }
 }

graphql-spring-boot-test/src/test/resources/test-schema.graphqls

@@ -14,6 +14,6 @@ type Subscription {
 type Query {
     dummy: Boolean!
     otherQuery: String!
-    fooBar: FooBar!
+    fooBar(foo: String, bar: String): FooBar!
     queryWithVariables(input: String!): String!
 }