organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 21:45:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 12

ICU-2498 Make intltest pass w/o data.

Browse source 
X-SVN-Rev: 23784
This commit is contained in:
Michael Ow 2008-04-10 23:19:16 +00:00
parent 8a63dd5683
commit b02865cecf
19 changed files with 71 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4c/source/test/intltest/convtest.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2007, International Business Machines
* Copyright (C) 2003-2008, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -185,7 +185,7 @@ ConversionTest::TestToUnicode() {
delete dataModule;
}
else {
errln("Failed: could not load test conversion data");
dataerrln("[DATA] Could not load test conversion data");
}
}
@ -338,7 +338,7 @@ ConversionTest::TestFromUnicode() {
delete dataModule;
}
else {
errln("Failed: could not load test conversion data");
dataerrln("[DATA] Could not load test conversion data");
}
}
@ -462,7 +462,7 @@ ConversionTest::TestGetUnicodeSet() {
delete dataModule;
}
else {
errln("Failed: could not load test conversion data");
dataerrln("[DATA] Could not load test conversion data");
}
}

2
icu4c/source/test/intltest/csdetest.cpp
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2005-2007, International Business Machines
* Copyright (C) 2005-2008, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/

4
icu4c/source/test/intltest/dadrcal.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2007, International Business Machines Corporation and
* Copyright (c) 1997-2008, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -62,7 +62,7 @@ void DataDrivenCalendarTest::runIndexedTest(int32_t index, UBool exec,
name = "";
}
} else {
errln("format/DataDriven*Test data (calendar.res) not initialized!");
dataerrln("[DATA] format/DataDriven*Test data (calendar.res) not initialized!");
name = "";
}

4
icu4c/source/test/intltest/dadrcoll.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2005, International Business Machines Corporation and
* Copyright (c) 1997-2008, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -73,7 +73,7 @@ void DataDrivenCollatorTest::runIndexedTest( int32_t index, UBool exec, const ch
name = "";
}
} else {
errln("collate/DataDrivenTest data not initialized!");
dataerrln("[DATA] collate/DataDrivenTest data not initialized!");
name = "";
}

2
icu4c/source/test/intltest/dadrfmt.cpp
View file

@ -64,7 +64,7 @@ void DataDrivenFormatTest::runIndexedTest(int32_t index, UBool exec,
name = "";
}
} else {
errln("format/DataDriven*Test data (format.res) not initialized!");
dataerrln("[DATA] format/DataDriven*Test data (format.res) not initialized!");
name = "";
}

