svn commit: r1585959 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java

[adrianc]

Author: adrianc
Date: Wed Apr  9 13:01:18 2014
New Revision: 1585959

URL: http://svn.apache.org/r1585959
Log:
Bug fix in ObjectTypeTests - a java.sql.Date instance created in one time zone is not equal to another instance created in another time zone.

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

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java?rev=1585959&r1=1585958&r2=1585959&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java Wed Apr  9 13:01:18 2014
@@ -34,10 +34,13 @@ import org.ofbiz.base.test.GenericTestCa
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.ObjectType;
 import org.ofbiz.base.util.TimeDuration;
+import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilXml;
 import org.w3c.dom.Document;
 
+import com.ibm.icu.util.Calendar;
+
 @SourceMonitored
 public class ObjectTypeTests extends GenericTestCaseBase {
     public static final String module = ObjectTypeTests.class.getName();
@@ -53,7 +56,7 @@ public class ObjectTypeTests extends Gen
     private final Timestamp tstmp = new Timestamp(781L);
     private final Timestamp ntstmp;
     private final java.util.Date utlDt = new java.util.Date(781);
-    private final java.sql.Date sqlDt = new java.sql.Date(-129600000);
+    private final java.sql.Date sqlDt;
     private final java.sql.Time sqlTm = new java.sql.Time(2096000);
     private final List<Object> list;
     private final Map<String, Object> map;
@@ -72,6 +75,10 @@ public class ObjectTypeTests extends Gen
         map.put("two", "2");
         map.put("three", "3");
         set = new LinkedHashSet<Object>(list);
+        Calendar cal = UtilDateTime.getCalendarInstance(localeData.goodTimeZone, localeData.goodLocale);
+        cal.set(1969, Calendar.DECEMBER, 31, 0, 0, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        sqlDt = new java.sql.Date(cal.getTimeInMillis());
     }
 
     public static class LocaleData {