RED-4510: Added generated RedactionLog Json files and optimizations for RulesTest.java for Bamboo

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java

@@ -113,12 +113,13 @@ public class RulesTest {
     private static final String IMPORTED_REDACTION = "imported_redaction";
     private static final String PII = "PII";
     private static final String RESOURCES_PATH = "src/test/resources/";
-
     private static final String REDACTION_LOG_PATH = "RedactionLog/";
     private static final String REDACTION_LOG_RESOURCES_PATH = RESOURCES_PATH + REDACTION_LOG_PATH;
     private final static String TEST_DOSSIER_TEMPLATE_ID = "123";
     private final static String TEST_DOSSIER_ID = "123";
     private String TEST_FILE_ID = "123";
+    private int counter = 0;
+    private int fileSize = 0;
     private final Map<String, List<String>> dictionary = new HashMap<>();
     private final Map<String, List<String>> dossierDictionary = new HashMap<>();
     private final Map<String, List<String>> falsePositive = new HashMap<>();
@@ -207,6 +208,7 @@ public class RulesTest {
     public void generateRedactionLogForOneFile() {
 
         String fileName = "files/Compounds/31 A14111B - EU AIR3 - MCP Section 1 - Identity of the plant protection product.pdf";
+        fileSize = 1;
         generateAndSaveRedactionLog(fileName, true);
     }
 
@@ -221,6 +223,7 @@ public class RulesTest {
 
         Set<String> files = getFileNames(new HashSet<>(), FileSystems.getDefault().getPath(RESOURCES_PATH));
         System.out.println("Will generate RedactionLog for " + files.size() + " files.");
+        fileSize = files.size();
         files.forEach(this::generateAndSaveRedactionLog);
     }
 
@@ -232,9 +235,8 @@ public class RulesTest {
     @Test
     public void analyseFileAndCompareRedactionLog() {
 
-        String fileName = "files/RulesTest/SYNGENTA_EFSA_sanitisation_GFL_v1_withHighlights.pdf"; //TODO PSC
-//        String fileName = "scanned/VV-377031.pdf";
-//        fileName = "files/new/A20622A izRMS (CZ) fRR Part B9.pdf";
+        String fileName = "files/RulesTest/SYNGENTA_EFSA_sanitisation_GFL_v1_withHighlights.pdf";
+        fileSize = 1;
         analyseFileAndCompareRedactionLog(fileName);
     }
 
@@ -243,12 +245,13 @@ public class RulesTest {
      * Analyses all files and compares its RedactionLog with saved one from here: REDACTION_LOG_PATH.
      * If RedactionLog Json for one file does not exist, whole test will fail.
      */
-    @IfProfileValue(name = "test-groups", value = "rules-test") //TODO PSC
+    @IfProfileValue(name = "test-groups", value = "rules-test")
     @Test
     public void analyseAllFilesAndCompareRedactionLogs() {
 
         Set<String> 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);
     }
 
@@ -262,13 +265,14 @@ public class RulesTest {
     @SneakyThrows
     private void generateAndSaveRedactionLog(String fileName, boolean force) {
 
+        counter++;
         if (!force && doesRedactionLogExist(fileName)) {
-            System.out.println("Skip generating RedactionLog as Json for " + fileName + " because it already exists.");
+            System.out.println("(" + counter + "/" + fileSize + ") Skip generating RedactionLog as Json for " + fileName + " because it already exists.");
 
         } else {
             generateTestFileId(fileName);
 
-            System.out.println("Generate RedactionLog as Json for " + fileName + " with fileId " + TEST_FILE_ID);
+            System.out.println("(" + counter + "/" + fileSize + ") Generate RedactionLog as Json for " + fileName + " with fileId " + TEST_FILE_ID);
 
             loadNerForTest();
 
@@ -287,8 +291,9 @@ public class RulesTest {
     @SneakyThrows
     public void analyseFileAndCompareRedactionLog(String fileName) {
 
+        counter++;
         generateTestFileId(fileName);
-        System.out.println("Analyse " + fileName + " with fileId " + TEST_FILE_ID + " and compare it with its saved RedactionLog");
+        System.out.println("(" + counter + "/" + fileSize + ") Analyse " + fileName + " with fileId " + TEST_FILE_ID + " and compare it with its saved RedactionLog");
 
         RedactionLog savedRedactionLog = loadSavedRedactionLog(fileName);
 
@@ -396,7 +401,7 @@ public class RulesTest {
                 assertThat(savedManualChange).isPresent();
             }
 
-            assertThat(savedRedactionLogEntry.get().getEngines()).containsExactly(redactionLogEntry.getEngines().toArray(new Engine[0]));
+            assertThat(savedRedactionLogEntry.get().getEngines()).containsExactlyInAnyOrder(redactionLogEntry.getEngines().toArray(new Engine[0]));
 
             assertThat(savedRedactionLogEntry.get().getReference()).containsAll(redactionLogEntry.getReference());
             assertThat(savedRedactionLogEntry.get().getImportedRedactionIntersections()).containsAll(redactionLogEntry.getImportedRedactionIntersections());
@@ -471,6 +476,25 @@ public class RulesTest {
     }
 
 
+    @SneakyThrows
+    private Set<String> getFileNames(Set<String> fileNames, Path dir) {
+
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
+            for (Path path : stream) {
+                if (path.toFile().isDirectory()) {
+                    getFileNames(fileNames, path);
+                } else if (StringUtils.endsWith(path.toAbsolutePath().toString(), ".pdf")) {
+                    String absolutePath = cleanPath(path.toAbsolutePath().toString());
+                    int pos = StringUtils.indexOf(absolutePath, RESOURCES_PATH) + RESOURCES_PATH.length();
+
+                    fileNames.add(StringUtils.substring(absolutePath, pos));
+                }
+            }
+        }
+        return fileNames;
+    }
+
+
     private String cleanPath(String path) {
 
         return StringUtils.replace(path, "\\", "/");
@@ -615,24 +639,6 @@ public class RulesTest {
     }
 
 
-    @SneakyThrows
-    private Set<String> getFileNames(Set<String> fileNames, Path dir) {
-
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
-            for (Path path : stream) {
-                if (path.toFile().isDirectory()) {
-                    getFileNames(fileNames, path);
-                } else if (StringUtils.endsWith(path.toAbsolutePath().toString(), ".pdf")) {
-                    String absolutePath = cleanPath(path.toAbsolutePath().toString());
-                    int pos = StringUtils.indexOf(absolutePath, RESOURCES_PATH) + RESOURCES_PATH.length();
-                    fileNames.add(StringUtils.substring(absolutePath, pos));
-                }
-            }
-        }
-        return fileNames;
-    }
-
-
     private Type getDictionaryResponse(String type, boolean isDossierDictionary) {
 
         return Type.builder()