ICU-57166.0.1.tar.gz

[apple/icu.git] / icuSources / test / iotest / iotest.cpp

diff --git a/icuSources/test/iotest/iotest.cpp b/icuSources/test/iotest/iotest.cpp
index 748ae3584d848c23dcf125d7cfb6df06234532d2..204e59812639372070fd76fb4d8ec117c0723bcd 100644 (file)
--- a/icuSources/test/iotest/iotest.cpp
+++ b/icuSources/test/iotest/iotest.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

-*   Copyright (C) 2002-2006, International Business Machines
+*   Copyright (C) 2002-2016, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  iotest.cpp
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  iotest.cpp


@@ -20,6 +20,7 @@
 #include "unicode/uchar.h"
 #include "unicode/unistr.h"
 #include "unicode/ustring.h"
 #include "unicode/uchar.h"
 #include "unicode/unistr.h"
 #include "unicode/ustring.h"

+#include "cmemory.h"

 #include "ustr_cnv.h"
 #include "iotest.h"
 #include "unicode/tstdtmod.h"
 #include "ustr_cnv.h"
 #include "iotest.h"
 #include "unicode/tstdtmod.h"


@@ -46,6 +47,20 @@ public:
         log_err(buffer);
     }
 
         log_err(buffer);
     }
 

+    virtual void logln( const UnicodeString &message ) {
+        char buffer[4000];
+        message.extract(0, message.length(), buffer, sizeof(buffer));
+        buffer[3999] = 0; /* NULL terminate */
+        log_info(buffer);
+    }
+
+    virtual void dataerrln( const UnicodeString &message ) {
+        char buffer[4000];
+        message.extract(0, message.length(), buffer, sizeof(buffer));
+        buffer[3999] = 0; /* NULL terminate */
+        log_data_err(buffer);
+    }
+

     static const char * pathToDataDirectory(void)
     {
 
     static const char * pathToDataDirectory(void)
     {
 


@@ -95,13 +110,13 @@ public:
             }
             else {
                 /* __FILE__ on MSVC7 does not contain the directory */
             }
             else {
                 /* __FILE__ on MSVC7 does not contain the directory */

-                FILE *file = fopen(".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "Makefile.in", "r");
+                FILE *file = fopen(".." U_FILE_SEP_STRING".." U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "Makefile.in", "r");

                 if (file) {
                     fclose(file);
                 if (file) {
                     fclose(file);

-                    fgDataDir = ".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING "data" U_FILE_SEP_STRING;
+                    fgDataDir = ".." U_FILE_SEP_STRING".." U_FILE_SEP_STRING "data" U_FILE_SEP_STRING;

                 }
                 else {
                 }
                 else {

-                    fgDataDir = ".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING "data" U_FILE_SEP_STRING;
+                    fgDataDir = ".." U_FILE_SEP_STRING".." U_FILE_SEP_STRING".." U_FILE_SEP_STRING".." U_FILE_SEP_STRING "data" U_FILE_SEP_STRING;

                 }
             }
         }
                 }
             }
         }


@@ -119,10 +134,10 @@ public:
             const char* tdrelativepath;
 
 #if defined (U_TOPBUILDDIR)
             const char* tdrelativepath;
 
 #if defined (U_TOPBUILDDIR)

-            tdrelativepath = "test"U_FILE_SEP_STRING"testdata"U_FILE_SEP_STRING"out"U_FILE_SEP_STRING;
+            tdrelativepath = "test" U_FILE_SEP_STRING "testdata" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;

             directory = U_TOPBUILDDIR;
 #else
             directory = U_TOPBUILDDIR;
 #else

-            tdrelativepath = ".."U_FILE_SEP_STRING"test"U_FILE_SEP_STRING"testdata"U_FILE_SEP_STRING"out"U_FILE_SEP_STRING;
+            tdrelativepath = ".." U_FILE_SEP_STRING "test" U_FILE_SEP_STRING "testdata" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;

             directory = pathToDataDirectory();
 #endif
 
             directory = pathToDataDirectory();
 #endif
 


@@ -140,7 +155,7 @@ public:
 
             if(U_FAILURE(err)){
                 err = U_FILE_ACCESS_ERROR;
 
             if(U_FAILURE(err)){
                 err = U_FILE_ACCESS_ERROR;

-                log_err("Could not load testtypes.res in testdata bundle with path %s - %s\n", tdpath, u_errorName(err));
+                log_data_err("Could not load testtypes.res in testdata bundle with path %s - %s\n", tdpath, u_errorName(err));

                 return "";
             }
             ures_close(test);
                 return "";
             }
             ures_close(test);


