diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-02 03:05:22 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-02 03:05:22 +0000 |
commit | 4a1dcef81a9b2263a1e612a9207a71149c12053f (patch) | |
tree | 941dbd81cc3e61c0763ad7c2f77b7fb43d00c2dc | |
parent | ba98e234cb2c8feca41b669df4f5bc36de7607c1 (diff) | |
parent | bd9e36bca483a5082e4017cf0c2ba9a6fa7ddb40 (diff) | |
download | libcore-pie-qpr1-s3-release.tar.gz |
Snap for 4927333 from bd9e36bca483a5082e4017cf0c2ba9a6fa7ddb40 to pi-qpr1-releaseandroid-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-release
Change-Id: Ica11fd070d968ed890d16b7d5341d3f1a78bff6e
-rw-r--r-- | luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java b/luni/src/test/java/libcore/java/text/SimpleDateFormatTest.java index dd41257c1c5..dc1412fa3ed 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 @@ public class SimpleDateFormatTest extends junit.framework.TestCase { 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. |