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

ICU-3754 Make u_formatMessage pay attention to patternLength

Browse Source 
X-SVN-Rev: 16042
This commit is contained in:
George Rhoten 2004-07-18 09:41:16 +00:00
parent a91586a1d3
commit 1406c1d12b
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/i18n/umsg.cpp
View File

@ -228,7 +228,7 @@ umsg_open( const UChar *pattern,
UnicodeString patString((patternLength == -1 ? TRUE:FALSE), pattern,len);
retVal = (UMessageFormat*) new MessageFormat(pattern,Locale(locale),*parseError,*status);
retVal = (UMessageFormat*) new MessageFormat(patString,Locale(locale),*parseError,*status);
if(retVal == 0) {
*status = U_MEMORY_ALLOCATION_ERROR;

24
icu4c/source/test/cintltst/cmsgtst.c
View File

@ -1010,6 +1010,28 @@ static void OpenMessageFormatTest(void)
umsg_close(f3);
}
static void MessageLength(void)
{
UErrorCode status = U_ZERO_ERROR;
const char patChars[] = {"123{0}456{0}"};
const char expectedChars[] = {"123abc"};
UChar pattern[sizeof(patChars)];
UChar arg[] = {0x61,0x62,0x63,0};
UChar result[128] = {0};
UChar expected[sizeof(expectedChars)];
u_uastrncpy(pattern, patChars, sizeof(pattern)/sizeof(pattern[0]));
u_uastrncpy(expected, expectedChars, sizeof(expected)/sizeof(expected[0]));
u_formatMessage("en_US", pattern, 6, result, sizeof(result)/sizeof(result[0]), &status, arg);
if (U_FAILURE(status)) {
log_err("u_formatMessage method failed. Error: %s \n",u_errorName(status));
}
if (u_strcmp(result, expected) != 0) {
log_err("u_formatMessage didn't return expected result\n");
}
}
void addMsgForTest(TestNode** root);
@ -1026,7 +1048,7 @@ void addMsgForTest(TestNode** root)
addTest(root, &TestMessageFormatWithValist, "tsformat/cmsgtst/TestMessageFormatWithValist");
addTest(root, &TestParseMessageWithValist, "tsformat/cmsgtst/TestParseMessageWithValist");
addTest(root, &TestJ904, "tsformat/cmsgtst/TestJ904");
addTest(root, &MessageLength, "tsformat/cmsgtst/MessageLength");
}
#endif /* #if !UCONFIG_NO_FORMATTING */