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

ICU-807

Browse Source 
Synched failed tests with C.

X-SVN-Rev: 4091
This commit is contained in:
Syn Wee Quek 2001-03-15 02:53:05 +00:00
parent f08be564a6
commit db72485283
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
icu4c/source/test/intltest/apicoll.cpp
View File

@ -125,7 +125,7 @@ CollationAPITest::TestProperty(/* char* par */)
doAssert((col->compare("ab", "abc") == Collator::LESS), "ab < abc comparison failed"); doAssert((col->compare("ab", "abc") == Collator::LESS), "ab < abc comparison failed");
doAssert((col->compare("ab", "AB") == Collator::LESS), "ab < AB comparison failed"); doAssert((col->compare("ab", "AB") == Collator::LESS), "ab < AB comparison failed");
doAssert((col->compare("black-bird", "blackbird") == Collator::GREATER), "black-bird > blackbird comparison failed"); doAssert((col->compare("blackbird", "black-bird") == Collator::GREATER), "black-bird > blackbird comparison failed");
doAssert((col->compare("black bird", "black-bird") == Collator::LESS), "black bird > black-bird comparison failed"); doAssert((col->compare("black bird", "black-bird") == Collator::LESS), "black bird > black-bird comparison failed");
doAssert((col->compare("Hello", "hello") == Collator::GREATER), "Hello > hello comparison failed"); doAssert((col->compare("Hello", "hello") == Collator::GREATER), "Hello > hello comparison failed");
@ -172,11 +172,6 @@ CollationAPITest::TestProperty(/* char* par */)
logln(Collator::getDisplayName(Locale::US, name)); logln(Collator::getDisplayName(Locale::US, name));
doAssert((name == UnicodeString("English (United States)")), "getDisplayName failed"); doAssert((name == UnicodeString("English (United States)")), "getDisplayName failed");
logln("Default collation property test ended.");
logln("Collator::getRules() testing ...");
doAssert(((RuleBasedCollator*)col)->getRules().length() != 0, "getRules() result incorrect" );
logln("getRules tests end.");
delete col; col = 0; delete col; col = 0;
col = Collator::createInstance(Locale::FRENCH, success); col = Collator::createInstance(Locale::FRENCH, success);
if (U_FAILURE(success)) if (U_FAILURE(success))
@ -218,7 +213,8 @@ CollationAPITest::TestProperty(/* char* par */)
return; return;
} }
doAssert((*col == *junk), "The default collation should be returned."); doAssert(((RuleBasedCollator *)col)->getRules() == ((RuleBasedCollator *)junk)->getRules(),
"The default collation should be returned.");
Collator *frCol = Collator::createInstance(Locale::FRANCE, success); Collator *frCol = Collator::createInstance(Locale::FRANCE, success);
if (U_FAILURE(success)) if (U_FAILURE(success))
{ {
@ -448,7 +444,7 @@ CollationAPITest::TestElemIter(/* char* par */)
CollationElementIterator::tertiaryOrder(order3)), "The tertiary orders should be the same"); CollationElementIterator::tertiaryOrder(order3)), "The tertiary orders should be the same");
order1 = iterator1->next(success); order3 = iterator3->next(success); order1 = iterator1->next(success); order3 = iterator3->next(success);
if (U_FAILURE(success)) if (U_FAILURE(success))
{ {
errln("Somehow ran out of memory stepping through the iterator."); errln("Somehow ran out of memory stepping through the iterator.");
return; return;
@ -459,9 +455,10 @@ CollationAPITest::TestElemIter(/* char* par */)
doAssert((CollationElementIterator::tertiaryOrder(order1) != doAssert((CollationElementIterator::tertiaryOrder(order1) !=
CollationElementIterator::tertiaryOrder(order3)), "The tertiary orders should be different"); CollationElementIterator::tertiaryOrder(order3)), "The tertiary orders should be different");
order1 = iterator1->next(success); order3 = iterator3->next(success); order1 = iterator1->next(success);
doAssert((CollationElementIterator::secondaryOrder(order1) != order3 = iterator3->next(success);
CollationElementIterator::secondaryOrder(order3)), "The secondary orders should be different"); doAssert((CollationElementIterator::secondaryOrder(order1) ==
CollationElementIterator::secondaryOrder(order3)), "The secondary orders should be the same");
doAssert((order1 != CollationElementIterator::NULLORDER), "Unexpected end of iterator reached"); doAssert((order1 != CollationElementIterator::NULLORDER), "Unexpected end of iterator reached");
iterator1->reset(); iterator2->reset(); iterator3->reset(); iterator1->reset(); iterator2->reset(); iterator3->reset();
@ -517,8 +514,8 @@ CollationAPITest::TestElemIter(/* char* par */)
return; return;
} }
doAssert((CollationElementIterator::secondaryOrder(order1) != doAssert((CollationElementIterator::secondaryOrder(order1) ==
CollationElementIterator::secondaryOrder(order3)), "The secondary orders should be different"); CollationElementIterator::secondaryOrder(order3)), "The secondary orders should be the same");
doAssert((order1 != CollationElementIterator::NULLORDER), "Unexpected end of iterator reached"); doAssert((order1 != CollationElementIterator::NULLORDER), "Unexpected end of iterator reached");
doAssert((*iterator2 != *iterator3), "The iterators should be different"); doAssert((*iterator2 != *iterator3), "The iterators should be different");

2
icu4c/source/test/intltest/regcoll.cpp
View File

@ -207,6 +207,7 @@ void CollationRegressionTest::Test4054736(/* char* par */)
{ {
RuleBasedCollator *c = (RuleBasedCollator *) en_us->clone(); RuleBasedCollator *c = (RuleBasedCollator *) en_us->clone();
c->setStrength(Collator::SECONDARY);
c->setDecomposition(Normalizer::DECOMP_COMPAT); c->setDecomposition(Normalizer::DECOMP_COMPAT);
static const UChar tests[][CollationRegressionTest::MAX_TOKEN_LEN] = static const UChar tests[][CollationRegressionTest::MAX_TOKEN_LEN] =
@ -837,6 +838,7 @@ void CollationRegressionTest::Test4132736(/* char* par */)
Collator *c = NULL; Collator *c = NULL;
c = Collator::createInstance(Locale::FRANCE, status); c = Collator::createInstance(Locale::FRANCE, status);
c->setStrength(Collator::TERTIARY);
if (c == NULL || U_FAILURE(status)) if (c == NULL || U_FAILURE(status))
{ {