From 431ccc2acf1614c50fbcd24db51b71056e7cb18b Mon Sep 17 00:00:00 2001 From: cesarvh Date: Wed, 17 Oct 2018 14:48:33 -0700 Subject: [PATCH] HM-5: Added BEFORE dates --- .../services/structureddate/DateUtils.java | 5 ++++- .../src/test/resources/test-dates.yaml | 17 +++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/DateUtils.java b/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/DateUtils.java index 4daeb359f..36c961373 100644 --- a/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/DateUtils.java +++ b/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/DateUtils.java @@ -1,5 +1,7 @@ package org.collectionspace.services.structureddate; +import java.util.Calendar; + import org.joda.time.Chronology; import org.joda.time.DateTime; import org.joda.time.DateTimeConstants; @@ -1063,7 +1065,8 @@ public class DateUtils { */ public static Date getEarliestBeforeDate(Date startDate, Date endDate) { // TODO - return null; + // Return an empty date to be used in before date cases + return new Date(); /* // This algorithm is inherited from the XDB fuzzydate parser, diff --git a/services/structureddate/structureddate/src/test/resources/test-dates.yaml b/services/structureddate/structureddate/src/test/resources/test-dates.yaml index d59f398f3..83a7358a6 100644 --- a/services/structureddate/structureddate/src/test/resources/test-dates.yaml +++ b/services/structureddate/structureddate/src/test/resources/test-dates.yaml @@ -1168,13 +1168,18 @@ earliestSingleDate: [1995, 4, 13, CE] latestDate: [2018, 4, 13, CE] - "after 13 april 1995": - earliestSingleDate: [1995, 4, 13, CE] - latestDate: [2018, 10, 17, CE] + "before 13 april 1995": + earliestSingleDate: [] + latestDate: [1995, 4, 13, CE] - "after april 13 1995": - earliestSingleDate: [1995, 4, 13, CE] - latestDate: [2018, 10, 17, CE] + # "before april 13 1995": + # earliestSingleDate: [1995, 4, 13, CE] + # latestDate: [2018, 10, 17, CE] + + + # "after 13 april 1995": + # earliestSingleDate: [1995, 4, 13, CE] + # latestDate: [2018, 10, 17, CE] "unknown": earliestSingleDate: [] -- 2.47.3