- F ParseInput with 2 parameters handles an array as 2nd parameter

Author: LarsEckart

approvaltests-tests/src/test/java/org/approvaltests/Parse2InputTest.java

@@ -48,6 +48,7 @@ public void testArrays()
         5,5,7,7 -> 24.0
         """;
     ParseInput.from(expected).withTypes(Integer[].class).verifyAll(this::sum);
+    ParseInput.from(expected).withTypes(Integer.class, Integer[].class).verifyAll((i, a) -> i + sum(a));
   }
   private Double sum(Integer[] integers)
   {

approvaltests/src/main/java/org/approvaltests/utils/parseinput/ParseInput.java

@@ -24,6 +24,11 @@ public static ParseInput<String> from(String expected)
   {
     return new ParseInput<String>(expected, s -> new Tuple<>(s, s), new ParseInputOptions());
   }
+  public static String getLast(Queryable<String> temp, int number)
+  {
+    Queryable<String> skip = temp.skip(number);
+    return skip.size() == 1 ? skip.first() : skip.join(", ");
+  }
   public ParseInput<OUT> multiline()
   {
     return new ParseInput<>(expected, transformer, new ParseInputOptions(true));

approvaltests/src/main/java/org/approvaltests/utils/parseinput/ParseInputWith2Parameters.java

@@ -23,7 +23,7 @@ public static <IN1, IN2> ParseInputWith2Parameters<IN1, IN2> create(String expec
     Function1<String, Tuple<IN1, IN2>> f = s -> {
       Queryable<String> temp = Queryable.as(s.split(",")).select(String::trim);
       IN1 v1 = t1.call(temp.get(0));
-      IN2 v2 = t2.call(temp.get(1));
+      IN2 v2 = t2.call(ParseInput.getLast(temp, 1));
       return new Tuple<>(v1, v2);
     };
     return new ParseInputWith2Parameters<>(expected, f, options);

approvaltests/src/main/java/org/approvaltests/utils/parseinput/ParseInputWith3Parameters.java

@@ -26,8 +26,7 @@ public static <IN1, IN2, IN3> ParseInputWith3Parameters<IN1, IN2, IN3> create(St
       Queryable<String> temp = Queryable.as(s.split(",")).select(String::trim);
       IN1 v1 = t1.call(temp.get(0));
       IN2 v2 = t2.call(temp.get(1));
-      Queryable<String> skip = temp.skip(2);
-      IN3 v3 = t3.call(skip.size() == 1 ? skip.first() : skip.join(", "));
+      IN3 v3 = t3.call(ParseInput.getLast(temp, 2));
       return new Tuple3<>(v1, v2, v3);
     };
     return new ParseInputWith3Parameters<>(expected, f, options);