4
icu4c/source/test/intltest/idnaconf.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2005-2006, International Business Machines
* Copyright (C) 2005-2008, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -80,7 +80,7 @@ UBool IdnaConfTest::ReadAndConvertFile(){
delete [] absolute_name;
if (f == NULL){
errln("fopen error on %s", name);
dataerrln("[DATA] fopen error on %s", name);
return FALSE;
}

11
icu4c/source/test/intltest/intltest.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2007, International Business Machines Corporation and
* Copyright (c) 1997-2008, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -516,6 +516,7 @@ void IntlTest::setCaller( IntlTest* callingTest )
{
caller = callingTest;
if (caller) {
warn_on_missing_data = caller->warn_on_missing_data;
verbose = caller->verbose;
no_err_msg = caller->no_err_msg;
quick = caller->quick;
@ -1265,7 +1266,7 @@ const char* IntlTest::loadTestData(UErrorCode& err){
if(U_FAILURE(err)){
err = U_FILE_ACCESS_ERROR;
it_errln((UnicodeString)"Could not load testtypes.res in testdata bundle with path " + tdpath + (UnicodeString)" - " + u_errorName(err));
it_dataerrln((UnicodeString)"[DATA] Could not load testtypes.res in testdata bundle with path " + tdpath + (UnicodeString)" - " + u_errorName(err));
return "";
}
ures_close(test);
@ -1469,7 +1470,11 @@ UBool IntlTest::assertFalse(const char* message, UBool condition, UBool quiet) {
UBool IntlTest::assertSuccess(const char* message, UErrorCode ec) {
if (U_FAILURE(ec)) {
errln("FAIL: %s (%s)", message, u_errorName(ec));
if (ec == U_FILE_ACCESS_ERROR) {
dataerrln("[DATA] Fail: %s.", message);
} else {
errln("FAIL: %s (%s)", message, u_errorName(ec));
}
return FALSE;
}
return TRUE;

4
icu4c/source/test/intltest/normconf.cpp
View file

@ -1,6 +1,6 @@
/*
************************************************************************
* Copyright (c) 1997-2004, International Business Machines
* Copyright (c) 1997-2008, International Business Machines
* Corporation and others. All Rights Reserved.
************************************************************************
*/
@ -141,7 +141,7 @@ NormalizerConformanceTest::openNormalizationTestFile(const char *filename) {
}
#endif
errln("Failed to open %s", filename);
dataerrln("[DATA] Failed to open %s", filename);
return NULL;
}

2
icu4c/source/test/intltest/numfmtst.cpp
View file

@ -1817,7 +1817,7 @@ void NumberFormatTest::TestCases() {
UErrorCode ec = U_ZERO_ERROR;
TextFile reader("NumberFormatTestCases.txt", "UTF8", ec);
if (U_FAILURE(ec)) {
errln("FAIL: Couldn't open NumberFormatTestCases.txt");
dataerrln("[DATA] Couldn't open NumberFormatTestCases.txt");
return;
}
TokenIterator tokens(&reader);

12
icu4c/source/test/intltest/rbbitst.cpp
View file

@ -37,7 +37,7 @@
#define TEST_ASSERT(x) {if (!(x)) { \
errln("Failure in file %s, line %d", __FILE__, __LINE__);}}
#define TEST_ASSERT_SUCCESS(errcode) {if (U_FAILURE(errcode)) { \
#define TEST_ASSERT_SUCCESS(errcode) { if (U_FAILURE(errcode)) { \
errln("Failure in file %s, line %d, status = \"%s\"", __FILE__, __LINE__, u_errorName(errcode));}}
@ -1804,7 +1804,7 @@ UChar *RBBITest::ReadAndConvertFile(const char *fileName, int &ulen, const char
//
f = fopen(fileName, "rb");
if (f == 0) {
errln("Error opening test data file %s\n", fileName);
dataerrln("[DATA] Error opening test data file %s\n", fileName);
status = U_FILE_ACCESS_ERROR;
return NULL;
}
@ -1940,7 +1940,7 @@ void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator *
const char *testDataDirectory = IntlTest::getSourceTestData(status);
char testFileName[1000];
if (testDataDirectory == NULL || strlen(testDataDirectory) >= sizeof(testFileName)) {
errln("Can't open test data. Path too long.");
dataerrln("[DATA] Can't open test data. Path too long.");
return;
}
strcpy(testFileName, testDataDirectory);
@ -1948,8 +1948,10 @@ void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator *
int len;
UChar *testFile = ReadAndConvertFile(testFileName, len, "UTF-8", status);
TEST_ASSERT_SUCCESS(status);
TEST_ASSERT(testFile != NULL);
if (status != U_FILE_ACCESS_ERROR) {
TEST_ASSERT_SUCCESS(status);
TEST_ASSERT(testFile != NULL);
}
if (U_FAILURE(status) || testFile == NULL) {
return; /* something went wrong, error already output */
}

2
icu4c/source/test/intltest/regextst.cpp
View file

@ -1915,7 +1915,7 @@ UChar *RegexTest::ReadAndConvertFile(const char *fileName, int32_t &ulen,
//
f = fopen(fileName, "rb");
if (f == 0) {
errln("Error opening test data file %s\n", fileName);
dataerrln("[DATA] Error opening test data file %s\n", fileName);
status = U_FILE_ACCESS_ERROR;
return NULL;
}

12
icu4c/source/test/intltest/restest.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2006, International Business Machines Corporation and
* Copyright (c) 1997-2008, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -202,7 +202,7 @@ ResourceBundleTest::TestResourceBundles()
loadTestData(status);
if(U_FAILURE(status))
{
errln("Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));
dataerrln("[DATA] Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));
return;
}
@ -235,7 +235,7 @@ ResourceBundleTest::TestConstruction()
const char* testdatapath=loadTestData(err);
if(U_FAILURE(err))
{
errln("Could not load testdata.dat " + UnicodeString(testdatapath) + ", " + UnicodeString(u_errorName(err)));
dataerrln("[DATA] Could not load testdata.dat " + UnicodeString(testdatapath) + ", " + UnicodeString(u_errorName(err)));
return;
}
@ -319,7 +319,7 @@ ResourceBundleTest::testTag(const char* frag,
testdatapath=loadTestData(status);
if(U_FAILURE(status))
{
errln("Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));
dataerrln("[DATA] Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));
return FALSE;
}
@ -534,7 +534,7 @@ ResourceBundleTest::TestGetSize(void)
if(U_FAILURE(status))
{
err("Could not load testdata.dat %s\n", u_errorName(status));
dataerrln("[DATA] Could not load testdata.dat %s\n", u_errorName(status));
return;
}
@ -588,7 +588,7 @@ ResourceBundleTest::TestGetLocaleByType(void)
if(U_FAILURE(status))
{
err("Could not load testdata.dat %s\n", u_errorName(status));
dataerrln("[DATA] Could not load testdata.dat %s\n", u_errorName(status));
return;
}

14
icu4c/source/test/intltest/restsnew.cpp
View file

@ -1,5 +1,5 @@
/********************************************************************
* Copyright (c) 1997-2007, International Business Machines
* Copyright (c) 1997-2008, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************/
@ -200,7 +200,7 @@ NewResourceBundleTest::TestResourceBundles()
loadTestData(status);
if(U_FAILURE(status))
{
errln("Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));
dataerrln("[DATA] Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));
return;
}
@ -234,7 +234,7 @@ NewResourceBundleTest::TestConstruction()
testdatapath=loadTestData(err);
if(U_FAILURE(err))
{
errln("Could not load testdata.dat %s " + UnicodeString(u_errorName(err)));
dataerrln("[DATA] Could not load testdata.dat %s " + UnicodeString(u_errorName(err)));
return;
}
@ -309,7 +309,7 @@ NewResourceBundleTest::TestIteration()
testdatapath=loadTestData(err);
if(U_FAILURE(err))
{
errln("Could not load testdata.dat %s " + UnicodeString(u_errorName(err)));
dataerrln("[DATA] Could not load testdata.dat %s " + UnicodeString(u_errorName(err)));
return;
}
@ -428,7 +428,7 @@ NewResourceBundleTest::TestOtherAPI(){
if(U_FAILURE(err))
{
errln("Could not load testdata.dat %s " + UnicodeString(u_errorName(err)));
dataerrln("[DATA] Could not load testdata.dat %s " + UnicodeString(u_errorName(err)));
return;
}
@ -636,7 +636,7 @@ NewResourceBundleTest::testTag(const char* frag,
testdatapath=loadTestData(status);
if(U_FAILURE(status))
{
errln("Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));
dataerrln("[DATA] Could not load testdata.dat %s " + UnicodeString(u_errorName(status)));
return FALSE;
}
@ -1017,7 +1017,7 @@ NewResourceBundleTest::TestNewTypes() {
if(U_FAILURE(status))
{
logln("Could not load testdata.dat %s \n",u_errorName(status));
dataerrln("[DATA] Could not load testdata.dat %s \n",u_errorName(status));
return;
}

14
icu4c/source/test/intltest/testidna.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2007, International Business Machines
* Copyright (C) 2003-2008, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -1460,7 +1460,11 @@ void TestIDNA::TestIDNAMonkeyTest(){
getInstance(status); // Init prep
if (U_FAILURE(status)) {
errln("Test could not initialize. Got %s", u_errorName(status));
if (status == U_FILE_ACCESS_ERROR) {
dataerrln("[DATA] Test could not initialize.");
} else {
errln("Test could not initialize. Got %s", u_errorName(status));
}
return;
}
@ -1535,7 +1539,11 @@ void TestIDNA::TestRefIDNA(){
UErrorCode status = U_ZERO_ERROR;
getInstance(status); // Init prep
if (U_FAILURE(status)) {
errln("Test could not initialize. Got %s", u_errorName(status));
if (status == U_FILE_ACCESS_ERROR) {
dataerrln("[DATA] Test could not initialize.");
} else {
errln("Test could not initialize. Got %s", u_errorName(status));
}
return;
}

6
icu4c/source/test/intltest/tsmthred.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1999-2007, International Business Machines Corporation and
* Copyright (c) 1999-2008, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -1303,7 +1303,7 @@ void MultithreadTest::TestCollators()
if (testFile == 0) {
*(buffer+bufLen) = 0;
errln("ERROR: could not open any of the conformance test files, tried opening base %s", buffer);
dataerrln("[DATA] could not open any of the conformance test files, tried opening base %s", buffer);
return;
} else {
infoln(
@ -1339,7 +1339,7 @@ void MultithreadTest::TestCollators()
}
fclose(testFile);
if(U_FAILURE(status)) {
errln("Couldn't read the test file!");
dataerrln("[DATA] Couldn't read the test file!");
return;
}

6
icu4c/source/test/intltest/ucaconf.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2002-2007, International Business Machines Corporation and
* Copyright (c) 2002-2008, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -31,7 +31,7 @@ status(U_ZERO_ERROR)
const char *srcDir = IntlTest::getSourceTestData(status);
if (U_FAILURE(status)) {
errln("ERROR: could not open test data %s", u_errorName(status));
dataerrln("[DATA] Could not open test data %s", u_errorName(status));
return;
}
uprv_strcpy(testDataPath, srcDir);
@ -136,7 +136,7 @@ void UCAConformanceTest::openTestFile(const char *type)
if (testFile == 0) {
*(buffer+bufLen) = 0;
errln("ERROR: could not open any of the conformance test files, tried opening base %s\n", buffer);
dataerrln("[DATA] Could not open any of the conformance test files, tried opening base %s\n", buffer);
return;
} else {
infoln(

6
icu4c/source/test/iotest/iotest.cpp
View file

@ -45,6 +45,12 @@ public:
buffer[3999] = 0; /* NULL terminate */
log_err(buffer);
}
virtual void dataerrln( const UnicodeString &message ) {
char buffer[4000];
message.extract(0, message.length(), buffer, sizeof(buffer));
buffer[3999] = 0; /* NULL terminate */
log_data_err(buffer);
}
static const char * pathToDataDirectory(void)
{

4
icu4c/source/tools/ctestfw/tstdtmod.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2002-2006, International Business Machines Corporation and
* Copyright (c) 2002-2008, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -158,7 +158,7 @@ RBTestDataModule::getTestBundle(const char* bundleName, UErrorCode &status)
if (testBundle == NULL) {
testBundle = ures_openDirect(icu_data, bundleName, &status);
if (status != U_ZERO_ERROR) {
fLog.errln(UNICODE_STRING_SIMPLE("Failed: could not load test data from resourcebundle: ") + UnicodeString(bundleName, -1, US_INV));
fLog.dataerrln(UNICODE_STRING_SIMPLE("[DATA] Could not load test data from resourcebundle: ") + UnicodeString(bundleName, -1, US_INV));
fDataTestValid = FALSE;
}
}

3
icu4c/source/tools/ctestfw/unicode/testlog.h
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2004-2006, International Business Machines Corporation and
* Copyright (c) 2004-2008, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -22,6 +22,7 @@ class T_CTEST_EXPORT_API TestLog {
public:
virtual ~TestLog();
virtual void errln( const UnicodeString &message ) = 0;
virtual void dataerrln( const UnicodeString &message ) = 0;
virtual const char* getTestDataPath(UErrorCode& err) = 0;
};