From 5732a4c692aed4e93ed77be53a46d8907aead76e Mon Sep 17 00:00:00 2001 From: Vladimir Weinstein Date: Sat, 17 Mar 2001 00:56:21 +0000 Subject: [PATCH] ICU-96 enabled strcollinc in problematic tests X-SVN-Rev: 4157 --- icu4c/source/test/cintltst/callcoll.c | 2 -- icu4c/source/test/cintltst/cdantst.c | 2 -- icu4c/source/test/cintltst/cjaptst.c | 10 ---------- icu4c/source/test/cintltst/creststn.c | 2 +- icu4c/source/test/cintltst/encoll.c | 3 +-- 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/icu4c/source/test/cintltst/callcoll.c b/icu4c/source/test/cintltst/callcoll.c index 7af51fc8964..64822c51fe0 100644 --- a/icu4c/source/test/cintltst/callcoll.c +++ b/icu4c/source/test/cintltst/callcoll.c @@ -527,8 +527,6 @@ static void TestPrimary( ) if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator :%s\n", myErrorName(status)); } - /* problem in strcollinc for unfinshed contractions */ - ucol_setAttribute(myCollation, UCOL_NORMALIZATION_MODE, UCOL_ON, &status); ucol_setStrength(myCollation, UCOL_PRIMARY); for (i = 17; i < 26 ; i++) diff --git a/icu4c/source/test/cintltst/cdantst.c b/icu4c/source/test/cintltst/cdantst.c index 6b60bce4c95..18527b0c701 100644 --- a/icu4c/source/test/cintltst/cdantst.c +++ b/icu4c/source/test/cintltst/cdantst.c @@ -196,8 +196,6 @@ static void TestTertiary( ) int32_t i,j; UErrorCode status = U_ZERO_ERROR; myCollation = ucol_open("da_DK", &status); - /* problem in strcollinc for unfinshed contractions */ - ucol_setAttribute(myCollation, UCOL_NORMALIZATION_MODE, UCOL_ON, &status); if(U_FAILURE(status)){ log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); return; diff --git a/icu4c/source/test/cintltst/cjaptst.c b/icu4c/source/test/cintltst/cjaptst.c index 57256b74037..5d49f346cd6 100644 --- a/icu4c/source/test/cintltst/cjaptst.c +++ b/icu4c/source/test/cintltst/cjaptst.c @@ -121,9 +121,6 @@ static void TestTertiary( ) return; } log_verbose("Testing Kanna(Japan) Collation with Tertiary strength\n"); - /* for one case, strcollinc fails, since it doesn't have good handling of contractions*/ - /* normalization is turned off to stop strcollinc from executing */ - ucol_setAttribute(myCollation, UCOL_NORMALIZATION_MODE, UCOL_ON, &status); ucol_setStrength(myCollation, UCOL_TERTIARY); ucol_setAttribute(myCollation, UCOL_CASE_LEVEL, UCOL_ON, &status); for (i = 0; i < 6 ; i++) @@ -192,9 +189,6 @@ static void TestSmallLarge(void) } log_verbose("Testing Japanese Small and Large Characters Collation\n"); - /* for one case, strcollinc fails, since it doesn't have good handling of contractions*/ - /* normalization is turned off to stop strcollinc from executing */ - ucol_setAttribute(myCollation, UCOL_NORMALIZATION_MODE, UCOL_ON, &status); ucol_setStrength(myCollation, UCOL_TERTIARY); ucol_setAttribute(myCollation, UCOL_CASE_LEVEL, UCOL_ON, &status); for (i = 0; i < 3 ; i++) @@ -220,7 +214,6 @@ static void TestKatakanaHiragana(void) } log_verbose("Testing Japanese Katakana, Hiragana Characters Collation\n"); - ucol_setNormalization(myCollation, UCOL_DECOMP_COMPAT); ucol_setStrength(myCollation, UCOL_QUATERNARY); ucol_setAttribute(myCollation, UCOL_CASE_LEVEL, UCOL_ON, &status); for (i = 0; i < 3 ; i++) { @@ -247,9 +240,6 @@ static void TestChooonKigoo(void) } log_verbose("Testing Japanese Choo-on Kigoo Characters Collation\n"); - /* for one case, strcollinc fails, since it has a bogus expansion at the end*/ - /* normalization is turned off to stop strcollinc from executing */ - ucol_setAttribute(myCollation, UCOL_NORMALIZATION_MODE, UCOL_ON, &status); ucol_setAttribute(myCollation, UCOL_CASE_LEVEL, UCOL_ON, &status); for (i = 0; i < 7 ; i++) { doTest(myCollation, testChooonKigooCases[i], testChooonKigooCases[i + 1], diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index c1555d7eddc..cd983f5c0d2 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -535,7 +535,7 @@ static void TestErrorConditions(){ /*Test ures_getBinary(0 status != U_ILLEGAL_ARGUMENT_ERROR*/ status=U_ZERO_ERROR; coll = ures_getByKey(teRes, "CollationElements", coll, &status); - binColl=ures_getByKey(teRes, "%%Collation", binColl, &status); + binColl=ures_getByKey(teRes, "%%CollationNew", binColl, &status); status=U_ILLEGAL_ARGUMENT_ERROR; binResult=(uint8_t*)ures_getBinary(binColl, &len, &status); diff --git a/icu4c/source/test/cintltst/encoll.c b/icu4c/source/test/cintltst/encoll.c index 77181bc19a1..71cbbc401e3 100644 --- a/icu4c/source/test/cintltst/encoll.c +++ b/icu4c/source/test/cintltst/encoll.c @@ -267,7 +267,7 @@ static void TestTertiary( ) return; } log_verbose("Testing English Collation with Tertiary strength\n"); - ucol_setAttribute(myCollation, UCOL_NORMALIZATION_MODE, UCOL_ON, &status); + ucol_setStrength(myCollation, UCOL_TERTIARY); for (i = 0; i < 38 ; i++) { @@ -308,7 +308,6 @@ static void TestPrimary() log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status)); return; } - ucol_setAttribute(myCollation, UCOL_NORMALIZATION_MODE, UCOL_ON, &status); ucol_setStrength(myCollation, UCOL_PRIMARY); log_verbose("Testing English Collation with Primary strength\n"); for (i = 38; i < 43 ; i++)