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

@@ -28,7 +28,6 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
-import org.assertj.core.data.Offset;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -114,15 +113,12 @@ 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<>();
@@ -212,7 +208,6 @@ public class RulesTest {
     public void generateRedactionLogForOneFile() {
 
         String fileName = "files/Compounds/31 A14111B - EU AIR3 - MCP Section 1 - Identity of the plant protection product.pdf";
-        fileName = "scanned/VV-377031.pdf";//TODO
         fileSize = 1;
         generateAndSaveRedactionLog(fileName, true);
     }
@@ -224,7 +219,6 @@ public class RulesTest {
      * Please commit generated files, if not the following tests will fail
      */
     @Test
-    @Ignore//TODO
     public void generateRedactionLogForAllFiles() {
 
         Set<String> files = getFileNames(new HashSet<>(), FileSystems.getDefault().getPath(RESOURCES_PATH));
@@ -239,11 +233,9 @@ public class RulesTest {
      * If RedactionLog Json does not exist, test will fail.
      */
     @Test
-//    @Ignore//TODO
     public void analyseFileAndCompareRedactionLog() {
 
-//        String fileName = "files/RulesTest/SYNGENTA_EFSA_sanitisation_GFL_v1_withHighlights.pdf"; //TODO PSC
-        String fileName = "scanned/VV-377031.pdf";
+        String fileName = "files/RulesTest/SYNGENTA_EFSA_sanitisation_GFL_v1_withHighlights.pdf";
         fileSize = 1;
         analyseFileAndCompareRedactionLog(fileName);
     }
@@ -255,7 +247,6 @@ public class RulesTest {
      */
     @IfProfileValue(name = "test-groups", value = "rules-test")
     @Test
-    @Ignore//TODO PSC
     public void analyseAllFilesAndCompareRedactionLogs() {
 
         Set<String> files = getFileNames(new HashSet<>(), FileSystems.getDefault().getPath(RESOURCES_PATH));
@@ -355,17 +346,8 @@ public class RulesTest {
             assertThat(savedRedactionLogEntry.get().getSectionNumber()).isEqualTo(redactionLogEntry.getSectionNumber());
             assertThat(savedRedactionLogEntry.get().getTextBefore()).isEqualTo(redactionLogEntry.getTextBefore());
             assertThat(savedRedactionLogEntry.get().getTextAfter()).isEqualTo(redactionLogEntry.getTextAfter());
-
-            System.out.println("OFF " + savedRedactionLogEntry.get().getId());
-            System.out.println("OFF " + savedRedactionLogEntry.get().getStartOffset() + " " + redactionLogEntry.getStartOffset());
-            System.out.println("OFF " + savedRedactionLogEntry.get().getEndOffset() + " " + redactionLogEntry.getEndOffset());
-
-            assertThat(savedRedactionLogEntry.get().getStartOffset()).isCloseTo(redactionLogEntry.getStartOffset(), Offset.offset(4));
-            assertThat(savedRedactionLogEntry.get().getEndOffset()).isCloseTo(redactionLogEntry.getEndOffset(), Offset.offset(4));
-
             assertThat(savedRedactionLogEntry.get().getStartOffset()).isEqualTo(redactionLogEntry.getStartOffset());
             assertThat(savedRedactionLogEntry.get().getEndOffset()).isEqualTo(redactionLogEntry.getEndOffset());
-
             assertThat(savedRedactionLogEntry.get().isImage()).isEqualTo(redactionLogEntry.isImage());
             assertThat(savedRedactionLogEntry.get().isImageHasTransparency()).isEqualTo(redactionLogEntry.isImageHasTransparency());
             assertThat(savedRedactionLogEntry.get().isDictionaryEntry()).isEqualTo(redactionLogEntry.isDictionaryEntry());