From ca9d96f401ed5cbf87abd2d9e41f15e078b10fb4 Mon Sep 17 00:00:00 2001 From: Mark Davis Date: Sat, 24 Aug 2013 16:19:47 +0000 Subject: [PATCH] ICU-8474 Fix test to also check for decimals if integer samples empty X-SVN-Rev: 34086 --- .../icu/dev/test/format/PluralFormatUnitTest.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralFormatUnitTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralFormatUnitTest.java index 1ef2e7c65c2..88300be61da 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralFormatUnitTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralFormatUnitTest.java @@ -20,6 +20,7 @@ import com.ibm.icu.text.NumberFormat; import com.ibm.icu.text.PluralFormat; import com.ibm.icu.text.PluralRules; import com.ibm.icu.text.PluralRules.PluralType; +import com.ibm.icu.text.PluralRules.SampleType; import com.ibm.icu.text.UFieldPosition; import com.ibm.icu.util.ULocale; @@ -195,13 +196,10 @@ public class PluralFormatUnitTest extends TestFmwk { Set keywords = rules.getKeywords(); for (String keyword : keywords) { Collection list = rules.getSamples(keyword); - // TODO: the locales excepted here have legitimately have no integer - // sample values. How best to handle this? - if (localeName.equals("be") && keyword.equals("other")) continue; - if (localeName.equals("cs") && keyword.equals("many")) continue; - if (localeName.equals("lt") && keyword.equals("many")) continue; - if (localeName.equals("pl") && keyword.equals("other")) continue; - if (localeName.equals("uk") && keyword.equals("other")) continue; + if (list.size() == 0) { + // if there aren't any integer samples, get the decimal ones. + list = rules.getSamples(keyword, SampleType.DECIMAL); + } if (list == null || list.size() == 0) { errln("Empty list for " + localeName + " : " + keyword); -- 2.40.0