ICU-8819 DecimalFormatSymbols::initialize now throws a DEFAULT WARNING instead of...

X-SVN-Rev: 30662

diff --git a/icu4c/source/i18n/dcfmtsym.cpp b/icu4c/source/i18n/dcfmtsym.cpp
index 638c18597a090d393bcc7d99ff99bca3c363e362..260f8b17c9eceaa15e8e66f0e5f8c028a6175a1c 100644 (file)
--- a/icu4c/source/i18n/dcfmtsym.cpp
+++ b/icu4c/source/i18n/dcfmtsym.cpp
@@ -189,7 +189,7 @@ DecimalFormatSymbols::initialize(const Locale& loc, UErrorCode& status, UBool us
 
     if (U_FAILURE(status)) {
         if ( useLastResortData ) {
-            status = U_USING_FALLBACK_WARNING;
+            status = U_USING_DEFAULT_WARNING;
             initialize();
         }
         return;

diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp
index 09f53589e41bb307c364bf54e0c2b0a2e0270a01..9559f67b0f56f8dac81b9463c91af03fa380f9bd 100644 (file)
--- a/icu4c/source/test/intltest/numfmtst.cpp
+++ b/icu4c/source/test/intltest/numfmtst.cpp
@@ -1923,38 +1923,28 @@ void NumberFormatTest::TestCurrencyAmount(void){
 void NumberFormatTest::TestSymbolsWithBadLocale(void) {
     Locale locDefault;
     static const char *badLocales[] = {
-        // length < ULOC_FULLNAME_CAPACITY => expect U_USING_DEFAULT_WARNING
+        // length < ULOC_FULLNAME_CAPACITY
         "x-crazy_ZZ_MY_SPECIAL_ADMINISTRATION_REGION_NEEDS_A_SPECIAL_VARIANT_WITH_A_REALLY_REALLY_REALLY_REALLY_REALLY_REALLY_REALLY_LONG_NAME",
 
-        // length > ULOC_FULLNAME_CAPACITY => expect U_USING_FALLBACK_WARNING
+        // length > ULOC_FULLNAME_CAPACITY
         "x-crazy_ZZ_MY_SPECIAL_ADMINISTRATION_REGION_NEEDS_A_SPECIAL_VARIANT_WITH_A_REALLY_REALLY_REALLY_REALLY_REALLY_REALLY_REALLY_REALLY_REALLY_REALLY_REALLY_LONG_NAME"
-    };
+    }; // expect U_USING_DEFAULT_WARNING for both
 
     int i;
     for (i = 0; i < sizeof(badLocales) / sizeof(char*); i++) {
         const char *localeName = badLocales[i];
         Locale locBad(localeName);
         UErrorCode status = U_ZERO_ERROR;
-        UErrorCode expectedStatus;
-        char *expectedStatusName;
         UnicodeString intlCurrencySymbol((UChar)0xa4);
 
         intlCurrencySymbol.append((UChar)0xa4);
 
-        if (uprv_strlen(localeName) < ULOC_FULLNAME_CAPACITY) {
-            expectedStatus = U_USING_DEFAULT_WARNING;
-            expectedStatusName = "U_USING_DEFAULT_WARNING";
-        } else {
-            expectedStatus = U_USING_FALLBACK_WARNING;
-            expectedStatusName = "U_USING_FALLBACK_WARNING";
-        }
-
         logln("Current locale is %s", Locale::getDefault().getName());
         Locale::setDefault(locBad, status);
         logln("Current locale is %s", Locale::getDefault().getName());
         DecimalFormatSymbols mySymbols(status);
-        if (status != expectedStatus) {
-            errln("DecimalFormatSymbols should return %s.", expectedStatusName);
+        if (status != U_USING_DEFAULT_WARNING) {
+            errln("DecimalFormatSymbols should return U_USING_DEFAULT_WARNING.");
         }
         if (strcmp(mySymbols.getLocale().getName(), locBad.getName()) != 0) {
             errln("DecimalFormatSymbols does not have the right locale.", locBad.getName());