From 81ac0f67a6122238dd7a4c6da65b6155243eb5bb Mon Sep 17 00:00:00 2001 From: Claire Ho Date: Tue, 17 Jun 2008 22:27:18 +0000 Subject: [PATCH] ICU-6356 Fixed the coredump for c tests running without data files. X-SVN-Rev: 24211 --- icu4c/source/common/uniset.cpp | 16 +++++++++------ icu4c/source/i18n/smpdtfmt.cpp | 10 ++++++---- icu4c/source/test/intltest/plurfmts.cpp | 26 +++++++++++++++++-------- icu4c/source/test/intltest/ssearch.cpp | 10 +++++++++- icu4c/source/test/intltest/uobjtest.cpp | 2 +- 5 files changed, 44 insertions(+), 20 deletions(-) diff --git a/icu4c/source/common/uniset.cpp b/icu4c/source/common/uniset.cpp index f566423fa88..0f90aa54570 100644 --- a/icu4c/source/common/uniset.cpp +++ b/icu4c/source/common/uniset.cpp @@ -1302,13 +1302,17 @@ UnicodeSet& UnicodeSet::complement(const UnicodeString& s) { * @see #add(char, char) */ UnicodeSet& UnicodeSet::addAll(const UnicodeSet& c) { - add(c.list, c.len, 0); + if ( c.len>0 && c.list!=NULL ) { + add(c.list, c.len, 0); + } // Add strings in order - for (int32_t i=0; isize(); ++i) { - const UnicodeString* s = (const UnicodeString*)c.strings->elementAt(i); - if (!strings->contains((void*) s)) { - _add(*s); + if ( c.strings!=NULL ) { + for (int32_t i=0; isize(); ++i) { + const UnicodeString* s = (const UnicodeString*)c.strings->elementAt(i); + if (!strings->contains((void*) s)) { + _add(*s); + } } } return *this; @@ -1677,7 +1681,7 @@ void UnicodeSet::exclusiveOr(const UChar32* other, int32_t otherLen, int8_t pola // polarity = 3: ~x union ~y void UnicodeSet::add(const UChar32* other, int32_t otherLen, int8_t polarity) { - if (isFrozen() || isBogus()) { + if (isFrozen() || isBogus() || other==NULL) { return; } UErrorCode status = U_ZERO_ERROR; diff --git a/icu4c/source/i18n/smpdtfmt.cpp b/icu4c/source/i18n/smpdtfmt.cpp index efcb4fb8025..f20d7694958 100644 --- a/icu4c/source/i18n/smpdtfmt.cpp +++ b/icu4c/source/i18n/smpdtfmt.cpp @@ -1284,11 +1284,13 @@ SimpleDateFormat::subFormat(UnicodeString &appendTo, void SimpleDateFormat::zeroPaddingNumber(UnicodeString &appendTo, int32_t value, int32_t minDigits, int32_t maxDigits) const { - FieldPosition pos(0); + if (fNumberFormat!=NULL) { + FieldPosition pos(0); - fNumberFormat->setMinimumIntegerDigits(minDigits); - fNumberFormat->setMaximumIntegerDigits(maxDigits); - fNumberFormat->format(value, appendTo, pos); // 3rd arg is there to speed up processing + fNumberFormat->setMinimumIntegerDigits(minDigits); + fNumberFormat->setMaximumIntegerDigits(maxDigits); + fNumberFormat->format(value, appendTo, pos); // 3rd arg is there to speed up processing + } } //---------------------------------------------------------------------- diff --git a/icu4c/source/test/intltest/plurfmts.cpp b/icu4c/source/test/intltest/plurfmts.cpp index 9acac7c6ff1..15b5f2de981 100644 --- a/icu4c/source/test/intltest/plurfmts.cpp +++ b/icu4c/source/test/intltest/plurfmts.cpp @@ -88,20 +88,30 @@ void PluralFormatTest::pluralFormatBasicTest(/*char *par*/) // ======= Test clone, assignment operator && == operator. plFmt[0]= new PluralFormat(status[0]); plFmt[1]= new PluralFormat(locale, status[1]); - *plFmt[1] = *plFmt[0]; - if (plFmt[1]!=NULL) { - if ( *plFmt[1] != *plFmt[0] ) { - errln("ERROR: clone plural format test failed!"); + if ( U_SUCCESS(status[0]) && U_SUCCESS(status[1]) ) { + *plFmt[1] = *plFmt[0]; + if (plFmt[1]!=NULL) { + if ( *plFmt[1] != *plFmt[0] ) { + errln("ERROR: clone plural format test failed!"); + } } } + else { + errln("ERROR: PluralFormat constructor failed!"); + } plFmt[2]= new PluralFormat(locale, status[1]); - *plFmt[1] = *plFmt[2]; - if (plFmt[1]!=NULL) { - if ( *plFmt[1] != *plFmt[2] ) { - errln("ERROR: assignment operator test failed!"); + if ( U_SUCCESS(status[1]) ) { + *plFmt[1] = *plFmt[2]; + if (plFmt[1]!=NULL) { + if ( *plFmt[1] != *plFmt[2] ) { + errln("ERROR: assignment operator test failed!"); + } } delete plFmt[1]; } + else { + errln("ERROR: PluralFormat constructor failed!"); + } delete plFmt[0]; delete plFmt[2]; delete numFmt; diff --git a/icu4c/source/test/intltest/ssearch.cpp b/icu4c/source/test/intltest/ssearch.cpp index caf4e4d6149..689f8c1992c 100644 --- a/icu4c/source/test/intltest/ssearch.cpp +++ b/icu4c/source/test/intltest/ssearch.cpp @@ -72,7 +72,7 @@ void SSearchTest::runIndexedTest( int32_t index, UBool exec, const char* &name, case 0: name = "searchTest"; if (exec) searchTest(); break; - + case 1: name = "offsetTest"; if (exec) offsetTest(); break; @@ -603,6 +603,10 @@ void SSearchTest::offsetTest() int32_t testCount = ARRAY_SIZE(test); UErrorCode status = U_ZERO_ERROR; RuleBasedCollator *col = (RuleBasedCollator *) Collator::createInstance(Locale::getEnglish(), status); + if (U_FAILURE(status)) { + errln("Failed to create collator in offsetTest!"); + return; + } char buffer[4096]; // A bit of a hack... just happens to be long enough for all the test cases... // We could allocate one that's the right size by (CE_count * 10) + 2 // 10 chars is enough room for 8 hex digits plus ", ". 2 extra chars for "[" and "]" @@ -1556,6 +1560,10 @@ void SSearchTest::monkeyTest(char *params) U_STRING_DECL(test_pattern, "[[:assigned:]-[:ideographic:]-[:hangul:]-[:c:]]", 47); U_STRING_INIT(test_pattern, "[[:assigned:]-[:ideographic:]-[:hangul:]-[:c:]]", 47); UCollator *coll = ucol_open(NULL, &status); + if (U_FAILURE(status)) { + errln("Failed to create collator in MonkeyTest!"); + return; + } USet *charsToTest = uset_openPattern(test_pattern, 47, &status); USet *expansions = uset_openEmpty(); USet *contractions = uset_openEmpty(); diff --git a/icu4c/source/test/intltest/uobjtest.cpp b/icu4c/source/test/intltest/uobjtest.cpp index b29ac4d681b..2f44e16454d 100644 --- a/icu4c/source/test/intltest/uobjtest.cpp +++ b/icu4c/source/test/intltest/uobjtest.cpp @@ -38,7 +38,7 @@ #define TESTCLASSID_CTOR(c, x) { delete testClass(new c x, #c, "new " #c #x, c ::getStaticClassID()); if(U_FAILURE(status)) { errln(UnicodeString(#c " - new " #x " - got err status ") + UnicodeString(u_errorName(status))); status = U_ZERO_ERROR; } } #define TESTCLASSID_DEFAULT(c) delete testClass(new c, #c, "new " #c , c::getStaticClassID()) #define TESTCLASSID_ABSTRACT(c) testClass(NULL, #c, NULL, c::getStaticClassID()) -#define TESTCLASSID_FACTORY_HIDDEN(c, f) {UObject *objVar = f; delete testClass(objVar, #c, #f, objVar->getDynamicClassID()); if(U_FAILURE(status)) { errln(UnicodeString(#c " - " #f " - got err status ") + UnicodeString(u_errorName(status))); status = U_ZERO_ERROR; } } +#define TESTCLASSID_FACTORY_HIDDEN(c, f) {UObject *objVar = f; delete testClass(objVar, #c, #f, objVar!=NULL? objVar->getDynamicClassID(): NULL); if(U_FAILURE(status)) { errln(UnicodeString(#c " - " #f " - got err status ") + UnicodeString(u_errorName(status))); status = U_ZERO_ERROR; } } #define MAX_CLASS_ID 200