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

ICU-7273 simplify caching code and add custom FCC test

Browse Source 
X-SVN-Rev: 27593
This commit is contained in:
Markus Scherer 2010-02-18 18:33:00 +00:00
parent 010a977b26
commit 049b68b40b
3 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
icu4c/source/common/normalizer2.cpp
View File

@ -557,16 +557,16 @@ Normalizer2::getInstance(const char *packageName,
}
}
if(allModes==NULL && U_SUCCESS(errorCode)) {
UHashtable *localCache;
{
Mutex lock;
localCache=cache;
if(localCache!=NULL) {
allModes=(Norm2AllModes *)uhash_get(localCache, name);
if(cache!=NULL) {
allModes=(Norm2AllModes *)uhash_get(cache, name);
}
}
if(allModes==NULL) {
if(localCache==NULL) {
LocalPointer<Norm2AllModes> localAllModes(
Norm2AllModes::createInstance(packageName, name, errorCode));
if(U_SUCCESS(errorCode)) {
Mutex lock;
if(cache==NULL) {
cache=uhash_open(uhash_hashChars, uhash_compareChars, NULL, &errorCode);
@ -576,12 +576,7 @@ Normalizer2::getInstance(const char *packageName,
uhash_setKeyDeleter(cache, uprv_free);
uhash_setValueDeleter(cache, deleteNorm2AllModes);
}
localCache=cache;
}
allModes=Norm2AllModes::createInstance(packageName, name, errorCode);
if(U_SUCCESS(errorCode)) {
Mutex lock;
void *temp=uhash_get(localCache, name);
void *temp=uhash_get(cache, name);
if(temp==NULL) {
int32_t keyLength=uprv_strlen(name)+1;
char *nameCopy=(char *)uprv_malloc(keyLength);
@ -590,10 +585,9 @@ Normalizer2::getInstance(const char *packageName,
return NULL;
}
uprv_memcpy(nameCopy, name, keyLength);
uhash_put(localCache, nameCopy, allModes, &errorCode);
uhash_put(cache, nameCopy, allModes=localAllModes.orphan(), &errorCode);
} else {
// race condition
delete allModes;
allModes=(Norm2AllModes *)temp;
}
}

44
icu4c/source/test/intltest/tstnorm.cpp
View File

@ -53,6 +53,7 @@ void BasicNormalizerTest::runIndexedTest(int32_t index, UBool exec,
CASE(15,TestCompare);
CASE(16,TestSkippable);
CASE(17,TestCustomComp);
CASE(18,TestCustomFCC);
default: name = ""; break;
}
}
@ -1771,22 +1772,53 @@ BasicNormalizerTest::TestCustomComp() {
{ "\\uFFF3\\uFFF7\\U00010036\\U00010077", "\\U00010037\\U00010037\\uFFF6\\U00010037" }
};
IcuTestErrorCode errorCode(*this, "BasicNormalizerTest/TestCustomComp");
const Normalizer2 *customComp=
Normalizer2::getInstance(loadTestData(errorCode), "testnorm", UNORM2_COMPOSE, errorCode);
if(errorCode.isFailure()) {
errorCode.reset();
dataerrln(UNICODE_STRING_SIMPLE("unable to load testdata/testnorm.nrm"));
const Normalizer2 *customNorm2=
Normalizer2::getInstance(loadTestData(errorCode), "testnorm",
UNORM2_COMPOSE, errorCode);
if(errorCode.logIfFailureAndReset("unable to load testdata/testnorm.nrm")) {
return;
}
for(int32_t i=0; i<LENGTHOF(pairs); ++i) {
const StringPair &pair=pairs[i];
UnicodeString input=UnicodeString(pair.input, -1, US_INV).unescape();
UnicodeString expected=UnicodeString(pair.expected, -1, US_INV).unescape();
UnicodeString result=customComp->normalize(input, errorCode);
UnicodeString result=customNorm2->normalize(input, errorCode);
if(result!=expected) {
errln("custom compose Normalizer2 did not normalize input %d as expected", i);
}
}
}
void
BasicNormalizerTest::TestCustomFCC() {
static const StringPair pairs[]={
{ "\\uD801\\uE000\\uDFFE", "" },
{ "\\uD800\\uD801\\uE000\\uDFFE\\uDFFF", "\\uD7FF\\uFFFF" },
{ "\\uD800\\uD801\\uDFFE\\uDFFF", "\\uD7FF\\U000107FE\\uFFFF" },
// The following expected result is different from CustomComp
// because of only-contiguous composition.
{ "\\uE001\\U000110B9\\u0345\\u0308\\u0327", "\\uE001\\U000110B9\\u0327\\u0308\\u0345" },
{ "\\uE010\\U000F0011\\uE012", "\\uE011\\uE012" },
{ "\\uE010\\U000F0011\\U000F0011\\uE012", "\\uE011\\U000F0010" },
{ "\\uE111\\u1161\\uE112\\u1162", "\\uAE4C\\u1102\\u0062\\u1162" },
{ "\\uFFF3\\uFFF7\\U00010036\\U00010077", "\\U00010037\\U00010037\\uFFF6\\U00010037" }
};
IcuTestErrorCode errorCode(*this, "BasicNormalizerTest/TestCustomFCC");
const Normalizer2 *customNorm2=
Normalizer2::getInstance(loadTestData(errorCode), "testnorm",
UNORM2_COMPOSE_CONTIGUOUS, errorCode);
if(errorCode.logIfFailureAndReset("unable to load testdata/testnorm.nrm")) {
return;
}
for(int32_t i=0; i<LENGTHOF(pairs); ++i) {
const StringPair &pair=pairs[i];
UnicodeString input=UnicodeString(pair.input, -1, US_INV).unescape();
UnicodeString expected=UnicodeString(pair.expected, -1, US_INV).unescape();
UnicodeString result=customNorm2->normalize(input, errorCode);
if(result!=expected) {
errln("custom FCC Normalizer2 did not normalize input %d as expected", i);
}
}
}
#endif /* #if !UCONFIG_NO_NORMALIZATION */

1
icu4c/source/test/intltest/tstnorm.h
View File

@ -43,6 +43,7 @@ public:
void FindFoldFCDExceptions();
void TestSkippable();
void TestCustomComp();
void TestCustomFCC();
private:
UnicodeString canonTests[24][3];