ICU-10222 (J) Update tests for new Latvian plural rules

X-SVN-Rev: 33967

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralFormatTest.java
index fb1e326067120256fbb25b4c39541313709418c3..5ee4c92eb747f4b0478bff0b9e1ed31da4d2cd10 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralFormatTest.java
@@ -101,14 +101,20 @@ public class PluralFormatTest extends TestFmwk {
     Map changes = new HashMap();
     changes.put(new Integer(0), "zero");
     changes.put(new Integer(1), "one");
-    changes.put(new Integer(2), "other");
-    for (int i = 0; i < 20; ++i) {
-      if (i == 11) {
-        continue;
+    for (int i = 2; i < 20; ++i) {
+      if (i < 10) {
+        changes.put(new Integer(i), "other");
+      } else {
+        changes.put(new Integer(i), "zero");
       }
       changes.put(new Integer(i*10), "zero");
-      changes.put(new Integer(i*10 + 1), "one");
-      changes.put(new Integer(i*10 + 2), "other");
+      if (i == 11) {
+        changes.put(new Integer(i*10 + 1), "zero");
+        changes.put(new Integer(i*10 + 2), "zero");
+      } else {
+        changes.put(new Integer(i*10 + 1), "one");
+        changes.put(new Integer(i*10 + 2), "other");
+      }
     }
     helperTestRules(localeIDs, testPattern, changes);
   }

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java
index 72ed91d5cd429df905065874db9396bf7dc9c5c4..a0777b5e3830334e2db79c117ae7a264afda9ca4 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java
@@ -702,7 +702,7 @@ public class PluralRulesTest extends TestFmwk {
         // [zero, one, other]
         "ksh; zero: 0, 0.0, 0.00; one: 1, 1.0, 1.00; other: 0.03, 0.1, 0.3, 0.30, 1.03, 1.3, 1.30, 1.99, 2, 2.0, 2.00, 2.01, 2.1, 2.10, 3",
         "lag; zero: 0, 0.0, 0.00; one: 0.02, 0.1, 0.2, 0.20, 1, 1.0, 1.00, 1.02, 1.2, 1.20, 1.99; other: 2, 2.0, 2.00, 2.01, 2.1, 2.10",
-        "lv; zero: 0, 0.0, 0.00, 10, 30; one: 0.1, 0.31, 1, 1.0, 1.00, 21, 31, 41; other: 1.30, 1.99, 2, 2.0, 2.00, 2.30, 11, 29, 49, 111, 311",
+        "lv; zero: 0, 0.0, 0.00, 10, 11, 30, 111, 311; one: 0.1, 0.31, 1, 1.0, 1.00, 21, 31, 41; other: 1.30, 1.99, 2, 2.0, 2.00, 2.30, 29, 49",
 
         // [one, two, other]
         "iu,kw,naq,se,sma,smi,smj,smn,sms; one: 1, 1.0, 1.00; two: 2, 2.0, 2.00; other: 0, 0.0, 0.00, 0.02, 0.1, 0.2, 0.20, 1.04, 1.4, 1.40, 1.99, 2.04, 2.4, 2.40, 3, 4",