Author: bleny Date: 2010-08-04 12:26:33 +0200 (Wed, 04 Aug 2010) New Revision: 221 Url: http://nuiton.org/repositories/revision/wikitty/221 Log: fixing date issues Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.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/conform/StorageTest.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 08:04:58 UTC (rev 220) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-08-04 10:26:33 UTC (rev 221) @@ -67,6 +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( DATE_FORMAT, CANONICAL_TZ, CANONICAL_LOCALE); 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 08:04:58 UTC (rev 220) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-08-04 10:26:33 UTC (rev 221) @@ -427,5 +427,11 @@ Date dateFormatedAndParsed = WikittyUtil.parseDate( WikittyUtil.solrDateFormat.format(date)); assertEquals(date, dateFormatedAndParsed); + + date = new Date(); + dateFormatedAndParsed = WikittyUtil.parseDate( + WikittyUtil.solrDateFormat.format(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 08:04:58 UTC (rev 220) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-08-04 10:26:33 UTC (rev 221) @@ -84,12 +84,12 @@ return new WikittyExtension(extName, "1", requires, fieldsMap); } - public static SimpleDateFormat dateFormater = new SimpleDateFormat("d/M/y"); public static String format(String dateTestFormat) { try { return WikittyUtil.solrDateFormat.format( dateTestFormat == null || dateTestFormat.isEmpty() - ? new Date() : dateFormater.parse(dateTestFormat) + ? new Date() + : WikittyUtil.parseDate(dateTestFormat) ); } catch (ParseException e) { Assert.fail( "Error parsing date : " + dateTestFormat ); @@ -97,15 +97,6 @@ return null; } } - public static Date parse(String date) { - try { - return dateFormater.parse(date); - } catch (ParseException e) { - Assert.fail( "Error parsing date : " + date); - 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/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-08-04 08:04:58 UTC (rev 220) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-08-04 10:26:33 UTC (rev 221) @@ -124,7 +124,7 @@ break; case 2: // check fieldName2 assertEquals( errorMsg, - WikittyUtil.solrDateFormat.parseObject(keyValuePair.getValue()), + WikittyUtil.parseDate(keyValuePair.getValue()), w.getFieldAsDate(EXTNAME, fieldName) ); break; default: