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

ICU-3984 update from code review and a collation reordering API test

Browse Source 
X-SVN-Rev: 29007
This commit is contained in:
Stuart Gill 2010-11-05 20:01:14 +00:00
parent 2d75c9c3b4
commit c8a64bd04e
2 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
icu4c/source/i18n/ucol.cpp
View File

@ -7160,6 +7160,7 @@ ucol_setReorderCodes(UCollator *coll,
}
uprv_free(coll->reorderCodes);
coll->reorderCodes = NULL;
coll->reorderCodesLength = 0;
if (reorderCodesLength == 0) {
uprv_free(coll->leadBytePermutationTable);

73
icu4c/source/test/cintltst/cmsccoll.c
View File

@ -5986,6 +5986,78 @@ static void TestNonLeadBytesDuringCollationReordering(void)
ucol_close(myCollation);
}
/*
* Test reordering API.
*/
static void TestReorderingAPI(void)
{
UParseError error;
UErrorCode status = U_ZERO_ERROR;
UCollator *myCollation;
int32_t reorderCodes[3] = {USCRIPT_GREEK, USCRIPT_HAN, UCOL_REORDER_CODE_PUNCTUATION};
UCollationResult collResult;
int32_t retrievedReorderCodesLength;
UChar greekString[] = { 0x03b1 };
UChar punctuationString[] = { 0x203e };
log_verbose("Testing non-lead bytes in a sort key with and without reordering\n");
/* build collator tertiary */
myCollation = ucol_open("", &status);
ucol_setStrength(myCollation, UCOL_TERTIARY);
if(U_FAILURE(status)) {
log_err_status(status, "ERROR: in creation of collator: %s\n", myErrorName(status));
return;
}
/* set the reorderding */
ucol_setReorderCodes(myCollation, reorderCodes, LEN(reorderCodes), &status);
if (U_FAILURE(status)) {
log_err_status(status, "ERROR: setting reorder codes: %s\n", myErrorName(status));
return;
}
retrievedReorderCodesLength = ucol_getReorderCodes(myCollation, NULL, 0, &status);
if (status != U_MEMORY_ALLOCATION_ERROR) {
log_err_status(status, "ERROR: getting error codes should have returned U_MEMORY_ALLOCATION_ERROR : %s\n", myErrorName(status));
return;
}
if (retrievedReorderCodesLength != LEN(reorderCodes)) {
log_err_status(status, "ERROR: retrieved reorder codes length was %d but should have been %d\n", retrievedReorderCodesLength, LEN(reorderCodes));
return;
}
collResult = ucol_strcoll(myCollation, greekString, LEN(greekString), punctuationString, LEN(punctuationString));
if (collResult != UCOL_LESS) {
log_err_status(status, "ERROR: collation result should have been UCOL_LESS\n");
return;
}
/* clear the reordering */
ucol_setReorderCodes(myCollation, NULL, 0, &status);
if (U_FAILURE(status)) {
log_err_status(status, "ERROR: setting reorder codes to NULL: %s\n", myErrorName(status));
return;
}
retrievedReorderCodesLength = ucol_getReorderCodes(myCollation, NULL, 0, &status);
if (status != U_MEMORY_ALLOCATION_ERROR) {
log_err_status(status, "ERROR: getting error codes should have returned U_MEMORY_ALLOCATION_ERROR : %s\n", myErrorName(status));
return;
}
if (retrievedReorderCodesLength != 0) {
log_err_status(status, "ERROR: retrieved reorder codes length was %d but should have been %d\n", retrievedReorderCodesLength, 0);
return;
}
collResult = ucol_strcoll(myCollation, greekString, LEN(greekString), punctuationString, LEN(punctuationString));
if (collResult != UCOL_GREATER) {
log_err_status(status, "ERROR: collation result should have been UCOL_GREATER\n");
return;
}
ucol_close(myCollation);
}
/*
* Utility function to test one collation reordering test case.
* @param testcases Array of test cases.
@ -6434,6 +6506,7 @@ void addMiscCollTest(TestNode** root)
TEST(TestBeforeRuleWithScriptReordering);
TEST(TestNonLeadBytesDuringCollationReordering);
TEST(TestReorderingAPI);
TEST(TestGreekFirstReorder);
TEST(TestGreekLastReorder);
TEST(TestNonScriptReorder);