commit bd9e36bca483a5082e4017cf0c2ba9a6fa7ddb40
author Victor Chang <vichang@google.com> Wed Aug 01 08:55:23 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 01 08:55:23 2018 -0700
tree 941dbd81cc3e61c0763ad7c2f77b7fb43d00c2dc
parent ba98e234cb2c8feca41b669df4f5bc36de7607c1
parent 1a2ea383a15a49016944ce123e63ce660d677701

Avoid depending on 24-hour settings in SimpleDateFormatTest
am: 1a2ea383a1

Change-Id: I68e3de350a1ab2da7e74b385f4b42efa10fd1cd6

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.