- F ParseInput with 3 parameters now handles arrays as last argument

Author: LarsEckart

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

@@ -1,11 +1,14 @@
 package org.approvaltests;
 
+import com.spun.util.Tuple;
 import org.approvaltests.reporters.AutoApproveReporter;
 import org.approvaltests.reporters.UseReporter;
 import org.approvaltests.utils.parseinput.ParseInput;
 import org.junit.jupiter.api.Test;
 import org.lambda.query.Queryable;
 
+import java.util.Arrays;
+
 public class Parse3InputTest
 {
   @Test
@@ -21,35 +24,22 @@ void testWithTypesTransformersAndBoth()
         .verifyAll((i, d, b) -> i * d * (b ? 1 : 0));
     ParseInput.from(expected).transformTo(Integer::parseInt, Double::parseDouble, Boolean::parseBoolean)
         .verifyAll(t -> t.getFirst() * t.getSecond() * (t.getThird() ? 1 : 0));
-    ParseInput.from(expected).withTypes(Integer.class, Double.class, Boolean.class).transformTo((i, d, b) -> i * d * (b ? 1 : 0))
-        .verifyAll(t -> t);
-  }
-  @Test
-  void testPersonAge()
-  {
-    var expected = """
-        Llewellyn, 25 -> Person[
-            name=Llewellyn
-            label=adult
-        ]
-        Oliver, 15 -> Person[
-            name=Oliver
-            label=teenager
-        ]
-        """;
-    ParseInput.from(expected).multiline().withTypes(String.class, Integer.class).transformTo(Person::new)
-        .verifyAll(Person::toString);
+    ParseInput.from(expected).withTypes(Integer.class, Double.class, Boolean.class)
+        .transformTo((i, d, b) -> i * d * (b ? 1 : 0)).verifyAll(t -> t);
   }
   @Test
   @UseReporter(AutoApproveReporter.class)
   public void testArrays()
   {
     var expected = """
-        1, 1 -> 2.0
-        10 ,1, 1 -> 12.0
-        5,5,7,7 -> 24.0
+        lars, 20, 1,2,3 -> Person[
+            name=lars
+            label=teenager
+        ] = 6.0
         """;
-    ParseInput.from(expected).withTypes(Integer[].class).verifyAll(this::sum);
+    ParseInput.from(expected).multiline().withTypes(String.class, Integer.class, Integer[].class)
+        .transformTo((s, i, r) -> new Tuple<>(new Person(s, i), r))
+        .verifyAll(t -> t.getFirst() + " = " + sum(t.getSecond()));
   }
   private Double sum(Integer[] integers)
   {

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

@@ -26,7 +26,8 @@ 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));
-      IN3 v3 = t3.call(temp.get(2));
+      Queryable<String> skip = temp.skip(2);
+      IN3 v3 = t3.call(skip.size() == 1 ? skip.first() : skip.join(", "));
       return new Tuple3<>(v1, v2, v3);
     };
     return new ParseInputWith3Parameters<>(expected, f, options);