Snap for 4927333 from bd9e36bca483a5082e4017cf0c2ba9a6fa7ddb40 to pi-qpr1-release
Change-Id: Ica11fd070d968ed890d16b7d5341d3f1a78bff6e
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.