ICU 56 update step 1

source/test/intltest/numfmtspectest.cpp

 /*
 *******************************************************************************
-* Copyright (C) 2014, International Business Machines Corporation and         *
+* Copyright (C) 2014-2015, International Business Machines Corporation and         *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 *
 * File numfmtspectest.cpp
 *
 *******************************************************************************
 */
 #include <stdio.h>
 #include <stdlib.h>
 
@@ skipping 15 matching lines @@
         }
     }    
 }
 
 static NumberFormat *nfWithPattern(const char *pattern) {
     UnicodeString upattern(pattern, -1, US_INV);
     upattern = upattern.unescape();
     UErrorCode status = U_ZERO_ERROR;
     DecimalFormat *result = new DecimalFormat(
             upattern, new DecimalFormatSymbols("fr", status), status);
-    U_ASSERT(status == U_ZERO_ERROR);
+    if (U_FAILURE(status)) {
+        return NULL;
+    }
+
     return result;
 }
 
 static UnicodeString format(double d, const NumberFormat &fmt) {
     UnicodeString result;
     fmt.format(d, result);
     fixNonBreakingSpace(result);
     return result;
 }
 
@@ skipping 39 matching lines @@
     assertPatternFr("1235", 1234.567, "0", TRUE);
     assertPatternFr("1 234,567", 1234.567, "#,##0.###", TRUE);
     assertPatternFr("1234,567", 1234.567, "###0.#####", TRUE);
     assertPatternFr("1234,5670", 1234.567, "###0.0000#", TRUE);
     assertPatternFr("01234,5670", 1234.567, "00000.0000", TRUE);
     assertPatternFr("1 234,57 \\u20ac", 1234.567, "#,##0.00 \\u00a4", TRUE);
 }
 
 void NumberFormatSpecificationTest::TestNfSetters() {
     LocalPointer<NumberFormat> nf(nfWithPattern("#,##0.##"));
+    if (nf == NULL) {
+        dataerrln("Error creating NumberFormat");
+        return;
+    }
     nf->setMaximumIntegerDigits(5);
     nf->setMinimumIntegerDigits(4);
     assertEquals("", "34 567,89", format(1234567.89, *nf), TRUE);
     assertEquals("", "0 034,56", format(34.56, *nf), TRUE);
 }
 
 void NumberFormatSpecificationTest::TestRounding() {
     assertPatternFr("1,0", 1.25, "0.5", TRUE);
     assertPatternFr("2,0", 1.75, "0.5", TRUE);
     assertPatternFr("-1,0", -1.25, "0.5", TRUE);
@@ skipping 71 matching lines @@
         assertPatternFr("EUR *433,00", 433.0, "\\u00a4\\u00a4 **####0.00");
         assertPatternFr("EUR *433,00", 433.0, "\\u00a4\\u00a4 **#######0");
     }
     {
         UnicodeString upattern("\\u00a4\\u00a4 **#######0", -1, US_INV);
         upattern = upattern.unescape();
         UErrorCode status = U_ZERO_ERROR;
         UnicodeString result;
         DecimalFormat fmt(
                 upattern, new DecimalFormatSymbols("fr", status), status);
-        fmt.setCurrency(kJPY);
-        fmt.format(433.22, result);
-        assertSuccess("", status);
-        assertEquals("", "JPY ****433", result, TRUE);
+        if (U_FAILURE(status)) {
+            dataerrln("Error creating DecimalFormat - %s", u_errorName(status));
+        } else {
+            fmt.setCurrency(kJPY);
+            fmt.format(433.22, result);
+            assertSuccess("", status);
+            assertEquals("", "JPY ****433", result, TRUE);
+        }
     }
     {
         UnicodeString upattern(
             "\\u00a4\\u00a4 **#######0;\\u00a4\\u00a4 (#)", -1, US_INV);
         upattern = upattern.unescape();
         UErrorCode status = U_ZERO_ERROR;
         UnicodeString result;
         DecimalFormat fmt(
                 upattern,
                 new DecimalFormatSymbols("en_US", status),
                 status);
-        fmt.format(-433.22, result);
-        assertSuccess("", status);
-        assertEquals("", "USD (433.22)", result, TRUE);
+        if (U_FAILURE(status)) {
+            dataerrln("Error creating DecimalFormat - %s", u_errorName(status));
+        } else {
+            fmt.format(-433.22, result);
+            assertSuccess("", status);
+            assertEquals("", "USD (433.22)", result, TRUE);
+        }
     }
     const char *paddedSciPattern = "QU**00.#####E0";
     assertPatternFr("QU***43,3E-1", 4.33, paddedSciPattern, TRUE);
     {
         UErrorCode status = U_ZERO_ERROR;
         DecimalFormatSymbols *sym = new DecimalFormatSymbols("fr", status);
         sym->setSymbol(DecimalFormatSymbols::kExponentialSymbol, "EE");
         DecimalFormat fmt(
                 paddedSciPattern,
                 sym,
                 status);
-        UnicodeString result;
-        fmt.format(4.33, result);
-        assertSuccess("", status);
-        assertEquals("", "QU**43,3EE-1", result, TRUE);
+        if (U_FAILURE(status)) {
+            dataerrln("Error creating DecimalFormat - %s", u_errorName(status));
+        } else {
+            UnicodeString result;
+            fmt.format(4.33, result);
+            assertSuccess("", status);
+            assertEquals("", "QU**43,3EE-1", result, TRUE);
+        }
     }
     // padding cannot work as intended with scientific notation.
     assertPatternFr("QU**43,32E-1", 4.332, paddedSciPattern, TRUE);
 }
 
 void NumberFormatSpecificationTest::assertPatternFr(
         const char *expected,
         double x,
         const char *pattern,
         UBool possibleDataError) {
     UnicodeString upattern(pattern, -1, US_INV);
     UnicodeString uexpected(expected, -1, US_INV);
     upattern = upattern.unescape();
     uexpected = uexpected.unescape();
     UErrorCode status = U_ZERO_ERROR;
     UnicodeString result;
     DecimalFormat fmt(
             upattern, new DecimalFormatSymbols("fr_FR", status), status);
+    if (U_FAILURE(status)) {
+        dataerrln("Error creating DecimalFormatSymbols - %s", u_errorName(status));
+        return;
+    }
     fmt.format(x, result);
     fixNonBreakingSpace(result);
     assertSuccess("", status);
     assertEquals("", uexpected, result, possibleDataError);
 }
 
 extern IntlTest *createNumberFormatSpecificationTest() {
     return new NumberFormatSpecificationTest();
 }
 
 #endif