From fcd09a928c384463964f480acc81282c6bd5f12a Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Fri, 21 Jun 2024 09:30:59 +0200 Subject: [PATCH] RED-9413: fixed date issue --- .../src/main/resources/date_formats.txt | 8 ++++---- .../v1/server/DocumineFloraTest.java | 2 ++ .../resources/files/dates/date_formats.pdf | Bin 48369 -> 49347 bytes 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt b/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt index fedcb8b6..0a5a946e 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt +++ b/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt @@ -1,3 +1,7 @@ +yyyy MMM dd +yyyy MMM d +yyyy MM dd +yyyy MM d dd-MMM-yyyy d-MMM-yyyy dd MMM yyyy @@ -30,8 +34,6 @@ yyyy, MMMM dd yyyy, MMMM d yyyy.MM.dd yyyy.MM.d -yyyyMMdd -yyyyMMd dd-MM-yy d-MM-yy dd/MM/yy @@ -70,5 +72,3 @@ dd.MM.yy d.MM.yy dd MMM. yyyy d MMM. yyyy -yyyy MMM dd -yyyy MMM d \ No newline at end of file diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java index cf1f7e98..6267c685 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java @@ -168,9 +168,11 @@ public class DocumineFloraTest extends AbstractRedactionIntegrationTest { List expectedDates = new ArrayList<>(); expectedDates.add("10/01/2022"); + expectedDates.add("01/01/2022"); expectedDates.add("08/09/2024"); expectedDates.add("03/01/2022"); expectedDates.add("03/08/1992"); + expectedDates.add("13/08/1992"); expectedDates.add("27/02/1992"); String dates = experimentalDates.getComponentValues() diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/dates/date_formats.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/dates/date_formats.pdf index 3fa07fadaa17b9e23fd4955ddeca4bb4cb7638e5..66ad153bd6c02efa1f87d8e0924f302086d73f2f 100644 GIT binary patch delta 7913 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 a85Zsr8on%4_pO|Q^ExlLwRM^7D*qq8c|m9Z delta 7442 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