organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 15:42:14 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-21480 Scrub TODOs for completed issues 21292 and 21236

Browse source 
See #1652
This commit is contained in:
Craig Cornelius 2021-03-16 01:37:55 +00:00
parent 2273ebbc80
commit bc7e2e230c
3 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
icu4c/source/common/locid.cpp
View file

@ -1366,7 +1366,6 @@ AliasReplacer::replaceLanguage(
}
}
if (replacedExtensions != nullptr) {
// TODO(ICU-21292)
// DO NOTHING
// UTS35 does not specifiy what should we do if we have extensions in the
// replacement. Currently we know only the following 4 "BCP47 LegacyRules" have

1
icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java
View file

@ -1549,7 +1549,6 @@ public final class ULocale implements Serializable, Comparable<ULocale> {
}
}
if (replacedExtensions != null && !replacedExtensions.isEmpty()) {
// TODO(ICU-21292)
// DO NOTHING
// UTS35 does not specifiy what should we do if we have extensions in the
// replacement. Currently we know only the following 4 "BCP47 LegacyRules" have

42
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
View file

@ -1001,10 +1001,8 @@ public class ULocaleTest extends TestFmwk {
}
if (level2Expected != null) {
if (logKnownIssue("21236", "skip some canonicalization tests until code fixed")) {
if (source.startsWith("zh_CN") || source.startsWith("zh_TW") || source.startsWith("uz-UZ")) {
continue;
}
if (source.startsWith("zh_CN") || source.startsWith("zh_TW") || source.startsWith("uz-UZ")) {
continue;
}
String level2 = ULocale.canonicalize(source);
if(!level2.equals(level2Expected)){
@ -5159,27 +5157,25 @@ public class ULocaleTest extends TestFmwk {
public void TestCanonical() {
// Test replacement of languageAlias
if (!logKnownIssue("21236", "skip some canonicalization tests until code fixed")) {
// language _ variant -> language
Assert.assertEquals("nb", canonicalTag("no-BOKMAL"));
// also test with script, country and extensions
Assert.assertEquals("nb-Cyrl-ID-u-ca-japanese", canonicalTag("no-Cyrl-ID-BOKMAL-u-ca-japanese"));
// also test with other variants, script, country and extensions
Assert.assertEquals("nb-Cyrl-ID-1901-xsistemo-u-ca-japanese",
canonicalTag("no-Cyrl-ID-1901-BOKMAL-xsistemo-u-ca-japanese"));
Assert.assertEquals("nb-Cyrl-ID-1901-u-ca-japanese",
canonicalTag("no-Cyrl-ID-1901-BOKMAL-u-ca-japanese"));
Assert.assertEquals("nb-Cyrl-ID-xsistemo-u-ca-japanese",
canonicalTag("no-Cyrl-ID-BOKMAL-xsistemo-u-ca-japanese"));
// language _ variant -> language
Assert.assertEquals("nb", canonicalTag("no-BOKMAL"));
// also test with script, country and extensions
Assert.assertEquals("nb-Cyrl-ID-u-ca-japanese", canonicalTag("no-Cyrl-ID-BOKMAL-u-ca-japanese"));
// also test with other variants, script, country and extensions
Assert.assertEquals("nb-Cyrl-ID-1901-xsistemo-u-ca-japanese",
canonicalTag("no-Cyrl-ID-1901-BOKMAL-xsistemo-u-ca-japanese"));
Assert.assertEquals("nb-Cyrl-ID-1901-u-ca-japanese",
canonicalTag("no-Cyrl-ID-1901-BOKMAL-u-ca-japanese"));
Assert.assertEquals("nb-Cyrl-ID-xsistemo-u-ca-japanese",
canonicalTag("no-Cyrl-ID-BOKMAL-xsistemo-u-ca-japanese"));
Assert.assertEquals("nn", canonicalTag("no-NYNORSK"));
// also test with script, country and extensions
Assert.assertEquals("nn-Cyrl-ID-u-ca-japanese", canonicalTag("no-Cyrl-ID-NYNORSK-u-ca-japanese"));
Assert.assertEquals("nn", canonicalTag("no-NYNORSK"));
// also test with script, country and extensions
Assert.assertEquals("nn-Cyrl-ID-u-ca-japanese", canonicalTag("no-Cyrl-ID-NYNORSK-u-ca-japanese"));
Assert.assertEquals("ssy", canonicalTag("aa-SAAHO"));
// also test with script, country and extensions
Assert.assertEquals("ssy-Devn-IN-u-ca-japanese", canonicalTag("aa-Devn-IN-SAAHO-u-ca-japanese"));
}
Assert.assertEquals("ssy", canonicalTag("aa-SAAHO"));
// also test with script, country and extensions
Assert.assertEquals("ssy-Devn-IN-u-ca-japanese", canonicalTag("aa-Devn-IN-SAAHO-u-ca-japanese"));
// language -> language
Assert.assertEquals("aas", canonicalTag("aam"));