CLDR-18329 For the known cases in which there is keyword entry without tts, re-enable the check failure

Author: pedberg-icu

tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckAnnotations.java

@@ -1,14 +1,16 @@
 package org.unicode.cldr.test;
 
-import java.util.Arrays;
+// import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
+// import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.unicode.cldr.test.CheckCLDR.CheckStatus.Subtype;
+import org.unicode.cldr.test.CheckCLDR.CheckStatus.Type;
+import org.unicode.cldr.util.CLDRConfig;
 import org.unicode.cldr.util.CLDRFile;
 import org.unicode.cldr.util.LocaleIDParser;
 import org.unicode.cldr.util.PatternCache;
@@ -21,31 +23,33 @@ public class CheckAnnotations extends CheckCLDR {
     // https://unicode-org.atlassian.net/browse/CLDR-18329 is fixed
     private static final Map<String, Set<String>> entriesLackingTts = new HashMap<>();
 
-    static {
-        //                    locID                                            cp= values to skip
-        entriesLackingTts.put("ak", new HashSet<>(Arrays.asList(new String[] {"🪀"})));
-        entriesLackingTts.put("br", new HashSet<>(Arrays.asList(new String[] {"'"})));
-        entriesLackingTts.put("ccp", new HashSet<>(Arrays.asList(new String[] {"🥪"})));
-        entriesLackingTts.put(
-                "ha",
-                new HashSet<>(Arrays.asList(new String[] {"👨‍🦯", "👨‍🦼", "👩‍🦯", "👩‍🦼"})));
-        entriesLackingTts.put(
-                "kab",
-                new HashSet<>(
-                        Arrays.asList(
-                                new String[] {"⚙", "🀄", "🌤", "🎀", "💊", "💲", "🖲", "🚀"})));
-        entriesLackingTts.put("om", null); // all entries lack tts version
-        entriesLackingTts.put("qu", new HashSet<>(Arrays.asList(new String[] {"✒"})));
-        entriesLackingTts.put(
-                "sat",
-                new HashSet<>(
-                        Arrays.asList(
-                                new String[] {
-                                    "🍐", "🍑", "🍒", "🍓", "🐠", "🐡", "🐨", "🐳", "🐹", "👞",
-                                    "💥", "🤽‍♂", "🥐", "🥸", "🦈"
-                                })));
-    }
-    ;
+    // Temporarily comment out this block so we do get errors in ST/ConsoleCheck for these cases;
+    // either they will be fixed in ST or we will need to remove keyword entries with no tts entry;
+    // see https://unicode-org.atlassian.net/browse/CLDR-18329.
+    // static {
+    //    //                    locID                                            cp= values to skip
+    //    entriesLackingTts.put("ak", new HashSet<>(Arrays.asList(new String[] {"🪀"})));
+    //    entriesLackingTts.put("br", new HashSet<>(Arrays.asList(new String[] {"'"})));
+    //    entriesLackingTts.put("ccp", new HashSet<>(Arrays.asList(new String[] {"🥪"})));
+    //    entriesLackingTts.put(
+    //            "ha",
+    //            new HashSet<>(Arrays.asList(new String[] {"👨‍🦯", "👨‍🦼", "👩‍🦯", "👩‍🦼"})));
+    //    entriesLackingTts.put(
+    //            "kab",
+    //            new HashSet<>(
+    //                    Arrays.asList(
+    //                            new String[] {"⚙", "🀄", "🌤", "🎀", "💊", "💲", "🖲", "🚀"})));
+    //    entriesLackingTts.put("om", null); // all entries lack tts version
+    //    entriesLackingTts.put("qu", new HashSet<>(Arrays.asList(new String[] {"✒"})));
+    //    entriesLackingTts.put(
+    //            "sat",
+    //            new HashSet<>(
+    //                    Arrays.asList(
+    //                            new String[] {
+    //                                "🍐", "🍑", "🍒", "🍓", "🐠", "🐡", "🐨", "🐳", "🐹", "👞",
+    //                                "💥", "🤽‍♂", "🥐", "🥸", "🦈"
+    //                            })));
+    // };
 
     @Override
     public CheckCLDR handleCheck(
@@ -103,13 +107,24 @@ public CheckCLDR handleCheck(
                 }
             }
             if (ttsMissing) {
+                final CLDRConfig.Environment env = CLDRConfig.getInstance().getEnvironment();
+                final boolean onSurveyTool =
+                        (env == CLDRConfig.Environment.PRODUCTION
+                                || env == CLDRConfig.Environment.SMOKETEST);
+                final Type mainType =
+                        onSurveyTool
+                                ? CheckStatus.errorType // this is an error in ST
+                                : CheckStatus
+                                        .warningType; // but a warning elsewhere (e.g. UNITTEST) so
+                // we can commit
                 result.add(
                         new CheckStatus()
                                 .setCause(this)
-                                .setMainType(CheckStatus.errorType)
+                                .setMainType(mainType)
                                 .setSubtype(Subtype.ttsAnnotationMissing)
                                 .setMessage(
-                                        "Have keywords but missing the corresponding name (tts) entry"));
+                                        "Have keywords but missing the corresponding name (tts) entry; error vs warning depends on environment {0}",
+                                        env));
             }
         }