AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-6637 Ignore stream test when iostream is disabled.

Browse Source 
X-SVN-Rev: 24991
This commit is contained in:
Michael Ow 2008-11-21 20:47:36 +00:00
parent 6c12fab16d
commit cdefbe48c1
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4c/source/test/iotest/iotest.cpp
View File

@ -688,7 +688,9 @@ static void addAllTests(TestNode** root) {
addTest(root, &DataDrivenPrintfPrecision, "datadriv/DataDrivenPrintfPrecision");
addTest(root, &DataDrivenScanf, "datadriv/DataDrivenScanf");
#endif
#if U_IOSTREAM_SOURCE
addStreamTests(root);
#endif
}
/* returns the path to icu/source/data/out */
@ -831,7 +833,7 @@ int main(int argc, char* argv[])
u_init(&errorCode);
if (U_FAILURE(errorCode)) {
fprintf(stderr,
"#### ERROR! %s: u_init() failed with status = \"%s\".\n"
"#### ERROR! %s: u_init() failed with status = \"%s\".\n"
"*** Check the ICU_DATA environment variable and \n"
"*** check that the data files are present.\n", argv[0], u_errorName(errorCode));
return 1;

13
icu4c/source/test/iotest/stream.cpp
View File

@ -50,6 +50,7 @@ const char C_NEW_LINE[] = {'\n',0};
#endif
U_CDECL_END
#if U_IOSTREAM_SOURCE
U_CDECL_BEGIN
static void U_CALLCONV TestStream(void)
{
@ -240,7 +241,7 @@ static void U_CALLCONV TestStreamEOF(void)
fs.close();
log_verbose("Testing operator >> for UnicodeString...\n");
/* The test cases needs to be converted to the default codepage. However, the stream operator needs char* so U_STRING_* is called. */
U_STRING_DECL(testCase1, "", 0);
U_STRING_INIT(testCase1, "", 0);
@ -254,8 +255,8 @@ static void U_CALLCONV TestStreamEOF(void)
U_STRING_INIT(testCase5, "bar ", 6);
U_STRING_DECL(testCase6, " bar ", 9);
U_STRING_INIT(testCase6, " bar ", 9);
U_STRING_DECL(expectedResultA, "", 0);
U_STRING_INIT(expectedResultA, "", 0);
U_STRING_DECL(expectedResultB, "foo", 3);
@ -264,8 +265,8 @@ static void U_CALLCONV TestStreamEOF(void)
U_STRING_INIT(expectedResultC, "unchanged", 9);
U_STRING_DECL(expectedResultD, "bar", 3);
U_STRING_INIT(expectedResultD, "bar", 3);
UnicodeString UStr;
UnicodeString expectedResults;
char testcase[10];
@ -283,4 +284,4 @@ U_CFUNC void addStreamTests(TestNode** root) {
addTest(root, &TestStream, "stream/TestStream");
addTest(root, &TestStreamEOF, "stream/TestStreamEOF");
}
#endif