ICU-511.34.tar.gz

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

diff --git a/icuSources/test/intltest/restest.cpp b/icuSources/test/intltest/restest.cpp
index 0f9175b02245badeed892eab162c893fe952d897..49f4de96648d63e5cf5e0032332d8ed8aab3fd83 100644 (file)
--- a/icuSources/test/intltest/restest.cpp
+++ b/icuSources/test/intltest/restest.cpp
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
 /********************************************************************
  * COPYRIGHT: 

- * Copyright (c) 1997-2008, International Business Machines Corporation and
+ * Copyright (c) 1997-2009, International Business Machines Corporation and

  * others. All Rights Reserved.
  ********************************************************************/
 
  * others. All Rights Reserved.
  ********************************************************************/
 


@@ -183,11 +183,16 @@ void ResourceBundleTest::runIndexedTest( int32_t index, UBool exec, const char*
 {
     if (exec) logln("TestSuite ResourceBundleTest: ");
     switch (index) {
 {
     if (exec) logln("TestSuite ResourceBundleTest: ");
     switch (index) {

+#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION

     case 0: name = "TestResourceBundles"; if (exec) TestResourceBundles(); break;
     case 1: name = "TestConstruction"; if (exec) TestConstruction(); break;
     case 0: name = "TestResourceBundles"; if (exec) TestResourceBundles(); break;
     case 1: name = "TestConstruction"; if (exec) TestConstruction(); break;

-    case 2: name = "TestExemplar"; if (exec) TestExemplar(); break;
-    case 3: name = "TestGetSize"; if (exec) TestGetSize(); break;
-    case 4: name = "TestGetLocaleByType"; if (exec) TestGetLocaleByType(); break;
+    case 2: name = "TestGetSize"; if (exec) TestGetSize(); break;
+    case 3: name = "TestGetLocaleByType"; if (exec) TestGetLocaleByType(); break;
+#else
+    case 0: case 1: case 2: case 3: name = "skip"; break;
+#endif
+
+    case 4: name = "TestExemplar"; if (exec) TestExemplar(); break;

         default: name = ""; break; //needed to end loop
     }
 }
         default: name = ""; break; //needed to end loop
     }
 }


@@ -202,7 +207,7 @@ ResourceBundleTest::TestResourceBundles()
     loadTestData(status);
     if(U_FAILURE(status))
     {
     loadTestData(status);
     if(U_FAILURE(status))
     {

-        dataerrln("[DATA] Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));
+        dataerrln("Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));

         return;
     }
 
         return;
     }
 


@@ -235,7 +240,7 @@ ResourceBundleTest::TestConstruction()
     const char* testdatapath=loadTestData(err);
     if(U_FAILURE(err))
     {
     const char* testdatapath=loadTestData(err);
     if(U_FAILURE(err))
     {

-        dataerrln("[DATA] Could not load testdata.dat " + UnicodeString(testdatapath) +  ", " + UnicodeString(u_errorName(err)));
+        dataerrln("Could not load testdata.dat " + UnicodeString(testdatapath) +  ", " + UnicodeString(u_errorName(err)));

         return;
     }
 
         return;
     }
 


@@ -319,7 +324,7 @@ ResourceBundleTest::testTag(const char* frag,
     testdatapath=loadTestData(status);
     if(U_FAILURE(status))
     {
     testdatapath=loadTestData(status);
     if(U_FAILURE(status))
     {

-        dataerrln("[DATA] Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));
+        dataerrln("Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -534,7 +539,7 @@ ResourceBundleTest::TestGetSize(void)
     
     if(U_FAILURE(status))
     {
     
     if(U_FAILURE(status))
     {

-        dataerrln("[DATA] Could not load testdata.dat %s\n", u_errorName(status));
+        dataerrln("Could not load testdata.dat %s\n", u_errorName(status));

         return;
     }
     
         return;
     }
     


@@ -588,7 +593,7 @@ ResourceBundleTest::TestGetLocaleByType(void)
     
     if(U_FAILURE(status))
     {
     
     if(U_FAILURE(status))
     {

-        dataerrln("[DATA] Could not load testdata.dat %s\n", u_errorName(status));
+        dataerrln("Could not load testdata.dat %s\n", u_errorName(status));

         return;
     }
     
         return;
     }