ICU-6.2.4.tar.gz

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

diff --git a/icuSources/test/intltest/itutil.cpp b/icuSources/test/intltest/itutil.cpp
index 846838271e83d767c08f9603ab4d660e871db462..2a5d6bd8df677dd5eabbc97ffbb295fd030b5001 100644 (file)
--- a/icuSources/test/intltest/itutil.cpp
+++ b/icuSources/test/intltest/itutil.cpp
@@ -18,10 +18,10 @@
 #include "ucdtest.h"
 #include "restest.h"
 #include "restsnew.h"
-#include "tsmutex.h"
 #include "tsmthred.h"
 #include "tsputil.h"
 #include "uobjtest.h"
+#include "v32test.h"
 //#include "custrtest.h"
 //#include "ccitrtst.h"
 //#include "cloctest.h"
@@ -33,15 +33,6 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
     if (exec) logln("TestSuite Utilities: ");
     switch (index) {
         case 0:
-            name = "MutexTest"; 
-            if (exec) {
-                logln("MutexTest---"); logln("");
-                MutexTest test;
-                callTest( test, par );
-            }
-            break;
-
-        case 1:
             name = "MultithreadTest"; 
             if (exec) {
                 logln("MultithreadTest---"); logln("");
@@ -50,7 +41,7 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
             }
             break;
 
-        case 2:
+        case 1:
             name = "StringTest"; 
             if (exec) {
                 logln("StringTest---"); logln("");
@@ -59,7 +50,7 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
             }
             break;
 
-        case 3:
+        case 2:
             name = "UnicodeStringTest"; 
             if (exec) {
                 logln("UnicodeStringTest---"); logln("");
@@ -68,7 +59,7 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
             }
             break;
 
-        case 4:
+        case 3:
             name = "LocaleTest"; 
             if (exec) {
                 logln("LocaleTest---"); logln("");
@@ -77,7 +68,7 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
             }
             break;
 
-        case 5:
+        case 4:
             name = "CharIterTest"; 
             if (exec) {
                 logln("CharIterTest---"); logln("");
@@ -86,7 +77,7 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
             }
             break;
 
-        case 6:
+        case 5:
             name = "UnicodeTest"; 
             if (exec) {
                 logln("UnicodeTest---"); logln("");
@@ -95,7 +86,7 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
             }
             break;
 
-        case 7:
+        case 6:
             name = "ResourceBundleTest"; 
             if (exec) {
                 logln("ResourceBundleTest---"); logln("");
@@ -103,7 +94,7 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
                 callTest( test, par );
             }
             break;
-        case 8:
+        case 7:
             name = "NewResourceBundleTest"; 
             if (exec) {
                 logln("NewResourceBundleTest---"); logln("");
@@ -112,7 +103,7 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
             }
             break;
 
-        case 9:
+        case 8:
             name = "PUtilTest"; 
             if (exec) {
                 logln("PUtilTest---"); logln("");
@@ -121,14 +112,23 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
             }
             break;
             
-    case 10:
-      name = "UObjectTest";
-      if(exec) {
-        logln ("UObjectTest---"); logln("");
-        UObjectTest test;
-        callTest( test, par );
-      }
-      break;;
+        case 9:
+            name = "UObjectTest";
+            if(exec) {
+                logln ("UObjectTest---"); logln("");
+                UObjectTest test;
+                callTest( test, par );
+            }
+            break;;
+
+        case 10:
+            name = "UVector32Test";
+            if(exec) {
+                logln ("UVector32Test---"); logln("");
+                UVector32Test test;
+                callTest( test, par );
+            }
+            break;;
 
         /*
         case 8:
@@ -139,44 +139,6 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
                 callTest( test, par );
             }
             break;
-
-
-        case 9:
-            name = "UnicodeStringCAPI";
-            if (exec) {
-                logln("UnicodeString C Round Trip test---"); logln("");
-                CUnicodeStringTest test;
-                callTest(test, par);
-            }
-            break;
-
-        case 10:
-            name = "CharacterIteratorCAPI";
-            if (exec) {
-                logln("CharacterIterator C Round Trip test---"); logln("");
-                CCharIterTest test;
-                callTest(test, par);
-            }
-            break;
-
-
-        case 11:
-            name = "UnicodeCAPI";
-            if (exec) {
-                logln("Unicode C-API test---"); logln();
-                TestCwrapperUnicode test;
-                callTest(test, par);
-            }
-            break;
-
-        case 12:
-            name = "ResourceBundleCAPI";
-            if (exec) {
-                logln("ResourceBundle C-API test---"); logln();
-                TestCwrapperResourceBundle test;
-                callTest(test, par);
-            }
-            break;
         */
         default: name = ""; break; //needed to end loop
     }