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 f49fd7c6..54625dd3 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 @@ -30,6 +30,7 @@ dd['.'] MMM yyyy d['.'] MMM yyyy dd['th']['st']['nd']['rd'] 'of' MMMM, yyyy d['th']['st']['nd']['rd'] 'of' MMMM, yyyy +d['st']['nd']['rd']['th'] MMMM yyyy MMMM dd['th']['st']['nd']['rd'], yyyy MMMM d['th']['st']['nd']['rd'], yyyy yyyy, MMMM 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 3e684a7a..a4f5f896 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 @@ -141,6 +141,12 @@ public class DocumineFloraTest extends AbstractRedactionIntegrationTest { expectedDates.add("07/10/1989"); expectedDates.add("21/08/1998"); expectedDates.add("02/08/1998"); + expectedDates.add("01/05/1988"); + expectedDates.add("02/06/2003"); + expectedDates.add("03/09/2005"); + expectedDates.add("06/09/2005"); + expectedDates.add("17/08/2005"); + expectedDates.add("22/08/2035"); 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 21ac9504..24175cb1 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 @@ -45,7 +45,13 @@ public class DateConverterTest { "October, 27 1989", "October, 7 1989", "August 21,1998", - "August 2,1998"); + "August 2,1998", + "1st May 1988", + "2nd June 2003", + "3rd September 2005", + "6th September 2005", + "17th August 2005", + "22nd August 2035"); 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 78961722..4c076c32 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