diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf9660c..4f73412 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,7 @@ +variables: + # SONAR_PROJECT_KEY: 'ocr-service:ocr-service-server' + GIT_SUBMODULE_STRATEGY: recursive + GIT_SUBMODULE_FORCE_HTTPS: 'true' include: - project: 'gitlab/gitlab' ref: 'main' diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..98dbe89 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,8 @@ +[submodule "ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta"] + path = ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta + url = https://gitlab.knecon.com/fforesight/documents/syngenta.git + update = merge +[submodule "ocr-service-v1/ocr-service-server/src/test/resources/files/basf"] + path = ocr-service-v1/ocr-service-server/src/test/resources/files/basf + url = https://gitlab.knecon.com/fforesight/documents/basf.git + update = merge diff --git a/ocr-service-v1/ocr-service-server/src/test/java/com/knecon/fforesight/service/ocr/v1/server/OcrServiceIntegrationTest.java b/ocr-service-v1/ocr-service-server/src/test/java/com/knecon/fforesight/service/ocr/v1/server/OcrServiceIntegrationTest.java index 4e6c751..a995fe3 100644 --- a/ocr-service-v1/ocr-service-server/src/test/java/com/knecon/fforesight/service/ocr/v1/server/OcrServiceIntegrationTest.java +++ b/ocr-service-v1/ocr-service-server/src/test/java/com/knecon/fforesight/service/ocr/v1/server/OcrServiceIntegrationTest.java @@ -50,9 +50,9 @@ public class OcrServiceIntegrationTest extends AbstractTest { @Test public void testOCRMetrics() { - testOCR("files/Watermark.pdf"); - testOCR("files/Watermark.pdf"); - testOCR("files/Watermark.pdf"); + testOCR("files/syngenta/CustomerFiles/SinglePages/Watermark_Page1_10.SYN524464 FS (A16148C) - Absorção cutânea.pdf"); + testOCR("files/syngenta/CustomerFiles/SinglePages/Watermark_Page1_10.SYN524464 FS (A16148C) - Absorção cutânea.pdf"); + testOCR("files/syngenta/CustomerFiles/SinglePages/Watermark_Page1_10.SYN524464 FS (A16148C) - Absorção cutânea.pdf"); var ocrOnDocumentMeter = registry.getMeters().stream().filter(m -> m.getId().getName().equalsIgnoreCase("redactmanager_runOcrOnDocument")).findAny(); assertThat(ocrOnDocumentMeter.isPresent()).isTrue(); @@ -81,7 +81,7 @@ public class OcrServiceIntegrationTest extends AbstractTest { @Test public void testMergeImages() { // check visually for most of the images containing text, the resulting text is kind of nonsense, just ensure it is there - String text = testOCR("files/merge_images.pdf"); + String text = testOCR("files/syngenta/CustomerFiles/SinglePages/merge_images - Page241_18 Chlorothalonil RAR 08 Volume 3CA B 6a Oct 2017.pdf"); assertThat(text).contains("Bodyweight change of dams with live young - group mean values", "Control", "mg/g day", @@ -101,7 +101,7 @@ public class OcrServiceIntegrationTest extends AbstractTest { @Test public void testOCRWatermark() { - assertThat(testOCR("files/Watermark.pdf")).contains("syngenta"); + assertThat(testOCR("files/syngenta/CustomerFiles/SinglePages/Watermark_Page1_10.SYN524464 FS (A16148C) - Absorção cutânea.pdf")).contains("syngenta"); } diff --git a/ocr-service-v1/ocr-service-server/src/test/resources/files/basf b/ocr-service-v1/ocr-service-server/src/test/resources/files/basf new file mode 160000 index 0000000..9dc6c23 --- /dev/null +++ b/ocr-service-v1/ocr-service-server/src/test/resources/files/basf @@ -0,0 +1 @@ +Subproject commit 9dc6c2337dea32e63aef53271dba0692537c6605 diff --git a/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta b/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta new file mode 160000 index 0000000..21fefb6 --- /dev/null +++ b/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta @@ -0,0 +1 @@ +Subproject commit 21fefb64bf27ca2b3329a6c69d90a27450b17930