From b3d29d3d8cf98d19cf90466f8203d23cdff65859 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Wed, 11 Sep 2013 00:51:18 +0000 Subject: [PATCH] ICU-9742 removing tests depending on closed CldrBug:3058 X-SVN-Rev: 34265 --- icu4c/source/test/cintltst/cldrtest.c | 9 --------- icu4c/source/test/cintltst/creststn.c | 8 -------- 2 files changed, 17 deletions(-) diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index a94d4f8d3d3..65780c1ec11 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -971,15 +971,6 @@ static void VerifyTranslation(void) { if (U_FAILURE(errorCode)) { log_err("error uloc_getDisplayCountry returned %s\n", u_errorName(errorCode)); } - else if ((uprv_strstr(currLoc, "ti_") != currLoc && uprv_strstr(currLoc, "sr_Latn_XK") != currLoc) || isICUVersionAtLeast(52, 0, 2)) { - /* TODO: FIX or REMOVE this test! Was: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) - but CldrBug:3058 is wontfix */ - /* For sr_Latn_XK we need to wait until the names get updated from sr[_Cyrl] later in CLDR 24 */ - strIdx = findStringSetMismatch(currLoc, langBuffer, langSize, mergedExemplarSet, FALSE, &badChar); - if (strIdx >= 0) { - log_err("getDisplayCountry(%s) at index %d returned characters not in the exemplar characters: %04X.\n", - currLoc, strIdx, badChar); - } - } { UResourceBundle* cal = ures_getByKey(currentLocale, "calendar", NULL, &errorCode); UResourceBundle* greg = ures_getByKeyWithFallback(cal, "gregorian", NULL, &errorCode); diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index 9b0611eb5e4..8444da45a04 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -280,14 +280,6 @@ static void TestErrorCodes(void) { status = U_USING_DEFAULT_WARNING; r = ures_open(U_ICUDATA_REGION, "ti", &status); checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status); - - /* we look up the resource which is aliased and at our level */ - /* TODO: restore the following test when cldrbug 3058: is fixed - but CldrBug:3058 is WONTFIX */ - if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(52, 0, 2)) { - status = U_USING_DEFAULT_WARNING; - r2 = ures_getByKey(r, "Countries", r2, &status); - checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status); - } ures_close(r); status = U_USING_FALLBACK_WARNING; -- 2.40.0