diff --git a/icu4c/source/test/intltest/transrt.cpp b/icu4c/source/test/intltest/transrt.cpp index cc367a48533..f36df47bab8 100644 --- a/icu4c/source/test/intltest/transrt.cpp +++ b/icu4c/source/test/intltest/transrt.cpp @@ -83,7 +83,7 @@ TransliteratorRoundTripTest::runIndexedTest(int32_t index, UBool exec, // Time bomb - allows temporary behavior that expires at a given // release //-------------------------------------------------------------------- -static const UVersionInfo ICU_35 = {3,5,0,0}; +static const UVersionInfo ICU_36 = {3,6,0,0}; static UBool isICUVersionAtLeast(const UVersionInfo x) { UVersionInfo v; @@ -1143,7 +1143,7 @@ void TransliteratorRoundTripTest::TestHan() { void TransliteratorRoundTripTest::TestGreek() { - if (isICUVersionAtLeast(ICU_35)) { + if (isICUVersionAtLeast(ICU_36)) { // We temporarily filter against Unicode 4.1, but we only do this // before version 3.4. errln("FAIL: TestGreek needs to be updated to remove delete the [:Age=4.0:] filter "); @@ -1175,7 +1175,7 @@ void TransliteratorRoundTripTest::TestGreek() { void TransliteratorRoundTripTest::TestGreekUNGEGN() { - if (isICUVersionAtLeast(ICU_35)) { + if (isICUVersionAtLeast(ICU_36)) { // We temporarily filter against Unicode 4.1, but we only do this // before version 3.4. errln("FAIL: TestGreek needs to be updated to remove delete the [:Age=4.0:] filter "); @@ -1204,7 +1204,7 @@ void TransliteratorRoundTripTest::TestGreekUNGEGN() { void TransliteratorRoundTripTest::Testel() { - if (isICUVersionAtLeast(ICU_35)) { + if (isICUVersionAtLeast(ICU_36)) { // We temporarily filter against Unicode 4.1, but we only do this // before version 3.4. errln("FAIL: TestGreek needs to be updated to remove delete the [:Age=4.0:] filter "); @@ -1272,7 +1272,7 @@ UBool LegalHebrew::is(const UnicodeString& sourceString)const{ return TRUE; } void TransliteratorRoundTripTest::TestHebrew() { - if (isICUVersionAtLeast(ICU_35)) { + if (isICUVersionAtLeast(ICU_36)) { // We temporarily filter against Unicode 4.1, but we only do this // before version 3.4. errln("FAIL: TestHebrew needs to be updated to remove delete the [:Age=4.0:] filter "); diff --git a/icu4c/source/test/intltest/transtst.cpp b/icu4c/source/test/intltest/transtst.cpp index c505e67de7b..648337cc3f4 100644 --- a/icu4c/source/test/intltest/transtst.cpp +++ b/icu4c/source/test/intltest/transtst.cpp @@ -190,7 +190,7 @@ TransliteratorTest::runIndexedTest(int32_t index, UBool exec, } } -static const UVersionInfo ICU_31 = {3,1,0,0}; +static const UVersionInfo ICU_36 = {3,6,0,0}; /** * Make sure every system transliterator can be instantiated. * @@ -225,7 +225,8 @@ void TransliteratorTest::TestInstantiation() { i + ") != getAvailableIDs().snext()"); continue; } - if(id2.indexOf("Thai")>-1 && isICUVersionAtLeast(ICU_31)){ + if(id2.indexOf("Thai")>-1 && !isICUVersionAtLeast(ICU_36)){ + /* The Thai-Latin transliterator doesn't exist in ICU4C yet */ continue; } UParseError parseError; @@ -3496,7 +3497,8 @@ void TransliteratorTest::TestIncrementalProgress(void) { Transliterator::getAvailableVariant(k, source, target, variant); UnicodeString id = source + "-" + target + "/" + variant; - if(id.indexOf("Thai")>-1 && isICUVersionAtLeast(ICU_31)){ + if(id.indexOf("Thai")>-1 && !isICUVersionAtLeast(ICU_36)){ + /* The Thai-Latin transliterator doesn't exist in ICU4C yet */ continue; } Transliterator *t = Transliterator::createInstance(id, UTRANS_FORWARD, err, status);