diff options
| author | Daniel Xie <dxie@google.com> | 2015-10-08 23:14:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-08 23:14:16 +0000 |
| commit | 779c726a7a24ae169cefacf2aa91cc54139a96ec (patch) | |
| tree | bd9079c55fe02e9ced8f12fc11d26beebd76b9d1 | |
| parent | 1d1abc5b0ccf31e79aa7173b2e592b7e52b3e519 (diff) | |
| parent | fc7112273a24ea619af9fd6c57bb962e8ec27a15 (diff) | |
| download | libcore-779c726a7a24ae169cefacf2aa91cc54139a96ec.zip libcore-779c726a7a24ae169cefacf2aa91cc54139a96ec.tar.gz libcore-779c726a7a24ae169cefacf2aa91cc54139a96ec.tar.bz2 | |
Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev
| -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 39e0af9..7cac26d 100644 --- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java +++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java @@ -254,14 +254,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"); |