From: Peter Edberg <pedberg@unicode.org>
Date: Tue, 23 Jul 2013 18:21:02 +0000 (+0000)
Subject: ICU-10222 (C) Update 2 more tests to match new plural rules
X-Git-Tag: milestone-59-0-1~2747
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=958d9edc4549492d2fea88b43dfc46ce930bf04c;p=icu

ICU-10222 (C) Update 2 more tests to match new plural rules

X-SVN-Rev: 33964
---

diff --git a/icu4c/source/test/cintltst/cpluralrulestest.c b/icu4c/source/test/cintltst/cpluralrulestest.c
index 3f33d234736..2ce185312d3 100644
--- a/icu4c/source/test/cintltst/cpluralrulestest.c
+++ b/icu4c/source/test/cintltst/cpluralrulestest.c
@@ -1,5 +1,5 @@
 /********************************************************************
- * Copyright (c) 2011-2012, International Business Machines Corporation
+ * Copyright (c) 2011-2013, International Business Machines Corporation
  * and others. All Rights Reserved.
  ********************************************************************/
 /* C API TEST FOR PLURAL RULES */
@@ -48,7 +48,7 @@ static const PluralRulesTestItem testItems[] = {
     { "ru", 0.5, "other" },
     { "ru",   1, "one" },
     { "ru", 1.5, "other" },
-    { "ru",   2, "few" },
+    { "ru",   2, "other" },
     { "ru",   5, "many" },
     { "ru",  10, "many" },
     { "ru",  11, "many" },
diff --git a/icu4c/source/test/intltest/plurfmts.cpp b/icu4c/source/test/intltest/plurfmts.cpp
index 95c0a731fd0..69341592476 100644
--- a/icu4c/source/test/intltest/plurfmts.cpp
+++ b/icu4c/source/test/intltest/plurfmts.cpp
@@ -358,10 +358,11 @@ PluralFormatTest::pluralFormatLocaleTest(/*char *par*/)
     for (int32_t i=2; i<20; ++i) {
         pluralResults[i]= (i < 10)? PFT_OTHER: PFT_ZERO;
         pluralResults[i*10] = PFT_ZERO;
-        pluralResults[i*10+1] = PFT_ONE;
-        pluralResults[i*10+2] = PFT_OTHER;
+        pluralResults[i*10+1] = PFT_ONE; // note override after loop
+        pluralResults[i*10+2] = PFT_OTHER; // note override after loop
     }
     pluralResults[111]= PFT_ZERO;
+    pluralResults[112]= PFT_ZERO;
     helperTestResults(zeroSingularLocales, 1, testPattern, pluralResults);
     
     // ======== Test singular dual locales.
@@ -382,7 +383,7 @@ PluralFormatTest::pluralFormatLocaleTest(/*char *par*/)
     uprv_memset(pluralResults, -1, sizeof(pluralResults));
     pluralResults[0]= PFT_FEW;
     for (int32_t i=1; i<20; ++i) {
-        pluralResults[i] = PFT_FEW;
+        pluralResults[i] = PFT_FEW; // note override after loop
         pluralResults[100+i] = PFT_FEW;
     }
     pluralResults[1]= PFT_ONE;
@@ -482,7 +483,7 @@ PluralFormatTest::pluralFormatLocaleTest(/*char *par*/)
     uprv_memset(pluralResults, -1, sizeof(pluralResults));
     for (int32_t i=0; i<20; ++i) {
         pluralResults[i*10+0] = PFT_MANY;
-        pluralResults[i*10+1] = PFT_MANY;
+        pluralResults[i*10+1] = PFT_MANY; // note override after loop
         if ((i==1)||(i==11)) {
             pluralResults[i*10+2] = PFT_MANY;
             pluralResults[i*10+3] = PFT_MANY;