commit 976875b16a72e5d189cd0741cc1b1cb031e5b83f
author Elliott Hughes <enh@google.com> Mon Mar 11 18:29:06 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 11 18:29:06 2013 +0000
tree d7aa3afb59a51afc564c8f016cf9396b99070bd9
parent d32ff7a2888eb1fba914d6841a93c653ba032664
parent ba38238650664e8ac4f7ec4dd3da91d4e7705055

Merge "Reinstate the CTS tests for the DateUtils year 2038 bugs."

tests/tests/text/src/android/text/format/cts/DateUtilsTest.java

diff --git a/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java b/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
index 599ca5d..87b0c46 100644
--- a/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
+++ b/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
@@ -261,11 +261,18 @@
     }
 
     /**
-     * DateUtils is broken beyond Integer.MAX_VALUE seconds of 1970.
+     * DateUtils used to use Time rather than Calendar, which is broken
+     * because Time uses a 32-bit time_t rather than Calendar's 64-bit Java long.
      * http://code.google.com/p/android/issues/detail?id=13050
      */
     public void test2038() {
         assertEquals("00:00, Thursday, January 1, 1970", formatFull(0L));
+        assertEquals("17:31, Sunday, November 24, 1833",
+                     formatFull(((long) Integer.MIN_VALUE + Integer.MIN_VALUE) * 1000L));
+        assertEquals("20:45, Friday, December 13, 1901", formatFull(Integer.MIN_VALUE * 1000L));
+        assertEquals("03:14, Tuesday, January 19, 2038", formatFull(Integer.MAX_VALUE * 1000L));
+        assertEquals("06:28, Sunday, February 7, 2106",
+                     formatFull((2L + Integer.MAX_VALUE + Integer.MAX_VALUE) * 1000L));
     }
 
     private String formatFull(long millis) {