diff --git a/src/test/java/com/example/parser/FlowableExcelMapperTest.java b/src/test/java/com/example/parser/FlowableExcelMapperTest.java index 2443988..d002fd8 100644 --- a/src/test/java/com/example/parser/FlowableExcelMapperTest.java +++ b/src/test/java/com/example/parser/FlowableExcelMapperTest.java @@ -97,11 +97,11 @@ class FlowableExcelMapperTest { return argumentList.stream(); } - protected Stream excelMapperTestDataOk() { + protected Stream excelMapperTestOk() { return getArgumentsFromExcel("flowableExcelMapperTestData_ok.xlsx"); } @ParameterizedTest - @MethodSource("excelMapperTestDataOk") + @MethodSource public void excelMapperTestOk(JsonNode row) { JsonNode root = row.get("root"); JsonNode test = row.get("test"); @@ -110,11 +110,11 @@ class FlowableExcelMapperTest { .withFailMessage(System.lineSeparator() + "root=" + root + System.lineSeparator() + "test=" + test).isTrue(); } - protected Stream excelMapperTestDataFail() { + protected Stream excelMapperTestFail() { return getArgumentsFromExcel("flowableExcelMapperTestData_fail.xlsx"); } @ParameterizedTest - @MethodSource("excelMapperTestDataFail") + @MethodSource public void excelMapperTestFail(JsonNode row) { JsonNode root = row.get("root"); JsonNode test = row.get("test"); diff --git a/src/test/java/com/example/parser/FlowableExcelParserTest.java b/src/test/java/com/example/parser/FlowableExcelParserTest.java index 4531e13..c935111 100644 --- a/src/test/java/com/example/parser/FlowableExcelParserTest.java +++ b/src/test/java/com/example/parser/FlowableExcelParserTest.java @@ -36,11 +36,11 @@ class FlowableExcelParserTest { } @NotNull - protected Stream booleanExcelParserTestData() { + protected Stream booleanExcelParserTest() { return getArgumentsFromExcelBook("flowableExcelParserTestDataBoolean.xlsx"); } @ParameterizedTest - @MethodSource("booleanExcelParserTestData") + @MethodSource public void booleanExcelParserTest(ArrayList row) { 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); @@ -50,11 +50,11 @@ class FlowableExcelParserTest { } @NotNull - protected Stream stringExcelParserTestData() { + protected Stream stringExcelParserTest() { return getArgumentsFromExcelBook("flowableExcelParserTestDataString.xlsx"); } @ParameterizedTest - @MethodSource("stringExcelParserTestData") + @MethodSource public void stringExcelParserTest(ArrayList row) { String val12 = row.get(0).toString() + row.get(1).toString(); Assertions.assertThat(row.get(3)).isEqualTo(val12); @@ -67,11 +67,11 @@ class FlowableExcelParserTest { } @NotNull - protected Stream numberExcelParserTestData() { + protected Stream numberExcelParserTest() { return getArgumentsFromExcelBook("flowableExcelParserTestDataInteger.xlsx"); } @ParameterizedTest - @MethodSource("numberExcelParserTestData") + @MethodSource public void numberExcelParserTest(ArrayList row) { Integer val12 = Integer.parseInt(row.get(0).toString()) + Integer.parseInt(row.get(1).toString()); Assertions.assertThat(Integer.parseInt(row.get(3).toString())).isEqualTo(val12); @@ -105,12 +105,12 @@ class FlowableExcelParserTest { } @NotNull - protected Stream booleanExcelParserTestDataProvider() { + protected Stream booleanOldExcelParserTest() { return getArgumentsFromExcel("flowableExcelParserTestDataBooleanOld.xlsx"); } @ParameterizedTest - @MethodSource("booleanExcelParserTestDataProvider") - public void booleanExcelParserTest(LinkedHashMap inputMap, LinkedHashMap outputMap) { + @MethodSource + public void booleanOldExcelParserTest(LinkedHashMap inputMap, LinkedHashMap outputMap) { for (Map.Entry entry : outputMap.entrySet()) { String key = entry.getKey(); if (key.equals("output1")) { @@ -125,12 +125,12 @@ class FlowableExcelParserTest { } @NotNull - protected Stream stringExcelParserTestDataProvider() { + protected Stream stringOldExcelParserTest() { return getArgumentsFromExcel("flowableExcelParserTestDataStringOld.xlsx"); } @ParameterizedTest - @MethodSource("stringExcelParserTestDataProvider") - public void stringExcelParserTest(LinkedHashMap inputMap, LinkedHashMap outputMap) { + @MethodSource + public void stringOldExcelParserTest(LinkedHashMap inputMap, LinkedHashMap outputMap) { for (Map.Entry entry : outputMap.entrySet()) { String key = entry.getKey(); if (key.equals("output1")) { @@ -149,12 +149,12 @@ class FlowableExcelParserTest { } @NotNull - protected Stream numberExcelParserTestDataProvider() { + protected Stream numberOldExcelParserTest() { return getArgumentsFromExcel("flowableExcelParserTestDataIntegerOld.xlsx"); } @ParameterizedTest - @MethodSource("numberExcelParserTestDataProvider") - public void numberExcelParserTest(LinkedHashMap inputMap, LinkedHashMap outputMap) { + @MethodSource + public void numberOldExcelParserTest(LinkedHashMap inputMap, LinkedHashMap outputMap) { for (Map.Entry entry : outputMap.entrySet()) { String key = entry.getKey(); if (key.equals("output1")) {