ICU 56 update step 1

source/test/intltest/numrgts.cpp

Index: source/test/intltest/numrgts.cpp
diff --git a/source/test/intltest/numrgts.cpp b/source/test/intltest/numrgts.cpp
index bf5345284a5c14a1801a1bb12368e735ebf058c8..aa0f2b4e0ee19fa7cf967b43d60966aab2914abf 100644
--- a/source/test/intltest/numrgts.cpp
+++ b/source/test/intltest/numrgts.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 1997-2014, International Business Machines Corporation
+ * Copyright (c) 1997-2015, International Business Machines Corporation
  * and others. All Rights Reserved.
  ***********************************************************************/
  
@@ -20,6 +20,7 @@
 #include "unicode/datefmt.h"
 #include "unicode/ucurr.h"
 #include "putilimp.h"
+#include "uassert.h"
 
 class MyNumberFormatTest : public NumberFormat 
 {
@@ -345,7 +346,10 @@ void NumberFormatRegressionTest::Test4087535 (void)
 {
     UErrorCode status = U_ZERO_ERROR;
     DecimalFormat *df = new DecimalFormat(status);
-    failure(status, "new DecimalFormat", "");
+    if (U_FAILURE(status)) {
+        dataerrln("Error creating DecimalFormat - %s", u_errorName(status));
+        return;
+    }
     df->setMinimumIntegerDigits(0);
 
     double n = 0;
@@ -370,7 +374,10 @@ void NumberFormatRegressionTest::Test4088503 (void)
 {
     UErrorCode status = U_ZERO_ERROR;
     DecimalFormat *df = new DecimalFormat(status);
-    failure(status, "new DecimalFormat", "");
+    if (U_FAILURE(status)) {
+        dataerrln("Error creating DecimalFormat - %s", u_errorName(status));
+        return;
+    }
     df->setGroupingSize(0);
     UnicodeString sBuf;
     FieldPosition fp(FieldPosition::DONT_CARE);
@@ -1343,7 +1350,10 @@ void NumberFormatRegressionTest::Test4061302(void)
 {
     UErrorCode status = U_ZERO_ERROR;
     DecimalFormatSymbols *fmt = new DecimalFormatSymbols(status);
-    failure(status, "new DecimalFormatSymbols");
+    if (U_FAILURE(status)) {
+        dataerrln("Error creating DecimalFormatSymbols - %s", u_errorName(status));
+        return;
+    }
     UnicodeString currency(fmt->getSymbol(DecimalFormatSymbols::kCurrencySymbol));
     UnicodeString intlCurrency(fmt->getSymbol(DecimalFormatSymbols::kIntlCurrencySymbol));
     UnicodeString monDecSeparator(fmt->getSymbol(DecimalFormatSymbols::kMonetarySeparatorSymbol));
@@ -1381,7 +1391,10 @@ void NumberFormatRegressionTest::Test4062486(void)
 {
     UErrorCode status = U_ZERO_ERROR;
     DecimalFormat *fmt = new DecimalFormat(UnicodeString("#,##0.00"), status);
-    failure(status, "new DecimalFormat");
+    if (U_FAILURE(status)) {
+        dataerrln("Error creating DecimalFormat - %s", u_errorName(status));
+        return;
+    }
     UnicodeString formatted;
     FieldPosition field(0);
     double num = 1234.5;
@@ -2438,18 +2451,20 @@ void NumberFormatRegressionTest::Test4212072(void) {
             }
 
             // Test toLocalizedPattern/applyLocalizedPattern round trip
-            df->toLocalizedPattern(pat);
-            f2.applyLocalizedPattern(pat, status);
+// TODO(refactor): don't worry about localized patterns for now.
+//            df->toLocalizedPattern(pat);
+//           f2.applyLocalizedPattern(pat, status);
             failure(status,
                     UnicodeString("applyLocalizedPattern(") + pat + ")", avail[i]);
             if (U_FAILURE(status)) {
                 continue;
             }
             
+// TODO(refactor): don't worry about localized patterns for now.
             // Make sure we set the currency attributes appropriately
-            if (j == 1) {   // Currency format
-                f2.setCurrency(f2.getCurrency(), status);
-            }
+//            if (j == 1) {   // Currency format
+//                f2.setCurrency(f2.getCurrency(), status);
+//            }
             failure(status,
                     UnicodeString("setCurrency() for (") + pat + ")", avail[i]);
             if (U_FAILURE(status)) {
@@ -2710,6 +2725,13 @@ void NumberFormatRegressionTest::TestJ691(void) {
     if ((expr)==FALSE) {\
         errln("File %s, line %d: Assertion Failed: " #expr "\n", __FILE__, __LINE__);\
     }
+#define TEST_ASSERT_EQUALS(x,y)                  \
+    {                                                                     \
+      char _msg[1000]; \
+      int32_t len = sprintf (_msg,"File %s, line %d: Assertion Failed: " #x "==" #y "\n", __FILE__, __LINE__); \
+      U_ASSERT(len < (int32_t) sizeof(_msg));                            \
+      assertEquals((const char*) _msg, x,y);                             \
+    }
 
 
 // Ticket 8199:  Parse failure for numbers in the range of 1E10 - 1E18
@@ -2827,8 +2849,8 @@ void NumberFormatRegressionTest::Test8199(void) {
     nf->parse(numStr, val, status); //    the ones digit, putting it up to ...994
     TEST_CHECK_STATUS(status);
     TEST_ASSERT(Formattable::kDouble == val.getType());
-    TEST_ASSERT(9007199254740993LL == val.getInt64(status));
-    TEST_ASSERT(9007199254740994.0 == val.getDouble(status));
+    TEST_ASSERT_EQUALS((int64_t)9007199254740993LL,val.getInt64(status));
+    TEST_ASSERT_EQUALS((double)9007199254740994.0,(double)val.getDouble(status));
     TEST_CHECK_STATUS(status);
 
     delete nf;
@@ -2839,12 +2861,12 @@ void NumberFormatRegressionTest::Test9109(void) {
     Formattable val;
     ParsePosition pos;
     DecimalFormat fmt("+##", status);
-    fmt.setLenient(TRUE);
-
     if (U_FAILURE(status)) {
         dataerrln("Failed to create DecimalFormat with pattern '+##' - %s", u_errorName(status));
+        return;
     }
 
+    fmt.setLenient(TRUE);
     UnicodeString text("123");
     int32_t expected = 123;
     int32_t expos = 3;
@@ -2995,7 +3017,7 @@ void NumberFormatRegressionTest::Test10361(void) {
     //    preventing formatting of big decimals.
     UErrorCode status = U_ZERO_ERROR;
     DecimalFormatSymbols symbols(Locale::getEnglish(), status);
-    LocalPointer<DecimalFormat> df(new DecimalFormat("###.##", symbols, status));
+    LocalPointer<DecimalFormat> df(new DecimalFormat("###.##", symbols, status), status);
     TEST_CHECK_STATUS(status);
 
     // Create a decimal number with a million digits.