CLDR-9774 Enable test for missing/extra English names for BCP47 keys/types

Author: pedberg-icu

tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestBCP47.java

@@ -78,9 +78,6 @@ public static void main(String[] args) {
     }
 
     public void TestEnglishKeyTranslations() {
-        logKnownIssue(
-                "cldr7631",
-                "Using just warnings for now, until issues are resolved. Change WARNING/ERROR when removing this.");
         ChainedMap.M3<String, String, String> foundEnglish =
                 ChainedMap.of(
                         new TreeMap<String, Object>(), new TreeMap<String, Object>(), String.class);
@@ -103,14 +100,11 @@ public void TestEnglishKeyTranslations() {
                     if (keyTrans != null) {
                         engKey = keyAlias;
                         foundEnglish.put(engKey, "", keyTrans);
-                        msg(
+                        warnln(
                                 "Type for English 'key' translation is "
                                         + engKey
                                         + ", while bcp47 is "
-                                        + bcp47Key,
-                                WARNING,
-                                true,
-                                true);
+                                        + bcp47Key);
                         break;
                     }
                 }
@@ -125,17 +119,14 @@ public void TestEnglishKeyTranslations() {
                                 Collections.<String>emptySet(),
                                 keyTrans));
             } else {
-                msg(
+                errln(
                         showData(
                                 bcp47Key,
                                 "",
                                 SUPPLEMENTAL_DATA_INFO.getBcp47Descriptions().get(keyRow),
                                 keyAliases,
                                 Collections.<String>emptySet(),
-                                "MISSING"),
-                        ERROR,
-                        true,
-                        true);
+                                "MISSING"));
             }
             if (bcp47Key.equals("tz")) {
                 continue;
@@ -156,32 +147,29 @@ public void TestEnglishKeyTranslations() {
             final String type = extra.get1();
             final String trans = extra.get2();
             if (foundEnglish.get(key, type) == null) {
-                if (key.equals("x")) {
-                    msg(
+                if (key.equals("x") || key.equals("t")) {
+                    logln(
                             "OK Extra English: "
                                     + showData(
                                             key,
                                             type,
                                             "MISSING",
                                             Collections.<String>emptySet(),
                                             Collections.<String>emptySet(),
-                                            trans),
-                            LOG,
-                            true,
-                            true);
+                                            trans));
+                } else if (type.equals("big5han") || type.equals("gb2312han")) {
+                    logKnownIssue(
+                            "CLDR-18307", "Remove English names for deprecated collation types");
                 } else {
-                    msg(
+                    errln(
                             "*Extra English: "
                                     + showData(
                                             key,
                                             type,
                                             "MISSING",
                                             Collections.<String>emptySet(),
                                             Collections.<String>emptySet(),
-                                            trans),
-                            ERROR,
-                            true,
-                            true);
+                                            trans));
                 }
             }
         }
@@ -223,18 +211,15 @@ private void checkKeyType(
                 if (trans != null) {
                     engType = typeAlias;
                     foundEnglish.put(engKey, engType, trans);
-                    msg(
+                    warnln(
                             "Type for English 'key+type' translation is "
                                     + engKey
                                     + "+"
                                     + engType
                                     + ", while bcp47 is "
                                     + bcp47Key
                                     + "+"
-                                    + bcp47Type,
-                            WARNING,
-                            true,
-                            true);
+                                    + bcp47Type);
                     break;
                 }
             }
@@ -260,17 +245,14 @@ private void checkKeyType(
                             typeAliases,
                             trans));
         } else {
-            msg(
+            errln(
                     showData(
                             bcp47Key,
                             bcp47Type,
                             SUPPLEMENTAL_DATA_INFO.getBcp47Descriptions().get(row),
                             keyAliases,
                             typeAliases,
-                            "MISSING"),
-                    ERROR,
-                    true,
-                    true);
+                            "MISSING"));
         }
     }