Skip to content

Commit e3c1c64

Browse files
LarsEckartLarsEckart
committed
- F promote to production
1 parent f7bf60e commit e3c1c64

File tree

5 files changed

+54
-48
lines changed

5 files changed

+54
-48
lines changed

‎approvaltests-tests/src/test/java/org/approvaltests/Parse1InputTest.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.spun.util.JsonUtils;
44
import org.approvaltests.core.Options;
5+
import org.approvaltests.utils.parseinput.ParseInput;
56
import org.junit.jupiter.api.Test;
67
import org.lambda.query.Queryable;
78

@@ -39,16 +40,18 @@ void testWithTypesTransformersAndBoth()
3940
void testMultiLineSupport()
4041
{
4142
var expected = """
42-
1 -> {
43-
"name": "name",
44-
"age": 1
45-
}
46-
9 -> {
47-
"name": "name",
48-
"age": 9
49-
}
50-
""";
51-
ParseInput.from(expected).multiline().verifyAll(s -> JsonUtils.asJson(new Person("name", Integer.parseInt(s))));
52-
ParseInput.from(expected).multiline().withTypes(Integer.class).transformTo(i -> new Person("name", i)).verifyAll(s -> JsonUtils.asJson(s));
43+
1 -> {
44+
"name": "name",
45+
"age": 1
46+
}
47+
9 -> {
48+
"name": "name",
49+
"age": 9
50+
}
51+
""";
52+
ParseInput.from(expected).multiline()
53+
.verifyAll(s -> JsonUtils.asJson(new Person("name", Integer.parseInt(s))));
54+
ParseInput.from(expected).multiline().withTypes(Integer.class).transformTo(i -> new Person("name", i))
55+
.verifyAll(s -> JsonUtils.asJson(s));
5356
}
5457
}

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.approvaltests;
22

3+
import org.approvaltests.utils.parseinput.ParseInput;
34
import org.junit.jupiter.api.Test;
45

56
public class Parse2InputTest
@@ -22,15 +23,15 @@ void testWithTypesTransformersAndBoth()
2223
void testPersonAge()
2324
{
2425
var expected = """
25-
Llewellyn, 25 -> Person[
26-
name=Llewellyn
27-
label=adult
28-
]
29-
Oliver, 15 -> Person[
30-
name=Oliver
31-
label=teenager
32-
]
33-
""";
26+
Llewellyn, 25 -> Person[
27+
name=Llewellyn
28+
label=adult
29+
]
30+
Oliver, 15 -> Person[
31+
name=Oliver
32+
label=teenager
33+
]
34+
""";
3435
ParseInput.from(expected).multiline().withTypes(String.class, Integer.class).transformTo(Person::new)
3536
.verifyAll(Person::toString);
3637
}

‎approvaltests-tests/src/test/java/org/approvaltests/ParseInput.java renamed to ‎approvaltests/src/main/java/org/approvaltests/utils/parseinput/ParseInput.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
package org.approvaltests;
1+
package org.approvaltests.utils.parseinput;
22

33
import com.spun.util.Tuple;
4+
import org.approvaltests.Approvals;
45
import org.approvaltests.core.Options;
56
import org.lambda.functions.Function1;
67
import org.lambda.query.Queryable;
78

89
import java.util.HashMap;
10+
import java.util.Map;
911

