Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ICU-22938 Remove Known Issue subtags for "und_Hant_CN" #3233

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 2 additions & 22 deletions icu4c/source/test/intltest/loctest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3518,8 +3518,8 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() {
"zh_TW"
}, {
"und_Hant_CN",
"zh_Hant_CN",
"zh_Hant_CN"
"yue_Hant_CN",
"yue_Hant_CN"
}, {
"und_Hant_TW",
"zh_Hant_TW",
Expand Down Expand Up @@ -4130,10 +4130,6 @@ 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-17981", "und_Hant_CN changed expected result for Likely Subtags")) {
continue;
}
Locale res(org);
res.addLikelySubtags(status);
status.errIfFailureAndReset("\"%s\"", org);
Expand All @@ -4147,10 +4143,6 @@ 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 &&
logKnownIssue("CLDR-17981", "und_Hant_CN changed expected result for Likely Subtags")) {
continue;
}
Locale res(org);
res.minimizeSubtags(status);
status.errIfFailureAndReset("\"%s\"", org);
Expand Down Expand Up @@ -5718,10 +5710,6 @@ 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-17981", "und_Hant_CN changed expected result for Likely Subtags")) {
return;
}
}

void LocaleTest::TestBug11421() {
Expand Down Expand Up @@ -5925,14 +5913,6 @@ 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-17981", "und_Hant_CN changed expected result for Likely Subtags")) {
return;
}



Locale actualMax(l);
actualMax.addLikelySubtags(*pErrorCode);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3659,9 +3659,9 @@ else if (!res.toString().equals(exp)) {
"zh_Hant_TW",
"zh_TW"
}, {
"und_Hant_CN",
"zh_Hant_CN",
"zh_Hant_CN"
"und_Hant_CN",
"yue_Hant_CN",
"yue_Hant_CN"
}, {
"und_Hant_TW",
"zh_Hant_TW",
Expand Down Expand Up @@ -4166,10 +4166,6 @@ else if (!res.toString().equals(exp)) {
};

for (int i = 0; i < full_data.length; i++) {
if (full_data[i][0].equals("und_Hant_CN") &&
logKnownIssue("CLDR-17981", "und_Hant_CN changed expected result for Likely Subtags")) {
continue;
}
ULocale org = new ULocale(full_data[i][0]);
ULocale res = ULocale.addLikelySubtags(org);
String exp = full_data[i][1];
Expand Down Expand Up @@ -5718,14 +5714,14 @@ public void likelySubtagsDataDriven(TestCase test) {
assertEquals("addLikelySubtags(" + test.source + ") should be unchanged",
l, ULocale.addLikelySubtags(l));
} else {
if ( ( test.source.equals("und-Latn-MU") || test.source.equals("und-Latn-RS") || test.source.equals("und-Latn-SL")
|| test.source.equals("und-Latn-TK") || test.source.equals("und-Latn-ZM") )
&& logKnownIssue("CLDR-17981", "und_Hant_CN changed expected result for Likely Subtags") ) {
return;
}
assertEquals("addLikelySubtags(" + test.source + ")",
test.addLikely, ULocale.addLikelySubtags(l).toLanguageTag());
}
if ( ( test.source.equals("und-Latn-MU") || test.source.equals("und-Latn-RS") || test.source.equals("und-Latn-SL")
|| test.source.equals("und-Latn-TK") || test.source.equals("und-Latn-ZM") )
&& logKnownIssue("CLDR-18002", "Incorrect Likely Subtags for some entries modified in CLDR 46") ) {
return;
}
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));
Expand Down