Update tests.

Author: gk-brown

kilo-test/src/main/java/org/httprpc/kilo/test/TestService.java

@@ -47,7 +47,9 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.SequencedMap;
+import java.util.SequencedSet;
 import java.util.Set;
+import java.util.SortedSet;
 import java.util.UUID;
 
 import static org.httprpc.kilo.util.Collections.*;
@@ -100,8 +102,9 @@ public interface Response {
         List<String> getStrings();
         Integer getNumber();
         Set<Integer> getNumbers();
-        boolean getFlag();
         char getCharacter();
+        Set<Character> getCharacters();
+        boolean getFlag();
         DayOfWeek getDayOfWeek();
         Instant getDate();
         List<Instant> getDates();
@@ -180,7 +183,8 @@ public Number next() {
 
     @RequestMethod("GET")
     public Response testGet(@Required String string, List<String> strings,
-        Integer number, Set<Integer> numbers, boolean flag, char character, DayOfWeek dayOfWeek,
+        int number, SequencedSet<Integer> numbers, char character, SortedSet<Character> characters,
+        boolean flag, DayOfWeek dayOfWeek,
         Instant date, List<Instant> dates,
         LocalDate localDate, LocalTime localTime, LocalDateTime localDateTime,
         Duration duration, Period period,
@@ -190,8 +194,9 @@ public Response testGet(@Required String string, List<String> strings,
             entry("strings", strings),
             entry("number", number),
             entry("numbers", numbers),
-            entry("flag", flag),
             entry("character", character),
+            entry("characters", characters),
+            entry("flag", flag),
             entry("dayOfWeek", dayOfWeek),
             entry("date", date),
             entry("dates", dates),
@@ -292,7 +297,7 @@ public List<String> testPostList(List<String> list) {
 
     @RequestMethod("POST")
     @ResourcePath("map")
-    public Map<String, Double> testPostMap(SequencedMap<String, Double> map) {
+    public SequencedMap<String, Double> testPostMap(SequencedMap<String, Double> map) {
         return map;
     }
 

kilo-test/src/test/java/org/httprpc/kilo/test/TestServiceProxy.java

@@ -33,7 +33,8 @@
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.SequencedSet;
+import java.util.SortedSet;
 
 import static org.httprpc.kilo.util.Iterables.*;
 
@@ -85,7 +86,9 @@ public void handleResponse(InputStream errorStream, String contentType, int stat
     }
 
     @RequestMethod("GET")
-    TestService.Response testGet(@Required String string, List<String> strings, Integer number, Set<Integer> numbers, char character) throws IOException;
+    TestService.Response testGet(@Required String string, List<String> strings,
+        int number, SequencedSet<Integer> numbers, char character, SortedSet<Character> characters,
+        boolean flag) throws IOException;
 
     @RequestMethod("GET")
     @ResourcePath("a#/?/b*/?/c@/?/d=/?")

kilo-test/src/test/java/org/httprpc/kilo/test/WebServiceProxyTest.java

@@ -76,8 +76,9 @@ public void testGet() throws IOException {
             entry("strings", listOf("a", "b", "c")),
             entry("number", 123),
             entry("numbers", listOf(1, 2, 2, 3, 3, 3)),
-            entry("flag", true),
             entry("character", "abc"),
+            entry("characters", listOf('c', 'b', 'b', 'a', 'a', 'a')),
+            entry("flag", true),
             entry("dayOfWeek", dayOfWeek),
             entry("date", date),
             entry("dates", listOf(date)),
@@ -97,8 +98,9 @@ public void testGet() throws IOException {
         assertEquals(listOf("a", "b", "c"), result.getStrings());
         assertEquals(123, result.getNumber());
         assertEquals(setOf(1, 2, 3), result.getNumbers());
-        assertTrue(result.getFlag());
         assertEquals('a', result.getCharacter());
+        assertEquals(sortedSetOf('a', 'b', 'c'), result.getCharacters());
+        assertTrue(result.getFlag());
         assertEquals(dayOfWeek, result.getDayOfWeek());
         assertEquals(date, result.getDate());
         assertEquals(listOf(date), result.getDates());
@@ -114,13 +116,17 @@ public void testGet() throws IOException {
     public void testGetProxy() throws IOException {
         var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI);
 
-        var result = testServiceProxy.testGet("héllo&gøod+bye?", listOf("a", "b", "c"), 123, setOf(1, 2, 3), 'a');
+        var result = testServiceProxy.testGet("héllo&gøod+bye?", listOf("a", "b", "c"),
+            123, setOf(1, 2, 3), 'a', sortedSetOf('a', 'b', 'c'),
+            true);
 
         assertEquals("héllo&gøod+bye?", result.getString());
         assertEquals(listOf("a", "b", "c"), result.getStrings());
         assertEquals(123, result.getNumber());
         assertEquals(setOf(1, 2, 3), result.getNumbers());
         assertEquals('a', result.getCharacter());
+        assertEquals(sortedSetOf('a', 'b', 'c'), result.getCharacters());
+        assertTrue(result.getFlag());
     }
 
     @Test
@@ -617,7 +623,7 @@ public void testMissingRequiredParameter() {
     public void testMissingRequiredParameterProxy() {
         var testServiceProxy = WebServiceProxy.of(TestServiceProxy.class, baseURI);
 
-        assertThrows(IllegalArgumentException.class, () -> testServiceProxy.testGet(null, null, null, null, '\0'));
+        assertThrows(IllegalArgumentException.class, () -> testServiceProxy.testGet(null, null, 0, null, '\0', null, false));
     }
 
     @Test