Fixed the tests (caused by real changes in the data, never fixed here)

unicode-org · Dec 7, 2024 · 6f4fea1 · 6f4fea1
1 parent 0448e8f
commit 6f4fea1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/...src/test/java/org/unicode/icu/tool/cldrtoicu/localedistance/LocaleDistanceMapperTest.java b/...src/test/java/org/unicode/icu/tool/cldrtoicu/localedistance/LocaleDistanceMapperTest.java
@@ -135,14 +135,15 @@ public void testEndToEnd() {
         // LSR values come in (language, script, region) tuples. They are the mapped-to
         // values for the likely subtag mappings, ordered by the DTD order in which the
         // mapping keys were encountered.
-        assertThat(icuData).hasValuesFor("likely/lsrs",
-                "", "", "",
-                "skip", "script", "",
-                "zh", "Hans", "CN",
-                "zh", "Hant", "TW",
-                "en", "Latn", "US",
-                "zh", "Hant", "HK",
-                "zh", "Hant", "MO");
+        assertThat(icuData).hasValuesFor("likely/lsrnum:intvector",
+                "0", // "", "", ""
+                "1", // "skip", "script", ""
+                "1232236233", // "zh", "Hans", "CN"
+                "1254131029", // "zh", "Hant", "TW"
+                "429941505", // "en", "Latn", "US"
+                "1247517541", // "zh", "Hant", "HK"
+                "1249741720" // "zh", "Hant", "MO"
+        );
 
         // It's a bit easier to see how match keys are grouped against the partitions.
         ImmutableSetMultimap<Integer, String> likelyTrie =
@@ -174,11 +175,12 @@ public void testEndToEnd() {
 
         // Pairs of expanded paradigm locales (using LSR tuples) in declaration order.
         // This is just the list from the CLDR data with no processing.
-        assertThat(icuData).hasValuesFor("match/paradigms",
-                "en", "Latn", "US",
-                "en", "Latn", "GB",
-                "es", "Latn", "ES",
-                "es", "Latn", "419");
+        assertThat(icuData).hasValuesFor("match/paradigmnum:intvector",
+                "429941505", // "en", "Latn", "US"
+                "420631446", // "en", "Latn", "GB"
+                "429626712", // "es", "Latn", "ES"
+                "419470284" // "es", "Latn", "419"
+        );
 
         // See PartitionInfoTest for a description of the ordering of these strings.
         assertThat(icuData).hasValuesFor("match/partitions",

diff --git a/...cldr/cldr-to-icu/src/test/java/org/unicode/icu/tool/cldrtoicu/mapper/Bcp47MapperTest.java b/...cldr/cldr-to-icu/src/test/java/org/unicode/icu/tool/cldrtoicu/mapper/Bcp47MapperTest.java
@@ -28,7 +28,9 @@ public class Bcp47MapperTest {
         RbPath.of("typeAlias", "timezone:alias"),
         RbValue.of("/ICUDATA/timezoneTypes/typeAlias/timezone"),
         RbPath.of("typeMap", "timezone:alias"),
-        RbValue.of("/ICUDATA/timezoneTypes/typeMap/timezone"));
+        RbValue.of("/ICUDATA/timezoneTypes/typeMap/timezone"),
+        RbPath.of("ianaMap", "timezone:alias"),
+        RbValue.of("/ICUDATA/timezoneTypes/ianaMap/timezone"));
 
     @Test
     public void testSimple() {