ICU-511.32.tar.gz

[apple/icu.git] / icuSources / test / intltest / itrbnfrt.cpp

diff --git a/icuSources/test/intltest/itrbnfrt.cpp b/icuSources/test/intltest/itrbnfrt.cpp
index ddc5e77bf5fd0166c6923024e13151999774d5ce..87c227d53824a1ba7a0d91604512848566b1b556 100644 (file)
--- a/icuSources/test/intltest/itrbnfrt.cpp
+++ b/icuSources/test/intltest/itrbnfrt.cpp
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
 /*
  *******************************************************************************

- * Copyright (C) 1996-2003, International Business Machines Corporation and    *
+ * Copyright (C) 1996-2009, International Business Machines Corporation and    *

  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */


@@ -21,7 +21,7 @@
         name = #test;                 \
         if (exec) {                   \
             logln(#test "---");       \
         name = #test;                 \
         if (exec) {                   \
             logln(#test "---");       \

-            logln((UnicodeString)""); \
+            logln();                  \

             test();                   \
         }                             \
         break
             test();                   \
         }                             \
         break


@@ -42,7 +42,7 @@ void RbnfRoundTripTest::runIndexedTest(int32_t index, UBool exec, const char* &n
       TESTCASE(8, TestDutchSpelloutRT);
       TESTCASE(9, TestJapaneseSpelloutRT);
       TESTCASE(10, TestRussianSpelloutRT);
       TESTCASE(8, TestDutchSpelloutRT);
       TESTCASE(9, TestJapaneseSpelloutRT);
       TESTCASE(10, TestRussianSpelloutRT);

-      TESTCASE(11, TestGreekSpelloutRT);
+      TESTCASE(11, TestPortugueseSpelloutRT);

 #else
       TESTCASE(0, TestRBNFDisabled);
 #endif
 #else
       TESTCASE(0, TestRBNFDisabled);
 #endif


@@ -65,7 +65,7 @@ RbnfRoundTripTest::TestEnglishSpelloutRT()
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale::getUS(), status);
 
   if (U_FAILURE(status)) {
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale::getUS(), status);
 
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
     doTest(formatter, -12345678, 12345678);
   }
   } else {
     doTest(formatter, -12345678, 12345678);
   }


@@ -83,7 +83,7 @@ RbnfRoundTripTest::TestDurationsRT()
     = new RuleBasedNumberFormat(URBNF_DURATION, Locale::getUS(), status);
 
   if (U_FAILURE(status)) {
     = new RuleBasedNumberFormat(URBNF_DURATION, Locale::getUS(), status);
 
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
     doTest(formatter, 0, 12345678);
   }
   } else {
     doTest(formatter, 0, 12345678);
   }


@@ -101,7 +101,7 @@ RbnfRoundTripTest::TestSpanishSpelloutRT()
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("es", "es"), status);
  
   if (U_FAILURE(status)) {
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("es", "es"), status);
  
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
     doTest(formatter, -12345678, 12345678);
   }
   } else {
     doTest(formatter, -12345678, 12345678);
   }


@@ -119,7 +119,7 @@ RbnfRoundTripTest::TestFrenchSpelloutRT()
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale::getFrance(), status);
 
   if (U_FAILURE(status)) {
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale::getFrance(), status);
 
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
     doTest(formatter, -12345678, 12345678);
   }
   } else {
     doTest(formatter, -12345678, 12345678);
   }


@@ -137,7 +137,7 @@ RbnfRoundTripTest::TestSwissFrenchSpelloutRT()
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("fr", "CH"), status);
 
   if (U_FAILURE(status)) {
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("fr", "CH"), status);
 
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
     doTest(formatter, -12345678, 12345678);
   }
   } else {
     doTest(formatter, -12345678, 12345678);
   }


@@ -155,7 +155,7 @@ RbnfRoundTripTest::TestItalianSpelloutRT()
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale::getItalian(), status);
 
   if (U_FAILURE(status)) {
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale::getItalian(), status);
 
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
     doTest(formatter, -999999, 999999);
   }
   } else {
     doTest(formatter, -999999, 999999);
   }


@@ -173,7 +173,7 @@ RbnfRoundTripTest::TestGermanSpelloutRT()
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale::getGermany(), status);
 
   if (U_FAILURE(status)) {
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale::getGermany(), status);
 
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
     doTest(formatter, 0, 12345678);
   }
   } else {
     doTest(formatter, 0, 12345678);
   }


@@ -191,7 +191,7 @@ RbnfRoundTripTest::TestSwedishSpelloutRT()
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("sv", "SE"), status);
 
   if (U_FAILURE(status)) {
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("sv", "SE"), status);
 
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
     doTest(formatter, 0, 12345678);
   }
   } else {
     doTest(formatter, 0, 12345678);
   }


@@ -209,7 +209,7 @@ RbnfRoundTripTest::TestDutchSpelloutRT()
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("nl", "NL"), status);
 
   if (U_FAILURE(status)) {
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("nl", "NL"), status);
 
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
     doTest(formatter, -12345678, 12345678);
   }
   } else {
     doTest(formatter, -12345678, 12345678);
   }


@@ -227,7 +227,7 @@ RbnfRoundTripTest::TestJapaneseSpelloutRT()
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale::getJapan(), status);
 
   if (U_FAILURE(status)) {
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale::getJapan(), status);
 
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
     doTest(formatter, 0, 12345678);
   }
   } else {
     doTest(formatter, 0, 12345678);
   }


@@ -245,7 +245,7 @@ RbnfRoundTripTest::TestRussianSpelloutRT()
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("ru", "RU"), status);
 
   if (U_FAILURE(status)) {
     = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("ru", "RU"), status);
 
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
     doTest(formatter, 0, 12345678);
   }
   } else {
     doTest(formatter, 0, 12345678);
   }


@@ -253,19 +253,19 @@ RbnfRoundTripTest::TestRussianSpelloutRT()
 }
 
 /**
 }
 
 /**

- * Perform an exhaustive round-trip test on the Greek spellout rules
+ * Perform an exhaustive round-trip test on the Portuguese spellout rules

  */
 void
  */
 void

-RbnfRoundTripTest::TestGreekSpelloutRT() 
+RbnfRoundTripTest::TestPortugueseSpelloutRT() 

 {
   UErrorCode status = U_ZERO_ERROR;
   RuleBasedNumberFormat* formatter
 {
   UErrorCode status = U_ZERO_ERROR;
   RuleBasedNumberFormat* formatter

-    = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("el", "GR"), status);
+    = new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale("pt", "BR"), status);

 
   if (U_FAILURE(status)) {
 
   if (U_FAILURE(status)) {

-    errln("failed to construct formatter");
+    errcheckln(status, "failed to construct formatter - %s", u_errorName(status));

   } else {
   } else {

-    doTest(formatter, 0, 12345678);
+    doTest(formatter, -12345678, 12345678);

   }
   delete formatter;
 }
   }
   delete formatter;
 }