Snap for 11532398 from 9c14af3c9004e4b3912ef82fd2565bb01a25f598 to android12L-tests-releaseandroid12L-tests-release

Change-Id: Ibec3a6b51d681f336c65ba8c1dd545ba708ff741

8 files changed, 45 insertions, 7 deletions

diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeZoneFormatTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeZoneFormatTest.java
index b26622405..e62fc792e 100644
--- a/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeZoneFormatTest.java
+++ b/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeZoneFormatTest.java
@@ -427,6 +427,13 @@ public class TimeZoneFormatTest extends TestFmwk {
                         continue;
                     }
 
+                    if ((id.equals("America/Miquelon") || id.equals("America/Hermosillo") || id.equals("America/Mazatlan"))
+                            && PATTERNS[patidx].equals("v")
+                            && LOCALES[locidx].getName().startsWith("ku")
+                            && logKnownIssue("CLDR-17024", "TestTimeRoundTrip fail with tz=America/Miquelon, pattern=v, locale=ku")) {
+                        continue;
+                    }
+
                     BasicTimeZone btz = (BasicTimeZone)TimeZone.getTimeZone(id, TimeZone.TIMEZONE_ICU);
                     TimeZone tz = TimeZone.getTimeZone(id);
                     sdf.setTimeZone(tz);
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 5f3082176..db2288681 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() {
         // Some canonical IDs in CLDR are defined as "Link"
         // in Olson tzdata.
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/util/TestLocaleValidity.java b/android_icu4j/src/main/tests/android/icu/dev/test/util/TestLocaleValidity.java
index 9480891c5..d49d209da 100644
--- a/android_icu4j/src/main/tests/android/icu/dev/test/util/TestLocaleValidity.java
+++ b/android_icu4j/src/main/tests/android/icu/dev/test/util/TestLocaleValidity.java
@@ -92,6 +92,8 @@ public class TestLocaleValidity extends TestFmwk {
                 {"OK", "en-u-ss-none"},
                 {"OK", "en-t-t0-und"},
                 {"OK", "en-t-x0-12345678"},
+                // Android-removed: Ignore en-u-tz-camtr. Behaviour is different after 2023d.
+                // {"OK", "en-u-tz-camtr"}, // CLDR 43 no longer deprecated, see CLDR-16489
 
                 // tests from LDML spec section on Hybrid Locale Identifiers
                 {"OK", "hi-t-en-h0-hybrid"},
@@ -181,7 +183,8 @@ public class TestLocaleValidity extends TestFmwk {
                 //{"{u, ca-civil}", "en-u-ca-islamicc"}, // deprecated, but turns into valid
                 {"{u, co-direct}", "en-u-co-direct"}, // deprecated
                 {"{u, kh}", "en-u-kh-false"}, // deprecated
-                {"{u, tz-camtr}", "en-u-tz-camtr"}, // deprecated
+                // Android-removed: Ignore en-u-tz-camtr. Behaviour is different after 2023d.
+                // {"{u, tz-camtr}", "en-u-tz-camtr"}, // CLDR 43 no longer deprecated, see CLDR-16489
                 {"{u, vt}", "en-u-vt-0020-0041"}, // deprecated
         };
         final LinkedHashSet<String> foundKeys = new LinkedHashSet<String>();
diff --git a/icu4c/source/test/intltest/tzfmttst.cpp b/icu4c/source/test/intltest/tzfmttst.cpp
index 0f58a0003..dca688e58 100644
--- a/icu4c/source/test/intltest/tzfmttst.cpp
+++ b/icu4c/source/test/intltest/tzfmttst.cpp
@@ -609,7 +609,15 @@ void TimeZoneFormatTest::RunTimeRoundTripTests(int32_t threadNumber) {
                 continue;
             }
 
-            BasicTimeZone *tz = (BasicTimeZone*) TimeZone::createTimeZone(*tzid);
+            if ((*tzid == "America/Miquelon" || *tzid == "America/Hermosillo" || *tzid == "America/Mazatlan")
+                    && uprv_strncmp(gLocaleData->locales[locidx].getName(),"ku",2) == 0
+                    && uprv_strcmp(PATTERNS[patidx], "v") == 0
+                    && logKnownIssue("CLDR-17024", "TestTimeRoundTrip fail with tz=America/Miquelon, pattern=v, locale=ku")) {
+                continue;
+            }
+
+
+            BasicTimeZone *tz = dynamic_cast<BasicTimeZone*>(TimeZone::createTimeZone(*tzid));
             sdf->setTimeZone(*tz);
 
             UDate t = gLocaleData->START_TIME;
diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp
index dfd3d8644..c19f05117 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/format/TimeZoneFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
index 71a33cd99..8d147efae 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
@@ -424,6 +424,13 @@ public class TimeZoneFormatTest extends TestFmwk {
                         continue;
                     }
 
+                    if ((id.equals("America/Miquelon") || id.equals("America/Hermosillo") || id.equals("America/Mazatlan"))
+                            && PATTERNS[patidx].equals("v")
+                            && LOCALES[locidx].getName().startsWith("ku")
+                            && logKnownIssue("CLDR-17024", "TestTimeRoundTrip fail with tz=America/Miquelon, pattern=v, locale=ku")) {
+                        continue;
+                    }
+
                     BasicTimeZone btz = (BasicTimeZone)TimeZone.getTimeZone(id, TimeZone.TIMEZONE_ICU);
                     TimeZone tz = TimeZone.getTimeZone(id);
                     sdf.setTimeZone(tz);
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 849ab1c11..865cbfcd4 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() {
         // Some canonical IDs in CLDR are defined as "Link"
         // in Olson tzdata.
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestLocaleValidity.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestLocaleValidity.java
index d299eb5e9..fad0cb29e 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestLocaleValidity.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestLocaleValidity.java
@@ -89,6 +89,8 @@ public class TestLocaleValidity extends TestFmwk {
                 {"OK", "en-u-ss-none"},
                 {"OK", "en-t-t0-und"},
                 {"OK", "en-t-x0-12345678"},
+                // Android-removed: ignore en-u-tz-camtr. Behaviour is different after 2023d.
+                // {"OK", "en-u-tz-camtr"}, // CLDR 43 no longer deprecated, see CLDR-16489
 
                 // tests from LDML spec section on Hybrid Locale Identifiers
                 {"OK", "hi-t-en-h0-hybrid"},
@@ -178,7 +180,8 @@ public class TestLocaleValidity extends TestFmwk {
                 //{"{u, ca-civil}", "en-u-ca-islamicc"}, // deprecated, but turns into valid
                 {"{u, co-direct}", "en-u-co-direct"}, // deprecated
                 {"{u, kh}", "en-u-kh-false"}, // deprecated
-                {"{u, tz-camtr}", "en-u-tz-camtr"}, // deprecated
+                // Android-removed: Ignore en-u-tz-camtr. Behaviour is different after 2023d.
+                // {"{u, tz-camtr}", "en-u-tz-camtr"}, // CLDR 43 no longer deprecated, see CLDR-16489
                 {"{u, vt}", "en-u-vt-0020-0041"}, // deprecated
         };
         final LinkedHashSet<String> foundKeys = new LinkedHashSet<String>();