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

ICU-2458 Update tests according to the new UCA data file

Browse Source 
X-SVN-Rev: 12922
This commit is contained in:
Vladimir Weinstein 2003-08-23 01:46:02 +00:00
parent de398063e5
commit 3943da5755
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
icu4c/source/test/cintltst/capitst.c
View File

@ -273,8 +273,9 @@ void TestProperty()
ICU 2.1 currVersionArray = {0x19, 0x00, 0x03, 0x03};
ICU 2.2 currVersionArray = {0x21, 0x40, 0x04, 0x04};
ICU 2.4 currVersionArray = {0x21, 0x40, 0x04, 0x04};
ICU 2.6 currVersionArray = {0x21, 0x40, 0x03, 0x03};
*/
UVersionInfo currVersionArray = {0x21, 0x40, 0x03, 0x03};
UVersionInfo currVersionArray = {0x21, 0x40, 0x04, 0x04};
UVersionInfo versionArray;
log_verbose("The property tests begin : \n");
@ -746,10 +747,12 @@ void TestSortKey()
{
uint8_t *sortk1 = NULL, *sortk2 = NULL, *sortk3 = NULL, *sortkEmpty = NULL;
uint8_t sortk2_compat[] = {
/* 2.6.1 key */
0x26, 0x28, 0x2A, 0x2C, 0x26, 0x01,
0x09, 0x01, 0x09, 0x01, 0x25, 0x01,
0x92, 0x93, 0x94, 0x95, 0x92, 0x00
/* 2.2 key */
0x1D, 0x1F, 0x21, 0x23, 0x1D, 0x01,
0x09, 0x01, 0x09, 0x01, 0x1C, 0x01,
0x92, 0x93, 0x94, 0x95, 0x92, 0x00
/*0x1D, 0x1F, 0x21, 0x23, 0x1D, 0x01, 0x09, 0x01, 0x09, 0x01, 0x1C, 0x01, 0x92, 0x93, 0x94, 0x95, 0x92, 0x00*/
/* 2.0 key */
/*0x19, 0x1B, 0x1D, 0x1F, 0x19, 0x01, 0x09, 0x01, 0x09, 0x01, 0x18, 0x01, 0x92, 0x93, 0x94, 0x95, 0x92, 0x00*/
/* 1.8.1 key.*/

6
icu4c/source/test/cintltst/citertst.c
View File

@ -781,7 +781,10 @@ static void TestMaxExpansion()
UErrorCode status = U_ZERO_ERROR;
UCollator *coll ;/*= ucol_open("en_US", &status);*/
UChar ch = 0;
UChar supplementary[2] = {0xD800, 0xDC00};
UChar32 unassigned = 0xEFFFD;
UChar supplementary[2];
uint32_t index = 0;
UBool isError = FALSE;
uint32_t sorder = 0;
UCollationElements *iter ;/*= ucol_openElements(coll, &ch, 1, &status);*/
uint32_t temporder = 0;
@ -852,6 +855,7 @@ static void TestMaxExpansion()
ch, 3);
}
U16_APPEND(supplementary, index, 2, unassigned, isError);
ucol_setText(iter, supplementary, 2, &status);
sorder = ucol_previous(iter, &status);

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

@ -3501,7 +3501,7 @@ static void TestRuleOptions(void) {
},
{ "&[last variable]<a &[before 1][last variable]<<<c<<<b ",
{ "c", "b", "\\uD800\\uDF23", "a", "\\u02d0" }, 5
{ "c", "b", "\\uD800\\uDD33", "a", "\\u02d0" }, 5
},
{ "&[first regular]<a"
@ -3511,7 +3511,7 @@ static void TestRuleOptions(void) {
{ "&[before 1][last regular]<b"
"&[last regular]<a",
{ "b", "\\uD801\\uDC25", "a", "\\u4e00" }, 4
{ "b", "\\uD800\\uDF9D", "a", "\\u4e00" }, 4
},
{ "&[before 1][first implicit]<b"

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

@ -96,8 +96,9 @@ CollationAPITest::TestProperty(/* char* par */)
ICU 2.1 currVersionArray = {0x19, 0x00, 0x03, 0x03};
ICU 2.2 currVersionArray = {0x21, 0x40, 0x04, 0x04};
ICU 2.4 currVersionArray = {0x21, 0x40, 0x04, 0x04};
ICU 2.6 currVersionArray = {0x21, 0x40, 0x03, 0x03};
*/
UVersionInfo currVersionArray = {0x21, 0x40, 0x03, 0x03};
UVersionInfo currVersionArray = {0x21, 0x40, 0x04, 0x04};
UVersionInfo versionArray;
int i = 0;
@ -1012,11 +1013,17 @@ void CollationAPITest::TestSortKey()
col->setAttribute(UCOL_STRENGTH, UCOL_IDENTICAL, status);
uint8_t key2compat[] = {
/* 2.6.1 key */
0x26, 0x28, 0x2A, 0x2C, 0x26, 0x01,
0x09, 0x01, 0x09, 0x01, 0x25, 0x01,
0x92, 0x93, 0x94, 0x95, 0x92, 0x00
/* 2.2 key */
/*
0x1D, 0x1F, 0x21, 0x23, 0x1D, 0x01,
0x09, 0x01, 0x09, 0x01, 0x1C, 0x01,
0x92, 0x93, 0x94, 0x95, 0x92, 0x00
*/
/* 2.0 key */
/*
0x19, 0x1B, 0x1D, 0x1F, 0x19,
@ -1176,7 +1183,7 @@ void CollationAPITest::TestMaxExpansion()
{
UErrorCode status = U_ZERO_ERROR;
UChar ch = 0;
UChar supplementary[2] = {0xD800, 0xDC00};
UChar32 unassigned = 0xEFFFD;
uint32_t sorder = 0;
uint32_t temporder = 0;
@ -1253,7 +1260,7 @@ void CollationAPITest::TestMaxExpansion()
ch, 3);
}
str.setTo(supplementary, 2);
str.setTo(unassigned);
iter->setText(str, status);
sorder = iter->previous(status);