Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 49149 invoked from network); 14 Mar 2010 06:36:42 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Mar 2010 06:36:42 -0000 Received: (qmail 95856 invoked by uid 500); 14 Mar 2010 06:35:59 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 95803 invoked by uid 500); 14 Mar 2010 06:35:59 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 95796 invoked by uid 99); 14 Mar 2010 06:35:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Mar 2010 06:35:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Mar 2010 06:35:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 22AEA238899B; Sun, 14 Mar 2010 06:35:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r922775 - /commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestDateTimeConverters.java Date: Sun, 14 Mar 2010 06:35:35 -0000 To: commits@commons.apache.org From: adrianc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100314063535.22AEA238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: adrianc Date: Sun Mar 14 06:35:34 2010 New Revision: 922775 URL: http://svn.apache.org/viewvc?rev=922775&view=rev Log: Improved Date/Time converter tests. Modified: commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestDateTimeConverters.java Modified: commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestDateTimeConverters.java URL: http://svn.apache.org/viewvc/commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestDateTimeConverters.java?rev=922775&r1=922774&r2=922775&view=diff ============================================================================== --- commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestDateTimeConverters.java (original) +++ commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestDateTimeConverters.java Sun Mar 14 06:35:34 2010 @@ -34,25 +34,46 @@ public class TestDateTimeConverters exte assertEquals(label + " converted", target, converter.convert(source)); } + public static void assertStringConversion(String label, Converter converter, S source, java.util.Date target) throws Exception { + assertTrue(label + " can convert", converter.canConvert(source.getClass(), target.getClass())); + T result = converter.convert(source); + assertEquals(label + " converted", source, result.toString()); + } + public void testDateTimeConverters() throws Exception { - // Source class = java.util.Date long currentTime = System.currentTimeMillis(); java.util.Date utilDate = new java.util.Date(currentTime); + java.sql.Date sqlDate = new java.sql.Date(currentTime); + java.sql.Time sqlTime = new java.sql.Time(currentTime); + java.sql.Timestamp timestamp = new java.sql.Timestamp(currentTime); + // Source class = java.util.Date assertConversion("DateToLong", new DateTimeConverters.DateToLong(), utilDate, currentTime); assertConversion("DateToSqlDate", new DateTimeConverters.DateToSqlDate(), utilDate, new java.sql.Date(currentTime)); assertConversion("DateToString", new DateTimeConverters.DateToString(), utilDate, utilDate.toString()); - //assertConversion("StringToDate", new DateTimeConverters.StringToDate(), utilDate.toString(), utilDate); assertConversion("DateToTimestamp", new DateTimeConverters.DateToTimestamp(), utilDate, new java.sql.Timestamp(currentTime)); // Source class = java.sql.Date - java.sql.Date sqlDate = new java.sql.Date(currentTime); assertConversion("SqlDateToDate", new DateTimeConverters.SqlDateToDate(), sqlDate, utilDate); + assertConversion("SqlDateToLong", new DateTimeConverters.SqlDateToLong(), sqlDate, currentTime); assertConversion("SqlDateToString", new DateTimeConverters.SqlDateToString(), sqlDate, sqlDate.toString()); - //assertConversion("StringToSqlDate", new DateTimeConverters.StringToSqlDate(), sqlDate.toString(), sqlDate); - java.sql.Timestamp timestamp = new java.sql.Timestamp(currentTime); assertConversion("SqlDateToTimestamp", new DateTimeConverters.SqlDateToTimestamp(), sqlDate, timestamp); - assertConversion("StringToTimestamp", new DateTimeConverters.StringToTimestamp(), timestamp.toString(), timestamp); + // Source class = java.sql.Time + // assertConversion("SqlTimeToDate", new DateTimeConverters.SqlTimeToSqlDate(), sqlTime, sqlDate); + assertConversion("SqlTimeToLong", new DateTimeConverters.SqlTimeToLong(), sqlTime, currentTime); + assertConversion("SqlTimeToString", new DateTimeConverters.SqlTimeToString(), sqlTime, sqlTime.toString()); + // Source class = java.sql.Timestamp assertConversion("TimestampToDate", new DateTimeConverters.TimestampToDate(), timestamp, utilDate); + assertConversion("TimestampToLong", new DateTimeConverters.TimestampToLong(), timestamp, currentTime); assertConversion("TimestampToSqlDate", new DateTimeConverters.TimestampToSqlDate(), timestamp, sqlDate); - //assertConversion("TimestampToString", new DateTimeConverters.TimestampToString(), timestamp, timestamp.toString()); + assertConversion("TimestampToString", new DateTimeConverters.TimestampToString(), timestamp, timestamp.toString()); + // Source class = java.lang.String + assertStringConversion("StringToDate", new DateTimeConverters.StringToDate(), utilDate.toString(), utilDate); + assertStringConversion("StringToSqlDate", new DateTimeConverters.StringToSqlDate(), sqlDate.toString(), sqlDate); + assertStringConversion("StringToSqlTime", new DateTimeConverters.StringToSqlTime(), sqlTime.toString(), sqlTime); + assertStringConversion("StringToTimestamp", new DateTimeConverters.StringToTimestamp(), timestamp.toString(), timestamp); + // Source class = java.lang.Long + assertConversion("LongToDate", new DateTimeConverters.LongToDate(), currentTime, utilDate); + assertConversion("LongToSqlDate", new DateTimeConverters.LongToSqlDate(), currentTime, sqlDate); + assertConversion("LongToSqlTime", new DateTimeConverters.LongToSqlTime(), currentTime, sqlTime); + assertConversion("LongToTimestamp", new DateTimeConverters.LongToTimestamp(), currentTime, timestamp); } }