svn commit: r893635 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java

[adrianc]

Author: adrianc
Date: Wed Dec 23 21:39:55 2009
New Revision: 893635

URL: http://svn.apache.org/viewvc?rev=893635&view=rev
Log:
Improved converter tests.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java?rev=893635&r1=893634&r2=893635&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java Wed Dec 23 21:39:55 2009
@@ -79,28 +79,28 @@
         Converter<java.util.Date, Long> dateToLong = new DateTimeConverters.DateToLong();
         try {
             Long target = dateToLong.convert(utilDate);
-            assertTrue(buildConversionMessage("DateToLong", dateMillis, target.longValue()), dateMillis == target.longValue());
+            assertEquals("DateToLong", dateMillis, target.longValue());
         } catch (ConversionException e) {
             fail(e.getMessage());
         }
         Converter<java.util.Date, java.sql.Date> dateToSqlDate = new DateTimeConverters.DateToSqlDate();
         try {
             java.sql.Date target = dateToSqlDate.convert(utilDate);
-            assertTrue(buildConversionMessage("DateToSqlDate", dateMillis, target.getTime()), dateMillis == target.getTime());
+            assertEquals("DateToSqlDate", dateMillis, target.getTime());
         } catch (ConversionException e) {
             fail(e.getMessage());
         }
         Converter<java.util.Date, String> dateToString = new DateTimeConverters.DateToString();
         try {
             String target = dateToString.convert(utilDate);
-            assertTrue(buildConversionMessage("DateToString", utilDate.toString(), target), utilDate.toString().equals(target));
+            assertEquals("DateToString", utilDate.toString(), target);
         } catch (ConversionException e) {
             fail(e.getMessage());
         }
         Converter<java.util.Date, java.sql.Timestamp> dateToTimestamp = new DateTimeConverters.DateToTimestamp();
         try {
             java.sql.Timestamp timestamp = dateToTimestamp.convert(utilDate);
-            assertTrue(buildConversionMessage("DateToTimestamp", dateMillis, timestamp.getTime()), dateMillis == timestamp.getTime());
+            assertEquals("DateToTimestamp", dateMillis, timestamp.getTime());
         } catch (ConversionException e) {
             fail(e.getMessage());
         }
@@ -109,27 +109,23 @@
         Converter<java.sql.Date, java.util.Date> sqlDateToDate = new DateTimeConverters.SqlDateToDate();
         try {
             java.util.Date target = sqlDateToDate.convert(sqlDate);
-            assertTrue(buildConversionMessage("SqlDateToDate", sqlDate.getTime(), target.getTime()), sqlDate.getTime() == target.getTime());
+            assertEquals("SqlDateToDate", sqlDate.getTime(), target.getTime());
         } catch (ConversionException e) {
             fail(e.getMessage());
         }
         Converter<java.sql.Date, String> sqlDateToString = new DateTimeConverters.SqlDateToString();
         try {
             String target = sqlDateToString.convert(sqlDate);
-            assertTrue(buildConversionMessage("SqlDateToString", sqlDate.toString(), target), sqlDate.toString().equals(target));
+            assertEquals("SqlDateToString", sqlDate.toString(), target);
         } catch (ConversionException e) {
             fail(e.getMessage());
         }
         Converter<java.sql.Date, java.sql.Timestamp> sqlDateToTimestamp = new DateTimeConverters.SqlDateToTimestamp();
         try {
             java.sql.Timestamp target = sqlDateToTimestamp.convert(sqlDate);
-            assertTrue(buildConversionMessage("SqlDateToTimestamp", sqlDate.getTime(), target.getTime()), sqlDate.getTime() == target.getTime());
+            assertEquals("SqlDateToTimestamp", sqlDate.getTime(), target.getTime());
         } catch (ConversionException e) {
             fail(e.getMessage());
         }
     }
-
-    protected static String buildConversionMessage(String conversion, Object source, Object target) {
-        return conversion + " conversion: source = " + source + ", target = " + target;    
-    }
 }