ICU-9397 Update tests in intltest to pass without data

X-SVN-Rev: 32489

diff --git a/icu4c/source/test/intltest/calregts.cpp b/icu4c/source/test/intltest/calregts.cpp
index b60c8b62fd0c5edc7b397ec56e2a2bfd49f9fc2d..e92b1b6b2552888b1c8f6cf3838f654fb5d531b1 100644 (file)
--- a/icu4c/source/test/intltest/calregts.cpp
+++ b/icu4c/source/test/intltest/calregts.cpp
@@ -2917,29 +2917,30 @@ void CalendarRegressionTest::TestT9452(void) {
     cal.set(2011, UCAL_DECEMBER, 29, 0, 0, 0);
 
     UDate d = cal.getTime(status);
-    failure(status, "getTime for initial date");
-    sdf.format(d, dstr);
-    logln(UnicodeString("Initial date: ") + dstr);
-
-    // Add 1 day
-    cal.add(UCAL_DATE, 1, status);
-    failure(status, "add 1 day");
-    d = cal.getTime(status);
-    failure(status, "getTime after +1 day");
-    dstr.remove();
-    sdf.format(d, dstr);
-    logln(UnicodeString("+1 day: ") + dstr);
-    assertEquals("Add 1 day", UnicodeString("2011-12-31T00:00:00+14:00"), dstr);
-
-    // Subtract 1 day
-    cal.add(UCAL_DATE, -1, status);
-    failure(status, "subtract 1 day");
-    d = cal.getTime(status);
-    failure(status, "getTime after -1 day");
-    dstr.remove();
-    sdf.format(d, dstr);
-    logln(UnicodeString("-1 day: ") + dstr);
-    assertEquals("Subtract 1 day", UnicodeString("2011-12-29T00:00:00-10:00"), dstr);
+    if (!failure(status, "getTime for initial date")) {
+        sdf.format(d, dstr);
+        logln(UnicodeString("Initial date: ") + dstr);
+
+        // Add 1 day
+        cal.add(UCAL_DATE, 1, status);
+        failure(status, "add 1 day");
+        d = cal.getTime(status);
+        failure(status, "getTime after +1 day");
+        dstr.remove();
+        sdf.format(d, dstr);
+        logln(UnicodeString("+1 day: ") + dstr);
+        assertEquals("Add 1 day", UnicodeString("2011-12-31T00:00:00+14:00"), dstr);
+
+        // Subtract 1 day
+        cal.add(UCAL_DATE, -1, status);
+        failure(status, "subtract 1 day");
+        d = cal.getTime(status);
+        failure(status, "getTime after -1 day");
+        dstr.remove();
+        sdf.format(d, dstr);
+        logln(UnicodeString("-1 day: ") + dstr);
+        assertEquals("Subtract 1 day", UnicodeString("2011-12-29T00:00:00-10:00"), dstr);
+    }
 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */

diff --git a/icu4c/source/test/intltest/testidna.cpp b/icu4c/source/test/intltest/testidna.cpp
index 07ad718551f1675fd1b2a2f1dc6a78867e1fdbdd..c24dbe6067adf584f3a0ad1bf9cfd6d7944fab10 100644 (file)
--- a/icu4c/source/test/intltest/testidna.cpp
+++ b/icu4c/source/test/intltest/testidna.cpp
@@ -1529,7 +1529,7 @@ void TestIDNA::TestCompareReferenceImpl(){
       UErrorCode dataStatus = U_ZERO_ERROR;
       loadTestData(dataStatus);
       if(U_FAILURE(dataStatus)) {
-        errln("Couldn't load test data: %s\n", u_errorName(dataStatus)); // save us from thousands and thousands of errors
+        dataerrln("Couldn't load test data: %s\n", u_errorName(dataStatus)); // save us from thousands and thousands of errors
         return;
       }
     }

diff --git a/icu4c/source/test/intltest/ucaconf.cpp b/icu4c/source/test/intltest/ucaconf.cpp
index 34bd76abb602dbf411d55bb43f325a00fa09203b..e7bee3c5d37c489c7f9408bf91d95b7c595504c6 100644 (file)
--- a/icu4c/source/test/intltest/ucaconf.cpp
+++ b/icu4c/source/test/intltest/ucaconf.cpp
@@ -27,7 +27,7 @@ status(U_ZERO_ERROR)
 {
     UCA = (RuleBasedCollator *)Collator::createInstance(Locale::getRoot(), status);
     if(U_FAILURE(status)) {
-        errln("ERROR - UCAConformanceTest: Unable to open UCA collator!");
+        dataerrln("Error - UCAConformanceTest: Unable to open UCA collator! - %s", u_errorName(status));
     }
 
     const char *srcDir = IntlTest::getSourceTestData(status);
@@ -48,7 +48,9 @@ UCAConformanceTest::~UCAConformanceTest()
 {
     delete UCA;
     delete rbUCA;
-    fclose(testFile);
+    if (testFile) {
+        fclose(testFile);
+    }
 }
 
 void UCAConformanceTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par */)
@@ -68,10 +70,15 @@ void UCAConformanceTest::initRbUCA()
 {
     if(!rbUCA) {
         UnicodeString ucarules;
-        UCA->getRules(UCOL_FULL_RULES, ucarules);
-        rbUCA = new RuleBasedCollator(ucarules, status);
-        if (U_FAILURE(status)) {
-            errln("Failure creating UCA rule-based collator: %s", u_errorName(status));
+        if (UCA) {
+            UCA->getRules(UCOL_FULL_RULES, ucarules);
+            rbUCA = new RuleBasedCollator(ucarules, status);
+            if (U_FAILURE(status)) {
+                dataerrln("Failure creating UCA rule-based collator: %s", u_errorName(status));
+                return;
+            }
+        } else {
+            dataerrln("Failure creating UCA rule-based collator: %s", u_errorName(status));
             return;
         }
     }
@@ -277,12 +284,20 @@ void UCAConformanceTest::testConformance(const Collator *coll)
 }
 
 void UCAConformanceTest::TestTableNonIgnorable(/* par */) {
+    if (U_FAILURE(status)) {
+        dataerrln("Error running UCA Conformance Test: %s", u_errorName(status));
+        return;
+    }
     setCollNonIgnorable(UCA);
     openTestFile("NON_IGNORABLE");
     testConformance(UCA);
 }
 
 void UCAConformanceTest::TestTableShifted(/* par */) {
+    if (U_FAILURE(status)) {
+        dataerrln("Error running UCA Conformance Test: %s", u_errorName(status));
+        return;
+    }
     setCollShifted(UCA);
     openTestFile("SHIFTED");
     testConformance(UCA);