CLDR-18294 Add unit test for inheriting null, and fix two items in xml (#4366)

Author: btangmu

common/main/bew.xml

@@ -1028,7 +1028,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<variant type="FONNAPA" draft="unconfirmed">Hurup Pengucapan Amrik Lor</variant>
 			<variant type="FONUPA" draft="unconfirmed">Hurup Pengucapan Ural</variant>
 			<variant type="FONXSAMP" draft="unconfirmed">Hurup Pengucapan X-SAMPA</variant>
-			<variant type="GALLO">↑↑↑</variant>
 			<variant type="GASCON" draft="unconfirmed">Gaskon</variant>
 			<variant type="GRCLASS" draft="unconfirmed">Èjaan Oksitan Klasik</variant>
 			<variant type="GRITAL" draft="unconfirmed">Èjaan Oksitan Keitalian</variant>

common/main/en_AU.xml

@@ -1272,7 +1272,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<variant type="SAAHO">↑↑↑</variant>
 			<variant type="SCOTLAND">↑↑↑</variant>
 			<variant type="SCOUSE">↑↑↑</variant>
-			<variant type="SIMPLE">↑↑↑</variant>
 			<variant type="SOLBA">↑↑↑</variant>
 			<variant type="SOTAV">↑↑↑</variant>
 			<variant type="TARASK">↑↑↑</variant>

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

@@ -42,6 +42,7 @@
 import org.unicode.cldr.util.CLDRInfo.PathValueInfo;
 import org.unicode.cldr.util.CLDRInfo.UserInfo;
 import org.unicode.cldr.util.CLDRLocale;
+import org.unicode.cldr.util.CldrUtility;
 import org.unicode.cldr.util.Counter;
 import org.unicode.cldr.util.DayPeriodInfo;
 import org.unicode.cldr.util.DayPeriodInfo.DayPeriod;
@@ -50,6 +51,7 @@
 import org.unicode.cldr.util.GrammarInfo;
 import org.unicode.cldr.util.LanguageTagParser;
 import org.unicode.cldr.util.Level;
+import org.unicode.cldr.util.NameType;
 import org.unicode.cldr.util.Organization;
 import org.unicode.cldr.util.Pair;
 import org.unicode.cldr.util.PathHeader;
@@ -476,8 +478,10 @@ public void TestAllLocales() {
         LanguageTagParser ltp = new LanguageTagParser();
         Set<String> locales = new HashSet<>();
         for (String locale : getInclusion() <= 5 ? eightPointLocales : factory.getAvailable()) {
+            checkNullWithInheritanceMark(locale);
+
             /*
-             * Only test locales without regions. E.g., test "pt", skip "pt_PT"
+             * For checkLocale, only test locales without regions. E.g., test "pt", skip "pt_PT"
              */
             if (ltp.set(locale).getRegion().isEmpty()) {
                 locales.add(locale);
@@ -491,6 +495,28 @@ public void TestAllLocales() {
         logln("Count:\t" + locales.size());
     }
 
+    private void checkNullWithInheritanceMark(String locale) {
+        CLDRFile resolved = cldrFactory.make(locale, true);
+        CLDRFile unresolved = resolved.getUnresolved();
+        for (String path : unresolved.fullIterable()) {
+            String value = unresolved.getStringValue(path);
+            if (CldrUtility.INHERITANCE_MARKER.equals(value)) {
+                switch (NameType.fromPath(path)) {
+                    case LANGUAGE:
+                    case SCRIPT:
+                    case TERRITORY:
+                    case VARIANT:
+                        assertNotNull(locale + " " + path, resolved.getStringValue(path));
+                        break;
+                    default:
+                        if (!logKnownIssue("CLDR-18294", "Null with inheritance mark")) {
+                            errln("Null with inheritance mark:\t" + locale + "\t" + path);
+                        }
+                }
+            }
+        }
+    }
+
     public void TestA() {
         CheckCLDR test = CheckCLDR.getCheckAll(factory, INDIVIDUAL_TESTS);
         CheckCLDR.setDisplayInformation(english);