Added couple of tests for url parser

Author: jknack

jooby/src/main/java/io/jooby/internal/UrlParser.java

@@ -15,6 +15,7 @@
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 
 public final class UrlParser {
   private static final QueryStringValue NO_QUERY_STRING = new QueryStringValue("");
@@ -87,7 +88,12 @@ private static boolean addParam(HashValue root, String s, int nameStart, int val
     }
     String name = decodeComponent(s, nameStart, valueStart - 1, charset, false);
     String value = decodeComponent(s, valueStart, valueEnd, charset, false);
-    root.put(name, value);
+    int comma = value.indexOf(',');
+    if (comma > 0) {
+      root.put(name, Arrays.asList(value.split(",")));
+    } else {
+      root.put(name, value);
+    }
     return true;
   }
 

jooby/src/test/java/io/jooby/ValueTest.java

@@ -7,7 +7,9 @@
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.Consumer;
 
@@ -217,7 +219,8 @@ public void valueToMap() {
   public void verifyIllegalAccess() {
     /** Object: */
     queryString("foo=bar", queryString -> {
-      assertThrows(MissingValueException.class, () -> queryString.get("a").get("a").get("a").value());
+      assertThrows(MissingValueException.class,
+          () -> queryString.get("a").get("a").get("a").value());
       assertThrows(MissingValueException.class, () -> queryString.get("missing").value());
       assertThrows(MissingValueException.class, () -> queryString.get(0).value());
       assertEquals("missing", queryString.get("missing").value("missing"));
@@ -236,13 +239,15 @@ public void verifyIllegalAccess() {
 
     /** Single Property: */
     queryString("foo=bar", queryString -> {
-      assertThrows(MissingValueException.class, () -> queryString.get("foo").get("missing").value());
+      assertThrows(MissingValueException.class,
+          () -> queryString.get("foo").get("missing").value());
       assertEquals("bar", queryString.get("foo").get(0).value());
     });
 
     /** Missing Property: */
     queryString("", queryString -> {
-      assertThrows(MissingValueException.class, () -> queryString.get("foo").get("missing").value());
+      assertThrows(MissingValueException.class,
+          () -> queryString.get("foo").get("missing").value());
       assertThrows(MissingValueException.class, () -> queryString.get("foo").get(0).value());
     });
   }
@@ -267,7 +272,20 @@ public void decode() {
     queryString("tail=a%20%2B", queryString -> {
       assertEquals("a +", queryString.get("tail").value());
     });
+  }
 
+  @Test
+  public void empty() {
+    queryString("n&x=&&", queryString -> {
+      assertEquals("", queryString.get("n").value());
+      assertEquals("", queryString.get("x").value());
+      assertEquals(Collections.singletonList(""), queryString.get("n").toList());
+      assertEquals(Collections.singletonList(""), queryString.get("x").toList());
+      Map<String, String> map = new HashMap<>();
+      map.put("n", "");
+      map.put("x", "");
+      assertEquals(map, queryString.toMap());
+    });
   }
 
   @Test
@@ -281,11 +299,17 @@ public void customMapper() {
   @Test
   public void toCollection() {
     /** Array: */
+    queryString("a=1,2,1", queryString -> {
+      assertEquals(Arrays.asList("1", "2", "1"), queryString.get("a").toList());
+
+      assertEquals(new LinkedHashSet<>(Arrays.asList("1", "2")), queryString.get("a").toSet());
+    });
     queryString("a=1;a=2;a=1", queryString -> {
       assertEquals(Arrays.asList("1", "2", "1"), queryString.get("a").toList());
 
       assertEquals(new LinkedHashSet<>(Arrays.asList("1", "2")), queryString.get("a").toSet());
     });
+
     queryString("a=1", queryString -> {
       assertEquals(Arrays.asList("1"), queryString.get("a").toList());
     });
@@ -310,7 +334,7 @@ public void toOptional() {
   }
 
   enum Letter {
-    A, B;
+    A, B
   }
 
   @Test
@@ -352,7 +376,8 @@ public void verifyExceptionMessage() {
           "Missing value: 'a[3]'");
       assertMessage(MissingValueException.class, () -> queryString.get("a").get("b").value(),
           "Missing value: 'a.b'");
-      assertMessage(MissingValueException.class, () -> queryString.get("a").get("b").get(3).longValue(),
+      assertMessage(MissingValueException.class,
+          () -> queryString.get("a").get("b").get(3).longValue(),
           "Missing value: 'a.b[3]'");
     });