@@ -157,6 +172,7 @@ public:
 const char* DataDrivenLogger::fgDataDir = NULL;
 char* DataDrivenLogger::fgTestDataPath = NULL;
 
 const char* DataDrivenLogger::fgDataDir = NULL;
 char* DataDrivenLogger::fgTestDataPath = NULL;
 

+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_FILE_IO

 static int64_t
 uto64(const UChar     *buffer)
 {
 static int64_t
 uto64(const UChar     *buffer)
 {


@@ -173,12 +189,12 @@ uto64(const UChar     *buffer)
     }
     return result;
 }
     }
     return result;
 }

-
+#endif

 
 U_CDECL_BEGIN
 static void U_CALLCONV DataDrivenPrintf(void)
 {
 
 U_CDECL_BEGIN
 static void U_CALLCONV DataDrivenPrintf(void)
 {

-#if !UCONFIG_NO_FORMATTING
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_FILE_IO

     UErrorCode errorCode;
     TestDataModule *dataModule;
     TestData *testData;
     UErrorCode errorCode;
     TestDataModule *dataModule;
     TestData *testData;


@@ -202,7 +218,7 @@ static void U_CALLCONV DataDrivenPrintf(void)
 
     const char *fileLocale = "en_US_POSIX";
     int32_t uFileBufferLenReturned;
 
     const char *fileLocale = "en_US_POSIX";
     int32_t uFileBufferLenReturned;

-    UFILE *testFile;
+    LocalUFILEPointer testFile;

 
     errorCode=U_ZERO_ERROR;
     dataModule=TestDataModule::getTestDataModule("icuio", logger, errorCode);
 
     errorCode=U_ZERO_ERROR;
     dataModule=TestDataModule::getTestDataModule("icuio", logger, errorCode);


@@ -216,20 +232,20 @@ static void U_CALLCONV DataDrivenPrintf(void)
                     errorCode=U_ZERO_ERROR;
                     continue;
                 }
                     errorCode=U_ZERO_ERROR;
                     continue;
                 }

-                testFile = u_fopen(STANDARD_TEST_FILE, "w", fileLocale, "UTF-8");
-                if (!testFile) {
+                testFile.adoptInstead(u_fopen(STANDARD_TEST_FILE, "w", fileLocale, "UTF-8"));
+                if (testFile.isNull()) {

                     log_err("Can't open test file - %s\n",
                             STANDARD_TEST_FILE);
                     continue;
                 }
                     log_err("Can't open test file - %s\n",
                             STANDARD_TEST_FILE);
                     continue;
                 }

-                u_memset(uBuffer, 0x2A, sizeof(uBuffer)/sizeof(uBuffer[0]));
-                uBuffer[sizeof(uBuffer)/sizeof(uBuffer[0])-1] = 0;
+                u_memset(uBuffer, 0x2A, UPRV_LENGTHOF(uBuffer));
+                uBuffer[UPRV_LENGTHOF(uBuffer)-1] = 0;

                 tempStr=testCase->getString("format", errorCode);
                 tempStr=testCase->getString("format", errorCode);

-                tempStr.extract(format, sizeof(format)/sizeof(format[0]), errorCode);
+                tempStr.extract(format, UPRV_LENGTHOF(format), errorCode);

                 tempStr=testCase->getString("result", errorCode);
                 tempStr=testCase->getString("result", errorCode);

-                tempStr.extract(expectedResult, sizeof(expectedResult)/sizeof(expectedResult[0]), errorCode);
+                tempStr.extract(expectedResult, UPRV_LENGTHOF(expectedResult), errorCode);

                 tempStr=testCase->getString("argument", errorCode);
                 tempStr=testCase->getString("argument", errorCode);

-                tempStr.extract(argument, sizeof(argument)/sizeof(argument[0]), errorCode);
+                tempStr.extract(argument, UPRV_LENGTHOF(argument), errorCode);

                 u_austrncpy(cBuffer, format, sizeof(cBuffer));
                 if(U_FAILURE(errorCode)) {
                     log_err("error retrieving icuio/printf test case %d - %s\n",
                 u_austrncpy(cBuffer, format, sizeof(cBuffer));
                 if(U_FAILURE(errorCode)) {
                     log_err("error retrieving icuio/printf test case %d - %s\n",


@@ -242,36 +258,36 @@ static void U_CALLCONV DataDrivenPrintf(void)
                 case 0x64:  // 'd' double
                     dbl = atof(u_austrcpy(cBuffer, argument));
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, dbl);
                 case 0x64:  // 'd' double
                     dbl = atof(u_austrcpy(cBuffer, argument));
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, dbl);

-                    uFileBufferLenReturned = u_fprintf_u(testFile, format, dbl);
+                    uFileBufferLenReturned = u_fprintf_u(testFile.getAlias(), format, dbl);

                     break;
                 case 0x31:  // '1' int8_t
                     i8 = (int8_t)uto64(argument);
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, i8);
                     break;
                 case 0x31:  // '1' int8_t
                     i8 = (int8_t)uto64(argument);
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, i8);

-                    uFileBufferLenReturned = u_fprintf_u(testFile, format, i8);
+                    uFileBufferLenReturned = u_fprintf_u(testFile.getAlias(), format, i8);

                     break;
                 case 0x32:  // '2' int16_t
                     i16 = (int16_t)uto64(argument);
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, i16);
                     break;
                 case 0x32:  // '2' int16_t
                     i16 = (int16_t)uto64(argument);
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, i16);

-                    uFileBufferLenReturned = u_fprintf_u(testFile, format, i16);
+                    uFileBufferLenReturned = u_fprintf_u(testFile.getAlias(), format, i16);

                     break;
                 case 0x34:  // '4' int32_t
                     i32 = (int32_t)uto64(argument);
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, i32);
                     break;
                 case 0x34:  // '4' int32_t
                     i32 = (int32_t)uto64(argument);
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, i32);

-                    uFileBufferLenReturned = u_fprintf_u(testFile, format, i32);
+                    uFileBufferLenReturned = u_fprintf_u(testFile.getAlias(), format, i32);

                     break;
                 case 0x38:  // '8' int64_t
                     i64 = uto64(argument);
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, i64);
                     break;
                 case 0x38:  // '8' int64_t
                     i64 = uto64(argument);
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, i64);

-                    uFileBufferLenReturned = u_fprintf_u(testFile, format, i64);
+                    uFileBufferLenReturned = u_fprintf_u(testFile.getAlias(), format, i64);

                     break;
                 case 0x73:  // 's' char *
                     u_austrncpy(cBuffer, argument, sizeof(cBuffer));
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, cBuffer);
                     break;
                 case 0x73:  // 's' char *
                     u_austrncpy(cBuffer, argument, sizeof(cBuffer));
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, cBuffer);

-                    uFileBufferLenReturned = u_fprintf_u(testFile, format, cBuffer);
+                    uFileBufferLenReturned = u_fprintf_u(testFile.getAlias(), format, cBuffer);

                     break;
                 case 0x53:  // 'S' UChar *
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, argument);
                     break;
                 case 0x53:  // 'S' UChar *
                     uBufferLenReturned = u_sprintf_u(uBuffer, format, argument);

-                    uFileBufferLenReturned = u_fprintf_u(testFile, format, argument);
+                    uFileBufferLenReturned = u_fprintf_u(testFile.getAlias(), format, argument);

                     break;
                 default:
                     uBufferLenReturned = 0;
                     break;
                 default:
                     uBufferLenReturned = 0;


@@ -286,7 +302,11 @@ static void U_CALLCONV DataDrivenPrintf(void)
                     log_err("FAILURE string test case %d \"%s\" - Got: \"%s\" Expected: \"%s\"\n",
                             i, cFormat, cBuffer, cExpected);
                 }
                     log_err("FAILURE string test case %d \"%s\" - Got: \"%s\" Expected: \"%s\"\n",
                             i, cFormat, cBuffer, cExpected);
                 }

-                if (uBuffer[uBufferLenReturned-1] == 0
+                if (uBufferLenReturned <= 0) {
+                    log_err("FAILURE test case %d - \"%s\" is an empty string.\n",
+                            i, cBuffer);
+                }
+                else if (uBuffer[uBufferLenReturned-1] == 0

                     || uBuffer[uBufferLenReturned] != 0
                     || uBuffer[uBufferLenReturned+1] != 0x2A
                     || uBuffer[uBufferLenReturned+2] != 0x2A)
                     || uBuffer[uBufferLenReturned] != 0
                     || uBuffer[uBufferLenReturned+1] != 0x2A
                     || uBuffer[uBufferLenReturned+2] != 0x2A)


@@ -296,14 +316,13 @@ static void U_CALLCONV DataDrivenPrintf(void)
                     log_err("FAILURE test case %d - \"%s\" wrong amount of characters was written. Got %d.\n",
                             i, cBuffer, uBufferLenReturned);
                 }
                     log_err("FAILURE test case %d - \"%s\" wrong amount of characters was written. Got %d.\n",
                             i, cBuffer, uBufferLenReturned);
                 }

-                u_fclose(testFile);
-                testFile = u_fopen(STANDARD_TEST_FILE, "r", fileLocale, "UTF-8");
-                if (!testFile) {
+                testFile.adoptInstead(u_fopen(STANDARD_TEST_FILE, "r", fileLocale, "UTF-8"));
+                if (testFile.isNull()) {

                     log_err("Can't open test file - %s\n",
                             STANDARD_TEST_FILE);
                 }
                 uBuffer[0]=0;
                     log_err("Can't open test file - %s\n",
                             STANDARD_TEST_FILE);
                 }
                 uBuffer[0]=0;

-                u_fgets(uBuffer, sizeof(uBuffer)/sizeof(uBuffer[0]), testFile);
+                u_fgets(uBuffer, UPRV_LENGTHOF(uBuffer), testFile.getAlias());

                 if (u_strcmp(uBuffer, expectedResult) != 0) {
                     u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
                     u_austrncpy(cFormat, format, sizeof(cFormat));
                 if (u_strcmp(uBuffer, expectedResult) != 0) {
                     u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
                     u_austrncpy(cFormat, format, sizeof(cFormat));


@@ -326,14 +345,13 @@ static void U_CALLCONV DataDrivenPrintf(void)
                     errorCode=U_ZERO_ERROR;
                     continue;
                 }
                     errorCode=U_ZERO_ERROR;
                     continue;
                 }

-                u_fclose(testFile);

             }
             delete testData;
         }
         delete dataModule;
     }
     else {
             }
             delete testData;
         }
         delete dataModule;
     }
     else {

-        log_err("Failed: could not load test icuio data\n");
+        log_data_err("Failed: could not load test icuio data\n");

     }
 #endif
 }
     }
 #endif
 }


@@ -342,7 +360,7 @@ U_CDECL_END
 U_CDECL_BEGIN
 static void U_CALLCONV DataDrivenScanf(void)
 {
 U_CDECL_BEGIN
 static void U_CALLCONV DataDrivenScanf(void)
 {

-#if !UCONFIG_NO_FORMATTING
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_FILE_IO

     UErrorCode errorCode;
     TestDataModule *dataModule;
     TestData *testData;
     UErrorCode errorCode;
     TestDataModule *dataModule;
     TestData *testData;


@@ -385,14 +403,14 @@ static void U_CALLCONV DataDrivenScanf(void)
                     log_err("Can't open test file - %s\n",
                             STANDARD_TEST_FILE);
                 }*/
                     log_err("Can't open test file - %s\n",
                             STANDARD_TEST_FILE);
                 }*/

-                u_memset(uBuffer, 0x2A, sizeof(uBuffer)/sizeof(uBuffer[0]));
-                uBuffer[sizeof(uBuffer)/sizeof(uBuffer[0])-1] = 0;
+                u_memset(uBuffer, 0x2A, UPRV_LENGTHOF(uBuffer));
+                uBuffer[UPRV_LENGTHOF(uBuffer)-1] = 0;

                 tempStr=testCase->getString("format", errorCode);
                 tempStr=testCase->getString("format", errorCode);

-                tempStr.extract(format, sizeof(format)/sizeof(format[0]), errorCode);
+                tempStr.extract(format, UPRV_LENGTHOF(format), errorCode);

                 tempStr=testCase->getString("result", errorCode);
                 tempStr=testCase->getString("result", errorCode);

-                tempStr.extract(expectedResult, sizeof(expectedResult)/sizeof(expectedResult[0]), errorCode);
+                tempStr.extract(expectedResult, UPRV_LENGTHOF(expectedResult), errorCode);

                 tempStr=testCase->getString("argument", errorCode);
                 tempStr=testCase->getString("argument", errorCode);

-                tempStr.extract(argument, sizeof(argument)/sizeof(argument[0]), errorCode);
+                tempStr.extract(argument, UPRV_LENGTHOF(argument), errorCode);

                 u_austrncpy(cBuffer, format, sizeof(cBuffer));
                 if(U_FAILURE(errorCode)) {
                     log_err("error retrieving icuio/printf test case %d - %s\n",
                 u_austrncpy(cBuffer, format, sizeof(cBuffer));
                 if(U_FAILURE(errorCode)) {
                     log_err("error retrieving icuio/printf test case %d - %s\n",


@@ -505,7 +523,7 @@ static void U_CALLCONV DataDrivenScanf(void)
                             STANDARD_TEST_FILE);
                 }
                 uBuffer[0];
                             STANDARD_TEST_FILE);
                 }
                 uBuffer[0];

-                u_fgets(uBuffer, sizeof(uBuffer)/sizeof(uBuffer[0]), testFile);
+                u_fgets(uBuffer, UPRV_LENGTHOF(uBuffer), testFile);

                 if (u_strcmp(uBuffer, expectedResult) != 0) {
                     u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
                     u_austrncpy(cFormat, format, sizeof(cFormat));
                 if (u_strcmp(uBuffer, expectedResult) != 0) {
                     u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
                     u_austrncpy(cFormat, format, sizeof(cFormat));


@@ -535,7 +553,7 @@ static void U_CALLCONV DataDrivenScanf(void)
         delete dataModule;
     }
     else {
         delete dataModule;
     }
     else {

-        log_err("Failed: could not load test icuio data\n");
+        log_data_err("Failed: could not load test icuio data\n");

     }
 #endif
 }
     }
 #endif
 }


@@ -544,7 +562,7 @@ U_CDECL_END
 U_CDECL_BEGIN
 static void U_CALLCONV DataDrivenPrintfPrecision(void)
 {
 U_CDECL_BEGIN
 static void U_CALLCONV DataDrivenPrintfPrecision(void)
 {

-#if !UCONFIG_NO_FORMATTING
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_FILE_IO

     UErrorCode errorCode;
     TestDataModule *dataModule;
     TestData *testData;
     UErrorCode errorCode;
     TestDataModule *dataModule;
     TestData *testData;


@@ -579,14 +597,14 @@ static void U_CALLCONV DataDrivenPrintfPrecision(void)
                     errorCode=U_ZERO_ERROR;
                     continue;
                 }
                     errorCode=U_ZERO_ERROR;
                     continue;
                 }

-                u_memset(uBuffer, 0x2A, sizeof(uBuffer)/sizeof(uBuffer[0]));
-                uBuffer[sizeof(uBuffer)/sizeof(uBuffer[0])-1] = 0;
+                u_memset(uBuffer, 0x2A, UPRV_LENGTHOF(uBuffer));
+                uBuffer[UPRV_LENGTHOF(uBuffer)-1] = 0;

                 tempStr=testCase->getString("format", errorCode);
                 tempStr=testCase->getString("format", errorCode);

-                tempStr.extract(format, sizeof(format)/sizeof(format[0]), errorCode);
+                tempStr.extract(format, UPRV_LENGTHOF(format), errorCode);

                 tempStr=testCase->getString("result", errorCode);
                 tempStr=testCase->getString("result", errorCode);

-                tempStr.extract(expectedResult, sizeof(expectedResult)/sizeof(expectedResult[0]), errorCode);
+                tempStr.extract(expectedResult, UPRV_LENGTHOF(expectedResult), errorCode);

                 tempStr=testCase->getString("argument", errorCode);
                 tempStr=testCase->getString("argument", errorCode);

-                tempStr.extract(argument, sizeof(argument)/sizeof(argument[0]), errorCode);
+                tempStr.extract(argument, UPRV_LENGTHOF(argument), errorCode);

                 precision=testCase->getInt28("precision", errorCode);
                 u_austrncpy(cBuffer, format, sizeof(cBuffer));
                 if(U_FAILURE(errorCode)) {
                 precision=testCase->getInt28("precision", errorCode);
                 u_austrncpy(cBuffer, format, sizeof(cBuffer));
                 if(U_FAILURE(errorCode)) {


@@ -636,7 +654,11 @@ static void U_CALLCONV DataDrivenPrintfPrecision(void)
                     log_err("FAILURE test case %d \"%s\" - Got: \"%s\" Expected: \"%s\"\n",
                             i, cFormat, cBuffer, cExpected);
                 }
                     log_err("FAILURE test case %d \"%s\" - Got: \"%s\" Expected: \"%s\"\n",
                             i, cFormat, cBuffer, cExpected);
                 }

-                if (uBuffer[uBufferLenReturned-1] == 0
+                if (uBufferLenReturned <= 0) {
+                    log_err("FAILURE test case %d - \"%s\" is an empty string.\n",
+                            i, cBuffer);
+                }
+                else if (uBuffer[uBufferLenReturned-1] == 0

                     || uBuffer[uBufferLenReturned] != 0
                     || uBuffer[uBufferLenReturned+1] != 0x2A
                     || uBuffer[uBufferLenReturned+2] != 0x2A)
                     || uBuffer[uBufferLenReturned] != 0
                     || uBuffer[uBufferLenReturned+1] != 0x2A
                     || uBuffer[uBufferLenReturned+2] != 0x2A)


@@ -658,7 +680,7 @@ static void U_CALLCONV DataDrivenPrintfPrecision(void)
         delete dataModule;
     }
     else {
         delete dataModule;
     }
     else {

-        log_err("Failed: could not load test icuio data\n");
+        log_data_err("Failed: could not load test icuio data\n");

     }
 #endif
 }
     }
 #endif
 }


@@ -669,12 +691,14 @@ static void addAllTests(TestNode** root) {
     addStringTest(root);
     addTranslitTest(root);
 
     addStringTest(root);
     addTranslitTest(root);
 

-#if !UCONFIG_NO_FORMATTING
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_LEGACY_CONVERSION

     addTest(root, &DataDrivenPrintf, "datadriv/DataDrivenPrintf");
     addTest(root, &DataDrivenPrintfPrecision, "datadriv/DataDrivenPrintfPrecision");
     addTest(root, &DataDrivenScanf, "datadriv/DataDrivenScanf");
 #endif
     addTest(root, &DataDrivenPrintf, "datadriv/DataDrivenPrintf");
     addTest(root, &DataDrivenPrintfPrecision, "datadriv/DataDrivenPrintfPrecision");
     addTest(root, &DataDrivenScanf, "datadriv/DataDrivenScanf");
 #endif

+#if U_IOSTREAM_SOURCE >= 199711

     addStreamTests(root);
     addStreamTests(root);

+#endif

 }
 
 /* returns the path to icu/source/data/out */
 }
 
 /* returns the path to icu/source/data/out */


@@ -696,7 +720,7 @@ static const char *ctest_dataOutDir()
     */
 #if defined (U_TOPBUILDDIR)
     {
     */
 #if defined (U_TOPBUILDDIR)
     {

-        dataOutDir = U_TOPBUILDDIR "data"U_FILE_SEP_STRING"out"U_FILE_SEP_STRING;
+        dataOutDir = U_TOPBUILDDIR "data" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;

     }
 #else
 
     }
 #else
 


@@ -728,13 +752,13 @@ static const char *ctest_dataOutDir()
         }
         else {
             /* __FILE__ on MSVC7 does not contain the directory */
         }
         else {
             /* __FILE__ on MSVC7 does not contain the directory */

-            FILE *file = fopen(".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "Makefile.in", "r");
+            FILE *file = fopen(".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "Makefile.in", "r");

             if (file) {
                 fclose(file);
             if (file) {
                 fclose(file);

-                dataOutDir = ".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;
+                dataOutDir = ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;

             }
             else {
             }
             else {

-                dataOutDir = ".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING".."U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;
+                dataOutDir = ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;

             }
         }
     }
             }
         }
     }


@@ -763,6 +787,25 @@ static void ctest_setICU_DATA() {
     }
 }
 
     }
 }
 

+U_CDECL_BEGIN
+/*
+ * Note: this assumes that context is a pointer to STANDARD_TEST_FILE. It would be
+ * cleaner to define an acutal context with a string pointer in it and set STANDARD_TEST_FILE
+ * after the call to initArgs()...
+ */
+static int U_CALLCONV argHandler(int arg, int /*argc*/, const char * const argv[], void *context)
+{
+    const char **str = (const char **) context;
+
+    if (argv[arg][0] != '/' && argv[arg][0] != '-') {
+        *str = argv[arg];
+        return 1;
+    }
+
+    return 0;
+}
+U_CDECL_END
+

 int main(int argc, char* argv[])
 {
     int32_t nerrors = 0;
 int main(int argc, char* argv[])
 {
     int32_t nerrors = 0;


@@ -771,7 +814,7 @@ int main(int argc, char* argv[])
     UDate startTime, endTime;
     int32_t diffTime;
 
     UDate startTime, endTime;
     int32_t diffTime;
 

-    startTime = uprv_getUTCtime();
+    startTime = uprv_getRawUTCtime();

 
     /* Check whether ICU will initialize without forcing the build data directory into
     *  the ICU_DATA path.  Success here means either the data dll contains data, or that
 
     /* Check whether ICU will initialize without forcing the build data directory into
     *  the ICU_DATA path.  Success here means either the data dll contains data, or that


@@ -788,13 +831,17 @@ int main(int argc, char* argv[])
     }
     u_cleanup();
     errorCode = U_ZERO_ERROR;
     }
     u_cleanup();
     errorCode = U_ZERO_ERROR;

+    if (!initArgs(argc, argv, argHandler, (void *) &STANDARD_TEST_FILE)) {
+        /* Error already displayed. */
+        return -1;
+    }

 
     /* Initialize ICU */
     ctest_setICU_DATA();    /* u_setDataDirectory() must happen Before u_init() */
     u_init(&errorCode);
     if (U_FAILURE(errorCode)) {
         fprintf(stderr,
 
     /* Initialize ICU */
     ctest_setICU_DATA();    /* u_setDataDirectory() must happen Before u_init() */
     u_init(&errorCode);
     if (U_FAILURE(errorCode)) {
         fprintf(stderr,

-            "#### ERROR! %s: u_init() failed with status = \"%s\".\n" 
+            "#### ERROR! %s: u_init() failed with status = \"%s\".\n"

             "*** Check the ICU_DATA environment variable and \n"
             "*** check that the data files are present.\n", argv[0], u_errorName(errorCode));
         return 1;
             "*** Check the ICU_DATA environment variable and \n"
             "*** check that the data files are present.\n", argv[0], u_errorName(errorCode));
         return 1;


@@ -803,7 +850,7 @@ int main(int argc, char* argv[])
     fprintf(stdout, "Default charset for this run is %s\n", ucnv_getDefaultName());
 
     addAllTests(&root);
     fprintf(stdout, "Default charset for this run is %s\n", ucnv_getDefaultName());
 
     addAllTests(&root);

-    nerrors = processArgs(root, argc, argv);
+    nerrors = runTestRequest(root, argc, argv);

 
 #if 1
     {
 
 #if 1
     {


@@ -811,6 +858,7 @@ int main(int argc, char* argv[])
         /* This should delete any temporary files. */
         if (fileToRemove) {
             fclose(fileToRemove);
         /* This should delete any temporary files. */
         if (fileToRemove) {
             fclose(fileToRemove);

+            log_verbose("Deleting: %s\n", STANDARD_TEST_FILE);

             if (remove(STANDARD_TEST_FILE) != 0) {
                 /* Maybe someone didn't close the file correctly. */
                 fprintf(stderr, "FAIL: Could not delete %s\n", STANDARD_TEST_FILE);
             if (remove(STANDARD_TEST_FILE) != 0) {
                 /* Maybe someone didn't close the file correctly. */
                 fprintf(stderr, "FAIL: Could not delete %s\n", STANDARD_TEST_FILE);


@@ -824,7 +872,7 @@ int main(int argc, char* argv[])
     DataDrivenLogger::cleanUp();
     u_cleanup();
 
     DataDrivenLogger::cleanUp();
     u_cleanup();
 

-    endTime = uprv_getUTCtime();
+    endTime = uprv_getRawUTCtime();

     diffTime = (int32_t)(endTime - startTime);
     printf("Elapsed Time: %02d:%02d:%02d.%03d\n",
         (int)((diffTime%U_MILLIS_PER_DAY)/U_MILLIS_PER_HOUR),
     diffTime = (int32_t)(endTime - startTime);
     printf("Elapsed Time: %02d:%02d:%02d.%03d\n",
         (int)((diffTime%U_MILLIS_PER_DAY)/U_MILLIS_PER_HOUR),