X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/73c04bcfe1096173b00431f0cdc742894b15eef0..e4f10fab0c078f399c9deef476d9c9b73b47dff8:/icuSources/test/intltest/nmfmapts.cpp

diff --git a/icuSources/test/intltest/nmfmapts.cpp b/icuSources/test/intltest/nmfmapts.cpp
index 117b2ed3..ca89948b 100644
--- a/icuSources/test/intltest/nmfmapts.cpp
+++ b/icuSources/test/intltest/nmfmapts.cpp
@@ -1,6 +1,6 @@
 /***********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2005, International Business Machines Corporation
+ * Copyright (c) 1997-2010, International Business Machines Corporation
  * and others. All Rights Reserved.
  ***********************************************************************/
 
@@ -68,35 +68,35 @@ void IntlTestNumberFormatAPI::testAPI(/* char* par */)
 
     NumberFormat *def = NumberFormat::createInstance(status);
     if(U_FAILURE(status)) {
-        errln("ERROR: Could not create NumberFormat (default)");
+        dataerrln("ERROR: Could not create NumberFormat (default) - %s", u_errorName(status));
     }
 
     status = U_ZERO_ERROR;
     NumberFormat *fr = NumberFormat::createInstance(Locale::getFrench(), status);
     if(U_FAILURE(status)) {
-        errln("ERROR: Could not create NumberFormat (French)");
+        dataerrln("ERROR: Could not create NumberFormat (French) - %s", u_errorName(status));
     }
 
     NumberFormat *cur = NumberFormat::createCurrencyInstance(status);
     if(U_FAILURE(status)) {
-        errln("ERROR: Could not create NumberFormat (currency, default)");
+        dataerrln("ERROR: Could not create NumberFormat (currency, default) - %s", u_errorName(status));
     }
 
     status = U_ZERO_ERROR;
     NumberFormat *cur_fr = NumberFormat::createCurrencyInstance(Locale::getFrench(), status);
     if(U_FAILURE(status)) {
-        errln("ERROR: Could not create NumberFormat (currency, French)");
+        dataerrln("ERROR: Could not create NumberFormat (currency, French) - %s", u_errorName(status));
     }
 
     NumberFormat *per = NumberFormat::createPercentInstance(status);
     if(U_FAILURE(status)) {
-        errln("ERROR: Could not create NumberFormat (percent, default)");
+        dataerrln("ERROR: Could not create NumberFormat (percent, default) - %s", u_errorName(status));
     }
 
     status = U_ZERO_ERROR;
     NumberFormat *per_fr = NumberFormat::createPercentInstance(Locale::getFrench(), status);
     if(U_FAILURE(status)) {
-        errln("ERROR: Could not create NumberFormat (percent, French)");
+        dataerrln("ERROR: Could not create NumberFormat (percent, French) - %s", u_errorName(status));
     }
 
 // ======= Test equality
