diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-27 02:24:37 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-27 02:24:37 +0000 |
| commit | 6885e6959519e866c15a37c4e3f1ee4dc2b8adf7 (patch) | |
| tree | 8709dcb0b6bb01655637d044d3ff7682ab5dae90 | |
| parent | a186543aece4065fef4c08433ea55ea383eb1e36 (diff) | |
| parent | 292d5c809fdb18fdc13bb47a9c97f57da4e93498 (diff) | |
| download | icu-6885e6959519e866c15a37c4e3f1ee4dc2b8adf7.tar.gz | |
Merge cherrypicks of [2063830] into sparse-8430561-L72000000954266199.android-cts-11.0_r8
Change-Id: Ibf4d941e17146bcd9fd657c04019e40a3b4d644c
| -rw-r--r-- | android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java | 2 | ||||
| -rw-r--r-- | icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java | 2 |
2 files changed, 4 insertions, 0 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 9d4dc7cba..07a8ca3e8 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 @@ -22,6 +22,7 @@ import java.util.List; import java.util.Locale; import java.util.Set; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -1506,6 +1507,7 @@ public class TimeZoneTest extends TestFmwk } @Test + @Ignore public void TestCanonicalID() { // Olson (IANA) tzdata used to have very few "Link"s long time ago. // This test case was written when most of CLDR canonical time zones are 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 f608f476a..23fc36d1b 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 @@ -21,6 +21,7 @@ import java.util.List; import java.util.Locale; import java.util.Set; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -1503,6 +1504,7 @@ public class TimeZoneTest extends TestFmwk } @Test + @Ignore public void TestCanonicalID() { // Olson (IANA) tzdata used to have very few "Link"s long time ago. // This test case was written when most of CLDR canonical time zones are |