commit 1a2ea383a15a49016944ce123e63ce660d677701
author Victor Chang <vichang@google.com> Mon May 21 19:43:38 2018 +0100
committer Victor Chang <vichang@google.com> Mon Jul 30 16:19:58 2018 +0000
tree 90776fa1666a5fe820c407176abc6216e863a428
parent 25f1aab417b492ab55ce4c2d9e7646f95766cffa

Avoid depending on 24-hour settings in SimpleDateFormatTest

Bug: 80062293
Test: adb shell settings put system time_12_24 24
cts-tradefed run cts-dev -m CtsLibcoreTestCases -t libcore.java.text.SimpleDateFormatTest
adb shell settings delete system time_12_24

(cherry picked from commit fea265617e277624c765b291f20dbacb90e307bc)

Merged-In: I1d9675ab41b184eb7449b567b828495eece3ab87
Change-Id: I1d9675ab41b184eb7449b567b828495eece3ab87

luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java

diff --git a/luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java b/luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java
index dd41257..dc1412f 100644
--- a/luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java
+++ b/luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java
@@ -57,11 +57,16 @@
         super.tearDown();
     }
 
+    /**
+     * Tests that the default constructor uses the data in the default locale
+     */
     public void testDefaultConstructor_localeUS() {
         SimpleDateFormat sdf = new SimpleDateFormat();
-        sdf.setTimeZone(UTC);
-        assertEquals("M/d/yy h:mm a", sdf.toPattern());
-        assertEquals("1/1/70 12:00 AM", sdf.format(new Date(0)));
+        DateFormat referencedDateFormat = DateFormat.getDateTimeInstance(
+                DateFormat.SHORT, DateFormat.SHORT, Locale.US);
+        Date date = new Date(0);
+
+        assertEquals(referencedDateFormat.format(date), sdf.format(date));
     }
 
     // The RI fails this test.