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 0a5a946e..f49fd7c6 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 @@ -14,6 +14,8 @@ dd MMMM yyyy d MMMM yyyy MMMM dd, yyyy MMMM d, yyyy +MMMM, d yyyy +MMMM d,yyyy dd.MM.yyyy d.MM.yyyy yyyy/MM/dd 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 6267c685..bded877a 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 @@ -174,6 +174,10 @@ public class DocumineFloraTest extends AbstractRedactionIntegrationTest { expectedDates.add("03/08/1992"); expectedDates.add("13/08/1992"); expectedDates.add("27/02/1992"); + expectedDates.add("27/10/1989"); + expectedDates.add("07/10/1989"); + expectedDates.add("21/08/1998"); + expectedDates.add("02/08/1998"); String dates = experimentalDates.getComponentValues() .get(0).getValue(); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/date/DateConverterTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/date/DateConverterTest.java index 9ae99c38..b2a011b7 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/date/DateConverterTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/date/DateConverterTest.java @@ -43,7 +43,11 @@ public class DateConverterTest { "28 March 2018 (animal 1 - 5000 mg/kg bw)", "28 March 2018 (animal1 - 5000 mg/kg bw)", "28 August 2018 (animal 1)", - "31 August 2018 (animal 1)"); + "31 August 2018 (animal 1)", + "October, 27 1989", + "October, 7 1989", + "August 21,1998", + "August 2,1998"); for (String dateStr : goldenStandardDates) { Optional parsedDate = DateConverter.parseDate(dateStr); 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 66ad153b..78961722 100644 Binary files a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/dates/date_formats.pdf and b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/dates/date_formats.pdf differ