summaryrefslogtreecommitdiffstats
path: root/luni
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-02-02 13:39:07 +0000
committerNeil Fuller <nfuller@google.com>2015-02-02 17:10:11 +0000
commitebfb8f8b0ee0c0a75d92d8fc56ccd0d87ee7e9ad (patch)
tree048d3330f88344be27f77b001b84f44346bc8a0f /luni
parent571815deb03bd0e3ed8497160e489c16c72d67a2 (diff)
downloadlibcore-ebfb8f8b0ee0c0a75d92d8fc56ccd0d87ee7e9ad.zip
libcore-ebfb8f8b0ee0c0a75d92d8fc56ccd0d87ee7e9ad.tar.gz
libcore-ebfb8f8b0ee0c0a75d92d8fc56ccd0d87ee7e9ad.tar.bz2
Fixes associated with the tzdata 2015a update
Chile has changed the rules for DST. The test duplicates testApia below it, so it can be removed. Bug: 19212588 Change-Id: Iaaca895ef2b49a6aa57ca26df5842eefaab60bde
Diffstat (limited to 'luni')
-rw-r--r--luni/src/test/java/libcore/java/util/TimeZoneTest.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/luni/src/test/java/libcore/java/util/TimeZoneTest.java b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
index c40c974..caf635c 100644
--- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
@@ -255,14 +255,6 @@ public class TimeZoneTest extends TestCase {
assertEquals("", failures.toString());
}
- public void testSantiago() 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-04:00", tz.getDisplayName(false, TimeZone.SHORT, Locale.US));
- }
-
// http://b/7955614
public void testApia() throws Exception {
TimeZone tz = TimeZone.getTimeZone("Pacific/Apia");