AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11952 test parallel with Java, passes without library change

Browse Source 
X-SVN-Rev: 38457
This commit is contained in:
Markus Scherer 2016-03-01 23:47:52 +00:00
parent 54ca0ab18c
commit 378a66f69c
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
icu4c/source/test/intltest/tmsgfmt.cpp
View File

@ -67,6 +67,7 @@ TestMessageFormat::runIndexedTest(int32_t index, UBool exec,
TESTCASE_AUTO(TestTrimArgumentName);
TESTCASE_AUTO(TestSelectOrdinal);
TESTCASE_AUTO(TestDecimals);
TESTCASE_AUTO(TestArgIsPrefixOfAnother);
TESTCASE_AUTO_END;
}
@ -1961,4 +1962,31 @@ void TestMessageFormat::TestDecimals() {
errorCode.reset();
}
void TestMessageFormat::TestArgIsPrefixOfAnother() {
IcuTestErrorCode errorCode(*this, "TestArgIsPrefixOfAnother");
// Ticket #11952
MessageFormat mf1("{0,select,a{A}ab{AB}abc{ABC}other{?}}", Locale::getEnglish(), errorCode);
Formattable args[3];
FieldPosition ignore;
UnicodeString result;
args[0].setString("a");
assertEquals("a", "A", mf1.format(args, 1, result, ignore, errorCode));
args[0].setString("ab");
assertEquals("ab", "AB", mf1.format(args, 1, result.remove(), ignore, errorCode));
args[0].setString("abc");
assertEquals("abc", "ABC", mf1.format(args, 1, result.remove(), ignore, errorCode));
// Ticket #12172
MessageFormat mf2("{a} {aa} {aaa}", Locale::getEnglish(), errorCode);
UnicodeString argNames[3] = { "a", "aa", "aaa" };
args[0].setString("A");
args[1].setString("AB");
args[2].setString("ABC");
assertEquals("a aa aaa", "A AB ABC", mf2.format(argNames, args, 3, result.remove(), errorCode));
// Ticket #12172
MessageFormat mf3("{aa} {aaa}", Locale::getEnglish(), errorCode);
assertEquals("aa aaa", "AB ABC", mf3.format(argNames + 1, args + 1, 2, result.remove(), errorCode));
}
#endif /* #if !UCONFIG_NO_FORMATTING */

3
icu4c/source/test/intltest/tmsgfmt.h
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2013, International Business Machines Corporation and
* Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
#ifndef _TESTMESSAGEFORMAT
@ -118,6 +118,7 @@ public:
void TestTrimArgumentName();
void TestSelectOrdinal();
void TestDecimals();
void TestArgIsPrefixOfAnother();
private:
UnicodeString GetPatternAndSkipSyntax(const MessagePattern& pattern);