Merge pull request #65 from msvab/master

yesterday isn't parsed correctly
ocpsoft · Dec 3, 2013 · 3b71714 · 3b71714
2 parents b687fc9 + 5171d65
commit 3b71714
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/nlp/src/test/java/org/ocpsoft/prettytime/nlp/PrettyTimeParserTest.java b/nlp/src/test/java/org/ocpsoft/prettytime/nlp/PrettyTimeParserTest.java
@@ -1,16 +1,15 @@
 package org.ocpsoft.prettytime.nlp;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
 import junit.framework.Assert;
-
 import org.junit.Test;
 import org.ocpsoft.prettytime.PrettyTime;
 import org.ocpsoft.prettytime.nlp.parse.DateGroup;
 
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
 public class PrettyTimeParserTest
 {
 
@@ -78,4 +77,21 @@ public void testParseSyntaxRecurring()
       Assert.assertEquals(1000 * 60 * 60 * 24 * 3, parse.get(0).getRecurInterval(), 1d);
    }
 
+    @Test
+    public void testParseYesterday()
+    {
+        Calendar yesterday = Calendar.getInstance();
+        yesterday.setTime(new Date());
+        yesterday.add(Calendar.DAY_OF_MONTH, -1);
+
+        List<Date> parse = new PrettyTimeParser().parse("yesterday");
+        Assert.assertFalse(parse.isEmpty());
+
+        Calendar parsedDate = Calendar.getInstance();
+        parsedDate.setTime(parse.get(0));
+
+        Assert.assertEquals(yesterday.get(Calendar.DAY_OF_MONTH), parsedDate.get(Calendar.DAY_OF_MONTH));
+        Assert.assertEquals(yesterday.get(Calendar.MONTH), parsedDate.get(Calendar.MONTH));
+        Assert.assertEquals(yesterday.get(Calendar.YEAR), parsedDate.get(Calendar.YEAR));
+    }
 }