From 37d7c8afaa704b68a61d9246b50784b7c7f7c7ca Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Wed, 8 Nov 2006 16:57:14 +0000 Subject: [PATCH] ICU-5366 Better fix to allow the tests to pass in the te_IN locale. X-SVN-Rev: 20643 --- icu4c/source/test/intltest/restest.cpp | 8 ++++++-- icu4c/source/test/intltest/restsnew.cpp | 12 +++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/icu4c/source/test/intltest/restest.cpp b/icu4c/source/test/intltest/restest.cpp index e39de66515f..3250303c238 100644 --- a/icu4c/source/test/intltest/restest.cpp +++ b/icu4c/source/test/intltest/restest.cpp @@ -208,7 +208,9 @@ ResourceBundleTest::TestResourceBundles() /* Make sure that users using te_IN for the default locale don't get test failures. */ Locale originalDefault; - Locale::setDefault(Locale("en_US"), status); + if (Locale::getDefault() == Locale("te_IN")) { + Locale::setDefault(Locale("en_US"), status); + } testTag("only_in_Root", TRUE, FALSE, FALSE); testTag("only_in_te", FALSE, TRUE, FALSE); @@ -239,7 +241,9 @@ ResourceBundleTest::TestConstruction() /* Make sure that users using te_IN for the default locale don't get test failures. */ Locale originalDefault; - Locale::setDefault(Locale("en_US"), err); + if (Locale::getDefault() == Locale("te_IN")) { + Locale::setDefault(Locale("en_US"), err); + } ResourceBundle test1((UnicodeString)testdatapath, err); ResourceBundle test2(testdatapath, locale, err); diff --git a/icu4c/source/test/intltest/restsnew.cpp b/icu4c/source/test/intltest/restsnew.cpp index 2937b0444f9..f17fd32d1de 100644 --- a/icu4c/source/test/intltest/restsnew.cpp +++ b/icu4c/source/test/intltest/restsnew.cpp @@ -207,7 +207,9 @@ NewResourceBundleTest::TestResourceBundles() /* Make sure that users using te_IN for the default locale don't get test failures. */ Locale originalDefault; - Locale::setDefault(Locale("en_US"), status); + if (Locale::getDefault() == Locale("te_IN")) { + Locale::setDefault(Locale("en_US"), status); + } testTag("only_in_Root", TRUE, FALSE, FALSE); testTag("only_in_te", FALSE, TRUE, FALSE); @@ -239,7 +241,9 @@ NewResourceBundleTest::TestConstruction() /* Make sure that users using te_IN for the default locale don't get test failures. */ Locale originalDefault; - Locale::setDefault(Locale("en_US"), err); + if (Locale::getDefault() == Locale("te_IN")) { + Locale::setDefault(Locale("en_US"), err); + } ResourceBundle test1((UnicodeString)testdatapath, err); ResourceBundle test2(testdatapath, locale, err); @@ -431,7 +435,9 @@ NewResourceBundleTest::TestOtherAPI(){ /* Make sure that users using te_IN for the default locale don't get test failures. */ Locale originalDefault; - Locale::setDefault(Locale("en_US"), err); + if (Locale::getDefault() == Locale("te_IN")) { + Locale::setDefault(Locale("en_US"), err); + } Locale *locale=new Locale("te_IN");