diff --git a/src/test/java/com/example/parser/FlowableExcelMapperTest.java b/src/test/java/com/example/parser/FlowableExcelMapperTest.java index d002fd8..edffce2 100644 --- a/src/test/java/com/example/parser/FlowableExcelMapperTest.java +++ b/src/test/java/com/example/parser/FlowableExcelMapperTest.java @@ -6,8 +6,6 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -23,8 +21,6 @@ class FlowableExcelMapperTest { @Autowired private FlowableExcelMapper flowableExcelMapper; - protected static final Logger logger = LoggerFactory.getLogger(FlowableExcelMapperTest.class); - public boolean isSubset(JsonNode root, JsonNode test) { // If test is null, it is always a subset of root @@ -71,7 +67,7 @@ class FlowableExcelMapperTest { rootValue = root.get(fieldName); } if (testValue.isTextual() && "__N_A".equals(testValue.asText())) { - if (rootValue != null && !rootValue.isNull()) { + if (root != null && root.has(fieldName)) { return false; } continue; @@ -105,9 +101,8 @@ class FlowableExcelMapperTest { public void excelMapperTestOk(JsonNode row) { JsonNode root = row.get("root"); JsonNode test = row.get("test"); - logger.info("{}root={}{}test={}", System.lineSeparator(), root, System.lineSeparator(), test); Assertions.assertThat(isSubset(root, test)) - .withFailMessage(System.lineSeparator() + "root=" + root + System.lineSeparator() + "test=" + test).isTrue(); + .withFailMessage(System.lineSeparator() + "test :" + test + System.lineSeparator() + "root :" + root).isTrue(); } protected Stream excelMapperTestFail() { @@ -118,8 +113,7 @@ class FlowableExcelMapperTest { public void excelMapperTestFail(JsonNode row) { JsonNode root = row.get("root"); JsonNode test = row.get("test"); - logger.info("{}root={}{}test={}", System.lineSeparator(), root, System.lineSeparator(), test); Assertions.assertThat(isSubset(root, test)) - .withFailMessage(System.lineSeparator() + "root=" + root + System.lineSeparator() + "test=" + test).isFalse(); + .withFailMessage(System.lineSeparator() + "test :" + test + System.lineSeparator() + "root :" + root).isFalse(); } } diff --git a/src/test/resources/flowableExcelMapperTestData_fail.xlsx b/src/test/resources/flowableExcelMapperTestData_fail.xlsx index 498685b..7b46a9b 100644 Binary files a/src/test/resources/flowableExcelMapperTestData_fail.xlsx and b/src/test/resources/flowableExcelMapperTestData_fail.xlsx differ