Author: bleny Date: 2010-08-04 12:57:59 +0200 (Wed, 04 Aug 2010) New Revision: 223 Url: http://nuiton.org/repositories/revision/wikitty/223 Log: fixing import WikittyImpl ; centralized date format in wikitty make tests pass Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java trunk/wikitty-jms-impl/pom.xml trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java trunk/wikitty-multistorage-impl/pom.xml trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-08-04 10:57:59 UTC (rev 223) @@ -67,8 +67,7 @@ protected static final Locale CANONICAL_LOCALE = Locale.US; // FastDateFormat is thread-safe - // FIXME 20100804 bleny should be protected, other module should use parseDate(), below - static final public FastDateFormat solrDateFormat = FastDateFormat.getInstance( + static final protected FastDateFormat solrDateFormat = FastDateFormat.getInstance( DATE_FORMAT, CANONICAL_TZ, CANONICAL_LOCALE); @@ -81,6 +80,10 @@ static public Date parseDate(String dateAsString) throws ParseException { return DateUtils.parseDate(dateAsString, DATE_FORMAT_ALLOWED); } + + static public String formatDate(Date date) throws ParseException { + return solrDateFormat.format(date); + } // TODO poussin 20090902 use spring configuration to add mapping in this // variable Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-08-04 10:57:59 UTC (rev 223) @@ -198,7 +198,7 @@ // test String => Date Calendar cal = Calendar.getInstance(Locale.ROOT); cal.set(1982, 0, 23, 0, 0, 0); cal.set( Calendar.MILLISECOND, 0 ); - w.setField( StorageTest.EXTNAME, "fieldName2", WikittyUtil.solrDateFormat.format(cal.getTime()) ); + w.setField( StorageTest.EXTNAME, "fieldName2", WikittyUtil.formatDate(cal.getTime()) ); assertEquals(cal.getTime(), w.getFieldAsDate(StorageTest.EXTNAME, "fieldName2") ); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-08-04 10:57:59 UTC (rev 223) @@ -425,12 +425,12 @@ public void testDateConsistency() throws Exception { Date date = WikittyUtil.parseDate( "30/01/2009" ); Date dateFormatedAndParsed = WikittyUtil.parseDate( - WikittyUtil.solrDateFormat.format(date)); + WikittyUtil.formatDate(date)); assertEquals(date, dateFormatedAndParsed); date = new Date(); dateFormatedAndParsed = WikittyUtil.parseDate( - WikittyUtil.solrDateFormat.format(date)); + WikittyUtil.formatDate(date)); assertEquals(date, dateFormatedAndParsed); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-08-04 10:57:59 UTC (rev 223) @@ -86,17 +86,27 @@ public static String format(String dateTestFormat) { try { - return WikittyUtil.solrDateFormat.format( + return WikittyUtil.formatDate( dateTestFormat == null || dateTestFormat.isEmpty() ? new Date() - : WikittyUtil.parseDate(dateTestFormat) + : parse(dateTestFormat) ); } catch (ParseException e) { - Assert.fail( "Error parsing date : " + dateTestFormat ); + Assert.fail( "Error format date : " + dateTestFormat ); e.printStackTrace(); return null; } } + + public static Date parse(String dateAsString) { + try { + return WikittyUtil.parseDate(dateAsString); + } catch (ParseException e) { + Assert.fail( "Error parsing date : " + dateAsString ); + e.printStackTrace(); + return null; + } + } protected static ArrayList<Wikitty> createSampleWikitty( WikittyService ws ) { ArrayList<Wikitty> result = new ArrayList<Wikitty>(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-08-04 10:57:59 UTC (rev 223) @@ -50,7 +50,7 @@ Wikitty w = createWikitty( "MyExtName.fieldName0 = 123," + "MyExtName.fieldName1 = 12.3," + - "MyExtName.fieldName2 = " + WikittyUtil.solrDateFormat.format(date), + "MyExtName.fieldName2 = " + WikittyUtil.formatDate(date), ext ); String id = w.getId(); Modified: trunk/wikitty-jms-impl/pom.xml =================================================================== --- trunk/wikitty-jms-impl/pom.xml 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-jms-impl/pom.xml 2010-08-04 10:57:59 UTC (rev 223) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java =================================================================== --- trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java 2010-08-04 10:57:59 UTC (rev 223) @@ -30,6 +30,7 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyImpl; import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.jms.WikittyExtensionStorageJMS; Modified: trunk/wikitty-multistorage-impl/pom.xml =================================================================== --- trunk/wikitty-multistorage-impl/pom.xml 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-multistorage-impl/pom.xml 2010-08-04 10:57:59 UTC (rev 223) @@ -7,7 +7,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java =================================================================== --- trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java 2010-08-04 10:57:59 UTC (rev 223) @@ -26,6 +26,7 @@ import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyImpl; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC;