From f4655c4050166b3d19f222995b9b6d7f8a5037d1 Mon Sep 17 00:00:00 2001 From: Philipp Schramm Date: Thu, 4 Aug 2022 13:18:05 +0200 Subject: [PATCH 1/2] RED-4890: Refactored RulesTests, will fail individually --- .../redaction/v1/server/RulesTest.java | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java index 6bcfa394..2ca6eb9d 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java @@ -249,10 +249,31 @@ public class RulesTest { @Test public void analyseAllFilesAndCompareRedactionLogs() { - Set files = getFileNames(new HashSet<>(), FileSystems.getDefault().getPath(RESOURCES_PATH)); - System.out.println("Will analyse " + files.size() + " files and compare its RedactionLogs."); - fileSize = files.size(); - files.forEach(this::analyseFileAndCompareRedactionLog); + Set fileNames = getFileNames(new HashSet<>(), FileSystems.getDefault().getPath(RESOURCES_PATH)); + System.out.println("Will analyse " + fileNames.size() + " files and compare its RedactionLogs."); + fileSize = fileNames.size(); + + Map failedFiles = new HashMap<>(); + + for (String fileName : fileNames) { + + try { + analyseFileAndCompareRedactionLog(fileName); + } catch (AssertionError assertionError) { + failedFiles.put(fileName, assertionError); + } + } + + if (!failedFiles.isEmpty()) { + System.out.println("WARNING: " + failedFiles.size() + " files from " + fileSize + " failed"); + for (String fileName : failedFiles.keySet()) { + System.out.println(" - '" + fileName + "' failed with Error: " + failedFiles.get(fileName) + " See line " + failedFiles.get(fileName) + .getStackTrace()[0].getLineNumber() + " in " + failedFiles.get(fileName).getStackTrace()[0].getClassName()); + } + } + + assertThat(failedFiles).isEmpty(); + } @@ -313,7 +334,11 @@ public class RulesTest { assertThat(redactionLog.getRulesVersion()).isEqualTo(savedRedactionLog.getRulesVersion()); assertThat(redactionLog.getLegalBasisVersion()).isEqualTo(savedRedactionLog.getLegalBasisVersion()); - assertThat(redactionLog.getRedactionLogEntry().stream().filter(r -> !r.isFalsePositive()).collect(Collectors.toSet()).size()).isEqualTo(savedRedactionLog.getRedactionLogEntry().stream().filter(r -> !r.isFalsePositive()).collect(Collectors.toSet()).size()); + assertThat(redactionLog.getRedactionLogEntry() + .stream() + .filter(r -> !r.isFalsePositive()) + .collect(Collectors.toSet()) + .size()).isEqualTo(savedRedactionLog.getRedactionLogEntry().stream().filter(r -> !r.isFalsePositive()).collect(Collectors.toSet()).size()); assertThat(redactionLog.getLegalBasis().size()).isEqualTo(savedRedactionLog.getLegalBasis().size()); for (RedactionLogLegalBasis redactionLegalBasis : redactionLog.getLegalBasis()) { From f5fb8f7c074b3e7b38c6cfdd28ba4c8cc1edfeff Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Tue, 16 Aug 2022 10:56:00 +0200 Subject: [PATCH 2/2] RED-4890: Refactored redaction log tests to show failed files --- .../iqser/red/service/redaction/v1/server/RulesTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java index 2ca6eb9d..c33dbbbf 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java @@ -85,7 +85,9 @@ import com.iqser.red.storage.commons.StorageAutoConfiguration; import com.iqser.red.storage.commons.service.StorageService; import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +@Slf4j @RunWith(SpringRunner.class) @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @Import(RulesTest.RulesTestConfiguration.class) @@ -265,10 +267,10 @@ public class RulesTest { } if (!failedFiles.isEmpty()) { - System.out.println("WARNING: " + failedFiles.size() + " files from " + fileSize + " failed"); + log.warn("WARNING: {} files from {} failed", failedFiles.size(), fileSize); for (String fileName : failedFiles.keySet()) { - System.out.println(" - '" + fileName + "' failed with Error: " + failedFiles.get(fileName) + " See line " + failedFiles.get(fileName) - .getStackTrace()[0].getLineNumber() + " in " + failedFiles.get(fileName).getStackTrace()[0].getClassName()); + log.warn(" - '{}' failed with Error: {} See line {} in {}", fileName, failedFiles.get(fileName), failedFiles.get(fileName) + .getStackTrace()[0].getLineNumber(), failedFiles.get(fileName).getStackTrace()[0].getClassName()); } }