Author: jcouteau Date: 2013-03-26 10:10:14 +0100 (Tue, 26 Mar 2013) New Revision: 1564 Url: http://nuiton.org/projects/wikitty/repository/revisions/1564 Log: #2620 : Add failing test on date parser Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2013-03-22 23:54:08 UTC (rev 1563) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2013-03-26 09:10:14 UTC (rev 1564) @@ -43,6 +43,7 @@ import java.beans.PropertyChangeListener; import java.math.BigDecimal; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -51,7 +52,6 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang3.time.DateUtils; /** * Test on WikittyUtil class. @@ -86,6 +86,68 @@ Assert.assertEquals(d3y, WikittyUtil.toDate("20101231+3YEARS")); Assert.assertEquals(j1, WikittyUtil.toDate("20101231/YEAR")); } + + //Test all date patterns + { + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yy"); + Date d = format.parse("26/03/13"); + Assert.assertEquals(d, WikittyUtil.toDate("26/03/13")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yy hh:mm"); + Date d = format.parse("26/03/13 20:51"); + Assert.assertEquals(d, WikittyUtil.toDate("26/03/2013 20:51")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); + Date d = format.parse("26/03/2013"); + Assert.assertEquals(d, WikittyUtil.toDate("26/03/2013")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy hh:mm"); + Date d = format.parse("26/03/2013 20:51"); + Assert.assertEquals(d, WikittyUtil.toDate("26/03/2013 20:51")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd-MM-yy"); + Date d = format.parse("26-03-13"); + Assert.assertEquals(d, WikittyUtil.toDate("26-03-13")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd-MM-yy hh:mm"); + Date d = format.parse("26-03-13 20:51"); + Assert.assertEquals(d, WikittyUtil.toDate("26-03-2013 20:51")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); + Date d = format.parse("26-03-2013"); + Assert.assertEquals(d, WikittyUtil.toDate("26-03-2013")); + } + { + SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy hh:mm"); + Date d = format.parse("26-03-2013 20:51"); + Assert.assertEquals(d, WikittyUtil.toDate("26-03-2013 20:51")); + } + { + SimpleDateFormat format = new SimpleDateFormat("yyMMdd"); + Date d = format.parse("130326"); + Assert.assertEquals(d, WikittyUtil.toDate("130326")); + } + { + SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd"); + Date d = format.parse("13-03-26"); + Assert.assertEquals(d, WikittyUtil.toDate("13-03-26")); + } + { + SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd hh:mm"); + Date d = format.parse("13-03-26 20:51"); + Assert.assertEquals(d, WikittyUtil.toDate("13-03-26 20:51")); + } + { + SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd'T' hh:mm:ss'Z'"); + Date d = format.parse("13-03-26'T' 20:51:00'Z'"); + Assert.assertEquals(d, WikittyUtil.toDate("13-03-26'T' 20:51:00'Z'")); + } } @Test