commit 1872f348c4fe99929898ccde33ff84d26711ba76
author The Android Automerger <android-build@google.com> Thu Feb 05 06:13:38 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Feb 05 06:13:38 2015 -0800
tree 3fd921a42cfeb1fc5f78216618cbbc1fbfaaaa30
parent 656a2e45ac4d986baf7b3cd3bffa83b5f83bf98c
parent c99e433d6e12b17b923305a7513dc9d50ad9d50e

merge in lmp-mr1-release history after reset to lmp-mr1-dev

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

diff --git a/luni/src/test/java/libcore/java/text/DateFormatSymbolsTest.java b/luni/src/test/java/libcore/java/text/DateFormatSymbolsTest.java
index 057cd17..e6933e6 100644
--- a/luni/src/test/java/libcore/java/text/DateFormatSymbolsTest.java
+++ b/luni/src/test/java/libcore/java/text/DateFormatSymbolsTest.java
@@ -147,17 +147,17 @@
     }
 
     // http://b/7955614
-    public void test_getZoneStrings_Apia() throws Exception {
+    public void test_getZoneStrings_GMT_short_names() throws Exception {
         String[][] array = DateFormatSymbols.getInstance(Locale.US).getZoneStrings();
         for (int i = 0; i < array.length; ++i) {
             String[] row = array[i];
-            // Pacific/Apia is somewhat arbitrary; we just want a zone we have to generate
+            // America/Santiago is somewhat arbitrary; we just want a zone we have to generate
             // "GMT" strings for the short names.
-            if (row[0].equals("Pacific/Apia")) {
-                assertEquals("Samoa Standard Time", row[1]);
-                assertEquals("GMT+13:00", row[2]);
-                assertEquals("Samoa Daylight Time", row[3]);
-                assertEquals("GMT+14:00", row[4]);
+            if (row[0].equals("America/Santiago")) {
+                assertEquals("Chile Standard Time", row[1]);
+                assertEquals("GMT-03:00", row[2]);
+                assertEquals("Chile Summer Time", row[3]);
+                assertEquals("GMT-03:00", row[4]);
             }
         }
     }

luni/src/test/java/libcore/java/util/TimeZoneTest.java

diff --git a/luni/src/test/java/libcore/java/util/TimeZoneTest.java b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
index caf635c..1ca950c 100644
--- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
@@ -256,12 +256,12 @@
     }
 
     // http://b/7955614
-    public void testApia() throws Exception {
-        TimeZone tz = TimeZone.getTimeZone("Pacific/Apia");
-        assertEquals("Samoa Daylight Time", tz.getDisplayName(true, TimeZone.LONG, Locale.US));
-        assertEquals("Samoa Standard Time", tz.getDisplayName(false, TimeZone.LONG, Locale.US));
-        assertEquals("GMT+14:00", tz.getDisplayName(true, TimeZone.SHORT, Locale.US));
-        assertEquals("GMT+13:00", tz.getDisplayName(false, TimeZone.SHORT, Locale.US));
+    public void test_getDisplayName_GMT_short_names() throws Exception {
+        TimeZone tz = TimeZone.getTimeZone("America/Santiago");
+        assertEquals("Chile Summer Time", tz.getDisplayName(true, TimeZone.LONG, Locale.US));
+        assertEquals("Chile Standard Time", tz.getDisplayName(false, TimeZone.LONG, Locale.US));
+        assertEquals("GMT-03:00", tz.getDisplayName(true, TimeZone.SHORT, Locale.US));
+        assertEquals("GMT-03:00", tz.getDisplayName(false, TimeZone.SHORT, Locale.US));
     }
 
     private static boolean isGmtString(String s) {