summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller2015-02-02 13:39:07 +0000
committerNeil Fuller2015-02-02 17:10:11 +0000
commite3f61187f0357a6569cb00bfa89bbf8e362f3439 (patch)
tree048d3330f88344be27f77b001b84f44346bc8a0f
parent371ed8ed0dceb7c1bb61c53c92dfb5c15465833b (diff)
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
-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");