diff options
author | Almaz Mingaleev <mingaleev@google.com> | 2024-02-20 09:39:29 +0000 |
---|---|---|
committer | Almaz Mingaleev <mingaleev@google.com> | 2024-02-20 09:39:29 +0000 |
commit | 0a6122ecc00f97a1b55975d518deef89e546e63e (patch) | |
tree | d0a763d96673f1dd269bcfcf6322bcfde5a9338d | |
parent | a652dea3b6259f704db4aa817d8f197028fa1e88 (diff) | |
download | icu-0a6122ecc00f97a1b55975d518deef89e546e63e.tar.gz |
DO NOT MERGE Track tzdb 2023d update. [R CTS]
TimeZoneTest#TestCanonicalID was already marked as ignored,
only comment was added / updated.
R branch took only 2023d changes (Greenland and Antarctica), so
some tests which are updated in S+ branches are not updated here.
Bug: 324364476
Test: run cts -m CtsIcuTestCases -t android.icu.dev.test.timezone.TimeZoneTest
Test: on ab/11461191 (2022a) instance.
Change-Id: Iaa6859d792626a0f5b3ce1b92521b380421c52ab
Merged-In: Iaa6859d792626a0f5b3ce1b92521b380421c52ab
3 files changed, 14 insertions, 4 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 07a8ca3e8..db7f52cfd 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 @@ -1507,7 +1507,11 @@ public class TimeZoneTest extends TestFmwk } @Test - @Ignore + // Android-added: Ignore this test on CTS branches. + // This test is written is such a way that it is heavily coupled with + // tzdata. Keeping it passing with system image tzdata and a newer one, which changes + // canonicality rules (i.e. 2023d), would probably mean re-writing this test. + @org.junit.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/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 9d30dece0..9c86ecb62 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -67,8 +67,10 @@ void TimeZoneTest::runIndexedTest( int32_t index, UBool exec, const char* &name, TESTCASE_AUTO(TestFractionalDST); TESTCASE_AUTO(TestFebruary); TESTCASE_AUTO(TestCanonicalIDAPI); - // Android-changed: b/228944103 Ignore test instead of adjusting to pass - // both w/ and w/o 2022a updates applied. + // Android-changed: Ignore this test on CTS branches. + // This test is written is such a way that it is heavily coupled with + // tzdata. Keeping it passing with system image tzdata and a newer one, which changes + // canonicality rules (i.e. 2023d), would probably mean re-writing this test. // TESTCASE_AUTO(TestCanonicalID); TESTCASE_AUTO(TestDisplayNamesMeta); TESTCASE_AUTO(TestGetRegion); 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 23fc36d1b..e9a95cab0 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 @@ -1504,7 +1504,11 @@ public class TimeZoneTest extends TestFmwk } @Test - @Ignore + // Android-added: Ignore this test on CTS branches. + // This test is written is such a way that it is heavily coupled with + // tzdata. Keeping it passing with system image tzdata and a newer one, which changes + // canonicality rules (i.e. 2023d), would probably mean re-writing this test. + @org.junit.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 |