diff options
| author | Neil Fuller <nfuller@google.com> | 2015-02-02 13:39:07 +0000 |
|---|---|---|
| committer | Raj M <r.mamadgi@samsung.com> | 2015-08-03 17:59:58 +0000 |
| commit | 60da282dd4c518190ff3bb4ff0a001c21d867771 (patch) | |
| tree | 9b483eba1d8884500cfc04e594560a138194ba78 /luni/src | |
| parent | 91994f09dce81de7b307aa88ce3c1c56cb0c7683 (diff) | |
| download | libcore-60da282dd4c518190ff3bb4ff0a001c21d867771.zip libcore-60da282dd4c518190ff3bb4ff0a001c21d867771.tar.gz libcore-60da282dd4c518190ff3bb4ff0a001c21d867771.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
(cherry-picked from commit ebfb8f8b0ee0c0a75d92d8fc56ccd0d87ee7e9ad)
Change-Id: Ibe7c0dc510813826dca13993b6600d368e03740a
(cherry picked from commit a88856485e84ad5cd45a6e16310490d871a679c4)
Diffstat (limited to 'luni/src')
| -rw-r--r-- | luni/src/test/java/libcore/java/util/TimeZoneTest.java | 8 |
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 86a8b7f..0bc02b0 100644 --- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java +++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java @@ -276,14 +276,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"); |