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