From: Michael Ow <mow@svn.icu-project.org>
Date: Wed, 11 Mar 2015 21:09:25 +0000 (+0000)
Subject: ICU-11433 Fix some no data test failures
X-Git-Tag: milestone-59-0-1~1163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9401ac86a02121eb93a3f09dc7dd3ca7335c4b84;p=icu

ICU-11433 Fix some no data test failures

X-SVN-Rev: 37219
---

diff --git a/icu4c/source/test/cintltst/cdattst.c b/icu4c/source/test/cintltst/cdattst.c
index aef58d07660..c09348f0ce6 100644
--- a/icu4c/source/test/cintltst/cdattst.c
+++ b/icu4c/source/test/cintltst/cdattst.c
@@ -1713,7 +1713,7 @@ static void TestParseErrorReturnValue(void) {
     UCalendar* cal;
 
     df = udat_open(UDAT_DEFAULT, UDAT_DEFAULT, NULL, NULL, -1, NULL, -1, &status);
-    if (!assertSuccess("udat_open()", &status)) {
+    if (!assertSuccessCheck("udat_open()", &status, TRUE)) {
         return;
     }
 
diff --git a/icu4c/source/test/intltest/itrbnf.cpp b/icu4c/source/test/intltest/itrbnf.cpp
index ab21234d5c0..54bce9d42e5 100644
--- a/icu4c/source/test/intltest/itrbnf.cpp
+++ b/icu4c/source/test/intltest/itrbnf.cpp
@@ -362,6 +362,12 @@ void IntlTestRBNF::TestMultiplePluralRules() {
     Formattable result;
     UnicodeString resultStr;
     FieldPosition pos;
+
+    if (U_FAILURE(status)) {
+        dataerrln("Unable to create formatter - %s", u_errorName(status));
+        return;
+    }
+
     formatter.parse(formatter.format(1000.0, resultStr, pos, status), result, status);
     if (1000 != result.getLong() || resultStr != UNICODE_STRING_SIMPLE("one thousand")) {
         errln("RuleBasedNumberFormat did not return the correct value. Got: %d", result.getLong());
diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp
index 7b9d23b88ec..9d108cb28cf 100644
--- a/icu4c/source/test/intltest/numfmtst.cpp
+++ b/icu4c/source/test/intltest/numfmtst.cpp
@@ -7777,6 +7777,10 @@ void NumberFormatTest::TestDoubleLimit11439() {
 void NumberFormatTest::TestFastPathConsistent11524() {
     UErrorCode status = U_ZERO_ERROR;
     NumberFormat *fmt = NumberFormat::createInstance("en", status);
+    if (U_FAILURE(status) || fmt == NULL) {
+        dataerrln("Failed call to NumberFormat::createInstance() - %s", u_errorName(status));
+        return;
+    }
     fmt->setMaximumIntegerDigits(INT32_MIN);
     UnicodeString appendTo;
     assertEquals("", "0", fmt->format(123, appendTo));
diff --git a/icu4c/source/test/intltest/regiontst.cpp b/icu4c/source/test/intltest/regiontst.cpp
index d8ce8bb661e..7f0b9625967 100644
--- a/icu4c/source/test/intltest/regiontst.cpp
+++ b/icu4c/source/test/intltest/regiontst.cpp
@@ -667,7 +667,7 @@ void RegionTest::TestAvailableTerritories() {
     UErrorCode status = U_ZERO_ERROR;
     StringEnumeration *availableTerritories = Region::getAvailable(URGN_TERRITORY, status);
     if (U_FAILURE(status)) {
-        errln("Region::getAvailable(URGN_TERRITORY,status) failed: %s", u_errorName(status));
+        dataerrln("Region::getAvailable(URGN_TERRITORY,status) failed: %s", u_errorName(status));
         return;
     }
     const Region *world = Region::getInstance("001",status);