Skip to content

Commit e3fd3ad

Browse files
committed
CLDR-19192 use a case insensensitive collator for TestAnnotations.TestUniqueness
- use ROOT_SECONDARY collator
1 parent c382657 commit e3fd3ad

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.google.common.collect.ImmutableSet;
77
import com.google.common.collect.ImmutableSortedSet;
88
import com.google.common.collect.Multimap;
9+
import com.google.common.collect.Ordering;
910
import com.google.common.collect.TreeMultimap;
1011
import com.ibm.icu.impl.Row;
1112
import com.ibm.icu.impl.Row.R3;
@@ -36,6 +37,7 @@
3637
import org.unicode.cldr.util.CLDRFile;
3738
import org.unicode.cldr.util.CLDRPaths;
3839
import org.unicode.cldr.util.CldrUtility;
40+
import org.unicode.cldr.util.CollatorHelper;
3941
import org.unicode.cldr.util.Emoji;
4042
import org.unicode.cldr.util.Factory;
4143
import org.unicode.cldr.util.Level;
@@ -308,7 +310,9 @@ public void TestUniqueness() {
308310

309311
private void uniquePerLocale(String locale, Set<String> problems) {
310312
logln("uniqueness: " + locale);
311-
Multimap<String, String> nameToEmoji = TreeMultimap.create();
313+
// use a case insensitive collator
314+
Multimap<String, String> nameToEmoji =
315+
TreeMultimap.create(CollatorHelper.ROOT_SECONDARY, Ordering.natural());
312316
AnnotationSet data = Annotations.getDataSet(locale);
313317
for (String emoji : Emoji.getAllRgi()) {
314318
String name = data.getShortName(emoji);

0 commit comments

Comments
 (0)