diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index 9fe056fe0e7..546b49006cc 100644 --- a/icu4c/source/test/intltest/loctest.cpp +++ b/icu4c/source/test/intltest/loctest.cpp @@ -5592,17 +5592,12 @@ public: } }; - bool isKnownSourceForCLDR17099(const std::string& s) { if (s.compare("qaa-Cyrl-CH") == 0) { return true; } - if (s.compare(0, 9, "und-Latn-") != 0) { - return false; - } - std::string tail(s.substr(9)); - std::string regionsForCLDR17099("AE CC ER HK IL IN MV PK RS SD SS"); - return (regionsForCLDR17099.find(tail) != std::string::npos); + + return false; } void U_CALLCONV @@ -5615,7 +5610,7 @@ testLikelySubtagsLineFn(void *context, (void)fieldCount; LocaleTest* THIS = (LocaleTest*)context; std::string source(trim(std::string(fields[0][0], fields[0][1]-fields[0][0]))); - if (isKnownSourceForCLDR17099(source) && THIS->logKnownIssue("CLDR-17099", "likelySubtags.txt wrong for certain und-Latn-XX locales")) { + if (isKnownSourceForCLDR17099(source) && THIS->logKnownIssue("CLDR-17099", "likelySubtags.txt wrong for qaa-Cyrl-CH")) { return; } std::string addLikely(trim(std::string(fields[1][0], fields[1][1]-fields[1][0]))); diff --git a/icu4c/source/test/intltest/transrt.cpp b/icu4c/source/test/intltest/transrt.cpp index c3426759989..6f9200ea4b0 100644 --- a/icu4c/source/test/intltest/transrt.cpp +++ b/icu4c/source/test/intltest/transrt.cpp @@ -1240,9 +1240,6 @@ void TransliteratorRoundTripTest::TestHebrew() { delete legal; } void TransliteratorRoundTripTest::TestCyrillic() { - if (logKnownIssue("CLDR-17026", "Remaining roundtrip issues with new Cyrillic-Latin transform")) { - return; - } RTTest test("Latin-Cyrillic"); Legal *legal = new Legal(); diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java index da2b4707f35..5f1903a28a2 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java @@ -5420,16 +5420,6 @@ public class ULocaleTest extends TestFmwk { } - final List regionsForCLDR17099 = Arrays.asList("AE", "CC", "ER", "HK", "IL", "IN", "MV", "PK", "RS", "SD", "SS"); - - boolean isKnownSourceForCLDR17099(String s) { - if (!s.startsWith("und-Latn-")) { - return false; - } - String tail = s.substring(9); - return regionsForCLDR17099.contains(tail); - } - private static final class TestCase implements Cloneable { private static final String ENDL = System.getProperties().getProperty("line.separator"); @@ -5483,28 +5473,27 @@ public class ULocaleTest extends TestFmwk { @Parameters(method = "readLikelySubtagsTestCases") public void likelySubtagsDataDriven(TestCase test) { ULocale l = ULocale.forLanguageTag(test.source); - if (!isKnownSourceForCLDR17099(test.source) && !logKnownIssue("CLDR-17099", "likelySubtags.txt wrong for certain und-Latn-XX locales")) { - if (test.addLikely.equals("FAIL")) { - assertEquals("addLikelySubtags(" + test.source + ") should be unchanged", - l, ULocale.addLikelySubtags(l)); - } else { - assertEquals("addLikelySubtags(" + test.source + ")", - test.addLikely, ULocale.addLikelySubtags(l).toLanguageTag()); - } - if (test.removeFavorRegion.equals("FAIL")) { - assertEquals("minimizeSubtags(" + test.source + ") should be unchanged", - l, ULocale.minimizeSubtags(l)); - } else { - assertEquals("minimizeSubtags(" + test.source + ")", - test.removeFavorRegion, ULocale.minimizeSubtags(l).toLanguageTag()); - } - if (test.removeFavorScript.equals("FAIL")) { - assertEquals("minimizeSubtags(" + test.source + ") - FAVOR_SCRIPT should be unchanged", - l, ULocale.minimizeSubtags(l, ULocale.Minimize.FAVOR_SCRIPT)); - } else { - assertEquals("minimizeSubtags(" + test.source + ") - FAVOR_SCRIPT", - test.removeFavorScript, ULocale.minimizeSubtags(l, ULocale.Minimize.FAVOR_SCRIPT).toLanguageTag()); - } + + if (test.addLikely.equals("FAIL")) { + assertEquals("addLikelySubtags(" + test.source + ") should be unchanged", + l, ULocale.addLikelySubtags(l)); + } else { + assertEquals("addLikelySubtags(" + test.source + ")", + test.addLikely, ULocale.addLikelySubtags(l).toLanguageTag()); + } + if (test.removeFavorRegion.equals("FAIL")) { + assertEquals("minimizeSubtags(" + test.source + ") should be unchanged", + l, ULocale.minimizeSubtags(l)); + } else { + assertEquals("minimizeSubtags(" + test.source + ")", + test.removeFavorRegion, ULocale.minimizeSubtags(l).toLanguageTag()); + } + if (test.removeFavorScript.equals("FAIL")) { + assertEquals("minimizeSubtags(" + test.source + ") - FAVOR_SCRIPT should be unchanged", + l, ULocale.minimizeSubtags(l, ULocale.Minimize.FAVOR_SCRIPT)); + } else { + assertEquals("minimizeSubtags(" + test.source + ") - FAVOR_SCRIPT", + test.removeFavorScript, ULocale.minimizeSubtags(l, ULocale.Minimize.FAVOR_SCRIPT).toLanguageTag()); } } }