1012
public class ParseInput<OUT>
1113
{
@@ -29,11 +31,11 @@ public ParseInput<OUT> multiline()
2931
public Queryable<Tuple<String, OUT>> parse()
3032
{
3133
Function1<String, Boolean> f = multiline ? s -> s.contains("->") : s -> true;
32-
return Queryable.as(expected.lines()) //
33-
.where(f) //
34-
.select(l -> l.split("->")[0].trim()) //
35-
.where(l -> !l.isEmpty()) //
36-
.select(l -> transformer.call(l));
34+
return Queryable.as(expected.split("\n")) //
35+
.where(f) //
36+
.select(l -> l.split("->")[0].trim()) //
37+
.where(l -> !l.isEmpty()) //
38+
.select(l -> transformer.call(l));
3739
}
3840
public Queryable<OUT> getInputs()
3941
{
@@ -46,7 +48,7 @@ public void verifyAll(Function1<OUT, Object> transform)
4648
}
4749
public static <OUT> Function1<String, OUT> getTransformerForClass(Class<OUT> targetType)
4850
{
49-
var transformers = new HashMap<Class<?>, Function1<String, Object>>()
51+
Map<Class<?>, Function1<String, Object>> transformers = new HashMap<Class<?>, Function1<String, Object>>()
5052
{
5153
{
5254
put(Integer.class, s -> Integer.parseInt(s));

‎approvaltests-tests/src/test/java/org/approvaltests/ParseInputWith1Parameters.java renamed to ‎approvaltests/src/main/java/org/approvaltests/utils/parseinput/ParseInputWith1Parameters.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.approvaltests;
1+
package org.approvaltests.utils.parseinput;
22

33
import com.spun.util.Tuple;
44
import org.lambda.functions.Function1;
@@ -7,8 +7,8 @@
77
public class ParseInputWith1Parameters<OUT>
88
{
99
private final String expected;
10-
private final Function1<String, OUT> transformer;
1110
private final boolean multiline;
11+
private final Function1<String, OUT> transformer;
1212
public ParseInputWith1Parameters(String expected, Function1<String, OUT> transformer, boolean multiline)
1313
{
1414
this.expected = expected;
@@ -24,17 +24,17 @@ public <OUT2> ParseInputWith1Parameters<OUT2> transformTo(Function1<OUT, OUT2> t
2424
Function1<String, OUT2> transformer2 = (String t) -> transformer1.call(transformer.call(t));
2525
return new ParseInputWith1Parameters<>(expected, transformer2, multiline);
2626
}
27-
public void verifyAll(Function1<OUT, Object> transform)
28-
{
29-
getParseInput().verifyAll(transform);
30-
}
3127
public Queryable<OUT> getInputs()
3228
{
33-
return getParseInput().parse().select(Tuple::getSecond);
29+
return getParseInput().parse().select(Tuple::getSecond);
3430
}
3531
private ParseInput<OUT> getParseInput()
3632
{
3733
Function1<String, Tuple<String, OUT>> transformer = s -> new Tuple<>(s, this.transformer.call(s));
3834
return new ParseInput<OUT>(expected, transformer, multiline);
3935
}
36+
public void verifyAll(Function1<OUT, Object> transform)
37+
{
38+
getParseInput().verifyAll(transform);
39+
}
4040
}

‎approvaltests-tests/src/test/java/org/approvaltests/ParseInputWith2Parameters.java renamed to ‎approvaltests/src/main/java/org/approvaltests/utils/parseinput/ParseInputWith2Parameters.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.approvaltests;
1+
package org.approvaltests.utils.parseinput;
22

33
import com.spun.util.Tuple;
44
import org.lambda.functions.Function1;
@@ -9,33 +9,25 @@ public class ParseInputWith2Parameters<IN1, IN2>
99
{
1010
private final String expected;
1111
private final Function1<String, Tuple<IN1, IN2>> transformer;
12-
private final boolean multiline;
13-
14-
public ParseInputWith2Parameters(String expected, Function1<String, Tuple<IN1, IN2>> transformer, boolean multiline)
12+
private final boolean multiline;
13+
public ParseInputWith2Parameters(String expected, Function1<String, Tuple<IN1, IN2>> transformer,
14+
boolean multiline)
1515
{
1616
this.expected = expected;
1717
this.transformer = transformer;
1818
this.multiline = multiline;
1919
}
2020
public static <IN1, IN2> ParseInputWith2Parameters<IN1, IN2> create(String expected, Function1<String, IN1> t1,
21-
Function1<String, IN2> t2, boolean multiline)
21+
Function1<String, IN2> t2, boolean multiline)
2222
{
2323
Function1<String, Tuple<IN1, IN2>> f = s -> {
24-
var temp = Queryable.as(s.split(",")).select(String::trim);
24+
Queryable<String> temp = Queryable.as(s.split(",")).select(String::trim);
2525
IN1 v1 = t1.call(temp.get(0));
2626
IN2 v2 = t2.call(temp.get(1));
2727
return new Tuple<>(v1, v2);
2828
};
2929
return new ParseInputWith2Parameters<>(expected, f, multiline);
3030
}
31-
public void verifyAll(Function1<Tuple<IN1, IN2>, Object> transform)
32-
{
33-
getParseInput().verifyAll(transform);
34-
}
35-
public void verifyAll(Function2<IN1, IN2, Object> transform)
36-
{
37-
getParseInput().verifyAll((t) -> transform.call(t.getFirst(), t.getSecond()));
38-
}
3931
private ParseInput<Tuple<IN1, IN2>> getParseInput()
4032
{
4133
return new ParseInput<>(expected, s -> new Tuple<>(s, transformer.call(s)), multiline);
@@ -48,4 +40,12 @@ public <OUT> ParseInputWith1Parameters<OUT> transformTo(Function2<IN1, IN2, OUT>
4840
};
4941
return new ParseInputWith1Parameters<>(expected, f1, multiline);
5042
}
43+
public void verifyAll(Function2<IN1, IN2, Object> transform)
44+
{
45+
getParseInput().verifyAll((t) -> transform.call(t.getFirst(), t.getSecond()));
46+
}
47+
public void verifyAll(Function1<Tuple<IN1, IN2>, Object> transform)
48+
{
49+
getParseInput().verifyAll(transform);
50+
}
5151
}

0 commit comments

Comments
 (0)