ICU 56 update step 1

source/test/intltest/numfmtst.h

 /************************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2014, International Business Machines Corporation
+ * Copyright (c) 1997-2015, International Business Machines Corporation
  * and others. All Rights Reserved.
  ************************************************************************/
 
 #ifndef _NUMBERFORMATTEST_
 #define _NUMBERFORMATTEST_
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/numfmt.h"
 #include "unicode/decimfmt.h"
 #include "caltztst.h"
 
 /**
+ * Expected field positions from field position iterator. Tests should
+ * stack allocate an array of these making sure that the last element is
+ * {0, -1, 0} (The sentinel element indicating end of iterator). Then test
+ * should call verifyFieldPositionIterator() passing both this array of
+ * expected results and the field position iterator from the format method.
+ */
+struct NumberFormatTest_Attributes {
+    int32_t id;
+    int32_t spos;
+    int32_t epos;
+};
+
+/**
  * Performs various in-depth test on NumberFormat
  **/
 class NumberFormatTest: public CalendarTimeZoneTest {
 
     // IntlTest override
     void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par );
  public:
 
     /**
      * Test APIs (to increase code coverage)
@@ skipping 147 matching lines @@
 
     void TestParseSignsAndMarks();
     void Test10419RoundingWith0FractionDigits();
     void Test10468ApplyPattern();
     void TestRoundingScientific10542();
     void TestZeroScientific10547();
     void TestAccountingCurrency();
     void TestEquality();
 
     void TestCurrencyUsage();
+    void TestNumberFormatTestTuple();
+    void TestDataDriven();
+
+    void TestDoubleLimit11439();
+    void TestFastPathConsistent11524();
+    void TestGetAffixes();
+    void TestToPatternScientific11648();
+    void TestBenchmark();
+    void TestCtorApplyPatternDifference();
+    void TestFractionalDigitsForCurrency();
+    void TestFormatCurrencyPlural();
+    void Test11868();
+    void Test10727_RoundingZero();
+    void Test11376_getAndSetPositivePrefix();
+    void Test11475_signRecognition();
+    void Test11640_getAffixes();
+    void Test11649_toPatternWithMultiCurrency();
 
  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 100 matching lines @@
 
     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);
 
+    void verifyFieldPositionIterator(
+            NumberFormatTest_Attributes *expected,
+            FieldPositionIterator &iter);
+
 };
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif // _NUMBERFORMATTEST_