[gwt-contrib] [google-web-toolkit] r8737 committed - Fix bug 2822942 Remove calls to System.currentTimeMillis in tests...

[codesite-noreply]

Revision: 8737
Author: zh...@google.com
Date: Thu Sep  9 05:17:25 2010
Log: Fix bug 2822942  Remove calls to System.currentTimeMillis in tests
Review at http://gwt-code-reviews.appspot.com/849801

http://code.google.com/p/google-web-toolkit/source/detail?r=8737

Modified:
 /trunk/user/test/com/google/gwt/emultest/java/sql/SqlDateTest.java
 /trunk/user/test/com/google/gwt/emultest/java/sql/SqlTimeTest.java
 /trunk/user/test/com/google/gwt/emultest/java/sql/SqlTimestampTest.java

=======================================
--- /trunk/user/test/com/google/gwt/emultest/java/sql/SqlDateTest.java	Tue  
Jun 23 16:19:42 2009
+++ /trunk/user/test/com/google/gwt/emultest/java/sql/SqlDateTest.java	Thu  
Sep  9 05:17:25 2010
@@ -36,7 +36,7 @@
   }

   public void testInternalPrecision() {
-    long millis = System.currentTimeMillis();
+    long millis = 1283895273475L;
     Date now = new Date(millis);
     Date after = new Date(now.getTime() + 1);
     Date before = new Date(now.getTime() - 1);
=======================================
--- /trunk/user/test/com/google/gwt/emultest/java/sql/SqlTimeTest.java	Tue  
Oct 28 11:27:54 2008
+++ /trunk/user/test/com/google/gwt/emultest/java/sql/SqlTimeTest.java	Thu  
Sep  9 05:17:25 2010
@@ -124,7 +124,7 @@
   }

   public void testInternalPrecision() {
-    long millis = System.currentTimeMillis();
+    long millis = 1283895273475L;
     Time today = new Time(millis);
     Time after = new Time(today.getTime() + 1);
     Time before = new Time(today.getTime() - 1);
=======================================
--- /trunk/user/test/com/google/gwt/emultest/java/sql/SqlTimestampTest.java	 
Wed Jul  7 04:47:08 2010
+++ /trunk/user/test/com/google/gwt/emultest/java/sql/SqlTimestampTest.java	 
Thu Sep  9 05:17:25 2010
@@ -41,36 +41,13 @@
    * dates.
    */
   public void testDateComparison() {
-    long now = System.currentTimeMillis();
-    Date d = new Date(now);
-
-    Timestamp t = new Timestamp(d.getTime());
-    if (now % 1000 == 0) {
-      t.setNanos(1000001);
-    } else {
-      t.setNanos(1);
-    }
-
-    // Timestamps are stored at second-level precision
-    Date d2 = new Date(t.getTime());
-
-    assertFalse("d.equals(t)", d.equals(t));
-    assertEquals("d2, t", d2, t);
-    assertEquals("hashcode", d2.hashCode(), t.hashCode());
-    assertFalse("t.equals(d2)", t.equals(d2));
-
-    // t is later then d2 by some number of nanoseconds
-    assertEquals(1, t.compareTo(d2));
-
-    Timestamp t2 = new Timestamp(d.getTime());
-    t2.setNanos(t.getNanos() + 1);
-
-    assertFalse("t.equals(t2)", t.equals(t2));
-    assertEquals("hashcode2", t.hashCode(), t2.hashCode());
+    /* Consider two cases, whether or not the time is a multiple of 1000 */
+    testDateComparisonOneValue(1283895274000L);
+    testDateComparisonOneValue(1283895273475L);
   }

   public void testNanosAffectTime() {
-    long now = System.currentTimeMillis();
+    long now = 1283895273475L;
     int millis = (int) (now % 1000);
     Timestamp t = new Timestamp(now);

@@ -85,7 +62,7 @@
   }

   public void testNanosComparison() {
-    long now = System.currentTimeMillis();
+    long now = 1283895273475L;
     Timestamp t = new Timestamp(now);
     t.setNanos(0);

@@ -107,7 +84,7 @@
   }

   public void testNanosRange() {
-    long now = System.currentTimeMillis();
+    long now = 1283895273475L;
     Timestamp t = new Timestamp(now);

     assertEquals(now, t.getTime());
@@ -134,7 +111,7 @@

   public void testTimeAffectsNanos() {
     // A value 5 millis past the current second
-    long now = (System.currentTimeMillis() / 1000) * 1000 + 5;
+    long now = 1283895273005L; // (1283895273475 / 1000) * 1000 + 5;

     Timestamp t = new Timestamp(now);
     assertEquals(5000000, t.getNanos());
@@ -202,4 +179,32 @@
     expected = new Timestamp(2000 - 1900, 1 - 1, 1, 12, 34, 56, 123456780);
     actual = Timestamp.valueOf("2000-01-01 12:34:56.12345678");
   }
-}
+
+  private void testDateComparisonOneValue(long value) {
+    Date d = new Date(value);
+
+    Timestamp t = new Timestamp(d.getTime());
+    if (value % 1000 == 0) {
+      t.setNanos(1000001);
+    } else {
+      t.setNanos(1);
+    }
+
+    // Timestamps are stored at second-level precision
+    Date d2 = new Date(t.getTime());
+
+    assertFalse("d.equals(t)", d.equals(t));
+    assertEquals("d2, t", d2, t);
+    assertEquals("hashcode", d2.hashCode(), t.hashCode());
+    assertFalse("t.equals(d2)", t.equals(d2));
+
+    // t is later then d2 by some number of nanoseconds
+    assertEquals(1, t.compareTo(d2));
+
+    Timestamp t2 = new Timestamp(d.getTime());
+    t2.setNanos(t.getNanos() + 1);
+
+    assertFalse("t.equals(t2)", t.equals(t2));
+    assertEquals("hashcode2", t.hashCode(), t2.hashCode());
+  }
+}

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors