ICU-23183 Merging fix done for CLDR-18985 and more logKnownIssues for…

See #3650

Author: yumaoka

icu4c/source/data/misc/metaZones.txt

@@ -1153,11 +1153,11 @@ metaZones:table(nofallback){
             {
                 "Liberia",
                 "1970-01-01 00:00",
-                "1972-01-07 00:30",
+                "1972-01-07 00:45",
             }
             {
                 "GMT",
-                "1972-01-07 00:30",
+                "1972-01-07 00:45",
                 "9999-12-31 23:59",
             }
         }

icu4c/source/test/intltest/tzfmttst.cpp

@@ -171,12 +171,14 @@ TimeZoneFormatTest::TestTimeZoneRoundTrip() {
 
     // Run the roundtrip test
     for (int32_t locidx = 0; locidx < nLocales; locidx++) {
-        if ((uprv_strcmp(LOCALES[locidx].getBaseName(),"ku") == 0) ||
-            (uprv_strncmp(LOCALES[locidx].getBaseName(),"ku_",3) == 0) ||
-            (uprv_strncmp(LOCALES[locidx].getBaseName(),"shn",3) == 0) ||
-            (uprv_strcmp(LOCALES[locidx].getBaseName(),"sv") == 0) ||
-            (uprv_strncmp(LOCALES[locidx].getBaseName(),"sv_",3) == 0)) {
-            logKnownIssue("CLDR-18924", "Timezone round trip issues in ku, shn, sv for various zones");
+        if (logKnownIssue("CLDR-18924", "Timezone round trip issues in ku, shn, sv for various zones") &&
+            (
+                (uprv_strcmp(LOCALES[locidx].getBaseName(),"ku") == 0) ||
+                (uprv_strncmp(LOCALES[locidx].getBaseName(),"ku_",3) == 0) ||
+                (uprv_strncmp(LOCALES[locidx].getBaseName(),"shn",3) == 0) ||
+                (uprv_strcmp(LOCALES[locidx].getBaseName(),"sv") == 0) ||
+                (uprv_strncmp(LOCALES[locidx].getBaseName(),"sv_",3) == 0)
+            )) {
             continue;
         }
         UnicodeString localGMTString;
@@ -578,7 +580,6 @@ void TimeZoneFormatTest::RunTimeRoundTripTests(int32_t threadNumber) {
     int32_t patidx = -1;
 
     while (gLocaleData->nextTest(locidx, patidx)) {
-
         UnicodeString pattern(BASEPATTERN);
         pattern.append(" ").append(PATTERNS[patidx]);
         logln("    Thread %d, Locale %s, Pattern %s",
@@ -600,6 +601,12 @@ void TimeZoneFormatTest::RunTimeRoundTripTests(int32_t threadNumber) {
         timer = Calendar::getNow();
 
         while ((tzid = tzids->snext(status))) {
+            if (logKnownIssue("CLDR-18924", "Time round trip issues for Pacific/Apia in various locales and Pacific/Honolulu in Swedish" ) &&
+                (tzid->compare(u"Pacific/Apia", -1) == 0
+                || (tzid->compare(u"Pacific/Honolulu", -1) == 0 && uprv_strncmp(gLocaleData->locales[locidx].getBaseName(),"sv_",3) == 0))) {
+                continue;
+            }
+
             if (uprv_strcmp(PATTERNS[patidx], "V") == 0) {
                 // Some zones do not have short ID assigned, such as Asia/Riyadh87.
                 // The time roundtrip will fail for such zones with pattern "V" (short zone ID).

icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java

@@ -144,12 +144,14 @@ public void TestTimeZoneRoundTrip() {
 
         // Run the roundtrip test
         for (int locidx = 0; locidx < LOCALES.length; locidx++) {
-            if (LOCALES[locidx].getBaseName().equals("ku") ||
-                LOCALES[locidx].getBaseName().startsWith("ku_") ||
-                LOCALES[locidx].getBaseName().startsWith("shn") ||
-                LOCALES[locidx].getBaseName().equals("sv") ||
-                LOCALES[locidx].getBaseName().startsWith("sv_")) {
-                logKnownIssue("CLDR-18924", "Timezone round trip issues in ku, shn, sv for various zones");
+            if (logKnownIssue("CLDR-18924", "Timezone round trip issues in ku, shn, sv for various zones") &&
+            	(
+            	    LOCALES[locidx].getBaseName().equals("ku") ||
+                    LOCALES[locidx].getBaseName().startsWith("ku_") ||
+                    LOCALES[locidx].getBaseName().startsWith("shn") ||
+                    LOCALES[locidx].getBaseName().equals("sv") ||
+                    LOCALES[locidx].getBaseName().startsWith("sv_")
+                )) {
                 continue;
             }
             logln("Locale: " + LOCALES[locidx].toString());
@@ -410,7 +412,15 @@ public void TestTimeRoundTrip() {
                 }
 
                 for (String id : ids) {
-                    if (PATTERNS[patidx].equals("V")) {
+                	if (logKnownIssue("CLDR-18924", "Time round trip issues for Pacific/Apia in various locales and Pacific/Honolulu in Swedish") &&
+                		(
+                		    id.equals("Pacific/Apia") ||
+                		    (id.equals("Pacific/Honolulu") && LOCALES[locidx].getLanguage().equals("sv"))
+                		)) {
+                		continue;
+                	}
+
+                	if (PATTERNS[patidx].equals("V")) {
                         // Some zones do not have short ID assigned, such as Asia/Riyadh87.
                         // The time roundtrip will fail for such zones with pattern "V" (short zone ID).
                         // This is expected behavior.