ICU 56 step 4: Apply post-56 fixes for measure/date format

source/test/intltest/itformat.cpp

 /********************************************************************
  * COPYRIGHT:
  * 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".
  */
 
@@ skipping 35 matching lines @@
 #include "tzrulets.h"       // TimeZoneRuleTest
 #include "dadrcal.h"        // DataDrivenCalendarTest
 #include "dadrfmt.h"        // DataDrivenFormatTest
 #include "dtptngts.h"       // IntlTestDateTimePatternGeneratorAPI
 #include "tzoffloc.h"       // TimeZoneOffsetLocalTest
 #include "tzfmttst.h"       // TimeZoneFormatTest
 #include "plurults.h"       // PluralRulesTest
 #include "plurfmts.h"       // PluralFormatTest
 #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 *createTimeUnitTest();
 extern IntlTest *createMeasureFormatTest();
 extern IntlTest *createNumberFormatSpecificationTest();
 extern IntlTest *createScientificNumberFormatterTest();
 extern IntlTest *createNumberFormat2Test(); 
 
 
 #define TESTCLASS(id, TestClass)          \
     case id:                              \
         name = #TestClass;                \
         if (exec) {                       \
@@ skipping 55 matching lines @@
 #if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION
         TESTCLASS(30,DataDrivenCalendarTest);
         TESTCLASS(31,DataDrivenFormatTest);
 #endif
         TESTCLASS(32,IntlTestDateTimePatternGeneratorAPI);
         TESTCLASS(33,TimeZoneOffsetLocalTest);
         TESTCLASS(34,TimeZoneFormatTest);
         TESTCLASS(35,PluralRulesTest);
         TESTCLASS(36,PluralFormatTest);
         TESTCLASS(37,DateIntervalFormatTest);
-        TESTCLASS(38,TimeUnitTest);
+        case 38:
+          name = "TimeUnitTest";
+          if (exec) {
+            logln("TimeUnitTest test---");
+            logln((UnicodeString)"");
+            LocalPointer<IntlTest> test(createTimeUnitTest());
+            callTest(*test, par);
+          }
+          break;
         TESTCLASS(39,SelectFormatTest);
         TESTCLASS(40,LocaleDisplayNamesTest);
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS
         TESTCLASS(41,DecimalFormatTest);
 #endif
         TESTCLASS(42,ListFormatterTest);
         case 43:
           name = "GenderInfoTest";
           if (exec) {
             logln("GenderInfoTest test---");
@@ skipping 66 matching lines @@
         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 */