From aabadf728944e290c6e47ba73c7485fefa036548 Mon Sep 17 00:00:00 2001
From: DraganBesevic <dragan@unicode.org>
Date: Wed, 21 Aug 2024 17:26:19 -0700
Subject: [PATCH] ICU-22723 Integrate CLDR 46 release alpha2, part 5, exclude
 failing unit tests for exhaust tests; spaces <-> tabs

---
 icu4c/source/test/cintltst/cloctst.c    |  4 ++--
 icu4c/source/test/intltest/caltest.cpp  |  6 +-----
 icu4c/source/test/intltest/dtptngts.cpp |  2 +-
 icu4c/source/test/intltest/loctest.cpp  | 18 +++++++++++++++---
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c
index 1955e518f420..a032753839f1 100644
--- a/icu4c/source/test/cintltst/cloctst.c
+++ b/icu4c/source/test/cintltst/cloctst.c
@@ -6202,8 +6202,8 @@ static void TestLikelySubtags(void)
         const char* const minimal = full_data[i][0];
         const char* const maximal = full_data[i][1];
 
-		if (uprv_strcmp(minimal, "und_Hant_CN") == 0 &&
-            	log_knownIssue("CLDR-17908", "und_Hant_CN changed expected result for Likely Subtags")) {
+        if (uprv_strcmp(minimal, "und_Hant_CN") == 0 &&
+                log_knownIssue("CLDR-17908", "und_Hant_CN changed expected result for Likely Subtags")) {
             continue;
         }
 
diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp
index 11975284d270..bae5eac77bc6 100644
--- a/icu4c/source/test/intltest/caltest.cpp
+++ b/icu4c/source/test/intltest/caltest.cpp
@@ -5632,11 +5632,7 @@ void CalendarTest::TestFirstDayOfWeek() {
     verifyFirstDayOfWeek("und-Thaa", UCAL_FRIDAY);
 
     // ssh => ssh_Arab_AE => Saturday
-    verifyFirstDayOfWeek("ssh", UCAL_SATURDAY);
-    // wbl_Arab => wbl_Arab_AF => Saturday
-	if (!logKnownIssue("CLDR-17907", "wbl-Arab returns wrong first day of the week, probably caused by wrong Likely Subtag algo")) {
-       verifyFirstDayOfWeek("wbl-Arab", UCAL_SATURDAY);
-    }    
+    verifyFirstDayOfWeek("ssh", UCAL_SATURDAY);  
     
     // en => en_Latn_US => Sunday
     verifyFirstDayOfWeek("en", UCAL_SUNDAY);
diff --git a/icu4c/source/test/intltest/dtptngts.cpp b/icu4c/source/test/intltest/dtptngts.cpp
index 9c483faf6039..2ea24458258b 100644
--- a/icu4c/source/test/intltest/dtptngts.cpp
+++ b/icu4c/source/test/intltest/dtptngts.cpp
@@ -1391,7 +1391,7 @@ void IntlTestDateTimePatternGeneratorAPI::testJjMapping() {
         }
         // Now check that shortPattern and jPattern use the same hour cycle
         if ((uprv_strncmp(localeID, "csw", 3) == 0 || uprv_strncmp(localeID, "kxv_", 4) == 0 || uprv_strncmp(localeID, "zh_Hans_MY", 10) == 0
-        		|| uprv_strncmp(localeID, "yue_Hant_CN", 11) == 0) 
+                || uprv_strncmp(localeID, "yue_Hant_CN", 11) == 0) 
         		&& logKnownIssue("CLDR-17199", "Need timeFormats with h for csw, kxv_Xxxx, zh_Hans_MY, yue_Hant_CN")) {
             continue;
         }
diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp
index debec8b96ed7..3b07d4cf29c7 100644
--- a/icu4c/source/test/intltest/loctest.cpp
+++ b/icu4c/source/test/intltest/loctest.cpp
@@ -4130,8 +4130,8 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() {
     for (const auto& item : full_data) {
         const char* const org = item.from;
         const char* const exp = item.add;
-		if (uprv_strcmp(org,"und_Hant_CN") == 0 &&
-            	logKnownIssue("CLDR-17908", "und_Hant_CN changed expected result for Likely Subtags")) {
+        if (uprv_strcmp(org,"und_Hant_CN") == 0 &&
+                logKnownIssue("CLDR-17908", "und_Hant_CN changed expected result for Likely Subtags")) {
             continue;
         }
         Locale res(org);
@@ -4147,7 +4147,7 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() {
     for (const auto& item : full_data) {
         const char* const org = item.from;
         const char* const exp = item.remove;
-		if (uprv_strcmp(org,"und_Hant_CN") == 0 &&
+        if (uprv_strcmp(org,"und_Hant_CN") == 0 &&
             	logKnownIssue("CLDR-17908", "und_Hant_CN changed expected result for Likely Subtags")) {
             continue;
         }
@@ -5718,6 +5718,10 @@ void LocaleTest::TestIsRightToLeft() {
     assertTrue("ckb RTL", Locale("ckb").isRightToLeft(), false, true);  // Sorani Kurdish
     assertFalse("fil LTR", Locale("fil").isRightToLeft());
     assertFalse("he-Zyxw LTR", Locale("he-Zyxw").isRightToLeft());
+
+    if (logKnownIssue("CLDR-17908", "und_Hant_CN changed expected result for Likely Subtags")) {
+            return;
+    }   
 }
 
 void LocaleTest::TestBug11421() {
@@ -5921,6 +5925,14 @@ testLikelySubtagsLineFn(void *context,
         *pErrorCode = U_ZERO_ERROR;
         return;
     }
+    
+     if ( (uprv_strcmp(source.c_str(), "und-Latn-MU") == 0 || uprv_strcmp(source.c_str(), "und-Latn-RS") == 0 || uprv_strcmp(source.c_str(), "und-Latn-SL") == 0
+            || uprv_strcmp(source.c_str(), "und-Latn-TK") == 0 || uprv_strcmp(source.c_str(), "und-Latn-ZM") == 0 )
+                 && THIS->logKnownIssue("CLDR-17908", "und_Hant_CN changed expected result for Likely Subtags")) {
+             return;
+     }    
+    
+ 
 
     Locale actualMax(l);
     actualMax.addLikelySubtags(*pErrorCode);