Simplified ParameterizedTest
This commit is contained in:
@@ -97,11 +97,11 @@ class FlowableExcelMapperTest {
|
|||||||
return argumentList.stream();
|
return argumentList.stream();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Stream<Arguments> excelMapperTestDataOk() {
|
protected Stream<Arguments> excelMapperTestOk() {
|
||||||
return getArgumentsFromExcel("flowableExcelMapperTestData_ok.xlsx");
|
return getArgumentsFromExcel("flowableExcelMapperTestData_ok.xlsx");
|
||||||
}
|
}
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@MethodSource("excelMapperTestDataOk")
|
@MethodSource
|
||||||
public void excelMapperTestOk(JsonNode row) {
|
public void excelMapperTestOk(JsonNode row) {
|
||||||
JsonNode root = row.get("root");
|
JsonNode root = row.get("root");
|
||||||
JsonNode test = row.get("test");
|
JsonNode test = row.get("test");
|
||||||
@@ -110,11 +110,11 @@ class FlowableExcelMapperTest {
|
|||||||
.withFailMessage(System.lineSeparator() + "root=" + root + System.lineSeparator() + "test=" + test).isTrue();
|
.withFailMessage(System.lineSeparator() + "root=" + root + System.lineSeparator() + "test=" + test).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Stream<Arguments> excelMapperTestDataFail() {
|
protected Stream<Arguments> excelMapperTestFail() {
|
||||||
return getArgumentsFromExcel("flowableExcelMapperTestData_fail.xlsx");
|
return getArgumentsFromExcel("flowableExcelMapperTestData_fail.xlsx");
|
||||||
}
|
}
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@MethodSource("excelMapperTestDataFail")
|
@MethodSource
|
||||||
public void excelMapperTestFail(JsonNode row) {
|
public void excelMapperTestFail(JsonNode row) {
|
||||||
JsonNode root = row.get("root");
|
JsonNode root = row.get("root");
|
||||||
JsonNode test = row.get("test");
|
JsonNode test = row.get("test");
|
||||||
|
|||||||
@@ -36,11 +36,11 @@ class FlowableExcelParserTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
protected Stream<Arguments> booleanExcelParserTestData() {
|
protected Stream<Arguments> booleanExcelParserTest() {
|
||||||
return getArgumentsFromExcelBook("flowableExcelParserTestDataBoolean.xlsx");
|
return getArgumentsFromExcelBook("flowableExcelParserTestDataBoolean.xlsx");
|
||||||
}
|
}
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@MethodSource("booleanExcelParserTestData")
|
@MethodSource
|
||||||
public void booleanExcelParserTest(ArrayList<Object> row) {
|
public void booleanExcelParserTest(ArrayList<Object> row) {
|
||||||
Boolean valOr = Boolean.parseBoolean(row.get(0).toString()) || Boolean.parseBoolean(row.get(1).toString()) || Boolean.parseBoolean(row.get(2).toString());
|
Boolean valOr = Boolean.parseBoolean(row.get(0).toString()) || Boolean.parseBoolean(row.get(1).toString()) || Boolean.parseBoolean(row.get(2).toString());
|
||||||
Assertions.assertThat(Boolean.parseBoolean(row.get(3).toString())).isEqualTo(valOr);
|
Assertions.assertThat(Boolean.parseBoolean(row.get(3).toString())).isEqualTo(valOr);
|
||||||
@@ -50,11 +50,11 @@ class FlowableExcelParserTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
protected Stream<Arguments> stringExcelParserTestData() {
|
protected Stream<Arguments> stringExcelParserTest() {
|
||||||
return getArgumentsFromExcelBook("flowableExcelParserTestDataString.xlsx");
|
return getArgumentsFromExcelBook("flowableExcelParserTestDataString.xlsx");
|
||||||
}
|
}
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@MethodSource("stringExcelParserTestData")
|
@MethodSource
|
||||||
public void stringExcelParserTest(ArrayList<Object> row) {
|
public void stringExcelParserTest(ArrayList<Object> row) {
|
||||||
String val12 = row.get(0).toString() + row.get(1).toString();
|
String val12 = row.get(0).toString() + row.get(1).toString();
|
||||||
Assertions.assertThat(row.get(3)).isEqualTo(val12);
|
Assertions.assertThat(row.get(3)).isEqualTo(val12);
|
||||||
@@ -67,11 +67,11 @@ class FlowableExcelParserTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
protected Stream<Arguments> numberExcelParserTestData() {
|
protected Stream<Arguments> numberExcelParserTest() {
|
||||||
return getArgumentsFromExcelBook("flowableExcelParserTestDataInteger.xlsx");
|
return getArgumentsFromExcelBook("flowableExcelParserTestDataInteger.xlsx");
|
||||||
}
|
}
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@MethodSource("numberExcelParserTestData")
|
@MethodSource
|
||||||
public void numberExcelParserTest(ArrayList<Object> row) {
|
public void numberExcelParserTest(ArrayList<Object> row) {
|
||||||
Integer val12 = Integer.parseInt(row.get(0).toString()) + Integer.parseInt(row.get(1).toString());
|
Integer val12 = Integer.parseInt(row.get(0).toString()) + Integer.parseInt(row.get(1).toString());
|
||||||
Assertions.assertThat(Integer.parseInt(row.get(3).toString())).isEqualTo(val12);
|
Assertions.assertThat(Integer.parseInt(row.get(3).toString())).isEqualTo(val12);
|
||||||
@@ -105,12 +105,12 @@ class FlowableExcelParserTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
protected Stream<Arguments> booleanExcelParserTestDataProvider() {
|
protected Stream<Arguments> booleanOldExcelParserTest() {
|
||||||
return getArgumentsFromExcel("flowableExcelParserTestDataBooleanOld.xlsx");
|
return getArgumentsFromExcel("flowableExcelParserTestDataBooleanOld.xlsx");
|
||||||
}
|
}
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@MethodSource("booleanExcelParserTestDataProvider")
|
@MethodSource
|
||||||
public void booleanExcelParserTest(LinkedHashMap<String, Object> inputMap, LinkedHashMap<String, Object> outputMap) {
|
public void booleanOldExcelParserTest(LinkedHashMap<String, Object> inputMap, LinkedHashMap<String, Object> outputMap) {
|
||||||
for (Map.Entry<String, Object> entry : outputMap.entrySet()) {
|
for (Map.Entry<String, Object> entry : outputMap.entrySet()) {
|
||||||
String key = entry.getKey();
|
String key = entry.getKey();
|
||||||
if (key.equals("output1")) {
|
if (key.equals("output1")) {
|
||||||
@@ -125,12 +125,12 @@ class FlowableExcelParserTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
protected Stream<Arguments> stringExcelParserTestDataProvider() {
|
protected Stream<Arguments> stringOldExcelParserTest() {
|
||||||
return getArgumentsFromExcel("flowableExcelParserTestDataStringOld.xlsx");
|
return getArgumentsFromExcel("flowableExcelParserTestDataStringOld.xlsx");
|
||||||
}
|
}
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@MethodSource("stringExcelParserTestDataProvider")
|
@MethodSource
|
||||||
public void stringExcelParserTest(LinkedHashMap<String, Object> inputMap, LinkedHashMap<String, Object> outputMap) {
|
public void stringOldExcelParserTest(LinkedHashMap<String, Object> inputMap, LinkedHashMap<String, Object> outputMap) {
|
||||||
for (Map.Entry<String, Object> entry : outputMap.entrySet()) {
|
for (Map.Entry<String, Object> entry : outputMap.entrySet()) {
|
||||||
String key = entry.getKey();
|
String key = entry.getKey();
|
||||||
if (key.equals("output1")) {
|
if (key.equals("output1")) {
|
||||||
@@ -149,12 +149,12 @@ class FlowableExcelParserTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
protected Stream<Arguments> numberExcelParserTestDataProvider() {
|
protected Stream<Arguments> numberOldExcelParserTest() {
|
||||||
return getArgumentsFromExcel("flowableExcelParserTestDataIntegerOld.xlsx");
|
return getArgumentsFromExcel("flowableExcelParserTestDataIntegerOld.xlsx");
|
||||||
}
|
}
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@MethodSource("numberExcelParserTestDataProvider")
|
@MethodSource
|
||||||
public void numberExcelParserTest(LinkedHashMap<String, Object> inputMap, LinkedHashMap<String, Object> outputMap) {
|
public void numberOldExcelParserTest(LinkedHashMap<String, Object> inputMap, LinkedHashMap<String, Object> outputMap) {
|
||||||
for (Map.Entry<String, Object> entry : outputMap.entrySet()) {
|
for (Map.Entry<String, Object> entry : outputMap.entrySet()) {
|
||||||
String key = entry.getKey();
|
String key = entry.getKey();
|
||||||
if (key.equals("output1")) {
|
if (key.equals("output1")) {
|
||||||
|
|||||||
Reference in New Issue
Block a user