diff options
| author | Neil Fuller <nfuller@google.com> | 2017-08-28 22:11:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-28 22:11:17 +0000 |
| commit | 0af2e64470797ad2576ae17c64199ab243670069 (patch) | |
| tree | b0271f7a46108e49854208144919d5c1440ab9b2 | |
| parent | 515339b4b326b6d8f1880443f572eb80632cd6f2 (diff) | |
| parent | 4fa63cbc6fea424652ffece3e5a3876a93531b6a (diff) | |
| download | icu-0af2e64470797ad2576ae17c64199ab243670069.tar.gz | |
DO NOT MERGE : Remove test for TimeZone.getWindowsID("Australia/Eucla") am: e34e3b07f3 -s ours am: d5ffbd3eca am: cf5171ef3e
am: 4fa63cbc6f
Change-Id: Idbae2430c5f766b12d2d2c0199aa24c4dc57455f
| -rw-r--r-- | android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java | 4 | ||||
| -rw-r--r-- | icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java index 1ce2b7cd5..2612b000c 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java @@ -2252,9 +2252,7 @@ public class TimeZoneTest extends TestFmwk {"America/Indianapolis", "US Eastern Standard Time"}, // CLDR canonical name {"America/Indiana/Indianapolis", "US Eastern Standard Time"}, // tzdb canonical name {"Asia/Khandyga", "Yakutsk Standard Time"}, - // Android-changed: Removed this case because CLDR 30 now has a mapping and some OEMs - // have picked up the windowsZone.txt change. http://b/32534123 & http://b/32512035. - // {"Australia/Eucla", null}, // No Windows ID mapping + {"Australia/Eucla", null}, // No Windows ID mapping {"Bogus", null}, }; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java index 01c257cb1..bac70b54d 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java @@ -2248,9 +2248,7 @@ public class TimeZoneTest extends TestFmwk {"America/Indianapolis", "US Eastern Standard Time"}, // CLDR canonical name {"America/Indiana/Indianapolis", "US Eastern Standard Time"}, // tzdb canonical name {"Asia/Khandyga", "Yakutsk Standard Time"}, - // Android-changed: Removed this case because CLDR 30 now has a mapping and some OEMs - // have picked up the windowsZone.txt change. http://b/32534123 & http://b/32512035. - // {"Australia/Eucla", null}, // No Windows ID mapping + {"Australia/Eucla", null}, // No Windows ID mapping {"Bogus", null}, }; |