ICU-10483 Fix no data test errors in ICU4C 53m1

X-SVN-Rev: 34979

diff --git a/icu4c/source/i18n/reldatefmt.cpp b/icu4c/source/i18n/reldatefmt.cpp
index 88da50b3781e44866bcfc13e55db64dcc60540fc..c1341dfc211c73632afb9bc83f7af493a3dded88 100644 (file)
--- a/icu4c/source/i18n/reldatefmt.cpp
+++ b/icu4c/source/i18n/reldatefmt.cpp
@@ -691,7 +691,9 @@ RelativeDateTimeFormatter& RelativeDateTimeFormatter::operator=(
 }
 
 RelativeDateTimeFormatter::~RelativeDateTimeFormatter() {
-    ptr->removeRef();
+    if (ptr != NULL) {
+        ptr->removeRef();
+    }
 }
 
 const NumberFormat& RelativeDateTimeFormatter::getNumberFormat() const {

diff --git a/icu4c/source/test/cintltst/ccaltst.c b/icu4c/source/test/cintltst/ccaltst.c
index 9c48017651a625af47cf08fc414377a0a56bf5c5..ef8522c8513738bba16d2d4595bcbe54cc132226 100644 (file)
--- a/icu4c/source/test/cintltst/ccaltst.c
+++ b/icu4c/source/test/cintltst/ccaltst.c
@@ -1,5 +1,5 @@
 /********************************************************************
- * Copyright (c) 1997-2013, International Business Machines
+ * Copyright (c) 1997-2014, International Business Machines
  * Corporation and others. All Rights Reserved.
  ********************************************************************
  *
@@ -259,7 +259,7 @@ static void TestCalendar()
     resultlength = ucal_getCanonicalTimeZoneID(PST, -1,
         canonicalID, sizeof(canonicalID)/sizeof(UChar), &isSystemID, &status);
     if (U_FAILURE(status)) {
-        log_err("FAIL: error in ucal_getCanonicalTimeZoneID : %s\n", u_errorName(status));
+        log_data_err("FAIL: error in ucal_getCanonicalTimeZoneID : %s\n", u_errorName(status));
     } else {
         if (u_strcmp(AMERICA_LOS_ANGELES, canonicalID) != 0) {
             log_data_err("FAIL: ucal_getCanonicalTimeZoneID(%s) returned %s : expected - %s (Are you missing data?)\n",

diff --git a/icu4c/source/test/cintltst/cdattst.c b/icu4c/source/test/cintltst/cdattst.c
index 7591efe37d4c201742568de4b18c995a9c0c367f..de3ed6fc75d1e07d599fb21d4e0eae22125cdae6 100644 (file)
--- a/icu4c/source/test/cintltst/cdattst.c
+++ b/icu4c/source/test/cintltst/cdattst.c
@@ -1476,7 +1476,7 @@ static void TestContext(void) {
             }
             udatpg_close(udtpg);
         } else {
-            log_err("FAIL: udatpg_open for locale %s, status %s\n", textContextItemPtr->locale, u_errorName(status) );
+            log_data_err("FAIL: udatpg_open for locale %s, status %s\n", textContextItemPtr->locale, u_errorName(status) );
         }
     }
     for (textRelContextItemPtr = textContextRelativeItems; textRelContextItemPtr->locale != NULL; ++textRelContextItemPtr) {

diff --git a/icu4c/source/test/intltest/dtfmrgts.cpp b/icu4c/source/test/intltest/dtfmrgts.cpp
index 2534a5397f763c825470b6dea841c4ac9a87ad23..2f482e2000dc8a70d6081e5f2052149281a67231 100644 (file)
--- a/icu4c/source/test/intltest/dtfmrgts.cpp
+++ b/icu4c/source/test/intltest/dtfmrgts.cpp
@@ -1534,17 +1534,22 @@ void DateFormatRegressionTest::TestT10334(void) {
     UnicodeString text("--mon-02-march-2011");
     SimpleDateFormat format(pattern, status);
 
+    if (U_FAILURE(status)) {
+        dataerrln("Fail creating SimpleDateFormat object - %s", u_errorName(status));
+        return;
+    }
+
     format.setBooleanAttribute(UDAT_PARSE_PARTIAL_MATCH, FALSE, status);
     format.parse(text, status);
     if (!U_FAILURE(status)) {
-        errln("parse partial match did NOT fail in strict mode", u_errorName(status));
+        errln("parse partial match did NOT fail in strict mode - %s", u_errorName(status));
     }
 
     status = U_ZERO_ERROR;
     format.setBooleanAttribute(UDAT_PARSE_PARTIAL_MATCH, TRUE, status);
     format.parse(text, status);
     if (U_FAILURE(status)) {
-        errln("parse partial match failure in lenient mode", u_errorName(status));
+        errln("parse partial match failure in lenient mode - %s", u_errorName(status));
     }
 
     status = U_ZERO_ERROR;

diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp
index dc5719c01e444b575b775cd03553b63ab2e156cf..9554ae0e557d96382cc85b645024c1d7e75bb35a 100644 (file)
--- a/icu4c/source/test/intltest/numfmtst.cpp
+++ b/icu4c/source/test/intltest/numfmtst.cpp
@@ -7326,6 +7326,11 @@ void NumberFormatTest::Test10468ApplyPattern() {
     UErrorCode status = U_ZERO_ERROR;
     DecimalFormat fmt("'I''ll'*a###.##", status);
 
+    if (U_FAILURE(status)) {
+        errcheckln(status, "DecimalFormat constructor failed - %s", u_errorName(status));
+        return;
+    }
+
     if (fmt.getPadCharacterString() != UnicodeString("a")) {
         errln("Padding character should be 'a'.");
         return;
@@ -7344,6 +7349,10 @@ void NumberFormatTest::Test10468ApplyPattern() {
 void NumberFormatTest::TestRoundingScientific10542() {
     UErrorCode status = U_ZERO_ERROR;
     DecimalFormat format("0.00E0", status);
+    if (U_FAILURE(status)) {
+        errcheckln(status, "DecimalFormat constructor failed - %s", u_errorName(status));
+        return;
+    }
         
     DecimalFormat::ERoundingMode roundingModes[] = {
             DecimalFormat::kRoundCeiling,

diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp
index dc25974e79cce29c2065173e8a739db1f551255e..f79d9bd93bf35ef3ce0bdaca36dde3e789dbda5c 100644 (file)
--- a/icu4c/source/test/intltest/tztest.cpp
+++ b/icu4c/source/test/intltest/tztest.cpp
@@ -1961,10 +1961,10 @@ void TimeZoneTest::TestCanonicalIDAPI() {
     canonicalID.setToBogus();
     ec = U_ZERO_ERROR;
     pResult = &TimeZone::getCanonicalID(berlin, canonicalID, ec);
-    assertSuccess("TimeZone::getCanonicalID(bogus dest) should succeed", ec);
+    assertSuccess("TimeZone::getCanonicalID(bogus dest) should succeed", ec, TRUE);
     assertTrue("TimeZone::getCanonicalID(bogus dest) should return the dest string", pResult == &canonicalID);
     assertFalse("TimeZone::getCanonicalID(bogus dest) should un-bogus the dest string", canonicalID.isBogus());
-    assertEquals("TimeZone::getCanonicalID(bogus dest) unexpected result", canonicalID, berlin);
+    assertEquals("TimeZone::getCanonicalID(bogus dest) unexpected result", canonicalID, berlin, TRUE);
 }
 
 void TimeZoneTest::TestCanonicalID() {