HM-5: Added BEFORE dates

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 4daeb359ff781ef229130b654e6008f99a7aa783..36c961373e8718c308fe12fdc07797827d5d8d24 100644 (file)
--- 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 d59f398f39d48c58a71c5836e134389ad63035d9..83a7358a68b536090d786bfc279a28e7a13d38b2 100644 (file)
--- 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: []