ICU-96 C++ has an interesting req :(

X-SVN-Rev: 3202
This commit is contained in:
Vladimir Weinstein 2000-12-12 20:33:54 +00:00
parent e09b328887
commit 6f6c6c0cad
13 changed files with 40 additions and 14 deletions

View File

@ -97,7 +97,9 @@ const Collator::EComparisonResult CollationDummyTest::results[] = {
void CollationDummyTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result)
{
Collator::EComparisonResult compareResult = myCollation->compare(source, target);
Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = myCollation->compare(src, trg);
CollationKey sortKey1, sortKey2;
UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos
myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );

View File

@ -96,7 +96,9 @@ void CollationCurrencyTest::currencyTest(/*char *par*/)
}
Collator::EComparisonResult compareResult = c->compare(source, target);
Collator::EComparisonResult incResult = c->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = c->compare(src, trg);
CollationKey sourceKey, targetKey;
UErrorCode status = U_ZERO_ERROR;

View File

@ -188,7 +188,9 @@ const UChar CollationDanishTest::testNTList[][CollationDanishTest::MAX_TOKEN_LEN
void CollationDanishTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result)
{
Collator::EComparisonResult compareResult = myCollation->compare(source, target);
Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = myCollation->compare(src, trg);
CollationKey sortKey1, sortKey2;
UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos
myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );

View File

@ -91,7 +91,9 @@ const Collator::EComparisonResult CollationGermanTest::results[][2] =
void CollationGermanTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result)
{
Collator::EComparisonResult compareResult = myCollation->compare(source, target);
Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = myCollation->compare(src, trg);
CollationKey sortKey1, sortKey2;
UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos
myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );

View File

@ -256,7 +256,9 @@ static const UChar testMore[][CollationEnglishTest::MAX_TOKEN_LEN] = {
void CollationEnglishTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result)
{
Collator::EComparisonResult compareResult = myCollation->compare(source, target);
Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = myCollation->compare(src, trg);
CollationKey sortKey1, sortKey2;
UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos
myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );

View File

@ -79,7 +79,9 @@ const Collator::EComparisonResult CollationSpanishTest::results[] = {
void CollationSpanishTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result)
{
Collator::EComparisonResult compareResult = myCollation->compare(source, target);
Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = myCollation->compare(src, trg);
CollationKey sortKey1, sortKey2;
UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos
myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );

View File

@ -66,7 +66,9 @@ const Collator::EComparisonResult CollationFinnishTest::results[] = {
void CollationFinnishTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result)
{
Collator::EComparisonResult compareResult = myCollation->compare(source, target);
Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = myCollation->compare(src, trg);
CollationKey sortKey1, sortKey2;
UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos
myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );

View File

@ -162,7 +162,9 @@ const UChar CollationFrenchTest::testBugs[][CollationFrenchTest::MAX_TOKEN_LEN]
void CollationFrenchTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result)
{
Collator::EComparisonResult compareResult = myCollation->compare(source, target);
Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = myCollation->compare(src, trg);
CollationKey sortKey1, sortKey2;
UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos
myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );

View File

@ -94,7 +94,9 @@ const int32_t G7CollationTest::results[G7CollationTest::TESTLOCALES][G7Collation
void G7CollationTest::doTest( Collator* myCollation, UnicodeString source, UnicodeString target, Collator::EComparisonResult result)
{
Collator::EComparisonResult compareResult = myCollation->compare(source, target);
Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = myCollation->compare(src, trg);
CollationKey sortKey1, sortKey2;
UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos
myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );

View File

@ -1,7 +1,7 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-1999, International Business Machines Corporation and
* others. All Rights Reserved.
* others. All Rights Reserved.
********************************************************************/
#ifndef _COLL
#include "unicode/coll.h"
@ -83,7 +83,9 @@ const Collator::EComparisonResult CollationKanaTest::results[] = {
void CollationKanaTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result)
{
Collator::EComparisonResult compareResult = myCollation->compare(source, target);
Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = myCollation->compare(src, trg);
CollationKey sortKey1, sortKey2;
UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos
myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );

View File

@ -264,7 +264,9 @@ void CollationMonkeyTest::TestRules(/* char* par */){
void CollationMonkeyTest::doTest(RuleBasedCollator *myCollation, UnicodeString mysource, UnicodeString target, Collator::EComparisonResult result)
{
Collator::EComparisonResult compareResult = myCollation->compare(source, target);
Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = myCollation->compare(src, trg);
CollationKey sortKey1, sortKey2;
UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos
myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );

View File

@ -1119,7 +1119,9 @@ void CollationRegressionTest::compareArray(Collator &c,
}
Collator::EComparisonResult compareResult = c.compare(source, target);
Collator::EComparisonResult incResult = c.compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = c.compare(src, trg);
CollationKey sourceKey, targetKey;
UErrorCode status = U_ZERO_ERROR;

View File

@ -83,7 +83,9 @@ const Collator::EComparisonResult CollationTurkishTest::results[] = {
void CollationTurkishTest::doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result)
{
Collator::EComparisonResult compareResult = myCollation->compare(source, target);
Collator::EComparisonResult incResult = myCollation->compare(SimpleFwdCharIterator(source), SimpleFwdCharIterator(target));
SimpleFwdCharIterator src(source);
SimpleFwdCharIterator trg(target);
Collator::EComparisonResult incResult = myCollation->compare(src, trg);
CollationKey sortKey1, sortKey2;
UErrorCode key1status = U_ZERO_ERROR, key2status = U_ZERO_ERROR; //nos
myCollation->getCollationKey(source, /*nos*/ sortKey1, key1status );