mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-14 17:24:01 +00:00
ICU-1003 removing incremental compare from cintltst
X-SVN-Rev: 5019
This commit is contained in:
parent
a87d3d54dd
commit
c705ce052b
3 changed files with 2 additions and 37 deletions
|
@ -176,28 +176,3 @@ UChar U_CALLCONV testInc(void *context) {
|
|||
}
|
||||
|
||||
|
||||
/* This is test for incremental */
|
||||
UCollationResult
|
||||
ctst_strcollTestIncremental( const UCollator *coll,
|
||||
const UChar *source,
|
||||
int32_t sourceLength,
|
||||
const UChar *target,
|
||||
int32_t targetLength)
|
||||
{
|
||||
testContext tcSource, tcTarget;
|
||||
|
||||
if(sourceLength == -1) {
|
||||
sourceLength = u_strlen(source);
|
||||
}
|
||||
if(targetLength == -1) {
|
||||
targetLength = u_strlen(target
|
||||
);
|
||||
}
|
||||
tcSource.start = source;
|
||||
tcSource.end = source+sourceLength;
|
||||
tcTarget.start = target;
|
||||
tcTarget.end = target + targetLength;
|
||||
|
||||
return ucol_strcollinc(coll, testInc, &tcSource, testInc, &tcTarget);
|
||||
|
||||
}
|
||||
|
|
|
@ -32,14 +32,6 @@ UChar* appendCompareResult(UCollationResult result, UChar* target);
|
|||
|
||||
UChar* CharsToUChars(const char* chars);
|
||||
|
||||
UCollationResult
|
||||
ctst_strcollTestIncremental( const UCollator *coll,
|
||||
const UChar *source,
|
||||
int32_t sourceLength,
|
||||
const UChar *target,
|
||||
int32_t targetLength);
|
||||
|
||||
|
||||
void addCollAPITest(TestNode**);
|
||||
void addCurrencyTest(TestNode**);
|
||||
void addNormTest(TestNode**);
|
||||
|
|
|
@ -101,7 +101,7 @@ void currTest()
|
|||
UCollator *c;
|
||||
uint8_t *sortKey1, *sortKey2;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
UCollationResult compareResult, keyResult, incResult;
|
||||
UCollationResult compareResult, keyResult;
|
||||
UCollationResult expectedResult = UCOL_EQUAL;
|
||||
log_verbose("Testing currency of all locales\n");
|
||||
c = ucol_open("en_US", &status);
|
||||
|
@ -134,8 +134,6 @@ void currTest()
|
|||
}
|
||||
|
||||
compareResult = ucol_strcoll(c, source, u_strlen(source), target, u_strlen(target));
|
||||
incResult = ctst_strcollTestIncremental(c, source, u_strlen(source), target, u_strlen(target));
|
||||
|
||||
|
||||
status = U_ZERO_ERROR;
|
||||
|
||||
|
@ -152,7 +150,7 @@ void currTest()
|
|||
else if (res > 0) keyResult = (UCollationResult)1;
|
||||
else keyResult = (UCollationResult)0;
|
||||
|
||||
reportCResult( source, target, sortKey1, sortKey2, compareResult, keyResult, incResult, expectedResult );
|
||||
reportCResult( source, target, sortKey1, sortKey2, compareResult, keyResult, compareResult, expectedResult );
|
||||
|
||||
free(sortKey1);
|
||||
free(sortKey2);
|
||||
|
|
Loading…
Add table
Reference in a new issue