diff options
author | Narayan Kamath <narayan@google.com> | 2014-11-26 15:34:00 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2014-11-27 11:12:43 +0000 |
commit | 4e5e7de620583f9f0d60766f22f31408919b9a6b (patch) | |
tree | 5fd4c8f965efb6c797da3db3e3a35dca14809c10 | |
parent | 5e0ff7c58657cdd0eee6500f8654af94d90b85ce (diff) | |
download | libcore-4e5e7de620583f9f0d60766f22f31408919b9a6b.zip libcore-4e5e7de620583f9f0d60766f22f31408919b9a6b.tar.gz libcore-4e5e7de620583f9f0d60766f22f31408919b9a6b.tar.bz2 |
"Pacific/Apia" is now "Apia Standard Time".
.. or "Apia Daylight time" as the case might be.
bug: 18479007
Change-Id: Ie637c33b38f55bea5273d1256264348e51d27f28
-rw-r--r-- | luni/src/test/java/libcore/java/text/DateFormatSymbolsTest.java | 4 | ||||
-rw-r--r-- | luni/src/test/java/libcore/java/util/TimeZoneTest.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/luni/src/test/java/libcore/java/text/DateFormatSymbolsTest.java b/luni/src/test/java/libcore/java/text/DateFormatSymbolsTest.java index 057cd17..0c97f34 100644 --- a/luni/src/test/java/libcore/java/text/DateFormatSymbolsTest.java +++ b/luni/src/test/java/libcore/java/text/DateFormatSymbolsTest.java @@ -154,9 +154,9 @@ public class DateFormatSymbolsTest extends junit.framework.TestCase { // Pacific/Apia 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("Apia Standard Time", row[1]); assertEquals("GMT+13:00", row[2]); - assertEquals("Samoa Daylight Time", row[3]); + assertEquals("Apia Daylight Time", row[3]); assertEquals("GMT+14:00", row[4]); } } diff --git a/luni/src/test/java/libcore/java/util/TimeZoneTest.java b/luni/src/test/java/libcore/java/util/TimeZoneTest.java index c40c974..aadb9df 100644 --- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java +++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java @@ -266,8 +266,8 @@ public class TimeZoneTest extends TestCase { // 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("Apia Daylight Time", tz.getDisplayName(true, TimeZone.LONG, Locale.US)); + assertEquals("Apia 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)); } |