From b0595e1051ef8e9093f1c34a70c19c07def1380c Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Thu, 11 Jul 2013 19:13:13 +0000 Subject: [PATCH] ICU-10222 Reverted r33902, but updated the locale used for testing from 'ru' to 'uk'. The test case was originally written for the rule set formerly shared by 'ru' and 'uk', but the rule for 'ru' had been changed. After the new syntax for fractional plural is once supported in ICU4C, then the test case should pass successfully with locale 'uk'. X-SVN-Rev: 33915 --- icu4c/source/test/intltest/tmsgfmt.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/icu4c/source/test/intltest/tmsgfmt.cpp b/icu4c/source/test/intltest/tmsgfmt.cpp index e2326d0f8f2..afba612304a 100644 --- a/icu4c/source/test/intltest/tmsgfmt.cpp +++ b/icu4c/source/test/intltest/tmsgfmt.cpp @@ -541,8 +541,8 @@ void TestMessageFormat::testMsgFormatPlural(/* char* par */) UErrorCode err = U_ZERO_ERROR; UnicodeString t1("{0, plural, one{C''est # fichier} other{Ce sont # fichiers}} dans la liste."); UnicodeString t2("{argument, plural, one{C''est # fichier} other {Ce sont # fichiers}} dans la liste."); - UnicodeString t3("There {0, plural, one{is # zavod}few{are # zavoda} other{are {0, number,###.0} zavodov}} in the directory."); - UnicodeString t4("There {argument, plural, one{is # zavod}few{are # zavoda} other{are {argument, number,###.0} zavodov}} in the directory."); + UnicodeString t3("There {0, plural, one{is # zavod}few{are {0, number,###.0} zavoda} other{are # zavodov}} in the directory."); + UnicodeString t4("There {argument, plural, one{is # zavod}few{are {argument, number,###.0} zavoda} other{are #zavodov}} in the directory."); UnicodeString t5("{0, plural, one {{0, number,C''est #,##0.0# fichier}} other {Ce sont # fichiers}} dans la liste."); MessageFormat* mfNum = new MessageFormat(t1, Locale("fr"), err); if (U_FAILURE(err)) { @@ -578,11 +578,11 @@ void TestMessageFormat::testMsgFormatPlural(/* char* par */) delete mfNum; delete mfAlpha; - MessageFormat* mfNum2 = new MessageFormat(t3, Locale("ru"), err); + MessageFormat* mfNum2 = new MessageFormat(t3, Locale("uk"), err); numResult1.remove(); Formattable testArgs2((int32_t)4); mfNum2->format(&testArgs2, 1, numResult1, ignore, err); - MessageFormat* mfAlpha2 = new MessageFormat(t4, Locale("ru"), err); + MessageFormat* mfAlpha2 = new MessageFormat(t4, Locale("uk"), err); argNameResult.remove(); mfAlpha2->format(argName, &testArgs2, 1, argNameResult, err); @@ -596,7 +596,7 @@ void TestMessageFormat::testMsgFormatPlural(/* char* par */) errln("TestMessageFormat::testMsgFormatPlural #2"); logln(UnicodeString("The results of argumentName and argumentIndex are not the same.")); } - if ( numResult1 != UnicodeString("There are 4,0 zavodov in the directory.")) { + if ( numResult1 != UnicodeString("There are 4,0 zavoda in the directory.")) { errln("TestMessageFormat::testMsgFormatPlural #2"); logln(UnicodeString("The results of argumentName and argumentIndex are not the same.")); } -- 2.40.0