ICU-66108.tar.gz

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

diff --git a/icuSources/test/intltest/itmajor.cpp b/icuSources/test/intltest/itmajor.cpp
index 2873de91d45dfd00f26e0408eab9ef5630d8c2fc..84bee28d93a78fc17065549ae40134ad8e9031b2 100644 (file)
--- a/icuSources/test/intltest/itmajor.cpp
+++ b/icuSources/test/intltest/itmajor.cpp
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1998-2003, International Business Machines Corporation and
+ * Copyright (c) 1998-2016, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
@@ -15,22 +17,29 @@
 ***********************************************************************/
 
 #include "unicode/utypes.h"
+#include "unicode/localpointer.h"
 #include "itmajor.h"
 
 #include "itutil.h"
 #include "tscoll.h"
 #include "itformat.h"
-//%#include "itconv.h"
 #include "ittrans.h"
 #include "itrbbi.h"
 #include "itrbnf.h"
+#include "itrbnfp.h"
 #include "itrbnfrt.h"
+#include "itspoof.h"
 #include "normconf.h"
 #include "regextst.h"
 #include "tstnorm.h"
 #include "canittst.h"
 #include "icusvtst.h"
 #include "testidna.h"
+#include "convtest.h"
+#include "csdetest.h"
+
+extern IntlTest *createBiDiConformanceTest();
+
 #define CASE_SUITE(id, suite) case id:                  \
                           name = #suite;                \
                           if(exec) {                    \
@@ -102,7 +111,7 @@ void MajorTestLevel::runIndexedTest( int32_t index, UBool exec, const char* &nam
                 break;
 
         case 6: name = "rbbi";
-#if !UCONFIG_NO_BREAK_ITERATION
+#if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_REGULAR_EXPRESSIONS
                 if (exec) {
                     logln("TestSuite RuleBasedBreakIterator---"); logln();
                     IntlTestRBBI test;
@@ -147,8 +156,61 @@ void MajorTestLevel::runIndexedTest( int32_t index, UBool exec, const char* &nam
             }
 #endif
             break;
+        case 11: name = "convert";
+#if !UCONFIG_NO_LEGACY_CONVERSION
+                if (exec) {
+                    logln("TestSuite Conversion---"); logln();
+                    ConversionTest test;
+                    callTest( test, par );
+                }
+#endif
+                break;
+
+            case 12: name = "rbnfp";
+#if !UCONFIG_NO_FORMATTING
+                if (exec) {
+                    logln("TestSuite RuleBasedNumberParse ----"); logln();
+                    IntlTestRBNFParse test;
+                    callTest(test, par);
+                }
+#endif
+                break;
+
+            case 13: name = "csdet";
+                if (exec) {
+                    logln("TestSuite CharsetDetection---"); logln();
+                    CharsetDetectionTest test;
+                    callTest(test, par);
+                }
+
+                break;
+
+            case 14:
+#if !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_NORMALIZATION && !UCONFIG_NO_FILE_IO
+                name = "spoof";
+                if (exec) {
+                    logln("TestSuite SpoofDetection---"); logln();
+                    IntlTestSpoof test;
+                    callTest(test, par);
+                }
+#else
+                name = "skip";
+#endif
+                break;
+
+            case 15: name = "bidi";
+                if (exec) {
+                    logln("TestSuite bidi---"); logln();
+                    LocalPointer<IntlTest> test(createBiDiConformanceTest());
+                    callTest(*test, par);
+                }
+
+                break;
+
         default: name = ""; break;
     }
+
+
 }
 
 void IntlTestNormalize::runIndexedTest( int32_t index, UBool exec, const char* &name, char* par )