RED-9667 - Extend convert dates

This commit is contained in:
Andrei Isvoran 2024-07-16 16:02:16 +02:00
parent c479df124d
commit 1397290a0e
4 changed files with 37 additions and 29 deletions

View File

@ -14,6 +14,8 @@ dd MMMM yyyy
d MMMM yyyy d MMMM yyyy
MMMM dd, yyyy MMMM dd, yyyy
MMMM d, yyyy MMMM d, yyyy
MMMM, d yyyy
MMMM d,yyyy
dd.MM.yyyy dd.MM.yyyy
d.MM.yyyy d.MM.yyyy
yyyy/MM/dd yyyy/MM/dd

View File

@ -137,6 +137,10 @@ public class DocumineFloraTest extends AbstractRedactionIntegrationTest {
expectedDates.add("03/08/1992"); expectedDates.add("03/08/1992");
expectedDates.add("13/08/1992"); expectedDates.add("13/08/1992");
expectedDates.add("27/02/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() String dates = experimentalDates.getComponentValues()
.get(0).getValue(); .get(0).getValue();

View File

@ -1,12 +1,11 @@
package com.iqser.red.service.redaction.v1.server.date; package com.iqser.red.service.redaction.v1.server.date;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import com.iqser.red.service.redaction.v1.server.utils.DateConverter; import com.iqser.red.service.redaction.v1.server.utils.DateConverter;
@ -43,7 +42,10 @@ public class DateConverterTest {
"28 March 2018 (animal 1 - 5000 mg/kg bw)", "28 March 2018 (animal 1 - 5000 mg/kg bw)",
"28 March 2018 (animal1 - 5000 mg/kg bw)", "28 March 2018 (animal1 - 5000 mg/kg bw)",
"28 August 2018 (animal 1)", "28 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) { for (String dateStr : goldenStandardDates) {
Optional<Date> parsedDate = DateConverter.parseDate(dateStr); Optional<Date> parsedDate = DateConverter.parseDate(dateStr);