X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/374ca955a76ecab1204ca8bfa63ff9238d998416..HEAD:/icuSources/test/intltest/itmajor.cpp

diff --git a/icuSources/test/intltest/itmajor.cpp b/icuSources/test/intltest/itmajor.cpp
index bcb74d14..84bee28d 100644
--- 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-2004, International Business Machines Corporation and
+ * Copyright (c) 1998-2016, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
@@ -15,6 +17,7 @@
 ***********************************************************************/
 
 #include "unicode/utypes.h"
+#include "unicode/localpointer.h"
 #include "itmajor.h"
 
 #include "itutil.h"
@@ -25,6 +28,7 @@
 #include "itrbnf.h"
 #include "itrbnfp.h"
 #include "itrbnfrt.h"
+#include "itspoof.h"
 #include "normconf.h"
 #include "regextst.h"
 #include "tstnorm.h"
@@ -32,6 +36,9 @@
 #include "icusvtst.h"
 #include "testidna.h"
 #include "convtest.h"
+#include "csdetest.h"
+
+extern IntlTest *createBiDiConformanceTest();
 
 #define CASE_SUITE(id, suite) case id:                  \
                           name = #suite;                \
@@ -104,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;
@@ -169,6 +176,37 @@ void MajorTestLevel::runIndexedTest( int32_t index, UBool exec, const char* &nam
 #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;
     }