diff options
| author | Daniel Xie <dxie@google.com> | 2015-10-08 23:27:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-08 23:27:16 +0000 |
| commit | 917c8e090576829ba0db6da4510e460ea44d806e (patch) | |
| tree | 67b635e1439a0c102af12c99e15fb90c6f07e2f9 | |
| parent | 97a16d1ac217e0eb3fd4ec8fe8abc360aa969c60 (diff) | |
| parent | fe790a73fb7c0ec9773f591a281ab1dbb2c8ed93 (diff) | |
| download | libcore-917c8e090576829ba0db6da4510e460ea44d806e.zip libcore-917c8e090576829ba0db6da4510e460ea44d806e.tar.gz libcore-917c8e090576829ba0db6da4510e460ea44d806e.tar.bz2 | |
am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev
* commit 'fe790a73fb7c0ec9773f591a281ab1dbb2c8ed93':
Fixes associated with the tzdata 2015a update
| -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"); |