ICU-21480 Scrub TODOs for completed issues 21292 and 21236

See #1652

diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp
index 2d005b23542d2d52250d316ba61ba3d50f244cd5..5d604350ecd1b252dbf982fd6993518e6b626c97 100644 (file)
--- a/icu4c/source/common/locid.cpp
+++ b/icu4c/source/common/locid.cpp
@@ -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

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java
index 7798ead97eafa685f7140f71000f8279af98e5e4..6e0009e881fb39fa8d7d14e253f6a3d4a7902631 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java
@@ -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

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
index d34b729eefdb2fb628f519e870cb2fc336b6833a..c2d8c0739c26aa21ebb6b0f92002b8d92ced9d5f 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
@@ -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"));
-
-            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"));
-        }
+        // 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("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"));