ICU-511.32.tar.gz

[apple/icu.git] / icuSources / test / intltest / itformat.cpp

diff --git a/icuSources/test/intltest/itformat.cpp b/icuSources/test/intltest/itformat.cpp
index c7233002e5cfcc5e599e9e6b91453d2fff083e27..aa919d34aea1564220b1d3ac9fb1eecd004935e1 100644 (file)
--- a/icuSources/test/intltest/itformat.cpp
+++ b/icuSources/test/intltest/itformat.cpp
@@ -1,7 +1,7 @@
 /********************************************************************
 /********************************************************************

- * COPYRIGHT: 
- * Copyright (c) 1997-2003, International Business Machines Corporation and
- * others. All Rights Reserved.
+ * COPYRIGHT:
+ * Copyright (c) 1997-2013, International Business Machines
+ * Corporation and others. All Rights Reserved.

  ********************************************************************/
 
 /**
  ********************************************************************/
 
 /**


@@ -9,6 +9,7 @@
  */
 
 #include "unicode/utypes.h"
  */
 
 #include "unicode/utypes.h"

+#include "unicode/localpointer.h"

 
 #if !UCONFIG_NO_FORMATTING
 
 
 #if !UCONFIG_NO_FORMATTING
 


@@ -42,6 +43,24 @@
 #include "astrotst.h"       // AstroTest
 #include "incaltst.h"       // IntlCalendarTest
 #include "calcasts.h"       // CalendarCaseTest
 #include "astrotst.h"       // AstroTest
 #include "incaltst.h"       // IntlCalendarTest
 #include "calcasts.h"       // CalendarCaseTest

+#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();

 
 #define TESTCLASS(id, TestClass)          \
     case id:                              \
 
 #define TESTCLASS(id, TestClass)          \
     case id:                              \


@@ -101,7 +120,43 @@ void IntlTestFormat::runIndexedTest( int32_t index, UBool exec, const char* &nam
         TESTCLASS(26,IntlCalendarTest);
         TESTCLASS(27,AstroTest);
         TESTCLASS(28,CalendarCaseTest);
         TESTCLASS(26,IntlCalendarTest);
         TESTCLASS(27,AstroTest);
         TESTCLASS(28,CalendarCaseTest);

-
+        TESTCLASS(29,TimeZoneRuleTest);
+#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);
+        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---");
+            logln((UnicodeString)"");
+            LocalPointer<IntlTest> test(createGenderInfoTest());
+            callTest(*test, par);
+          }
+          break;
+        case 44:
+          name = "CompactDecimalFormatTest";
+          if (exec) {
+            logln("CompactDecimalFormatTest test---");
+            logln((UnicodeString)"");
+            LocalPointer<IntlTest> test(createCompactDecimalFormatTest());
+            callTest(*test, par);
+          }
+          break;
+        TESTCLASS(45,RegionTest);

         default: name = ""; break; //needed to end loop
     }
     if (exec) {
         default: name = ""; break; //needed to end loop
     }
     if (exec) {