commit fc7112273a24ea619af9fd6c57bb962e8ec27a15
author Neil Fuller <nfuller@google.com> Mon Feb 02 13:39:07 2015 +0000
committer Takeshi Katae <takeshi.katae.xm@kyocera.jp> Thu Oct 08 09:47:07 2015 +0000
tree c0112d4137b6422c978a884a1f1454c2cf9e0a82
parent 70a463cbfe0aac6bc88a46b3b103e40d70ff3abf

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
(cherry-picked from commit ebfb8f8b0ee0c0a75d92d8fc56ccd0d87ee7e9ad)

Change-Id: Ibe7c0dc510813826dca13993b6600d368e03740a
(cherry picked from commit a88856485e84ad5cd45a6e16310490d871a679c4)
(cherry picked from commit 60da282dd4c518190ff3bb4ff0a001c21d867771)

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 08d1e69..ea40cda 100644
--- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
@@ -275,14 +275,6 @@
         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");