| Index: source/test/intltest/numfmtst.h
|
| diff --git a/source/test/intltest/numfmtst.h b/source/test/intltest/numfmtst.h
|
| index fad385974dca6e2b922b741ab3abe44ecebe7bfb..c03defb14122d9e96fcfbc6f8b731417e7137079 100644
|
| --- a/source/test/intltest/numfmtst.h
|
| +++ b/source/test/intltest/numfmtst.h
|
| @@ -1,6 +1,6 @@
|
| /************************************************************************
|
| * COPYRIGHT:
|
| - * Copyright (c) 1997-2013, International Business Machines Corporation
|
| + * Copyright (c) 1997-2014, International Business Machines Corporation
|
| * and others. All Rights Reserved.
|
| ************************************************************************/
|
|
|
| @@ -175,6 +175,14 @@ class NumberFormatTest: public CalendarTimeZoneTest {
|
| 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);
|
| @@ -218,11 +226,21 @@ class NumberFormatTest: public CalendarTimeZoneTest {
|
| }
|
|
|
| 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,
|
| @@ -275,6 +293,16 @@ class NumberFormatTest: public CalendarTimeZoneTest {
|
| 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 */
|
|
|