Update ICU to 54.1 step 1

source/test/intltest/itformat.cpp

 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2013, International Business Machines
+ * Copyright (c) 1997-2014, 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 40 matching lines @@
 #include "selfmts.h"       // PluralFormatTest
 #include "dtifmtts.h"       // DateIntervalFormatTest
 #include "tufmtts.h"        // TimeUnitTest
 #include "locnmtst.h"       // LocaleDisplayNamesTest
 #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();
 
 #define TESTCLASS(id, TestClass)          \
     case id:                              \
         name = #TestClass;                \
         if (exec) {                       \
             logln(#TestClass " test---"); \
             logln((UnicodeString)"");     \
             TestClass test;               \
             callTest(test, par);          \
         }                                 \
         break
 
 void IntlTestFormat::runIndexedTest( int32_t index, UBool exec, const char* &name, char* par )
 {
     // for all format tests, always set default Locale and TimeZone to ENGLISH and PST.
     TimeZone* saveDefaultTimeZone = NULL;
     Locale  saveDefaultLocale = Locale::getDefault();
     if (exec) {
         saveDefaultTimeZone = TimeZone::createDefault();
-        TimeZone *tz = TimeZone::createTimeZone("PST");
+        TimeZone *tz = TimeZone::createTimeZone("America/Los_Angeles");
         TimeZone::setDefault(*tz);
         delete tz;
         UErrorCode status = U_ZERO_ERROR;
         Locale::setDefault( Locale::getEnglish(), status );
         if (U_FAILURE(status)) {
             errln("itformat: couldn't set default Locale to ENGLISH!");
         }
     }
     if (exec) logln("TestSuite Format: ");
     switch (index) {
@@ skipping 56 matching lines @@
         case 44:
           name = "CompactDecimalFormatTest";
           if (exec) {
             logln("CompactDecimalFormatTest test---");
             logln((UnicodeString)"");
             LocalPointer<IntlTest> test(createCompactDecimalFormatTest());
             callTest(*test, par);
           }
           break;
         TESTCLASS(45,RegionTest);
+        case 46:
+#if !UCONFIG_NO_BREAK_ITERATION
+          name = "RelativeDateTimeFormatterTest";
+          if (exec) {
+            logln("RelativeDateTimeFormatterTest test---");
+            logln((UnicodeString)"");
+            LocalPointer<IntlTest> test(createRelativeDateTimeFormatterTest());
+            callTest(*test, par);
+          }
+#endif
+          break;
+        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;
         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 */