Update ICU to 54.1 step 1

source/test/intltest/numfmtst.h

 /************************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2013, International Business Machines Corporation
+ * Copyright (c) 1997-2014, International Business Machines Corporation
  * and others. All Rights Reserved.
  ************************************************************************/
 
 #ifndef _NUMBERFORMATTEST_
 #define _NUMBERFORMATTEST_
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
@@ skipping 154 matching lines @@
     void TestShowZero();
 
     void TestCompatibleCurrencies();
     void TestBug9936();
     void TestParseNegativeWithFaLocale();
     void TestParseNegativeWithAlternateMinusSign();
 
     void TestCustomCurrencySignAndSeparator();
 
     void TestParseSignsAndMarks();
+    void Test10419RoundingWith0FractionDigits();
+    void Test10468ApplyPattern();
+    void TestRoundingScientific10542();
+    void TestZeroScientific10547();
+    void TestAccountingCurrency();
+    void TestEquality();
+
+    void TestCurrencyUsage();
 
  private:
     UBool testFormattableAsUFormattable(const char *file, int line, Formattable &f);
 
     void expectParseCurrency(const NumberFormat &fmt, const UChar* currency, double amount, const char *text);
 
     static UBool equalValue(const Formattable& a, const Formattable& b);
 
     void expectPositions(FieldPositionIterator& iter, int32_t *values, int32_t tupleCount,
                          const UnicodeString& str);
@@ skipping 23 matching lines @@
 
     void expect(NumberFormat& fmt, const Formattable& n,
                 const UnicodeString& exp, UBool rt=TRUE);
 
     void expect(NumberFormat& fmt, const Formattable& n,
                 const char *exp, UBool rt=TRUE) {
         expect(fmt, n, UnicodeString(exp, ""), rt);
     }
 
     void expect(NumberFormat* fmt, const Formattable& n,
-                const UnicodeString& exp, UErrorCode);
+                const UnicodeString& exp, UBool rt, UErrorCode errorCode);
+
+    void expect(NumberFormat* fmt, const Formattable& n,
+                const char *exp, UBool rt, UErrorCode errorCode) {
+        expect(fmt, n, UnicodeString(exp, ""), rt, errorCode);
+    }
+
+    void expect(NumberFormat* fmt, const Formattable& n,
+                const UnicodeString& exp, UErrorCode errorCode) {
+        expect(fmt, n, exp, TRUE, errorCode);
+    }
 
     void expect(NumberFormat* fmt, const Formattable& n,
                 const char *exp, UErrorCode errorCode) {
-        expect(fmt, n, UnicodeString(exp, ""), errorCode);
+        expect(fmt, n, UnicodeString(exp, ""), TRUE, errorCode);
     }
 
     void expectCurrency(NumberFormat& nf, const Locale& locale,
                         double value, const UnicodeString& string);
 
     void expectPad(DecimalFormat& fmt, const UnicodeString& pat,
                    int32_t pos, int32_t width, UChar pad);
 
     void expectPad(DecimalFormat& fmt, const char *pat,
                    int32_t pos, int32_t width, UChar pad) {
@@ skipping 32 matching lines @@
 
     enum { ILLEGAL = -1 };
 
     // internal subtest used by TestRounding487
     void roundingTest(NumberFormat& nf, double x, int32_t maxFractionDigits, const char* expected);
 
     // internal rounding checking for TestRounding
     void checkRounding(DecimalFormat* df, double base, int iterations, double increment);
 
     double checkRound(DecimalFormat* df, double iValue, double lastParsed);
+
+    void verifyRounding(
+        DecimalFormat& format,
+        const double *values,
+        const char * const *expected,
+        const DecimalFormat::ERoundingMode *roundingModes,
+        const char * const *descriptions,
+        int32_t valueSize,
+        int32_t roundingModeSize);
+
 };
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif // _NUMBERFORMATTEST_