ICU 56 update step 1

source/test/intltest/itformat.cpp

 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2014, International Business Machines
+ * Copyright (c) 1997-2015, International Business Machines
  * Corporation and others. All Rights Reserved.
  ********************************************************************/
 
 /**
  * IntlTestFormat is the medium level test class for everything in the directory "format".
  */
 
 #include "unicode/utypes.h"
 #include "unicode/localpointer.h"
 
@@ skipping 44 matching lines @@
 #include "dcfmtest.h"       // DecimalFormatTest
 #include "listformattertest.h"  // ListFormatterTest
 #include "regiontst.h"      // RegionTest
 
 extern IntlTest *createCompactDecimalFormatTest();
 extern IntlTest *createGenderInfoTest();
 #if !UCONFIG_NO_BREAK_ITERATION
 extern IntlTest *createRelativeDateTimeFormatterTest();
 #endif
 extern IntlTest *createMeasureFormatTest();
-extern IntlTest *createScientificFormatHelperTest();
 extern IntlTest *createNumberFormatSpecificationTest();
+extern IntlTest *createScientificNumberFormatterTest();
+extern IntlTest *createNumberFormat2Test(); 
+
 
 #define TESTCLASS(id, TestClass)          \
     case id:                              \
         name = #TestClass;                \
         if (exec) {                       \
             logln(#TestClass " test---"); \
             logln((UnicodeString)"");     \
             TestClass test;               \
             callTest(test, par);          \
         }                                 \
@@ skipping 97 matching lines @@
         case 47:
           name = "MeasureFormatTest";
           if (exec) {
             logln("MeasureFormatTest test---");
             logln((UnicodeString)"");
             LocalPointer<IntlTest> test(createMeasureFormatTest());
             callTest(*test, par);
           }
           break;
         case 48:
-          name = "ScientificFormatHelperTest";
-          if (exec) {
-            logln("ScientificFormatHelperTest test---");
-            logln((UnicodeString)"");
-            LocalPointer<IntlTest> test(createScientificFormatHelperTest());
-            callTest(*test, par);
-          }
-          break;
-        case 49:
           name = "NumberFormatSpecificationTest";
           if (exec) {
             logln("NumberFormatSpecificationTest test---");
             logln((UnicodeString)"");
             LocalPointer<IntlTest> test(createNumberFormatSpecificationTest());
             callTest(*test, par);
           }
           break;
+       case 49:
+          name = "ScientificNumberFormatterTest";
+          if (exec) {
+            logln("ScientificNumberFormatterTest test---");
+            logln((UnicodeString)"");
+            LocalPointer<IntlTest> test(createScientificNumberFormatterTest());
+            callTest(*test, par);
+          }
+          break;
+      case 50: 
+        name = "NumberFormat2Test"; 
+          if (exec) { 
+            logln("NumberFormat2Test test---"); 
+            logln((UnicodeString)""); 
+            LocalPointer<IntlTest> test(createNumberFormat2Test()); 
+            callTest(*test, par); 
+          } 
+          break; 
         default: name = ""; break; //needed to end loop
     }
     if (exec) {
         // restore saved Locale and TimeZone
         TimeZone::adoptDefault(saveDefaultTimeZone);
         UErrorCode status = U_ZERO_ERROR;
         Locale::setDefault( saveDefaultLocale, status );
         if (U_FAILURE(status)) {
             errln("itformat: couldn't re-set default Locale!");
         }
     }
 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */