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 16e5c72e18492a48d49ca9b862c1ecfd20a8bdb5..204e59812639372070fd76fb4d8ec117c0723bcd 100644 (file)
--- a/icuSources/test/iotest/iotest.cpp
+++ b/icuSources/test/iotest/iotest.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

-*   Copyright (C) 2002-2003, 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


@@ -14,1706 +14,871 @@
 
 
 #include "unicode/ustdio.h"
 
 
 #include "unicode/ustdio.h"

-#include "unicode/ustream.h"

 #include "unicode/uclean.h"
 
 #include "unicode/ucnv.h"
 #include "unicode/uclean.h"
 
 #include "unicode/ucnv.h"

-#include "unicode/uloc.h"
+#include "unicode/uchar.h"

 #include "unicode/unistr.h"
 #include "unicode/ustring.h"
 #include "unicode/unistr.h"
 #include "unicode/ustring.h"

-#include "unicode/ctest.h"
-#include "unicode/utrans.h"
-#include "ustr_imp.h"
-
-#if U_IOSTREAM_SOURCE >= 199711
-#include <iostream>
-#include <strstream>
-using namespace std;
-#elif U_IOSTREAM_SOURCE >= 198506
-#include <iostream.h>
-#include <strstream.h>
-#endif
+#include "cmemory.h"
+#include "ustr_cnv.h"
+#include "iotest.h"
+#include "unicode/tstdtmod.h"
+#include "putilimp.h"

 
 #include <string.h>
 
 #include <string.h>

+#include <stdlib.h>

 
 

-static char STANDARD_TEST_FILE[] = "iotest-c.txt";
-static const int32_t STANDARD_TEST_NUM_RANGE = 1000;
-
-#ifdef WIN32
-static const UChar NEW_LINE[] = {0x0d,0x0a,0};
-#define C_NEW_LINE "\r\n"
-#else
-static const UChar NEW_LINE[] = {0x0a,0};
-#define C_NEW_LINE "\n"
-#endif
-
-static void TestFileFromICU(UFILE *myFile) {
-    int32_t n[1];
-    float myFloat = -1234.0;
-    UDate myDate = 0.0;
-    UDate dec_31_1969 = -57600000.000000; /* TODO: These are not correct */
-    UDate midnight = 86400000.000000; /* TODO: These are not correct */
-    UDate myNewDate = -1.0;
-    int32_t newValuePtr[1];
-    double newDoubleValuePtr[1];
-    UChar myUString[256];
-    UChar uStringBuf[256];
-    char myString[256] = "";
-    char testBuf[256] = "";
-
-    u_memset(myUString, 0x2a, sizeof(myUString)/sizeof(*myUString));
-    u_memset(uStringBuf, 0x2a, sizeof(uStringBuf)/sizeof(*uStringBuf));
-    memset(myString, 0x2a, sizeof(myString)/sizeof(*myString));
-    memset(testBuf, 0x2a, sizeof(testBuf)/sizeof(*testBuf));
-
-    if (myFile == NULL) {
-        log_err("Can't write test file.");
-        return;
-    }
-
-    *n = -1234;
-
-    /* Test fprintf */
-    u_fprintf(myFile, "Signed decimal integer %%d: %d\n", *n);
-    u_fprintf(myFile, "Signed decimal integer %%i: %i\n", *n);
-    u_fprintf(myFile, "Unsigned octal integer %%o: %o\n", *n);
-    u_fprintf(myFile, "Unsigned decimal integer %%u: %u\n", *n);
-    u_fprintf(myFile, "Lowercase unsigned hexadecimal integer %%x: %x\n", *n);
-    u_fprintf(myFile, "Uppercase unsigned hexadecimal integer %%X: %X\n", *n);
-    u_fprintf(myFile, "Float %%f: %f\n", myFloat);
-    u_fprintf(myFile, "Lowercase float %%e: %e\n", myFloat);
-    u_fprintf(myFile, "Uppercase float %%E: %E\n", myFloat);
-    u_fprintf(myFile, "Lowercase float %%g: %g\n", myFloat);
-    u_fprintf(myFile, "Uppercase float %%G: %G\n", myFloat);
-//    u_fprintf(myFile, "Pointer %%p: %p\n", myFile);
-    u_fprintf(myFile, "Char %%c: %c\n", 'A');
-    u_fprintf(myFile, "UChar %%K (non-ANSI, should be %%C for Microsoft?): %K\n", L'A');
-    u_fprintf(myFile, "String %%s: %s\n", "My-String");
-    u_fprintf(myFile, "NULL String %%s: %s\n", NULL);
-    u_fprintf(myFile, "Unicode String %%U (non-ANSI, should be %%S for Microsoft?): %U\n", L"My-String");
-    u_fprintf(myFile, "NULL Unicode String %%U (non-ANSI, should be %%S for Microsoft?): %U\n", NULL);
-    u_fprintf(myFile, "Date %%D (non-ANSI): %D\n", myDate);
-    u_fprintf(myFile, "Time %%T (non-ANSI): %T\n", myDate);
-    u_fprintf(myFile, "Percent %%P (non-ANSI): %P\n", myFloat);
-    u_fprintf(myFile, "Currency %%M (non-ANSI): %M\n", myFloat);
-    u_fprintf(myFile, "Spell Out %%V (non-ANSI): %V\n", myFloat);
-
-    *n = 1;
-    u_fprintf(myFile, "\t\nPointer to integer (Count) %%n: n=%d %n n=%d\n", *n, n, *n);
-    u_fprintf(myFile, "Pointer to integer Value: %d\n", *n);
-    u_fprintf(myFile, "This is a long test123456789012345678901234567890123456789012345678901234567890\n");
-    *n = 1;
-    fprintf(u_fgetfile(myFile), "\tNormal fprintf count: n=%d %n n=%d\n", *n ,n, *n);
-    fprintf(u_fgetfile(myFile), "\tNormal fprintf count value: n=%d\n", *n);
+class DataDrivenLogger : public TestLog {
+    static const char* fgDataDir;
+    static char *fgTestDataPath;

 
 

-    u_fclose(myFile);
-    myFile = u_fopen(STANDARD_TEST_FILE, "r", NULL, NULL);
-
-    if (myFile == NULL) {
-        log_err("Can't read test file.");
-        return;
-    }
-
-    *n = -1234;
-
-    myString[0] = u_fgetc(myFile);
-    if (myString[0] != 0x53 /* S */) {
-        log_err("u_fgetc 1 returned %X. Expected 'S'.", myString[0]);
-    }
-    u_fungetc(myString[0], myFile);
-    myString[0] = u_fgetc(myFile);
-    if (myString[0] != 0x53 /* S */) {
-        log_err("u_fgetc 2 returned %X. Expected 'S'.", myString[0]);
-    }
-    u_fungetc(myString[0], myFile);
-    myString[0] = u_fgetc(myFile);
-    if (myString[0] != 0x53 /* S */) {
-        log_err("u_fgetc 3 returned %X. Expected 'S'.", myString[0]);
-    }
-    u_fungetc(myString[0], myFile);
-
-    *newValuePtr = 1;
-    u_fscanf(myFile, "Signed decimal integer %%d: %d\n", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%d Got: %d, Expected: %d\n", *newValuePtr, *n);
-    }
-    *newValuePtr = 1;
-    u_fscanf(myFile, "Signed decimal integer %%i: %i\n", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%i Got: %i, Expected: %i\n", *newValuePtr, *n);
-    }
-    *newValuePtr = 1;
-    u_fscanf(myFile, "Unsigned octal integer %%o: %o\n", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%o Got: %o, Expected: %o\n", *newValuePtr, *n);
-    }
-    *newValuePtr = 1;
-    u_fscanf(myFile, "Unsigned decimal integer %%u: %u\n", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%u Got: %u, Expected: %u\n", *newValuePtr, *n);
-    }
-    *newValuePtr = 1;
-    u_fscanf(myFile, "Lowercase unsigned hexadecimal integer %%x: %x\n", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%x Got: %x, Expected: %x\n", *newValuePtr, *n);
-    }
-    *newValuePtr = 1;
-    u_fscanf(myFile, "Uppercase unsigned hexadecimal integer %%X: %X\n", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%X Got: %X, Expected: %X\n", *newValuePtr, *n);
-    }
-    *newDoubleValuePtr = -1.0;
-    u_fscanf(myFile, "Float %%f: %f\n", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%f Got: %f, Expected: %f\n", *newDoubleValuePtr, myFloat);
-    }
-    *newDoubleValuePtr = -1.0;
-    u_fscanf(myFile, "Lowercase float %%e: %e\n", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%e Got: %e, Expected: %e\n", *newDoubleValuePtr, myFloat);
-    }
-    *newDoubleValuePtr = -1.0;
-    u_fscanf(myFile, "Uppercase float %%E: %E\n", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%E Got: %E, Expected: %E\n", *newDoubleValuePtr, myFloat);
-    }
-    *newDoubleValuePtr = -1.0;
-    u_fscanf(myFile, "Lowercase float %%g: %g\n", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%g Got: %g, Expected: %g\n", *newDoubleValuePtr, myFloat);
-    }
-    *newDoubleValuePtr = -1.0;
-    u_fscanf(myFile, "Uppercase float %%G: %G\n", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%G Got: %G, Expected: %G\n", *newDoubleValuePtr, myFloat);
-    }
-//  u_fscanf(myFile, "Pointer %%p: %p\n", newDoubleValue);
-    u_fscanf(myFile, "Char %%c: %c\n", myString);
-    if (*myString != 'A') {
-        log_err("%%c Got: %c, Expected: A\n", *myString);
-    }
-    u_fscanf(myFile, "UChar %%K (non-ANSI, should be %%C for Microsoft?): %K\n", myUString);
-    if (*myUString != L'A') {
-        log_err("%%C Got: %C, Expected: A\n", *myUString);
-    }
-    u_fscanf(myFile, "String %%s: %s\n", myString);
-    if (strcmp(myString, "My-String")) {
-        log_err("%%s Got: %s, Expected: My String\n", myString);
-    }
-    u_fscanf(myFile, "NULL String %%s: %s\n", myString);
-    if (strcmp(myString, "(null)")) {
-        log_err("%%s Got: %s, Expected: My String\n", myString);
-    }
-    u_fscanf(myFile, "Unicode String %%U (non-ANSI, should be %%S for Microsoft?): %U\n", myUString);
-    u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
-    if (strcmp(myString, "My-String")) {
-        log_err("%%S Got: %S, Expected: My String\n", myUString);
-    }
-    u_fscanf(myFile, "NULL Unicode String %%U (non-ANSI, should be %%S for Microsoft?): %U\n", myUString);
-    u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
-    if (strcmp(myString, "(null)")) {
-        log_err("%%S Got: %S, Expected: My String\n", myUString);
-    }
-    myNewDate = -1.0;
-    u_fscanf(myFile, "Date %%D (non-ANSI): %D\n", &myNewDate);
-    if (myNewDate != dec_31_1969) {
-        log_err("%%D Got: %f, Expected: %f\n", myNewDate, dec_31_1969);
-    }
-    myNewDate = -1.0;
-    u_fscanf(myFile, "Time %%T (non-ANSI): %T\n", &myNewDate);
-    if (myNewDate != midnight) {
-        log_err("%%T Got: %f, Expected: %f\n", myNewDate, midnight);
-    }
-    *newDoubleValuePtr = -1.0;
-    u_fscanf(myFile, "Percent %%P (non-ANSI): %P\n", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%P Got: %f, Expected: %f\n", *newDoubleValuePtr, myFloat);
-    }
-    *newDoubleValuePtr = -1.0;
-    u_fscanf(myFile, "Currency %%M (non-ANSI): %M\n", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%P Got: %f, Expected: %f\n", *newDoubleValuePtr, myFloat);
-    }
-    *newDoubleValuePtr = -1.0;
-    u_fscanf(myFile, "Spell Out %%V (non-ANSI): %V\n", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%V Got: %f, Expected: %f\n", *newDoubleValuePtr, myFloat);
-    }
-
-    u_fgets(myFile, 4, myUString);
-    u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
-    if (myString == NULL || strcmp(myString, "\t\n") != 0) {
-        log_err("u_fgets got \"%s\"\n", myString);
-    }
-
-    if (u_fgets(myFile, sizeof(myUString)/sizeof(*myUString), myUString) != myUString) {
-        log_err("u_fgets did not return myUString\n");
-    }
-    u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
-    if (myString == NULL || strcmp(myString, "Pointer to integer (Count) %n: n=1  n=1\n") != 0) {
-        log_err("u_fgets got \"%s\"\n", myString);
-    }
-
-    if (u_fgets(myFile, sizeof(myUString)/sizeof(*myUString), myUString) != myUString) {
-        log_err("u_fgets did not return myUString\n");
-    }
-    u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
-    if (myString == NULL || strcmp(myString, "Pointer to integer Value: 37\n") != 0) {
-        log_err("u_fgets got \"%s\"\n", myString);
-    }
-
-    if (u_fgets(myFile, sizeof(myUString)/sizeof(*myUString), myUString) != myUString) {
-        log_err("u_fgets did not return myUString\n");
-    }
-    u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
-    if (myString == NULL || strcmp(myString, "This is a long test123456789012345678901234567890123456789012345678901234567890\n") != 0) {
-        log_err("u_fgets got \"%s\"\n", myString);
-    }
-
-    if (u_fgets(myFile, 0, myUString) != NULL) {
-        log_err("u_fgets got \"%s\" and it should have returned NULL\n", myString);
-    }
-
-    if (u_fgets(myFile, 1, myUString) != myUString) {
-        log_err("u_fgets did not return myUString\n");
-    }
-    u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
-    if (myString == NULL || strcmp(myString, "") != 0) {
-        log_err("u_fgets got \"%s\"\n", myString);
-    }
-
-    if (u_fgets(myFile, 2, myUString) != myUString) {
-        log_err("u_fgets did not return myUString\n");
-    }
-    u_austrncpy(myString, myUString, sizeof(myUString)/sizeof(*myUString));
-    if (myString == NULL || strcmp(myString, "\t") != 0) {
-        log_err("u_fgets got \"%s\"\n", myString);
-    }
-
-    u_fclose(myFile);
-}
-
-static void TestFile() {
-/*    FILE *standardFile;*/
-
-    log_verbose("Testing u_fopen\n");
-    TestFileFromICU(u_fopen(STANDARD_TEST_FILE, "w", NULL, NULL));
-
-/* Don't know how to make this work without stdout or stderr */
-/*
-    log_verbose("Testing u_finit\n");
-    standardFile = fopen(STANDARD_TEST_FILE, "wb");
-    TestFileFromICU(u_finit(standardFile, NULL, NULL));
-    fclose(standardFile);
-*/
-}
-
-static void TestCodepageAndLocale() {
-    UFILE *myFile = u_fopen(STANDARD_TEST_FILE, "w", NULL, NULL);
-    if (u_fgetcodepage(myFile) == NULL
-        || strcmp(u_fgetcodepage(myFile), ucnv_getDefaultName()) != 0)
-    {
-        log_err("Didn't get the proper default codepage. Got %s expected: %s\n",
-            u_fgetcodepage(myFile), ucnv_getDefaultName());
+public:
+    static void cleanUp() {
+        if (fgTestDataPath) {
+            free(fgTestDataPath);
+            fgTestDataPath = NULL;
+        }

     }
     }

-    if (u_fgetlocale(myFile) == NULL
-        || strcmp(u_fgetlocale(myFile), uloc_getDefault()) != 0)
-    {
-        log_err("Didn't get the proper default locale. Got %s expected: %s\n",
-            u_fgetlocale(myFile), uloc_getDefault());
+    virtual void errln( const UnicodeString &message ) {
+        char buffer[4000];
+        message.extract(0, message.length(), buffer, sizeof(buffer));
+        buffer[3999] = 0; /* NULL terminate */
+        log_err(buffer);

     }
     }

-    u_fclose(myFile);

 
 

-    myFile = u_fopen(STANDARD_TEST_FILE, "w", "es", NULL);
-    if (u_fgetcodepage(myFile) == NULL
-        || strcmp(u_fgetcodepage(myFile), "ISO-8859-1") != 0)
-    {
-        log_err("Didn't get the proper default codepage for \"en\". Got %s expected: iso-8859-1\n",
-            u_fgetcodepage(myFile));
-    }
-    if (u_fgetlocale(myFile) == NULL
-        || strcmp(u_fgetlocale(myFile), "es") != 0)
-    {
-        log_err("Didn't get the proper default locale. Got %s expected: %s\n",
-            u_fgetlocale(myFile), "es");
+    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);

     }
     }

-    u_fclose(myFile);

 
 

-    myFile = u_fopen(STANDARD_TEST_FILE, "w", NULL, "UTF-16");
-    if (u_fgetcodepage(myFile) == NULL
-        || strcmp(u_fgetcodepage(myFile), "UTF-16") != 0)
-    {
-        log_err("Didn't get the proper default codepage for \"en\". Got %s expected: iso-8859-1\n",
-            u_fgetcodepage(myFile));
-    }
-    if (u_fgetlocale(myFile) == NULL
-        || strcmp(u_fgetlocale(myFile), uloc_getDefault()) != 0)
-    {
-        log_err("Didn't get the proper default locale. Got %s expected: %s\n",
-            u_fgetlocale(myFile), uloc_getDefault());
+    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);

     }
     }

-    u_fclose(myFile);

 
 

-    myFile = u_fopen(STANDARD_TEST_FILE, "w", "zh", "UTF-16");
-    if (u_fgetcodepage(myFile) == NULL
-        || strcmp(u_fgetcodepage(myFile), "UTF-16") != 0)
+    static const char * pathToDataDirectory(void)

     {
     {

-        log_err("Didn't get the proper default codepage for \"en\". Got %s expected: iso-8859-1\n",
-            u_fgetcodepage(myFile));
-    }
-    if (u_fgetlocale(myFile) == NULL
-        || strcmp(u_fgetlocale(myFile), "zh") != 0)
-    {
-        log_err("Didn't get the proper default locale. Got %s expected: %s\n",
-            u_fgetlocale(myFile), "zh");
-    }
-    u_fclose(myFile);
-}
-
-
-static void TestfgetsBuffers() {
-    UChar buffer[2048];
-    UChar expectedBuffer[2048];
-    static const char testStr[] = "This is a test string that tests u_fgets. It makes sure that we don't try to read too much!";
-    UFILE *myFile = u_fopen(STANDARD_TEST_FILE, "w", NULL, "UTF-16");
-    int32_t expectedSize = strlen(testStr);
-    int32_t readSize;
-    int32_t repetitions;
-
-    u_fputc(0x3BC, myFile);
-    u_fputc(0xFF41, myFile);
-    u_memset(buffer, 0xDEAD, sizeof(buffer)/sizeof(buffer[0]));
-    u_memset(expectedBuffer, 0, sizeof(expectedBuffer)/sizeof(expectedBuffer[0]));
-    u_uastrncpy(buffer, testStr, expectedSize+1);
-    for (repetitions = 0; repetitions < 16; repetitions++) {
-        u_file_write(buffer, expectedSize, myFile);
-        u_strcat(expectedBuffer, buffer);
-    }
-    u_fclose(myFile);
-
-    u_memset(buffer, 0xDEAD, sizeof(buffer)/sizeof(buffer[0]));
-    myFile = u_fopen(STANDARD_TEST_FILE, "r", NULL, "UTF-16");
-    if (u_fgetc(myFile) != 0x3BC) {
-        log_err("The first character is wrong\n");
-    }
-    if (u_fgetc(myFile) != 0xFF41) {
-        log_err("The second character is wrong\n");
-    }
-    if (u_fgets(myFile, sizeof(buffer)/sizeof(buffer[0]), buffer) != buffer) {
-        log_err("Didn't get the buffer back\n");
-        return;
-    }
-    readSize = u_strlen(buffer);
-    if (readSize != expectedSize*repetitions) {
-        log_err("Buffer is the wrong size. Got %d Expected %d\n", u_strlen(buffer), expectedSize*repetitions);
-    }
-    if (buffer[(expectedSize*repetitions) + 1] != 0xDEAD) {
-        log_err("u_fgets wrote too much data\n");
-    }
-    if (u_strcmp(buffer, expectedBuffer) != 0) {
-        log_err("Did get expected string back\n");
-    }
-    if (strcmp(u_fgetcodepage(myFile), "UTF-16") != 0) {
-        log_err("Got %s instead of UTF-16\n", u_fgetcodepage(myFile));
-    }
-    u_fclose(myFile);
-
-
-    log_verbose("Now trying a multi-byte encoding (UTF-8).\n");
-
-    myFile = u_fopen(STANDARD_TEST_FILE, "w", NULL, "UTF-8");
-
-    u_fputc(0x3BC, myFile);
-    u_fputc(0xFF41, myFile);
-    u_memset(buffer, 0xDEAD, sizeof(buffer)/sizeof(buffer[0]));
-    u_memset(expectedBuffer, 0, sizeof(expectedBuffer)/sizeof(expectedBuffer[0]));
-    u_uastrncpy(buffer, testStr, expectedSize+1);
-    for (repetitions = 0; repetitions < 16; repetitions++) {
-        u_file_write(buffer, expectedSize, myFile);
-        u_strcat(expectedBuffer, buffer);
-    }
-    u_fclose(myFile);

 
 

-    u_memset(buffer, 0xDEAD, sizeof(buffer)/sizeof(buffer[0]));
-    myFile = u_fopen(STANDARD_TEST_FILE, "r", NULL, "UTF-8");
-    if (strcmp(u_fgetcodepage(myFile), "UTF-8") != 0) {
-        log_err("Got %s instead of UTF-8\n", u_fgetcodepage(myFile));
-    }
-    if (u_fgetc(myFile) != 0x3BC) {
-        log_err("The first character is wrong\n");
-    }
-    if (u_fgetc(myFile) != 0xFF41) {
-        log_err("The second character is wrong\n");
-    }
-    if (u_fgets(myFile, sizeof(buffer)/sizeof(buffer[0]), buffer) != buffer) {
-        log_err("Didn't get the buffer back\n");
-        return;
-    }
-    readSize = u_strlen(buffer);
-    if (readSize != expectedSize*repetitions) {
-        log_err("Buffer is the wrong size. Got %d Expected %d\n", u_strlen(buffer), expectedSize*repetitions);
-    }
-    if (buffer[(expectedSize*repetitions) + 1] != 0xDEAD) {
-        log_err("u_fgets wrote too much data\n");
-    }
-    if (u_strcmp(buffer, expectedBuffer) != 0) {
-        log_err("Did get expected string back\n");
-    }
-    u_fclose(myFile);
-
-
-    log_verbose("Now trying a multi-byte encoding (UTF-8) with a really small buffer.\n");
-
-    myFile = u_fopen(STANDARD_TEST_FILE, "w", NULL, "UTF-8");
-
-    u_fputc(0xFF41, myFile);
-    u_memset(buffer, 0xDEAD, sizeof(buffer)/sizeof(buffer[0]));
-    u_memset(expectedBuffer, 0, sizeof(expectedBuffer)/sizeof(expectedBuffer[0]));
-    u_uastrncpy(buffer, testStr, expectedSize+1);
-    for (repetitions = 0; repetitions < 1; repetitions++) {
-        u_file_write(buffer, expectedSize, myFile);
-        u_strcat(expectedBuffer, buffer);
-    }
-    u_fclose(myFile);
-
-    u_memset(buffer, 0xDEAD, sizeof(buffer)/sizeof(buffer[0]));
-    myFile = u_fopen(STANDARD_TEST_FILE, "r", NULL, "UTF-8");
-    if (u_fgets(myFile, 2, buffer) != buffer) {
-        log_err("Didn't get the buffer back\n");
-        return;
-    }
-    readSize = u_strlen(buffer);
-    if (readSize != 1) {
-        log_err("Buffer is the wrong size. Got %d Expected %d\n", u_strlen(buffer), 1);
-    }
-    if (buffer[0] != 0xFF41 || buffer[1] != 0) {
-        log_err("Did get expected string back\n");
-    }
-    if (buffer[2] != 0xDEAD) {
-        log_err("u_fgets wrote too much data\n");
-    }
-    u_fclose(myFile);
-
-}
-
-
-static void TestfgetsLineCount() {
-    UChar buffer[2048];
-    UChar expectedBuffer[2048];
-    char charBuffer[2048];
-    static const char testStr[] = "This is a test string that tests u_fgets. It makes sure that we don't try to read too much!";
-    UFILE *myFile = NULL;
-    FILE *stdFile = fopen(STANDARD_TEST_FILE, "w");
-    int32_t expectedSize = strlen(testStr);
-    int32_t repetitions;
-    int32_t nlRepetitions;
-
-    u_memset(expectedBuffer, 0, sizeof(expectedBuffer)/sizeof(expectedBuffer[0]));
-
-    for (repetitions = 0; repetitions < 16; repetitions++) {
-        fwrite(testStr, sizeof(testStr[0]), expectedSize, stdFile);
-        for (nlRepetitions = 0; nlRepetitions < repetitions; nlRepetitions++) {
-            fwrite("\n", sizeof(testStr[0]), 1, stdFile);
+        if(fgDataDir != NULL) {
+            return fgDataDir;

         }
         }

-    }
-    fclose(stdFile);
-
-    myFile = u_fopen(STANDARD_TEST_FILE, "r", NULL, NULL);
-    stdFile = fopen(STANDARD_TEST_FILE, "r");
-
-    for (;;) {
-        u_memset(buffer, 0xDEAD, sizeof(buffer)/sizeof(buffer[0]));
-        char *returnedCharBuffer = fgets(charBuffer, sizeof(charBuffer)/sizeof(charBuffer[0]), stdFile);
-        UChar *returnedUCharBuffer = u_fgets(myFile, sizeof(buffer)/sizeof(buffer[0]), buffer);

 
 

-        if (!returnedCharBuffer && !returnedUCharBuffer) {
-            /* Both returned NULL. stop. */
-            break;
+        /* U_TOPSRCDIR is set by the makefiles on UNIXes when building cintltst and intltst
+        //              to point to the top of the build hierarchy, which may or
+        //              may not be the same as the source directory, depending on
+        //              the configure options used.  At any rate,
+        //              set the data path to the built data from this directory.
+        //              The value is complete with quotes, so it can be used
+        //              as-is as a string constant.
+        */
+    #if defined (U_TOPSRCDIR)
+        {
+            fgDataDir = U_TOPSRCDIR  U_FILE_SEP_STRING "data" U_FILE_SEP_STRING;

         }
         }

-        if (returnedCharBuffer != charBuffer) {
-            log_err("Didn't get the charBuffer back\n");
-            continue;
+    #else
+
+        /* On Windows, the file name obtained from __FILE__ includes a full path.
+        *             This file is "wherever\icu\source\test\cintltst\cintltst.c"
+        *             Change to    "wherever\icu\source\data"
+        */
+        {
+            static char p[sizeof(__FILE__) + 10];
+            char *pBackSlash;
+            int i;
+
+            strcpy(p, __FILE__);
+            /* We want to back over three '\' chars.                            */
+            /*   Only Windows should end up here, so looking for '\' is safe.   */
+            for (i=1; i<=3; i++) {
+                pBackSlash = strrchr(p, U_FILE_SEP_CHAR);
+                if (pBackSlash != NULL) {
+                    *pBackSlash = 0;        /* Truncate the string at the '\'   */
+                }
+            }
+
+            if (pBackSlash != NULL) {
+                /* We found and truncated three names from the path.
+                *  Now append "source\data" and set the environment
+                */
+                strcpy(pBackSlash, U_FILE_SEP_STRING "data" U_FILE_SEP_STRING );
+                fgDataDir = p;
+            }
+            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");
+                if (file) {
+                    fclose(file);
+                    fgDataDir = ".." U_FILE_SEP_STRING".." U_FILE_SEP_STRING "data" U_FILE_SEP_STRING;
+                }
+                else {
+                    fgDataDir = ".." U_FILE_SEP_STRING".." U_FILE_SEP_STRING".." U_FILE_SEP_STRING".." U_FILE_SEP_STRING "data" U_FILE_SEP_STRING;
+                }
+            }

         }
         }

-        u_uastrncpy(expectedBuffer, charBuffer, strlen(charBuffer)+1);
-        if (returnedUCharBuffer != buffer) {
-            log_err("Didn't get the buffer back\n");
-            continue;
-        }
-        if (u_strcmp(buffer, expectedBuffer) != 0) {
-            log_err("buffers are different\n");
-        }
-        if (buffer[u_strlen(buffer)+1] != 0xDEAD) {
-            log_err("u_fgets wrote too much\n");
-        }
-    }
-    fclose(stdFile);
-    u_fclose(myFile);
-}
-
-static void TestFilePrintCompatibility() {
-    UFILE *myFile = u_fopen(STANDARD_TEST_FILE, "wb", "en_US_POSIX", NULL);
-    FILE *myCFile;
-    int32_t num;
-    char cVal;
-    static const UChar emptyStr[] = {0};
-    char readBuf[512] = "";
-    char testBuf[512] = "";
+    #endif

 
 

-    if (myFile == NULL) {
-        log_err("Can't read test file.");
-        return;
-    }
+        return fgDataDir;

 
 

-    if (strcmp(u_fgetlocale(myFile), "en_US_POSIX") != 0) {
-        log_err("Got %s instead of en_US_POSIX for locale\n", u_fgetlocale(myFile));

     }
 
     }
 

-    /* Compare against C API compatibility */
-    for (num = -STANDARD_TEST_NUM_RANGE; num < STANDARD_TEST_NUM_RANGE; num++) {
-        u_fprintf(myFile, "%x ", num);
-        u_fprintf(myFile, "%X ", num);
-        u_fprintf(myFile, "%o ", num);
-        u_fprintf(myFile, "%d ", num);
-        u_fprintf(myFile, "%i ", num);
-        u_fprintf(myFile, "%f ", (double)num);
-        u_fprintf(myFile, "%e ", (double)num);
-        u_fprintf(myFile, "%E ", (double)num);
-        u_fprintf(myFile, "%g ", (double)num);
-        u_fprintf(myFile, "%G", (double)num);
-        u_fputs(emptyStr, myFile);
-    }
-
-    u_fprintf_u(myFile, NEW_LINE);
-
-    for (num = 0; num < 0x80; num++) {
-        u_fprintf(myFile, "%c", num);
-    }
-
-    u_fclose(myFile);
-    myCFile = fopen(STANDARD_TEST_FILE, "rb");
-    if (myCFile == NULL) {
-        log_err("Can't read test file.");
-        return;
-    }
+    static const char* loadTestData(UErrorCode& err){
+        if( fgTestDataPath == NULL){
+            const char*      directory=NULL;
+            UResourceBundle* test =NULL;
+            char* tdpath=NULL;
+            const char* tdrelativepath;

 
 

-    for (num = -STANDARD_TEST_NUM_RANGE; num < STANDARD_TEST_NUM_RANGE; num++) {
-        fscanf(myCFile, "%s", readBuf);
-        sprintf(testBuf, "%x", num);
-        if (strcmp(readBuf, testBuf) != 0) {
-            log_err("%%x Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
-        }
-
-        fscanf(myCFile, "%s", readBuf);
-        sprintf(testBuf, "%X", num);
-        if (strcmp(readBuf, testBuf) != 0) {
-            log_err("%%X Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
-        }
-
-        fscanf(myCFile, "%s", readBuf);
-        sprintf(testBuf, "%o", num);
-        if (strcmp(readBuf, testBuf) != 0) {
-            log_err("%%o Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
-        }
+#if defined (U_TOPBUILDDIR)
+            tdrelativepath = "test" U_FILE_SEP_STRING "testdata" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;
+            directory = U_TOPBUILDDIR;
+#else
+            tdrelativepath = ".." U_FILE_SEP_STRING "test" U_FILE_SEP_STRING "testdata" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;
+            directory = pathToDataDirectory();
+#endif

 
 

-        /* fprintf is not compatible on all platforms e.g. the iSeries */
-        fscanf(myCFile, "%s", readBuf);
-        sprintf(testBuf, "%d", num);
-        if (strcmp(readBuf, testBuf) != 0) {
-            log_err("%%d Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
-        }
+            tdpath = (char*) malloc(sizeof(char) *(( strlen(directory) * strlen(tdrelativepath)) + 100));

 
 

-        fscanf(myCFile, "%s", readBuf);
-        sprintf(testBuf, "%i", num);
-        if (strcmp(readBuf, testBuf) != 0) {
-            log_err("%%i Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
-        }

 
 

-        fscanf(myCFile, "%s", readBuf);
-        sprintf(testBuf, "%f", (double)num);
-        if (strcmp(readBuf, testBuf) != 0) {
-            log_err("%%f Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
-        }
+            /* u_getDataDirectory shoul return \source\data ... set the
+            * directory to ..\source\data\..\test\testdata\out\testdata
+            */
+            strcpy(tdpath, directory);
+            strcat(tdpath, tdrelativepath);
+            strcat(tdpath,"testdata");

 
 

-        fscanf(myCFile, "%s", readBuf);
-        sprintf(testBuf, "%e", (double)num);
-        if (strcmp(readBuf, testBuf) != 0) {
-            log_err("%%e Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
-        }
+            test=ures_open(tdpath, "testtypes", &err);

 
 

-        fscanf(myCFile, "%s", readBuf);
-        sprintf(testBuf, "%E", (double)num);
-        if (strcmp(readBuf, testBuf) != 0) {
-            log_err("%%E Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
-        }
-
-        fscanf(myCFile, "%s", readBuf);
-        sprintf(testBuf, "%g", (double)num);
-        if (strcmp(readBuf, testBuf) != 0) {
-            log_err("%%g Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
-        }
-
-        fscanf(myCFile, "%s", readBuf);
-        sprintf(testBuf, "%G", (double)num);
-        if (strcmp(readBuf, testBuf) != 0) {
-            log_err("%%G Got: \"%s\", Expected: \"%s\"\n", readBuf, testBuf);
+            if(U_FAILURE(err)){
+                err = U_FILE_ACCESS_ERROR;
+                log_data_err("Could not load testtypes.res in testdata bundle with path %s - %s\n", tdpath, u_errorName(err));
+                return "";
+            }
+            ures_close(test);
+            fgTestDataPath = tdpath;

         }
         }

+        return fgTestDataPath;

     }
 
     }
 

-    /* Properly eat the newlines */
-    for (num = 0; num < u_strlen(NEW_LINE); num++) {
-        fscanf(myCFile, "%c", &cVal);
-        if (cVal != NEW_LINE[num]) {
-            log_err("OS newline error\n");
-        }
-    }
-    for (num = 0; num < u_strlen(NEW_LINE); num++) {
-        fscanf(myCFile, "%c", &cVal);
-        if (cVal != NEW_LINE[num]) {
-            log_err("ustdio newline error\n");
-        }
+    virtual const char* getTestDataPath(UErrorCode& err) {
+        return loadTestData(err);

     }
     }

+};
+
+const char* DataDrivenLogger::fgDataDir = NULL;
+char* DataDrivenLogger::fgTestDataPath = NULL;

 
 

-    for (num = 0; num < 0x80; num++) {
-        cVal = -1;
-        fscanf(myCFile, "%c", &cVal);
-        if (num != cVal) {
-            log_err("%%c Got: 0x%x, Expected: 0x%x\n", cVal, num);
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_FILE_IO
+static int64_t
+uto64(const UChar     *buffer)
+{
+    int64_t result = 0;
+    /* iterate through buffer */
+    while(*buffer) {
+        /* read the next digit */
+        result *= 16;
+        if (!u_isxdigit(*buffer)) {
+            log_err("\\u%04X is not a valid hex digit for this test\n", (UChar)*buffer);

         }
         }

+        result += *buffer - 0x0030 - (*buffer >= 0x0041 ? (*buffer >= 0x0061 ? 39 : 7) : 0);
+        buffer++;

     }
     }

-    fclose(myCFile);
-}
-
-#define TestFPrintFormat(uFormat, uValue, cFormat, cValue) \
-    myFile = u_fopen(STANDARD_TEST_FILE, "w", "en_US_POSIX", NULL);\
-    /* Reinitialize the buffer to verify null termination works. */\
-    u_memset(uBuffer, 0x2a, sizeof(uBuffer)/sizeof(*uBuffer));\
-    memset(buffer, 0x2a, sizeof(buffer)/sizeof(*buffer));\
-    \
-    uNumPrinted = u_fprintf(myFile, uFormat, uValue);\
-    u_fclose(myFile);\
-    myFile = u_fopen(STANDARD_TEST_FILE, "r", "en_US_POSIX", NULL);\
-    u_fgets(myFile, sizeof(uBuffer)/sizeof(*uBuffer), uBuffer);\
-    u_fclose(myFile);\
-    u_austrncpy(compBuffer, uBuffer, sizeof(uBuffer)/sizeof(*uBuffer));\
-    cNumPrinted = sprintf(buffer, cFormat, cValue);\
-    if (strcmp(buffer, compBuffer) != 0) {\
-        log_err("%" uFormat " Got: \"%s\", Expected: \"%s\"\n", compBuffer, buffer);\
-    }\
-    if (cNumPrinted != uNumPrinted) {\
-        log_err("%" uFormat " number printed Got: %d, Expected: %d\n", uNumPrinted, cNumPrinted);\
-    }\
-    if (buffer[uNumPrinted+1] != 0x2a) {\
-        log_err("%" uFormat " too much stored\n");\
-    }\
-
-#define TestFPrintFormat2(format, precision, value) \
-    myFile = u_fopen(STANDARD_TEST_FILE, "w", "en_US_POSIX", NULL);\
-    /* Reinitialize the buffer to verify null termination works. */\
-    u_memset(uBuffer, 0x2a, sizeof(uBuffer)/sizeof(*uBuffer));\
-    memset(buffer, 0x2a, sizeof(buffer)/sizeof(*buffer));\
-    \
-    uNumPrinted = u_fprintf(myFile, format, precision, value);\
-    u_fclose(myFile);\
-    myFile = u_fopen(STANDARD_TEST_FILE, "r", "en_US_POSIX", NULL);\
-    u_fgets(myFile, sizeof(uBuffer)/sizeof(*uBuffer), uBuffer);\
-    u_fclose(myFile);\
-    u_austrncpy(compBuffer, uBuffer, sizeof(uBuffer)/sizeof(*uBuffer));\
-    cNumPrinted = sprintf(buffer, format, precision, value);\
-    if (strcmp(buffer, compBuffer) != 0) {\
-        log_err("%" format " Got: \"%s\", Expected: \"%s\"\n", compBuffer, buffer);\
-    }\
-    if (cNumPrinted != uNumPrinted) {\
-        log_err("%" format " number printed Got: %d, Expected: %d\n", uNumPrinted, cNumPrinted);\
-    }\
-
-static void TestFprintfFormat() {
-    static const UChar abcUChars[] = {0x61,0x62,0x63,0};
-    static const char abcChars[] = "abc";
-    UChar uBuffer[256];
-    char buffer[256];
-    char compBuffer[256];
-    int32_t uNumPrinted;
-    int32_t cNumPrinted;
-    UFILE *myFile;
-
-    TestFPrintFormat("%8U", abcUChars, "%8s", abcChars);
-    TestFPrintFormat("%-8U", abcUChars, "%-8s", abcChars);
-
-    TestFPrintFormat("%8s", abcChars, "%8s", abcChars);
-    TestFPrintFormat("%-8s", abcChars, "%-8s", abcChars);
-
-    TestFPrintFormat("%8c", 0x65, "%8c", 0x65);
-    TestFPrintFormat("%-8c", 0x65, "%-8c", 0x65);
-
-    TestFPrintFormat("%8K", (UChar)0x65, "%8c", (char)0x65);
-    TestFPrintFormat("%-8K", (UChar)0x65, "%-8c", (char)0x65);
-
-    TestFPrintFormat("%10f", 1.23456789, "%10f", 1.23456789);
-    TestFPrintFormat("%-10f", 1.23456789, "%-10f", 1.23456789);
-    TestFPrintFormat("%10f", 123.456789, "%10f", 123.456789);
-    TestFPrintFormat("%-10f", 123.456789, "%-10f", 123.456789);
-
-    TestFPrintFormat("%e", 1234567.89, "%e", 1234567.89);
-    TestFPrintFormat("%E", 1234567.89, "%E", 1234567.89);
-    TestFPrintFormat("%10e", 1.23456789, "%10e", 1.23456789);
-    TestFPrintFormat("%-10e", 1.23456789, "%-10e", 1.23456789);
-    TestFPrintFormat("%10e", 1234.56789, "%10e", 1234.56789);
-    TestFPrintFormat("%-10e", 1234.56789, "%-10e", 1234.56789);
-
-    TestFPrintFormat("%g", 123456.789, "%g", 123456.789);
-    TestFPrintFormat("%g", 1234567.89, "%g", 1234567.89);
-    TestFPrintFormat("%G", 1234567.89, "%G", 1234567.89);
-    TestFPrintFormat("%10g", 1.23456789, "%10g", 1.23456789);
-    TestFPrintFormat("%-10g", 1.23456789, "%-10g", 1.23456789);
-    TestFPrintFormat("%10g", 123.456789, "%10g", 123.456789);
-    TestFPrintFormat("%-10g", 123.456789, "%-10g", 123.456789);
-
-    TestFPrintFormat("%8x", 123456, "%8x", 123456);
-    TestFPrintFormat("%-8x", 123456, "%-8x", 123456);
-
-    TestFPrintFormat("%8X", 123456, "%8X", 123456);
-    TestFPrintFormat("%-8X", 123456, "%-8X", 123456);
-    TestFPrintFormat("%#x", 123456, "%#x", 123456);
-    TestFPrintFormat("%#x", -123456, "%#x", -123456);
-
-    TestFPrintFormat("%8o", 123456, "%8o", 123456);
-    TestFPrintFormat("%-8o", 123456, "%-8o", 123456);
-    TestFPrintFormat("%#o", 123, "%#o", 123);
-    TestFPrintFormat("%#o", -123, "%#o", -123);
-
-    TestFPrintFormat("%8u", 123456, "%8u", 123456);
-    TestFPrintFormat("%-8u", 123456, "%-8u", 123456);
-    TestFPrintFormat("%8u", -123456, "%8u", -123456);
-    TestFPrintFormat("%-8u", -123456, "%-8u", -123456);
-
-    TestFPrintFormat("%8d", 123456, "%8d", 123456);
-    TestFPrintFormat("%-8d", 123456, "%-8d", 123456);
-    TestFPrintFormat("% d", 123456, "% d", 123456);
-    TestFPrintFormat("% d", -123456, "% d", -123456);
-
-    TestFPrintFormat("%8i", 123456, "%8i", 123456);
-    TestFPrintFormat("%-8i", 123456, "%-8i", 123456);
-
-    TestFPrintFormat2("%+1.*e", 4, 1.2345678);
-    TestFPrintFormat2("%+2.*e", 6, 1.2345678);
-
-    log_verbose("Get really crazy with the formatting.\n");
-
-    TestFPrintFormat("%-#12x", 123, "%-#12x", 123);
-    TestFPrintFormat("%-#12x", -123, "%-#12x", -123);
-    TestFPrintFormat("%#12x", 123, "%#12x", 123);
-    TestFPrintFormat("%#12x", -123, "%#12x", -123);
-
-    TestFPrintFormat("%-+12d", 123,  "%-+12d", 123);
-    TestFPrintFormat("%-+12d", -123, "%-+12d", -123);
-    TestFPrintFormat("%- 12d", 123,  "%- 12d", 123);
-    TestFPrintFormat("%- 12d", -123, "%- 12d", -123);
-    TestFPrintFormat("%+12d", 123,   "%+12d", 123);
-    TestFPrintFormat("%+12d", -123,  "%+12d", -123);
-    TestFPrintFormat("% 12d", 123,   "% 12d", 123);
-    TestFPrintFormat("% 12d", -123,  "% 12d", -123);
-    TestFPrintFormat("%12d", 123,    "%12d", 123);
-    TestFPrintFormat("%12d", -123,   "%12d", -123);
-
-    TestFPrintFormat("%-+12.1e", 1.234,  "%-+12.1e", 1.234);
-    TestFPrintFormat("%-+12.1e", -1.234, "%-+12.1e", -1.234);
-    TestFPrintFormat("%- 12.1e", 1.234,  "%- 12.1e", 1.234);
-    TestFPrintFormat("%- 12.1e", -1.234, "%- 12.1e", -1.234);
-    TestFPrintFormat("%+12.1e", 1.234,   "%+12.1e", 1.234);
-    TestFPrintFormat("%+12.1e", -1.234,  "%+12.1e", -1.234);
-    TestFPrintFormat("% 12.1e", 1.234,   "% 12.1e", 1.234);
-    TestFPrintFormat("% 12.1e", -1.234,  "% 12.1e", -1.234);
-    TestFPrintFormat("%12.1e", 1.234,    "%12.1e", 1.234);
-    TestFPrintFormat("%12.1e", -1.234,   "%12.1e", -1.234);
-    TestFPrintFormat("%.2e", 1.234,      "%.2e", 1.234);
-    TestFPrintFormat("%.2e", -1.234,     "%.2e", -1.234);
-    TestFPrintFormat("%3e", 1.234,       "%3e", 1.234);
-    TestFPrintFormat("%3e", -1.234,      "%3e", -1.234);
-
-    TestFPrintFormat("%-+12.1f", 1.234,  "%-+12.1f", 1.234);
-    TestFPrintFormat("%-+12.1f", -1.234, "%-+12.1f", -1.234);
-    TestFPrintFormat("%- 12.1f", 1.234,  "%- 12.1f", 1.234);
-    TestFPrintFormat("%- 12.1f", -1.234, "%- 12.1f", -1.234);
-    TestFPrintFormat("%+12.1f", 1.234,   "%+12.1f", 1.234);
-    TestFPrintFormat("%+12.1f", -1.234,  "%+12.1f", -1.234);
-    TestFPrintFormat("% 12.1f", 1.234,   "% 12.1f", 1.234);
-    TestFPrintFormat("% 12.1f", -1.234,  "% 12.1f", -1.234);
-    TestFPrintFormat("%12.1f", 1.234,    "%12.1f", 1.234);
-    TestFPrintFormat("%12.1f", -1.234,   "%12.1f", -1.234);
-    TestFPrintFormat("%.2f", 1.234,      "%.2f", 1.234);
-    TestFPrintFormat("%.2f", -1.234,     "%.2f", -1.234);
-    TestFPrintFormat("%3f", 1.234,       "%3f", 1.234);
-    TestFPrintFormat("%3f", -1.234,      "%3f", -1.234);
-
+    return result;

 }
 }

+#endif

 
 

-#undef TestFPrintFormat
-
-static void TestString() {
-    int32_t n[1];
-    float myFloat = -1234.0;
-    UDate myDate = 0.0;
-    UDate dec_31_1969 = -57600000.000000; /* TODO: These are not correct */
-    UDate midnight = 86400000.000000; /* TODO: These are not correct */
-    UDate myNewDate = -1.0;
-    int32_t newValuePtr[1];
-    double newDoubleValuePtr[1];
-    UChar myUString[512];
-    UChar uStringBuf[512];
-    char myString[512] = "";
-    char testBuf[512] = "";
-
-    u_memset(myUString, 0x0a, sizeof(myUString)/ sizeof(*myUString));
-    u_memset(uStringBuf, 0x0a, sizeof(uStringBuf) / sizeof(*uStringBuf));
-
-    *n = -1234;
-
-    /* Test sprintf */
-    u_sprintf(uStringBuf, NULL, "Signed decimal integer d: %d", *n);
-    *newValuePtr = 1;
-    u_sscanf(uStringBuf, NULL, "Signed decimal integer d: %d", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%d Got: %d, Expected: %d\n", *newValuePtr, *n);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Signed decimal integer i: %i", *n);
-    *newValuePtr = 1;
-    u_sscanf(uStringBuf, NULL, "Signed decimal integer i: %i", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%i Got: %i, Expected: %i\n", *newValuePtr, *n);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Unsigned octal integer o: %o", *n);
-    *newValuePtr = 1;
-    u_sscanf(uStringBuf, NULL, "Unsigned octal integer o: %o", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%o Got: %o, Expected: %o\n", *newValuePtr, *n);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Unsigned decimal integer %%u: %u", *n);
-    *newValuePtr = 1;
-    u_sscanf(uStringBuf, NULL, "Unsigned decimal integer %%u: %u", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%u Got: %u, Expected: %u\n", *newValuePtr, *n);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Lowercase unsigned hexadecimal integer x: %x", *n);
-    *newValuePtr = 1;
-    u_sscanf(uStringBuf, NULL, "Lowercase unsigned hexadecimal integer x: %x", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%x Got: %x, Expected: %x\n", *newValuePtr, *n);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Uppercase unsigned hexadecimal integer X: %X", *n);
-    *newValuePtr = 1;
-    u_sscanf(uStringBuf, NULL, "Uppercase unsigned hexadecimal integer X: %X", newValuePtr);
-    if (*n != *newValuePtr) {
-        log_err("%%X Got: %X, Expected: %X\n", *newValuePtr, *n);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Float f: %f", myFloat);
-    *newDoubleValuePtr = -1.0;
-    u_sscanf(uStringBuf, NULL, "Float f: %f", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%f Got: %f, Expected: %f\n", *newDoubleValuePtr, myFloat);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Lowercase float e: %e", myFloat);
-    *newDoubleValuePtr = -1.0;
-    u_sscanf(uStringBuf, NULL, "Lowercase float e: %e", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%e Got: %e, Expected: %e\n", *newDoubleValuePtr, myFloat);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Uppercase float E: %E", myFloat);
-    *newDoubleValuePtr = -1.0;
-    u_sscanf(uStringBuf, NULL, "Uppercase float E: %E", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%E Got: %E, Expected: %E\n", *newDoubleValuePtr, myFloat);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Lowercase float g: %g", myFloat);
-    *newDoubleValuePtr = -1.0;
-    u_sscanf(uStringBuf, NULL, "Lowercase float g: %g", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%g Got: %g, Expected: %g\n", *newDoubleValuePtr, myFloat);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Uppercase float G: %G", myFloat);
-    *newDoubleValuePtr = -1.0;
-    u_sscanf(uStringBuf, NULL, "Uppercase float G: %G", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%G Got: %G, Expected: %G\n", *newDoubleValuePtr, myFloat);
-    }
-
-//    u_sprintf(uStringBuf, NULL, "Pointer %%p: %p\n", myFile);
-    u_sprintf(uStringBuf, NULL, "Char c: %c", 'A');
-    u_sscanf(uStringBuf, NULL, "Char c: %c", myString);
-    if (*myString != 'A') {
-        log_err("%%c Got: %c, Expected: A\n", *myString);
-    }
-
-    u_sprintf(uStringBuf, NULL, "UChar %%K (non-ANSI, should be %%C for Microsoft?): %K", L'A');
-    u_sscanf(uStringBuf, NULL, "UChar %%K (non-ANSI, should be %%C for Microsoft?): %K", myUString);
-    if (*myUString != L'A') {
-        log_err("%%C Got: %C, Expected: A\n", *myUString);
-    }
-
-    u_sprintf(uStringBuf, NULL, "String %%s: %s", "My-String");
-    u_sscanf(uStringBuf, NULL, "String %%s: %s", myString);
-    if (strcmp(myString, "My-String")) {
-        log_err("%%s Got: %s, Expected: My-String\n", myString);
-    }
-    if (uStringBuf[20] != 0) {
-        log_err("String not terminated. Got %c\n", uStringBuf[20] );
-    }
-    u_sprintf(uStringBuf, NULL, "NULL String %%s: %s", NULL);
-    u_sscanf(uStringBuf, NULL, "NULL String %%s: %s", myString);
-    if (strcmp(myString, "(null)")) {
-        log_err("%%s Got: %s, Expected: My-String\n", myString);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Unicode String %%U (non-ANSI, should be %%S for Microsoft?): %U", L"My-String");
-    u_sscanf(uStringBuf, NULL, "Unicode String %%U (non-ANSI, should be %%S for Microsoft?): %U", myUString);
-    u_austrncpy(myString, myUString, sizeof(myString)/sizeof(*myString));
-    if (strcmp(myString, "My-String")) {
-        log_err("%%U Got: %s, Expected: My String\n", myString);
-    }
-
-    u_sprintf(uStringBuf, NULL, "NULL Unicode String %%U (non-ANSI, should be %%S for Microsoft?): %U", NULL);
-    u_sscanf(uStringBuf, NULL, "NULL Unicode String %%U (non-ANSI, should be %%S for Microsoft?): %U", myUString);
-    u_austrncpy(myString, myUString, sizeof(myString)/sizeof(*myString));
-    if (strcmp(myString, "(null)")) {
-        log_err("%%U Got: %s, Expected: (null)\n", myString);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Date %%D (non-ANSI): %D", myDate);
-    myNewDate = -1.0;
-    u_sscanf(uStringBuf, NULL, "Date %%D (non-ANSI): %D", &myNewDate);
-    if (myNewDate != dec_31_1969) {
-        log_err("%%D Got: %f, Expected: %f\n", myNewDate, dec_31_1969);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Time %%T (non-ANSI): %T", myDate);
-    myNewDate = -1.0;
-    u_sscanf(uStringBuf, NULL, "Time %%T (non-ANSI): %T", &myNewDate);
-    if (myNewDate != midnight) {
-        log_err("%%T Got: %f, Expected: %f\n", myNewDate, midnight);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Percent %%P (non-ANSI): %P", myFloat);
-    *newDoubleValuePtr = -1.0;
-    u_sscanf(uStringBuf, NULL, "Percent %%P (non-ANSI): %P", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%P Got: %P, Expected: %P\n", *newDoubleValuePtr, myFloat);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Currency %%M (non-ANSI): %M", myFloat);
-    *newDoubleValuePtr = -1.0;
-    u_sscanf(uStringBuf, NULL, "Currency %%M (non-ANSI): %M", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%P Got: %P, Expected: %P\n", *newDoubleValuePtr, myFloat);
-    }
-
-    u_sprintf(uStringBuf, NULL, "Spell Out %%V (non-ANSI): %V", myFloat);
-    *newDoubleValuePtr = -1.0;
-    u_sscanf(uStringBuf, NULL, "Spell Out %%V (non-ANSI): %V", newDoubleValuePtr);
-    if (myFloat != *newDoubleValuePtr) {
-        log_err("%%V Got: %f, Expected: %f\n", *newDoubleValuePtr, myFloat);
+U_CDECL_BEGIN
+static void U_CALLCONV DataDrivenPrintf(void)
+{
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_FILE_IO
+    UErrorCode errorCode;
+    TestDataModule *dataModule;
+    TestData *testData;
+    const DataMap *testCase;
+    DataDrivenLogger logger;
+    UChar uBuffer[512];
+    char cBuffer[512];
+    char cFormat[sizeof(cBuffer)];
+    char cExpected[sizeof(cBuffer)];
+    UnicodeString tempStr;
+    UChar format[512];
+    UChar expectedResult[512];
+    UChar argument[512];
+    int32_t i;
+    int8_t i8;
+    int16_t i16;
+    int32_t i32;
+    int64_t i64;
+    double dbl;
+    int32_t uBufferLenReturned;
+
+    const char *fileLocale = "en_US_POSIX";
+    int32_t uFileBufferLenReturned;
+    LocalUFILEPointer testFile;
+
+    errorCode=U_ZERO_ERROR;
+    dataModule=TestDataModule::getTestDataModule("icuio", logger, errorCode);
+    if(U_SUCCESS(errorCode)) {
+        testData=dataModule->createTestData("printf", errorCode);
+        if(U_SUCCESS(errorCode)) {
+            for(i=0; testData->nextCase(testCase, errorCode); ++i) {
+                if(U_FAILURE(errorCode)) {
+                    log_err("error retrieving icuio/printf test case %d - %s\n",
+                            i, u_errorName(errorCode));
+                    errorCode=U_ZERO_ERROR;
+                    continue;
+                }
+                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;
+                }
+                u_memset(uBuffer, 0x2A, UPRV_LENGTHOF(uBuffer));
+                uBuffer[UPRV_LENGTHOF(uBuffer)-1] = 0;
+                tempStr=testCase->getString("format", errorCode);
+                tempStr.extract(format, UPRV_LENGTHOF(format), errorCode);
+                tempStr=testCase->getString("result", errorCode);
+                tempStr.extract(expectedResult, UPRV_LENGTHOF(expectedResult), errorCode);
+                tempStr=testCase->getString("argument", 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",
+                            i, u_errorName(errorCode));
+                    errorCode=U_ZERO_ERROR;
+                    continue;
+                }
+                log_verbose("Test %d: format=\"%s\"\n", i, cBuffer);
+                switch (testCase->getString("argumentType", errorCode)[0]) {
+                case 0x64:  // 'd' double
+                    dbl = atof(u_austrcpy(cBuffer, argument));
+                    uBufferLenReturned = u_sprintf_u(uBuffer, 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);
+                    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);
+                    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);
+                    uFileBufferLenReturned = u_fprintf_u(testFile.getAlias(), format, i32);
+                    break;
+                case 0x38:  // '8' int64_t
+                    i64 = uto64(argument);
+                    uBufferLenReturned = u_sprintf_u(uBuffer, 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);
+                    uFileBufferLenReturned = u_fprintf_u(testFile.getAlias(), format, cBuffer);
+                    break;
+                case 0x53:  // 'S' UChar *
+                    uBufferLenReturned = u_sprintf_u(uBuffer, format, argument);
+                    uFileBufferLenReturned = u_fprintf_u(testFile.getAlias(), format, argument);
+                    break;
+                default:
+                    uBufferLenReturned = 0;
+                    uFileBufferLenReturned = 0;
+                    log_err("Unknown type %c for test %d\n", testCase->getString("argumentType", errorCode)[0], i);
+                }
+                if (u_strcmp(uBuffer, expectedResult) != 0) {
+                    u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
+                    u_austrncpy(cFormat, format, sizeof(cFormat));
+                    u_austrncpy(cExpected, expectedResult, sizeof(cExpected));
+                    cBuffer[sizeof(cBuffer)-1] = 0;
+                    log_err("FAILURE string test case %d \"%s\" - Got: \"%s\" Expected: \"%s\"\n",
+                            i, cFormat, cBuffer, cExpected);
+                }
+                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)
+                {
+                    u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
+                    cBuffer[sizeof(cBuffer)-1] = 0;
+                    log_err("FAILURE test case %d - \"%s\" wrong amount of characters was written. Got %d.\n",
+                            i, cBuffer, uBufferLenReturned);
+                }
+                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;
+                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));
+                    u_austrncpy(cExpected, expectedResult, sizeof(cExpected));
+                    cBuffer[sizeof(cBuffer)-1] = 0;
+                    log_err("FAILURE file test case %d \"%s\" - Got: \"%s\" Expected: \"%s\"\n",
+                            i, cFormat, cBuffer, cExpected);
+                }
+                if (uFileBufferLenReturned != uBufferLenReturned)
+                {
+                    u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
+                    cBuffer[sizeof(cBuffer)-1] = 0;
+                    log_err("FAILURE uFileBufferLenReturned(%d) != uBufferLenReturned(%d)\n",
+                            uFileBufferLenReturned, uBufferLenReturned);
+                }
+
+                if(U_FAILURE(errorCode)) {
+                    log_err("error running icuio/printf test case %d - %s\n",
+                            i, u_errorName(errorCode));
+                    errorCode=U_ZERO_ERROR;
+                    continue;
+                }
+            }
+            delete testData;
+        }
+        delete dataModule;

     }
     }

-
-    *newValuePtr = 1;
-    u_sprintf(uStringBuf, NULL, "\t\nPointer to integer (Count) %%n: n=%d %n n=%d\n", *newValuePtr, newValuePtr, *newValuePtr);
-    if (*newValuePtr != 37) {
-        log_err("%%V Got: %f, Expected: %f\n", *newDoubleValuePtr, myFloat);
+    else {
+        log_data_err("Failed: could not load test icuio data\n");

     }
     }

-
-    u_sprintf(myUString, NULL, "This is a long test123456789012345678901234567890123456789012345678901234567890");
-    u_austrncpy(myString, myUString, sizeof(myString)/sizeof(*myString));
-    if (strcmp(myString, "This is a long test123456789012345678901234567890123456789012345678901234567890")) {
-        log_err("%%U Got: %s, Expected: My String\n", myString);
-    }
-
-
-//  u_sscanf(uStringBuf, NULL, "Pointer %%p: %p\n", myFile);
-}
-
-#define Test_u_snprintf(limit, format, value, expectedSize, expectedStr) \
-    u_uastrncpy(testStr, "xxxxxxxxxxxxxx", sizeof(testStr)/sizeof(testStr[0]));\
-    size = u_snprintf(testStr, limit, "en_US_POSIX", format, value);\
-    u_austrncpy(cTestResult, testStr, sizeof(cTestResult)/sizeof(cTestResult[0]));\
-    if (size != expectedSize || strcmp(cTestResult, expectedStr) != 0) {\
-        log_err("Unexpected formatting. size=%d expectedSize=%d cTestResult=%s expectedStr=%s\n",\
-            size, expectedSize, cTestResult, expectedStr);\
-    }\
-    else {\
-        log_verbose("Got: %s\n", cTestResult);\
-    }\
-
-
-static void TestSnprintf() {
-    UChar testStr[256];
-    char cTestResult[256];
-    int32_t size;
-
-    Test_u_snprintf(0, "%d", 123, 0, "xxxxxxxxxxxxxx");
-    Test_u_snprintf(2, "%d", 123, 2, "12xxxxxxxxxxxx");
-    Test_u_snprintf(3, "%d", 123, 3, "123xxxxxxxxxxx");
-    Test_u_snprintf(4, "%d", 123, 3, "123");
-
-    Test_u_snprintf(0, "%s", "abcd", 0, "xxxxxxxxxxxxxx");
-    Test_u_snprintf(3, "%s", "abcd", 3, "abcxxxxxxxxxxx");
-    Test_u_snprintf(4, "%s", "abcd", 4, "abcdxxxxxxxxxx");
-    Test_u_snprintf(5, "%s", "abcd", 4, "abcd");
-
-    Test_u_snprintf(0, "%e", 12.34, 0, "xxxxxxxxxxxxxx");
-    Test_u_snprintf(1, "%e", 12.34, 1, "1xxxxxxxxxxxxx");
-    Test_u_snprintf(2, "%e", 12.34, 2, "1.xxxxxxxxxxxx");
-    Test_u_snprintf(3, "%e", 12.34, 3, "1.2xxxxxxxxxxx");
-    Test_u_snprintf(5, "%e", 12.34, 5, "1.234xxxxxxxxx");
-    Test_u_snprintf(6, "%e", 12.34, 6, "1.2340xxxxxxxx");
-    Test_u_snprintf(8, "%e", 12.34, 8, "1.234000xxxxxx");
-    Test_u_snprintf(9, "%e", 12.34, 9, "1.234000exxxxx");
-    Test_u_snprintf(10, "%e", 12.34, 10, "1.234000e+xxxx");
-    Test_u_snprintf(11, "%e", 12.34, 11, "1.234000e+0xxx");
-    Test_u_snprintf(13, "%e", 12.34, 13, "1.234000e+001x");
-    Test_u_snprintf(14, "%e", 12.34, 13, "1.234000e+001");
-}
-
-#define TestSPrintFormat(uFormat, uValue, cFormat, cValue) \
-    /* Reinitialize the buffer to verify null termination works. */\
-    u_memset(uBuffer, 0x2a, sizeof(uBuffer)/sizeof(*uBuffer));\
-    memset(buffer, 0x2a, sizeof(buffer)/sizeof(*buffer));\
-    \
-    uNumPrinted = u_sprintf(uBuffer, "en_US_POSIX", uFormat, uValue);\
-    u_austrncpy(compBuffer, uBuffer, sizeof(uBuffer)/sizeof(uBuffer[0]));\
-    cNumPrinted = sprintf(buffer, cFormat, cValue);\
-    if (strcmp(buffer, compBuffer) != 0) {\
-        log_err("%" uFormat " Got: \"%s\", Expected: \"%s\"\n", compBuffer, buffer);\
-    }\
-    if (cNumPrinted != uNumPrinted) {\
-        log_err("%" uFormat " number printed Got: %d, Expected: %d\n", uNumPrinted, cNumPrinted);\
-    }\
-    if (buffer[uNumPrinted+1] != 0x2a) {\
-        log_err("%" uFormat " too much stored\n");\
-    }\
-
-#define TestSPrintFormat2(format, precision, value) \
-    /* Reinitialize the buffer to verify null termination works. */\
-    u_memset(uBuffer, 0x2a, sizeof(uBuffer)/sizeof(*uBuffer));\
-    memset(buffer, 0x2a, sizeof(buffer)/sizeof(*buffer));\
-    \
-    uNumPrinted = u_sprintf(uBuffer, "en_US_POSIX", format, precision, value);\
-    u_austrncpy(compBuffer, uBuffer, sizeof(uBuffer)/sizeof(uBuffer[0]));\
-    cNumPrinted = sprintf(buffer, format, precision, value);\
-    if (strcmp(buffer, compBuffer) != 0) {\
-        log_err("%" format " Got: \"%s\", Expected: \"%s\"\n", compBuffer, buffer);\
-    }\
-    if (cNumPrinted != uNumPrinted) {\
-        log_err("%" format " number printed Got: %d, Expected: %d\n", uNumPrinted, cNumPrinted);\
-    }\
-
-static void TestSprintfFormat() {
-    static const UChar abcUChars[] = {0x61,0x62,0x63,0};
-    static const char abcChars[] = "abc";
-    UChar uBuffer[256];
-    char buffer[256];
-    char compBuffer[256];
-    int32_t uNumPrinted;
-    int32_t cNumPrinted;
-
-    TestSPrintFormat("%8U", abcUChars, "%8s", abcChars);
-    TestSPrintFormat("%-8U", abcUChars, "%-8s", abcChars);
-
-    TestSPrintFormat("%8s", abcChars, "%8s", abcChars);
-    TestSPrintFormat("%-8s", abcChars, "%-8s", abcChars);
-
-    TestSPrintFormat("%8c", 0x65, "%8c", 0x65);
-    TestSPrintFormat("%-8c", 0x65, "%-8c", 0x65);
-
-    TestSPrintFormat("%8K", (UChar)0x65, "%8c", (char)0x65);
-    TestSPrintFormat("%-8K", (UChar)0x65, "%-8c", (char)0x65);
-
-    TestSPrintFormat("%10f", 1.23456789, "%10f", 1.23456789);
-    TestSPrintFormat("%-10f", 1.23456789, "%-10f", 1.23456789);
-    TestSPrintFormat("%10f", 123.456789, "%10f", 123.456789);
-    TestSPrintFormat("%-10f", 123.456789, "%-10f", 123.456789);
-
-    TestSPrintFormat("%e", 1234567.89, "%e", 1234567.89);
-    TestSPrintFormat("%E", 1234567.89, "%E", 1234567.89);
-    TestSPrintFormat("%10e", 1.23456789, "%10e", 1.23456789);
-    TestSPrintFormat("%-10e", 1.23456789, "%-10e", 1.23456789);
-    TestSPrintFormat("%10e", 123.456789, "%10e", 123.456789);
-    TestSPrintFormat("%-10e", 123.456789, "%-10e", 123.456789);
-
-    TestSPrintFormat("%g", 123456.789, "%g", 123456.789);
-    TestSPrintFormat("%g", 1234567.89, "%g", 1234567.89);
-    TestSPrintFormat("%G", 1234567.89, "%G", 1234567.89);
-    TestSPrintFormat("%10g", 1.23456789, "%10g", 1.23456789);
-    TestSPrintFormat("%-10g", 1.23456789, "%-10g", 1.23456789);
-    TestSPrintFormat("%10g", 123.456789, "%10g", 123.456789);
-    TestSPrintFormat("%-10g", 123.456789, "%-10g", 123.456789);
-
-    TestSPrintFormat("%8x", 123456, "%8x", 123456);
-    TestSPrintFormat("%-8x", 123456, "%-8x", 123456);
-
-    TestSPrintFormat("%8X", 123456, "%8X", 123456);
-    TestSPrintFormat("%-8X", 123456, "%-8X", 123456);
-    TestSPrintFormat("%#x", 123456, "%#x", 123456);
-    TestSPrintFormat("%#x", -123456, "%#x", -123456);
-
-    TestSPrintFormat("%8o", 123456, "%8o", 123456);
-    TestSPrintFormat("%-8o", 123456, "%-8o", 123456);
-    TestSPrintFormat("%#o", 123, "%#o", 123);
-    TestSPrintFormat("%#o", -123, "%#o", -123);
-
-    TestSPrintFormat("%8u", 123456, "%8u", 123456);
-    TestSPrintFormat("%-8u", 123456, "%-8u", 123456);
-    TestSPrintFormat("%8u", -123456, "%8u", -123456);
-    TestSPrintFormat("%-8u", -123456, "%-8u", -123456);
-
-    TestSPrintFormat("%8d", 123456, "%8d", 123456);
-    TestSPrintFormat("%-8d", 123456, "%-8d", 123456);
-    TestSPrintFormat("% d", 123456, "% d", 123456);
-    TestSPrintFormat("% d", -123456, "% d", -123456);
-
-    TestSPrintFormat("%8i", 123456, "%8i", 123456);
-    TestSPrintFormat("%-8i", 123456, "%-8i", 123456);
-
-    TestSPrintFormat2("%+1.*e", 4, 1.2345678);
-    TestSPrintFormat2("%+2.*e", 6, 1.2345678);
-
-    log_verbose("Get really crazy with the formatting.\n");
-
-    TestSPrintFormat("%-#12x", 123, "%-#12x", 123);
-    TestSPrintFormat("%-#12x", -123, "%-#12x", -123);
-    TestSPrintFormat("%#12x", 123, "%#12x", 123);
-    TestSPrintFormat("%#12x", -123, "%#12x", -123);
-
-    TestSPrintFormat("%-+12d", 123,  "%-+12d", 123);
-    TestSPrintFormat("%-+12d", -123, "%-+12d", -123);
-    TestSPrintFormat("%- 12d", 123,  "%- 12d", 123);
-    TestSPrintFormat("%- 12d", -123, "%- 12d", -123);
-    TestSPrintFormat("%+12d", 123,   "%+12d", 123);
-    TestSPrintFormat("%+12d", -123,  "%+12d", -123);
-    TestSPrintFormat("% 12d", 123,   "% 12d", 123);
-    TestSPrintFormat("% 12d", -123,  "% 12d", -123);
-    TestSPrintFormat("%12d", 123,    "%12d", 123);
-    TestSPrintFormat("%12d", -123,   "%12d", -123);
-
-    TestSPrintFormat("%-+12.1e", 1.234,  "%-+12.1e", 1.234);
-    TestSPrintFormat("%-+12.1e", -1.234, "%-+12.1e", -1.234);
-    TestSPrintFormat("%- 12.1e", 1.234,  "%- 12.1e", 1.234);
-    TestSPrintFormat("%- 12.1e", -1.234, "%- 12.1e", -1.234);
-    TestSPrintFormat("%+12.1e", 1.234,   "%+12.1e", 1.234);
-    TestSPrintFormat("%+12.1e", -1.234,  "%+12.1e", -1.234);
-    TestSPrintFormat("% 12.1e", 1.234,   "% 12.1e", 1.234);
-    TestSPrintFormat("% 12.1e", -1.234,  "% 12.1e", -1.234);
-    TestSPrintFormat("%12.1e", 1.234,    "%12.1e", 1.234);
-    TestSPrintFormat("%12.1e", -1.234,   "%12.1e", -1.234);
-    TestSPrintFormat("%.2e", 1.234,      "%.2e", 1.234);
-    TestSPrintFormat("%.2e", -1.234,     "%.2e", -1.234);
-    TestSPrintFormat("%3e", 1.234,       "%3e", 1.234);
-    TestSPrintFormat("%3e", -1.234,      "%3e", -1.234);
-
-    TestSPrintFormat("%-+12.1f", 1.234,  "%-+12.1f", 1.234);
-    TestSPrintFormat("%-+12.1f", -1.234, "%-+12.1f", -1.234);
-    TestSPrintFormat("%- 12.1f", 1.234,  "%- 12.1f", 1.234);
-    TestSPrintFormat("%- 12.1f", -1.234, "%- 12.1f", -1.234);
-    TestSPrintFormat("%+12.1f", 1.234,   "%+12.1f", 1.234);
-    TestSPrintFormat("%+12.1f", -1.234,  "%+12.1f", -1.234);
-    TestSPrintFormat("% 12.1f", 1.234,   "% 12.1f", 1.234);
-    TestSPrintFormat("% 12.1f", -1.234,  "% 12.1f", -1.234);
-    TestSPrintFormat("%12.1f", 1.234,    "%12.1f", 1.234);
-    TestSPrintFormat("%12.1f", -1.234,   "%12.1f", -1.234);
-    TestSPrintFormat("%.2f", 1.234,      "%.2f", 1.234);
-    TestSPrintFormat("%.2f", -1.234,     "%.2f", -1.234);
-    TestSPrintFormat("%3f", 1.234,       "%3f", 1.234);
-    TestSPrintFormat("%3f", -1.234,      "%3f", -1.234);
-
+#endif

 }
 }

+U_CDECL_END

 
 

-#undef TestSPrintFormat
-
-static void TestStringCompatibility() {
-    UChar myUString[256];
-    UChar uStringBuf[256];
-    char myString[256] = "";
-    char testBuf[256] = "";
-    int32_t num;
-
-    u_memset(myUString, 0x0a, sizeof(myUString)/ sizeof(*myUString));
-    u_memset(uStringBuf, 0x0a, sizeof(uStringBuf) / sizeof(*uStringBuf));
-
-    /* Compare against C API compatibility */
-    for (num = -STANDARD_TEST_NUM_RANGE; num < STANDARD_TEST_NUM_RANGE; num++) {
-        sprintf(testBuf, "%x", num);
-        u_sprintf(uStringBuf, NULL, "%x", num);
-        u_austrncpy(myString, uStringBuf, sizeof(myString)/sizeof(myString[0]));
-        if (strcmp(myString, testBuf) != 0) {
-            log_err("%%x Got: \"%s\", Expected: \"%s\"\n", myString, testBuf);
-        }
-
-        sprintf(testBuf, "%X", num);
-        u_sprintf(uStringBuf, NULL, "%X", num);
-        u_austrncpy(myString, uStringBuf, sizeof(myString)/sizeof(myString[0]));
-        if (strcmp(myString, testBuf) != 0) {
-            log_err("%%X Got: \"%s\", Expected: \"%s\"\n", myString, testBuf);
-        }
-
-        sprintf(testBuf, "%o", num);
-        u_sprintf(uStringBuf, NULL, "%o", num);
-        u_austrncpy(myString, uStringBuf, sizeof(myString)/sizeof(myString[0]));
-        if (strcmp(myString, testBuf) != 0) {
-            log_err("%%o Got: \"%s\", Expected: \"%s\"\n", myString, testBuf);
-        }
-
-        /* sprintf is not compatible on all platforms e.g. the iSeries*/
-        sprintf(testBuf, "%d", num);
-        u_sprintf(uStringBuf, "en_US_POSIX", "%d", num);
-        u_austrncpy(myString, uStringBuf, sizeof(myString)/sizeof(myString[0]));
-        if (strcmp(myString, testBuf) != 0) {
-            log_err("%%d Got: \"%s\", Expected: \"%s\"\n", myString, testBuf);
-        }
-
-        sprintf(testBuf, "%i", num);
-        u_sprintf(uStringBuf, "en_US_POSIX", "%i", num);
-        u_austrncpy(myString, uStringBuf, sizeof(myString)/sizeof(myString[0]));
-        if (strcmp(myString, testBuf) != 0) {
-            log_err("%%i Got: \"%s\", Expected: \"%s\"\n", myString, testBuf);
-        }
-
-        sprintf(testBuf, "%f", (double)num);
-        u_sprintf(uStringBuf, "en_US_POSIX", "%f", (double)num);
-        u_austrncpy(myString, uStringBuf, sizeof(myString)/sizeof(myString[0]));
-        if (strcmp(myString, testBuf) != 0) {
-            log_err("%%f Got: \"%s\", Expected: \"%s\"\n", myString, testBuf);
-        }
-
-        sprintf(testBuf, "%e", (double)num);
-        u_sprintf(uStringBuf, "en_US_POSIX", "%e", (double)num);
-        u_austrncpy(myString, uStringBuf, sizeof(myString)/sizeof(myString[0]));
-        if (strcmp(myString, testBuf) != 0) {
-            log_err("%%e Got: \"%s\", Expected: \"%s\"\n", myString, testBuf);
-        }
-
-        sprintf(testBuf, "%E", (double)num);
-        u_sprintf(uStringBuf, "en_US_POSIX", "%E", (double)num);
-        u_austrncpy(myString, uStringBuf, sizeof(myString)/sizeof(myString[0]));
-        if (strcmp(myString, testBuf) != 0) {
-            log_err("%%E Got: \"%s\", Expected: \"%s\"\n", myString, testBuf);
-        }
-
-        sprintf(testBuf, "%g", (double)num);
-        u_sprintf(uStringBuf, "en_US_POSIX", "%g", (double)num);
-        u_austrncpy(myString, uStringBuf, sizeof(myString)/sizeof(myString[0]));
-        if (strcmp(myString, testBuf) != 0) {
-            log_err("%%g Got: \"%s\", Expected: \"%s\"\n", myString, testBuf);
-        }
-
-        sprintf(testBuf, "%G", (double)num);
-        u_sprintf(uStringBuf, "en_US_POSIX", "%G", (double)num);
-        u_austrncpy(myString, uStringBuf, sizeof(myString)/sizeof(myString[0]));
-        if (strcmp(myString, testBuf) != 0) {
-            log_err("%%G Got: \"%s\", Expected: \"%s\"\n", myString, testBuf);
+U_CDECL_BEGIN
+static void U_CALLCONV DataDrivenScanf(void)
+{
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_FILE_IO
+    UErrorCode errorCode;
+    TestDataModule *dataModule;
+    TestData *testData;
+    const DataMap *testCase;
+    DataDrivenLogger logger;
+    UChar uBuffer[512];
+    char cBuffer[512];
+    char cExpected[sizeof(cBuffer)];
+    UnicodeString tempStr;
+    UChar format[512];
+    UChar expectedResult[512];
+    UChar argument[512];
+    int32_t i;
+    int8_t i8, expected8;
+    int16_t i16, expected16;
+    int32_t i32, expected32;
+    int64_t i64, expected64;
+    double dbl, expectedDbl;
+    volatile float flt, expectedFlt; // Use volatile in order to get around an Intel compiler issue.
+    int32_t uBufferLenReturned;
+
+    //const char *fileLocale = "en_US_POSIX";
+    //int32_t uFileBufferLenReturned;
+    //UFILE *testFile;
+
+    errorCode=U_ZERO_ERROR;
+    dataModule=TestDataModule::getTestDataModule("icuio", logger, errorCode);
+    if(U_SUCCESS(errorCode)) {
+        testData=dataModule->createTestData("scanf", errorCode);
+        if(U_SUCCESS(errorCode)) {
+            for(i=0; testData->nextCase(testCase, errorCode); ++i) {
+                if(U_FAILURE(errorCode)) {
+                    log_err("error retrieving icuio/printf test case %d - %s\n",
+                            i, u_errorName(errorCode));
+                    errorCode=U_ZERO_ERROR;
+                    continue;
+                }
+/*                testFile = u_fopen(STANDARD_TEST_FILE, "w", fileLocale, "UTF-8");
+                if (!testFile) {
+                    log_err("Can't open test file - %s\n",
+                            STANDARD_TEST_FILE);
+                }*/
+                u_memset(uBuffer, 0x2A, UPRV_LENGTHOF(uBuffer));
+                uBuffer[UPRV_LENGTHOF(uBuffer)-1] = 0;
+                tempStr=testCase->getString("format", errorCode);
+                tempStr.extract(format, UPRV_LENGTHOF(format), errorCode);
+                tempStr=testCase->getString("result", errorCode);
+                tempStr.extract(expectedResult, UPRV_LENGTHOF(expectedResult), errorCode);
+                tempStr=testCase->getString("argument", 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",
+                            i, u_errorName(errorCode));
+                    errorCode=U_ZERO_ERROR;
+                    continue;
+                }
+                log_verbose("Test %d: format=\"%s\"\n", i, cBuffer);
+                switch (testCase->getString("argumentType", errorCode)[0]) {
+                case 0x64:  // 'd' double
+                    expectedDbl = atof(u_austrcpy(cBuffer, expectedResult));
+                    uBufferLenReturned = u_sscanf_u(argument, format, &dbl);
+                    //uFileBufferLenReturned = u_fscanf_u(testFile, format, dbl);
+                    if (dbl != expectedDbl) {
+                        log_err("error in scanf test case[%d] Got: %f Exp: %f\n",
+                                i, dbl, expectedDbl);
+                    }
+                    break;
+                case 0x66:  // 'f' float
+                    expectedFlt = (float)atof(u_austrcpy(cBuffer, expectedResult));
+                    uBufferLenReturned = u_sscanf_u(argument, format, &flt);
+                    //uFileBufferLenReturned = u_fscanf_u(testFile, format, flt);
+                    if (flt != expectedFlt) {
+                        log_err("error in scanf test case[%d] Got: %f Exp: %f\n",
+                                i, flt, expectedFlt);
+                    }
+                    break;
+                case 0x31:  // '1' int8_t
+                    expected8 = (int8_t)uto64(expectedResult);
+                    uBufferLenReturned = u_sscanf_u(argument, format, &i8);
+                    //uFileBufferLenReturned = u_fscanf_u(testFile, format, i8);
+                    if (i8 != expected8) {
+                        log_err("error in scanf test case[%d] Got: %02X Exp: %02X\n",
+                                i, i8, expected8);
+                    }
+                    break;
+                case 0x32:  // '2' int16_t
+                    expected16 = (int16_t)uto64(expectedResult);
+                    uBufferLenReturned = u_sscanf_u(argument, format, &i16);
+                    //uFileBufferLenReturned = u_fscanf_u(testFile, format, i16);
+                    if (i16 != expected16) {
+                        log_err("error in scanf test case[%d] Got: %04X Exp: %04X\n",
+                                i, i16, expected16);
+                    }
+                    break;
+                case 0x34:  // '4' int32_t
+                    expected32 = (int32_t)uto64(expectedResult);
+                    uBufferLenReturned = u_sscanf_u(argument, format, &i32);
+                    //uFileBufferLenReturned = u_fscanf_u(testFile, format, i32);
+                    if (i32 != expected32) {
+                        log_err("error in scanf test case[%d] Got: %08X Exp: %08X\n",
+                                i, i32, expected32);
+                    }
+                    break;
+                case 0x38:  // '8' int64_t
+                    expected64 = uto64(expectedResult);
+                    uBufferLenReturned = u_sscanf_u(argument, format, &i64);
+                    //uFileBufferLenReturned = u_fscanf_u(testFile, format, i64);
+                    if (i64 != expected64) {
+                        log_err("error in scanf 64-bit. Test case = %d\n", i);
+                    }
+                    break;
+                case 0x73:  // 's' char *
+                    u_austrcpy(cExpected, expectedResult);
+                    uBufferLenReturned = u_sscanf_u(argument, format, cBuffer);
+                    //uFileBufferLenReturned = u_fscanf_u(testFile, format, cBuffer);
+                    if (strcmp(cBuffer, cExpected) != 0) {
+                        log_err("error in scanf char * string. Got \"%s\" Expected \"%s\". Test case = %d\n", cBuffer, cExpected, i);
+                    }
+                    break;
+                case 0x53:  // 'S' UChar *
+                    uBufferLenReturned = u_sscanf_u(argument, format, uBuffer);
+                    //uFileBufferLenReturned = u_fscanf_u(testFile, format, argument);
+                    if (u_strcmp(uBuffer, expectedResult) != 0) {
+                        u_austrcpy(cExpected, format);
+                        u_austrcpy(cBuffer, uBuffer);
+                        log_err("error in scanf UChar * string %s Got: \"%s\". Test case = %d\n", cExpected, cBuffer, i);
+                    }
+                    break;
+                default:
+                    uBufferLenReturned = 0;
+                    //uFileBufferLenReturned = 0;
+                    log_err("Unknown type %c for test %d\n", testCase->getString("argumentType", errorCode)[0], i);
+                }
+                if (uBufferLenReturned != 1) {
+                    log_err("error scanf converted %d arguments. Test case = %d\n", uBufferLenReturned, i);
+                }
+/*                if (u_strcmp(uBuffer, expectedResult) != 0) {
+                    u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
+                    u_austrncpy(cFormat, format, sizeof(cFormat));
+                    u_austrncpy(cExpected, expectedResult, sizeof(cExpected));
+                    cBuffer[sizeof(cBuffer)-1] = 0;
+                    log_err("FAILURE string test case %d \"%s\" - Got: \"%s\" Expected: \"%s\"\n",
+                            i, cFormat, cBuffer, cExpected);
+                }
+                if (uBuffer[uBufferLenReturned-1] == 0
+                    || uBuffer[uBufferLenReturned] != 0
+                    || uBuffer[uBufferLenReturned+1] != 0x2A
+                    || uBuffer[uBufferLenReturned+2] != 0x2A)
+                {
+                    u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
+                    cBuffer[sizeof(cBuffer)-1] = 0;
+                    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) {
+                    log_err("Can't open test file - %s\n",
+                            STANDARD_TEST_FILE);
+                }
+                uBuffer[0];
+                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));
+                    u_austrncpy(cExpected, expectedResult, sizeof(cExpected));
+                    cBuffer[sizeof(cBuffer)-1] = 0;
+                    log_err("FAILURE file test case %d \"%s\" - Got: \"%s\" Expected: \"%s\"\n",
+                            i, cFormat, cBuffer, cExpected);
+                }
+                if (uFileBufferLenReturned != uBufferLenReturned)
+                {
+                    u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
+                    cBuffer[sizeof(cBuffer)-1] = 0;
+                    log_err("FAILURE uFileBufferLenReturned(%d) != uBufferLenReturned(%d)\n",
+                            uFileBufferLenReturned, uBufferLenReturned);
+                }
+*/
+                if(U_FAILURE(errorCode)) {
+                    log_err("error running icuio/printf test case %d - %s\n",
+                            i, u_errorName(errorCode));
+                    errorCode=U_ZERO_ERROR;
+                    continue;
+                }
+//                u_fclose(testFile);
+            }
+            delete testData;

         }
         }

+        delete dataModule;

     }
     }

-
-    for (num = 0; num < 0x80; num++) {
-        testBuf[0] = (char)0xFF;
-        uStringBuf[0] = (UChar)0xfffe;
-        sprintf(testBuf, "%c", num);
-        u_sprintf(uStringBuf, NULL, "%c", num);
-        u_austrncpy(myString, uStringBuf, sizeof(myString)/sizeof(myString[0]));
-        if (testBuf[0] != uStringBuf[0] || uStringBuf[0] != num) {
-            log_err("%%c Got: 0x%x, Expected: 0x%x\n", myString[0], testBuf[0]);
-        }
+    else {
+        log_data_err("Failed: could not load test icuio data\n");

     }
     }

+#endif

 }
 }

+U_CDECL_END

 
 

-#define TestSScanSetFormat(format, uValue, cValue) \
-    /* Reinitialize the buffer to verify null termination works. */\
-    u_memset(uBuffer, 0x2a, sizeof(uBuffer)/sizeof(*uBuffer));\
-    memset(buffer, 0x2a, sizeof(buffer)/sizeof(*buffer));\
-    \
-    uNumScanned = u_sscanf(uValue, NULL, format, uBuffer);\
-    u_austrncpy(compBuffer, uBuffer, sizeof(uBuffer)/sizeof(uBuffer[0]));\
-    cNumScanned = sscanf(cValue, format, buffer);\
-    if (strncmp(buffer, compBuffer, sizeof(uBuffer)/sizeof(uBuffer[0])) != 0) {\
-        log_err("%" format " Got: \"%s\", Expected: \"%s\"\n", compBuffer, buffer);\
-    }\
-    if (cNumScanned != uNumScanned) {\
-        log_err("%" format " number scanned Got: %d, Expected: %d\n", uNumScanned, cNumScanned);\
-    }\
-    if (uNumScanned > 0 && uBuffer[u_strlen(uBuffer)+1] != 0x2a) {\
-        log_err("%" format " too much stored\n");\
-    }\
-
-static void TestSScanf() {
-    static const UChar abcUChars[] = {0x61,0x62,0x63,0x63,0x64,0x65,0x66,0x67,0};
-    static const char abcChars[] = "abccdefg";
-    UChar uBuffer[256];
-    char buffer[256];
-    char compBuffer[256];
-    int32_t uNumScanned;
-    int32_t cNumScanned;
-
-    TestSScanSetFormat("%[bc]U", abcUChars, abcChars);
-    TestSScanSetFormat("%[cb]U", abcUChars, abcChars);
-
-    TestSScanSetFormat("%[ab]U", abcUChars, abcChars);
-    TestSScanSetFormat("%[ba]U", abcUChars, abcChars);
-
-    TestSScanSetFormat("%[ab]", abcUChars, abcChars);
-    TestSScanSetFormat("%[ba]", abcUChars, abcChars);
-
-    TestSScanSetFormat("%[abcdefgh]", abcUChars, abcChars);
-    TestSScanSetFormat("%[;hgfedcba]", abcUChars, abcChars);
-
-    TestSScanSetFormat("%[a-f]", abcUChars, abcChars);
-    TestSScanSetFormat("%[f-a]", abcUChars, abcChars);
-    TestSScanSetFormat("%[a-c]", abcUChars, abcChars);
-    TestSScanSetFormat("%[c-a]", abcUChars, abcChars);
-
-    TestSScanSetFormat("%[^e-f]", abcUChars, abcChars);
-
-    TestSScanSetFormat("%[^a]", abcUChars, abcChars);
-    TestSScanSetFormat("%[^e]", abcUChars, abcChars);
-    TestSScanSetFormat("%[^ed]", abcUChars, abcChars);
-    TestSScanSetFormat("%[^dc]", abcUChars, abcChars);
-    TestSScanSetFormat("%[^e]  ", abcUChars, abcChars);
-
-    TestSScanSetFormat("%[]  ", abcUChars, abcChars);
-    TestSScanSetFormat("%1[ab]  ", abcUChars, abcChars);
-    TestSScanSetFormat("%2[^f]", abcUChars, abcChars);
-
-    /* Bad format */
-    TestSScanSetFormat("%[a", abcUChars, abcChars);
-    /* The following is not deterministic on Windows */
-/*    TestSScanSetFormat("%[a-", abcUChars, abcChars);*/
-    TestSScanSetFormat("%[a-]", abcUChars, abcChars);
-
-    /* TODO: Need to specify precision with a "*" */
-}
-
-#undef TestSScanSetFormat
-
-
-#define TestFScanSetFormat(format, uValue, cValue) \
-    myFile = u_fopen(STANDARD_TEST_FILE, "w", NULL, NULL);\
-    /* Reinitialize the buffer to verify null termination works. */\
-    u_memset(uBuffer, 0x2a, sizeof(uBuffer)/sizeof(*uBuffer));\
-    memset(buffer, 0x2a, sizeof(buffer)/sizeof(*buffer));\
-    \
-    u_fprintf(myFile, "%U", uValue);\
-    u_fclose(myFile);\
-    myFile = u_fopen(STANDARD_TEST_FILE, "r", "en_US_POSIX", NULL);\
-    uNumScanned = u_fscanf(myFile, format, uBuffer);\
-    u_fclose(myFile);\
-    u_austrncpy(compBuffer, uBuffer, sizeof(uBuffer)/sizeof(*uBuffer));\
-    cNumScanned = sscanf(cValue, format, buffer);\
-    if (strncmp(buffer, compBuffer, sizeof(uBuffer)/sizeof(*uBuffer)) != 0) {\
-        log_err("%" format " Got: \"%s\", Expected: \"%s\"\n", compBuffer, buffer);\
-    }\
-    if (cNumScanned != uNumScanned) {\
-        log_err("%" format " number printed Got: %d, Expected: %d\n", uNumScanned, cNumScanned);\
-    }\
-    if (uNumScanned > 0 && uBuffer[u_strlen(uBuffer)+1] != 0x2a) {\
-        log_err("%" format " too much stored\n");\
-    }\
-
-
-static void TestFScanf() {
-    UFILE *myFile;
-    static const UChar abcUChars[] = {0x61,0x62,0x63,0x63,0x64,0x65,0x66,0x67,0};
-    static const char abcChars[] = "abccdefg";
-    UChar uBuffer[256];
-    char buffer[256];
-    char compBuffer[256];
-    int32_t uNumScanned;
-    int32_t cNumScanned;
-
-    TestFScanSetFormat("%[bc]U", abcUChars, abcChars);
-    TestFScanSetFormat("%[cb]U", abcUChars, abcChars);
-
-    TestFScanSetFormat("%[ab]U", abcUChars, abcChars);
-    TestFScanSetFormat("%[ba]U", abcUChars, abcChars);
-
-    TestFScanSetFormat("%[ab]", abcUChars, abcChars);
-    TestFScanSetFormat("%[ba]", abcUChars, abcChars);
-
-    TestFScanSetFormat("%[abcdefgh]", abcUChars, abcChars);
-    TestFScanSetFormat("%[;hgfedcba]", abcUChars, abcChars);
-
-    TestFScanSetFormat("%[a-f]", abcUChars, abcChars);
-    TestFScanSetFormat("%[f-a]", abcUChars, abcChars);
-    TestFScanSetFormat("%[a-c]", abcUChars, abcChars);
-    TestFScanSetFormat("%[c-a]", abcUChars, abcChars);
-
-    TestFScanSetFormat("%[^e-f]", abcUChars, abcChars);
-
-    TestFScanSetFormat("%[^a]", abcUChars, abcChars);
-    TestFScanSetFormat("%[^e]", abcUChars, abcChars);
-    TestFScanSetFormat("%[^ed]", abcUChars, abcChars);
-    TestFScanSetFormat("%[^dc]", abcUChars, abcChars);
-    TestFScanSetFormat("%[^e]  ", abcUChars, abcChars);
-
-    TestFScanSetFormat("%[]  ", abcUChars, abcChars);
-    TestFScanSetFormat("%1[ab]  ", abcUChars, abcChars);
-    TestFScanSetFormat("%2[^f]", abcUChars, abcChars);
-
-    /* Bad format */
-    TestFScanSetFormat("%[a", abcUChars, abcChars);
-    /* The following is not deterministic on Windows */
-/*    TestFScanSetFormat("%[a-", abcUChars, abcChars);*/
-    TestFScanSetFormat("%[a-]", abcUChars, abcChars);
-
-    /* TODO: Need to specify precision with a "*" */
-}
-
-static void TestStream() {
-#if U_IOSTREAM_SOURCE >= 198506
-    char testStreamBuf[512];
-    const char *testStr = "Beginning of test str1   <<432 1" C_NEW_LINE " UTF-8 \xCE\xBC\xF0\x90\x80\x81\xF0\x90\x80\x82";
-    ostrstream outTestStream(testStreamBuf, sizeof(testStreamBuf));
-    istrstream inTestStream(" tHis\xCE\xBC\xE2\x80\x82 mu world", 0);
-    const UChar thisMu[] = { 0x74, 0x48, 0x69, 0x73, 0x3BC, 0};
-    const UChar mu[] = { 0x6D, 0x75, 0};
-    UnicodeString str1 = UNICODE_STRING_SIMPLE("str1");
-    UnicodeString str2 = UNICODE_STRING_SIMPLE(" <<");
-    UnicodeString str3 = UNICODE_STRING_SIMPLE("4");
-    UnicodeString str4 = UNICODE_STRING_SIMPLE(" UTF-8 ");
-    UnicodeString inStr = UNICODE_STRING_SIMPLE(" UTF-8 ");
-    UnicodeString inStr2;
-    char defConvName[UCNV_MAX_CONVERTER_NAME_LENGTH*2];
-    char inStrC[128];
-    UErrorCode status = U_ZERO_ERROR;
-    UConverter *defConv;
-
-    str4.append((UChar32)0x03BC);   /* mu */
-    str4.append((UChar32)0x10001);
-    str4.append((UChar32)0x10002);
-
-    /* release the default converter and use utf-8 for a bit */
-    defConv = u_getDefaultConverter(&status);
-    if (U_FAILURE(status)) {
-        log_err("Can't get default converter");
-        return;
-    }
-    ucnv_close(defConv);
-    strncpy(defConvName, ucnv_getDefaultName(), sizeof(defConvName)/sizeof(defConvName[0]));
-    ucnv_setDefaultName("UTF-8");
-
-    outTestStream << "Beginning of test ";
-    outTestStream << str1 << "  " << str2 << str3 << 3 << "2 " << 1.0 << C_NEW_LINE << str4 << ends;
-    if (strcmp(testStreamBuf, testStr) != 0) {
-        log_err("Got: \"%s\", Expected: \"%s\"\n", testStreamBuf, testStr);
-    }
-
-    inTestStream >> inStr >> inStr2;
-    if (inStr.compare(thisMu) != 0) {
-        u_austrncpy(inStrC, inStr.getBuffer(), inStr.length());
-        inStrC[inStr.length()] = 0;
-        log_err("Got: \"%s\", Expected: \"tHis\\u03BC\"\n", inStrC);
+U_CDECL_BEGIN
+static void U_CALLCONV DataDrivenPrintfPrecision(void)
+{
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_FILE_IO
+    UErrorCode errorCode;
+    TestDataModule *dataModule;
+    TestData *testData;
+    const DataMap *testCase;
+    DataDrivenLogger logger;
+    UChar uBuffer[512];
+    char cBuffer[512];
+    char cFormat[sizeof(cBuffer)];
+    char cExpected[sizeof(cBuffer)];
+    UnicodeString tempStr;
+    UChar format[512];
+    UChar expectedResult[512];
+    UChar argument[512];
+    int32_t precision;
+    int32_t i;
+    int8_t i8;
+    int16_t i16;
+    int32_t i32;
+    int64_t i64;
+    double dbl;
+    int32_t uBufferLenReturned;
+
+    errorCode=U_ZERO_ERROR;
+    dataModule=TestDataModule::getTestDataModule("icuio", logger, errorCode);
+    if(U_SUCCESS(errorCode)) {
+        testData=dataModule->createTestData("printfPrecision", errorCode);
+        if(U_SUCCESS(errorCode)) {
+            for(i=0; testData->nextCase(testCase, errorCode); ++i) {
+                if(U_FAILURE(errorCode)) {
+                    log_err("error retrieving icuio/printf test case %d - %s\n",
+                            i, u_errorName(errorCode));
+                    errorCode=U_ZERO_ERROR;
+                    continue;
+                }
+                u_memset(uBuffer, 0x2A, UPRV_LENGTHOF(uBuffer));
+                uBuffer[UPRV_LENGTHOF(uBuffer)-1] = 0;
+                tempStr=testCase->getString("format", errorCode);
+                tempStr.extract(format, UPRV_LENGTHOF(format), errorCode);
+                tempStr=testCase->getString("result", errorCode);
+                tempStr.extract(expectedResult, UPRV_LENGTHOF(expectedResult), errorCode);
+                tempStr=testCase->getString("argument", errorCode);
+                tempStr.extract(argument, UPRV_LENGTHOF(argument), errorCode);
+                precision=testCase->getInt28("precision", errorCode);
+                u_austrncpy(cBuffer, format, sizeof(cBuffer));
+                if(U_FAILURE(errorCode)) {
+                    log_err("error retrieving icuio/printf test case %d - %s\n",
+                            i, u_errorName(errorCode));
+                    errorCode=U_ZERO_ERROR;
+                    continue;
+                }
+                log_verbose("Test %d: format=\"%s\"\n", i, cBuffer);
+                switch (testCase->getString("argumentType", errorCode)[0]) {
+                case 0x64:  // 'd' double
+                    dbl = atof(u_austrcpy(cBuffer, argument));
+                    uBufferLenReturned = u_sprintf_u(uBuffer, format, precision, dbl);
+                    break;
+                case 0x31:  // '1' int8_t
+                    i8 = (int8_t)uto64(argument);
+                    uBufferLenReturned = u_sprintf_u(uBuffer, format, precision, i8);
+                    break;
+                case 0x32:  // '2' int16_t
+                    i16 = (int16_t)uto64(argument);
+                    uBufferLenReturned = u_sprintf_u(uBuffer, format, precision, i16);
+                    break;
+                case 0x34:  // '4' int32_t
+                    i32 = (int32_t)uto64(argument);
+                    uBufferLenReturned = u_sprintf_u(uBuffer, format, precision, i32);
+                    break;
+                case 0x38:  // '8' int64_t
+                    i64 = uto64(argument);
+                    uBufferLenReturned = u_sprintf_u(uBuffer, format, precision, i64);
+                    break;
+                case 0x73:  // 's' char *
+                    u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
+                    uBufferLenReturned = u_sprintf_u(uBuffer, format, precision, cBuffer);
+                    break;
+                case 0x53:  // 'S' UChar *
+                    uBufferLenReturned = u_sprintf_u(uBuffer, format, precision, argument);
+                    break;
+                default:
+                    uBufferLenReturned = 0;
+                    log_err("Unknown type %c for test %d\n", testCase->getString("argumentType", errorCode)[0], i);
+                }
+                if (u_strcmp(uBuffer, expectedResult) != 0) {
+                    u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
+                    u_austrncpy(cFormat, format, sizeof(cFormat));
+                    u_austrncpy(cExpected, expectedResult, sizeof(cExpected));
+                    cBuffer[sizeof(cBuffer)-1] = 0;
+                    log_err("FAILURE test case %d \"%s\" - Got: \"%s\" Expected: \"%s\"\n",
+                            i, cFormat, cBuffer, cExpected);
+                }
+                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)
+                {
+                    u_austrncpy(cBuffer, uBuffer, sizeof(cBuffer));
+                    cBuffer[sizeof(cBuffer)-1] = 0;
+                    log_err("FAILURE test case %d - \"%s\" wrong amount of characters was written. Got %d.\n",
+                            i, cBuffer, uBufferLenReturned);
+                }
+                if(U_FAILURE(errorCode)) {
+                    log_err("error running icuio/printf test case %d - %s\n",
+                            i, u_errorName(errorCode));
+                    errorCode=U_ZERO_ERROR;
+                    continue;
+                }
+            }
+            delete testData;
+        }
+        delete dataModule;

     }
     }

-    if (inStr2.compare(mu) != 0) {
-        u_austrncpy(inStrC, inStr.getBuffer(), inStr.length());
-        inStrC[inStr.length()] = 0;
-        log_err("Got: \"%s\", Expected: \"mu\"\n", inStrC);
+    else {
+        log_data_err("Failed: could not load test icuio data\n");

     }
     }

+#endif
+}
+U_CDECL_END

 
 

-    /* return the default converter to the original state. */
-    ucnv_setDefaultName(defConvName);
-    defConv = u_getDefaultConverter(&status);
-    if (U_FAILURE(status)) {
-        log_err("Can't get default converter");
-        return;
-    }
-    ucnv_close(defConv);
-#else
-    log_err("U_IOSTREAM_SOURCE is disabled");
+static void addAllTests(TestNode** root) {
+    addFileTest(root);
+    addStringTest(root);
+    addTranslitTest(root);
+
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_LEGACY_CONVERSION
+    addTest(root, &DataDrivenPrintf, "datadriv/DataDrivenPrintf");
+    addTest(root, &DataDrivenPrintfPrecision, "datadriv/DataDrivenPrintfPrecision");
+    addTest(root, &DataDrivenScanf, "datadriv/DataDrivenScanf");
+#endif
+#if U_IOSTREAM_SOURCE >= 199711
+    addStreamTests(root);

 #endif
 }
 
 #endif
 }
 

-static void TestTranslitOps()
+/* returns the path to icu/source/data/out */
+static const char *ctest_dataOutDir()

 {
 {

-    UFILE *f;
-    UErrorCode err = U_ZERO_ERROR;
-    UTransliterator *a = NULL, *b = NULL, *c = NULL;
-
-    log_verbose("opening a transliterator and UFILE for testing\n");
+    static const char *dataOutDir = NULL;

 
 

-    f = u_fopen(STANDARD_TEST_FILE, "w", "en_US_POSIX", NULL);
-    if(f == NULL)
-    {
-        log_err("Couldn't open test file for writing");
-        return;
+    if(dataOutDir) {
+        return dataOutDir;

     }
 
     }
 

-    a = utrans_open("Latin-Greek", UTRANS_FORWARD, NULL, -1, NULL, &err);
-    if(U_FAILURE(err))
+    /* U_TOPBUILDDIR is set by the makefiles on UNIXes when building cintltst and intltst
+    //              to point to the top of the build hierarchy, which may or
+    //              may not be the same as the source directory, depending on
+    //              the configure options used.  At any rate,
+    //              set the data path to the built data from this directory.
+    //              The value is complete with quotes, so it can be used
+    //              as-is as a string constant.
+    */
+#if defined (U_TOPBUILDDIR)

     {
     {

-        log_err("Err opening transliterator %s\n", u_errorName(err));
-        u_fclose(f);
-        return;
-    }
-
-
-    log_verbose("setting a transliterator\n");
-    b = u_fsettransliterator(f, U_WRITE, a, &err);
-    if(U_FAILURE(err))
-    {
-        log_err("Err setting transliterator %s\n", u_errorName(err));
-        u_fclose(f);
-        return;
+        dataOutDir = U_TOPBUILDDIR "data" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;

     }
     }

+#else

 
 

-    if(b != NULL)
+    /* On Windows, the file name obtained from __FILE__ includes a full path.
+     *             This file is "wherever\icu\source\test\cintltst\cintltst.c"
+     *             Change to    "wherever\icu\source\data"
+     */

     {
     {

-        log_err("Err, a transliterator was already set!\n");
-    }
+        static char p[sizeof(__FILE__) + 20];
+        char *pBackSlash;
+        int i;
+
+        strcpy(p, __FILE__);
+        /* We want to back over three '\' chars.                            */
+        /*   Only Windows should end up here, so looking for '\' is safe.   */
+        for (i=1; i<=3; i++) {
+            pBackSlash = strrchr(p, U_FILE_SEP_CHAR);
+            if (pBackSlash != NULL) {
+                *pBackSlash = 0;        /* Truncate the string at the '\'   */
+            }
+        }

 
 

-    log_verbose("un-setting transliterator (setting to null)\n");
-    c = u_fsettransliterator(f, U_WRITE, NULL, &err);
-    if(U_FAILURE(err))
-    {
-        log_err("Err setting transliterator %s\n", u_errorName(err));
-        u_fclose(f);
-        return;
+        if (pBackSlash != NULL) {
+            /* We found and truncated three names from the path.
+             *  Now append "source\data" and set the environment
+             */
+            strcpy(pBackSlash, U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING);
+            dataOutDir = p;
+        }
+        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");
+            if (file) {
+                fclose(file);
+                dataOutDir = ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;
+            }
+            else {
+                dataOutDir = ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING "data" U_FILE_SEP_STRING "out" U_FILE_SEP_STRING;
+            }
+        }

     }
     }

+#endif

 
 

-    if(c != a)
-    {
-        log_err("Err, transliterator that came back was not the original one.\n");
-    }
+    return dataOutDir;
+}

 
 

-    log_verbose("Trying to set read transliterator (should fail)\n");
-    b = u_fsettransliterator(f, U_READ, NULL, &err);
-    if(err != U_UNSUPPORTED_ERROR)
-    {
-        log_err("Should have U_UNSUPPORTED_ERROR setting  Read transliterator but got %s - REVISIT AND UPDATE TEST\n", u_errorName(err));
-        u_fclose(f);
-        return;
+/*  ctest_setICU_DATA  - if the ICU_DATA environment variable is not already
+ *                       set, try to deduce the directory in which ICU was built,
+ *                       and set ICU_DATA to "icu/source/data" in that location.
+ *                       The intent is to allow the tests to have a good chance
+ *                       of running without requiring that the user manually set
+ *                       ICU_DATA.  Common data isn't a problem, since it is
+ *                       picked up via a static (build time) reference, but the
+ *                       tests dynamically load some data.
+ */
+static void ctest_setICU_DATA() {
+
+    /* No location for the data dir was identifiable.
+     *   Add other fallbacks for the test data location here if the need arises
+     */
+    if (getenv("ICU_DATA") == NULL) {
+        /* If ICU_DATA isn't set, set it to the usual location */
+        u_setDataDirectory(ctest_dataOutDir());

     }
     }

-    else
-    {
-        log_verbose("Got %s error (expected) setting READ transliterator.\n", u_errorName(err));
-        err = U_ZERO_ERROR;
-    }
-
-
-    utrans_close(c);
-    u_fclose(f);

 }
 
 }
 

-static void TestTranslitOut()
+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)

 {
 {

-    UFILE *f;
-    UErrorCode err = U_ZERO_ERROR;
-    UTransliterator *a = NULL, *b = NULL, *c = NULL;
-    FILE *infile;
-    UChar compare[] = { 0xfeff, 0x03a3, 0x03c4, 0x03b5, 0x03c6, 0x1f00, 0x03bd, 0x03bf, 0x03c2, 0x0000 };
-    UChar ubuf[256];
-    int len;
-
-    log_verbose("opening a transliterator and UFILE for testing\n");
+    const char **str = (const char **) context;

 
 

-    f = u_fopen(STANDARD_TEST_FILE, "w", "en_US_POSIX", "utf-16");
-    if(f == NULL)
-    {
-        log_err("Couldn't open test file for writing");
-        return;
+    if (argv[arg][0] != '/' && argv[arg][0] != '-') {
+        *str = argv[arg];
+        return 1;

     }
 
     }
 

-    a = utrans_open("Latin-Greek", UTRANS_FORWARD, NULL, -1, NULL, &err);
-    if(U_FAILURE(err))
-    {
-        log_err("Err opening transliterator %s\n", u_errorName(err));
-        u_fclose(f);
-        return;
-    }
+    return 0;
+}
+U_CDECL_END

 
 

-    log_verbose("setting a transliterator\n");
-    b = u_fsettransliterator(f, U_WRITE, a, &err);
-    if(U_FAILURE(err))
-    {
-        log_err("Err setting transliterator %s\n", u_errorName(err));
-        u_fclose(f);
-        return;
+int main(int argc, char* argv[])
+{
+    int32_t nerrors = 0;
+    TestNode *root = NULL;
+    UErrorCode errorCode = U_ZERO_ERROR;
+    UDate startTime, endTime;
+    int32_t diffTime;
+
+    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
+    *  this test program was run with ICU_DATA set externally.  Failure of this check
+    *  is normal when ICU data is not packaged into a shared library.
+    *
+    *  Whether or not this test succeeds, we want to cleanup and reinitialize
+    *  with a data path so that data loading from individual files can be tested.
+    */
+    u_init(&errorCode);
+    if (U_FAILURE(errorCode)) {
+        fprintf(stderr,
+            "#### Note:  ICU Init without build-specific setDataDirectory() failed.\n");

     }
     }

-
-    if(b != NULL)
-    {
-        log_err("Err, a transliterator was already set!\n");
+    u_cleanup();
+    errorCode = U_ZERO_ERROR;
+    if (!initArgs(argc, argv, argHandler, (void *) &STANDARD_TEST_FILE)) {
+        /* Error already displayed. */
+        return -1;

     }
 
     }
 

-    u_fprintf(f, "Stephanos");
-
-    u_fclose(f);
-
-    log_verbose("Re reading test file to verify transliteration\n");
-    infile = fopen(STANDARD_TEST_FILE, "rb");
-    if(infile == NULL)
-    {
-        log_err("Couldn't reopen test file\n");
-        return;
+    /* 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"
+            "*** Check the ICU_DATA environment variable and \n"
+            "*** check that the data files are present.\n", argv[0], u_errorName(errorCode));
+        return 1;

     }
 
     }
 

-    len=fread(ubuf, sizeof(UChar), u_strlen(compare), infile);
-    log_verbose("Read %d UChars\n", len);
-    if(len != u_strlen(compare))
-    {
-        log_err("Wanted %d UChars from file, got %d\n", u_strlen(compare), len);
-    }
-    ubuf[len]=0;
+    fprintf(stdout, "Default charset for this run is %s\n", ucnv_getDefaultName());

 
 

-    if(u_strlen(compare) != u_strlen(ubuf))
-    {
-        log_err("Wanted %d UChars from file, but u_strlen() returns %d\n", u_strlen(compare), len);
-    }
+    addAllTests(&root);
+    nerrors = runTestRequest(root, argc, argv);

 
 

-    if(u_strcmp(compare, ubuf))
+#if 1

     {
     {

-        log_err("Read string doesn't match expected.\n");
-    }
-    else
-    {
-        log_verbose("Read string matches expected.\n");
+        FILE* fileToRemove = fopen(STANDARD_TEST_FILE, "r");
+        /* 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);
+                nerrors += 1;
+            }
+        }

     }
     }

-
-    fclose(infile);
-
-}
-
-static void addAllTests(TestNode** root) {
-    addTest(root, &TestFile, "file/TestFile");
-    addTest(root, &TestCodepageAndLocale, "file/TestCodepageAndLocale");
-    addTest(root, &TestfgetsBuffers, "file/TestfgetsBuffers");
-    addTest(root, &TestfgetsLineCount, "file/TestfgetsLineCount");
-    addTest(root, &TestFprintfFormat, "file/TestFprintfFormat");
-    addTest(root, &TestFScanf, "file/TestFScanf");
-    addTest(root, &TestFilePrintCompatibility, "file/TestFilePrintCompatibility");
-
-    addTest(root, &TestString, "string/TestString");
-    addTest(root, &TestSprintfFormat, "string/TestSprintfFormat");
-    addTest(root, &TestSnprintf, "string/TestSnprintf");
-    addTest(root, &TestSScanf, "string/TestSScanf");
-    addTest(root, &TestStringCompatibility, "string/TestStringCompatibility");
-    addTest(root, &TestStream, "stream/TestStream");
-
-    addTest(root, &TestTranslitOps, "translit/ops");
-    addTest(root, &TestTranslitOut, "translit/out");
-}
-
-int main(int argc, char* argv[])
-{
-    int32_t nerrors = 0;
-    TestNode *root = NULL;
-
-    addAllTests(&root);
-    nerrors = processArgs(root, argc, argv);
+#endif

 
     cleanUpTestTree(root);
 
     cleanUpTestTree(root);

+    DataDrivenLogger::cleanUp();

     u_cleanup();
     u_cleanup();

+
+    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),
+        (int)((diffTime%U_MILLIS_PER_HOUR)/U_MILLIS_PER_MINUTE),
+        (int)((diffTime%U_MILLIS_PER_MINUTE)/U_MILLIS_PER_SECOND),
+        (int)(diffTime%U_MILLIS_PER_SECOND));
+

     return nerrors;
 }
     return nerrors;
 }