feat(StringUtils): clean up and increase test coverage

Remove redundant "null"-string checks now covered in value parsing Increase test coverage above jacoco threshold (88->100%)
americanexpress · Nov 1, 2018 · 56ee26e · 56ee26e
1 parent 27501b2
commit 56ee26e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/nodes/src/main/java/io/aexp/nodes/graphql/StringUtil.java b/nodes/src/main/java/io/aexp/nodes/graphql/StringUtil.java
@@ -19,6 +19,9 @@
 
 abstract class StringUtil {
 
+    private StringUtil() {
+    }
+
     /**
      * Joins and array to a delimited string
      *
@@ -46,7 +49,7 @@ static <T> String formatGraphQLParameter(String key, T value) {
         StringBuilder stringBuilder = new StringBuilder();
         Pattern pattern = Pattern.compile("^\\$");
         Matcher matcher = pattern.matcher("" + value);
-        if (value instanceof String && !"null".equalsIgnoreCase((String) value) && !matcher.find()) {
+        if (value instanceof String && !matcher.find()) {
             stringBuilder.append(key).append(":\"").append(value).append("\"");
         } else if (value instanceof List) {
             stringBuilder.append(key).append(":").append(formatGraphQLArgumentList((List) value));
@@ -71,7 +74,7 @@ private static String formatGraphQLArgumentList(List values) {
         for (Object value: values) {
             if (stringBuilder.length() != 1) stringBuilder.append(",");
             Matcher m = p.matcher("" + value);
-            if (value instanceof String && !"null".equalsIgnoreCase((String) value) && !m.find()) {
+            if (value instanceof String && !m.find()) {
                 stringBuilder.append("\"").append(value).append("\"");
             } else if (value instanceof InputObject) {
                 stringBuilder.append(((InputObject) value).getMessage());

diff --git a/nodes/src/test/java/io/aexp/nodes/graphql/GraphQLRequestEntityTest.java b/nodes/src/test/java/io/aexp/nodes/graphql/GraphQLRequestEntityTest.java
@@ -13,6 +13,7 @@
 
 package io.aexp.nodes.graphql;
 
+import org.junit.Before;
 import org.junit.Test;
 import io.aexp.nodes.graphql.models.TestModel;
 import io.aexp.nodes.graphql.models.TestModelEnum;
@@ -21,7 +22,9 @@
 
 import java.math.BigDecimal;
 import java.net.MalformedURLException;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -32,7 +35,15 @@ enum STATUS {
         active
     }
 
-    private String EXAMPLE_URL = "https://graphql.example.com";
+    private static String EXAMPLE_URL = "https://graphql.example.com";
+    private List<String> idList;
+
+    @Before
+    public void setUp() {
+        idList = new ArrayList<String>();
+        idList.add("47");
+        idList.add("$id");
+    }
 
     @Test
     public void requestWithoutUrl() {
@@ -63,23 +74,29 @@ public void requestWithOptionalParameter() throws MalformedURLException {
         GraphQLRequestEntity requestEntity = GraphQLRequestEntity.Builder()
                 .url(EXAMPLE_URL)
                 .request(TestModelOptionalArguments.class)
-                .arguments(new Arguments("test.nested", new Argument<Integer>("first", 10)))
+                .arguments(
+                        new Arguments("test.nested",
+                                new Argument<List<String>>("ids", idList),
+                                new Argument<Integer>("first", 10)))
                 .build();
         requestEntity.setRequestMethod(GraphQLTemplate.GraphQLMethod.QUERY);
         assertEquals(EXAMPLE_URL, requestEntity.getUrl().toString());
-        assertEquals("GraphQLRequestEntity{request='query { test { nested (first:10) { string } } } ', url='"+EXAMPLE_URL+"'}", requestEntity.toString());
+        assertEquals("GraphQLRequestEntity{request='query { test { nested (ids:[\"47\",$id],first:10) { string } } } ', url='"+EXAMPLE_URL+"'}", requestEntity.toString());
     }
 
     @Test
     public void requestWithOtherOptionalParameter() throws MalformedURLException {
         GraphQLRequestEntity requestEntity = GraphQLRequestEntity.Builder()
                 .url(EXAMPLE_URL)
                 .request(TestModelOptionalArguments.class)
-                .arguments(new Arguments("test.nested", new Argument<Integer>("last", 5)))
+                .arguments(
+                        new Arguments("test.nested",
+                                new Argument<List<String>>("ids", idList),
+                                new Argument<Integer>("last", 5)))
                 .build();
         requestEntity.setRequestMethod(GraphQLTemplate.GraphQLMethod.QUERY);
         assertEquals(EXAMPLE_URL, requestEntity.getUrl().toString());
-        assertEquals("GraphQLRequestEntity{request='query { test { nested (last:5) { string } } } ', url='"+EXAMPLE_URL+"'}", requestEntity.toString());
+        assertEquals("GraphQLRequestEntity{request='query { test { nested (ids:[\"47\",$id],last:5) { string } } } ', url='"+EXAMPLE_URL+"'}", requestEntity.toString());
     }
 
     @Test

diff --git a/nodes/src/test/java/io/aexp/nodes/graphql/models/TestModelOptionalArguments.java b/nodes/src/test/java/io/aexp/nodes/graphql/models/TestModelOptionalArguments.java
@@ -20,6 +20,7 @@
 @GraphQLProperty(name = "test")
 public class TestModelOptionalArguments {
     @GraphQLArguments({
+        @GraphQLArgument(name = "ids"),
         @GraphQLArgument(name = "first", type = "Integer", optional = true),
         @GraphQLArgument(name = "last", type = "Integer", optional = true)
     })