From 795c05a795efc7cafd9340443bd8274b91a6f595 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Tue, 13 Nov 2012 23:09:18 +0000 Subject: [PATCH] ICU-9721 move two timebombs forward - but fix them in #9742 X-SVN-Rev: 32810 --- icu4c/source/test/cintltst/cldrtest.c | 2 +- icu4c/source/test/cintltst/creststn.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index a996086b15..7d7c4fc9ff 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -937,7 +937,7 @@ 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 || isICUVersionAtLeast(51, 0, 0)) { /* TODO: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) */ + else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(51, 0, 2)) { /* TODO: FIX or REMOVE this test! Was: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) - but CldrBug:3058 is wontfix */ strIdx = findStringSetMismatch(currLoc, langBuffer, langSize, exemplarCharacters, exemplarLen, FALSE, &badChar); if (strIdx >= 0) { log_err("getDisplayCountry(%s) at index %d returned characters not in the exemplar characters: %04X.\n", diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index 8f04f4c2d0..2cc2857a99 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -280,8 +280,8 @@ static void TestErrorCodes(void) { 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 */ - if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(51, 0, 0)) { + /* TODO: restore the following test when cldrbug 3058: is fixed - but CldrBug:3058 is WONTFIX */ + if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(51, 0, 2)) { status = U_USING_DEFAULT_WARNING; r2 = ures_getByKey(r, "Countries", r2, &status); checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);