@@ -232,7 +232,7 @@ if (fr != NULL && def != NULL)
     status = U_ZERO_ERROR;
     NumberFormat *test = new DecimalFormat(status);
     if(U_FAILURE(status)) {
-        errln("ERROR: Couldn't create a NumberFormat");
+        errcheckln(status, "ERROR: Couldn't create a NumberFormat - %s", u_errorName(status));
     }
 
     if(test->getDynamicClassID() != DecimalFormat::getStaticClassID()) {
@@ -300,18 +300,18 @@ IntlTestNumberFormatAPI::testRegistration()
 #if !UCONFIG_NO_SERVICE
     UErrorCode status = U_ZERO_ERROR;
     
-    NumberFormat* f0 = NumberFormat::createInstance(SWAP_LOC, status);
-    NumberFormat* f1 = NumberFormat::createInstance(SRC_LOC, status);
-    NumberFormat* f2 = NumberFormat::createCurrencyInstance(SRC_LOC, status);
+    LocalPointer<NumberFormat> f0(NumberFormat::createInstance(SWAP_LOC, status));
+    LocalPointer<NumberFormat> f1(NumberFormat::createInstance(SRC_LOC, status));
+    LocalPointer<NumberFormat> f2(NumberFormat::createCurrencyInstance(SRC_LOC, status));
     URegistryKey key = NumberFormat::registerFactory(new NFTestFactory(), status);
-    NumberFormat* f3 = NumberFormat::createCurrencyInstance(SRC_LOC, status);
-    NumberFormat* f3a = NumberFormat::createCurrencyInstance(SRC_LOC, status);
-    NumberFormat* f4 = NumberFormat::createInstance(SRC_LOC, status);
+    LocalPointer<NumberFormat> f3(NumberFormat::createCurrencyInstance(SRC_LOC, status));
+    LocalPointer<NumberFormat> f3a(NumberFormat::createCurrencyInstance(SRC_LOC, status));
+    LocalPointer<NumberFormat> f4(NumberFormat::createInstance(SRC_LOC, status));
 
     StringEnumeration* locs = NumberFormat::getAvailableLocales();
 
-    UNumberFormat* uf3 = unum_open(UNUM_CURRENCY, NULL, 0, SRC_LOC.getName(),NULL, &status);
-    UNumberFormat* uf4 = unum_open(UNUM_DEFAULT, NULL, 0, SRC_LOC.getName(), NULL, &status);
+    LocalUNumberFormatPointer uf3(unum_open(UNUM_CURRENCY, NULL, 0, SRC_LOC.getName(), NULL, &status));
+    LocalUNumberFormatPointer uf4(unum_open(UNUM_DEFAULT, NULL, 0, SRC_LOC.getName(), NULL, &status));
 
     const UnicodeString* res;
     for (res = locs->snext(status); res; res = locs->snext(status)) {
@@ -319,8 +319,8 @@ IntlTestNumberFormatAPI::testRegistration()
     }
 
     NumberFormat::unregister(key, status); // restore for other tests
-    NumberFormat* f5 = NumberFormat::createCurrencyInstance(SRC_LOC, status);
-    UNumberFormat* uf5 = unum_open(UNUM_CURRENCY, NULL, 0, SRC_LOC.getName(),NULL, &status);
+    LocalPointer<NumberFormat> f5(NumberFormat::createCurrencyInstance(SRC_LOC, status));
+    LocalUNumberFormatPointer uf5(unum_open(UNUM_CURRENCY, NULL, 0, SRC_LOC.getName(), NULL, &status));
 
     if (U_FAILURE(status)) {
         dataerrln("Error creating instnaces.");
@@ -339,9 +339,9 @@ IntlTestNumberFormatAPI::testRegistration()
         f4->format(n, res4);
         f5->format(n, res5);
 
-        unum_formatDouble(uf3, n, ures3, 50, NULL, &status);
-        unum_formatDouble(uf4, n, ures4, 50, NULL, &status);
-        unum_formatDouble(uf5, n, ures5, 50, NULL, &status);
+        unum_formatDouble(uf3.getAlias(), n, ures3, 50, NULL, &status);
+        unum_formatDouble(uf4.getAlias(), n, ures4, 50, NULL, &status);
+        unum_formatDouble(uf5.getAlias(), n, ures5, 50, NULL, &status);
 
         logln((UnicodeString)"f0 swap int: " + res0);
         logln((UnicodeString)"f1 src int: " + res1);
@@ -356,10 +356,9 @@ IntlTestNumberFormatAPI::testRegistration()
         log("uf5 ureg cur: ");
         logln(ures5);
 
-        if (f3 == f3a) {
+        if (f3.getAlias() == f3a.getAlias()) {
             errln("did not get new instance from service");
-        } else {
-            delete f3a;
+            f3a.orphan();
         }
         if (res3 != res0) {
             errln("registered service did not match");
@@ -382,16 +381,6 @@ IntlTestNumberFormatAPI::testRegistration()
         }
     }
 
-    unum_close(uf5);
-    delete f5;
-    unum_close(uf4);
-    unum_close(uf3);
-    delete f4;
-    delete f3;
-    delete f2;
-    delete f1;
-    delete f0;
-
     for (res = locs->snext(status); res; res = locs->snext(status)) {
         errln(*res); // service should be out of synch
     }