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

ICU-6356 Fixed the coredump for c tests running without data files.

Browse source 
X-SVN-Rev: 24211
This commit is contained in:
Claire Ho 2008-06-17 22:27:18 +00:00
parent 4153a1bc82
commit 81ac0f67a6
5 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
icu4c/source/common/uniset.cpp
View file

@ -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; i<c.strings->size(); ++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; i<c.strings->size(); ++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;

10
icu4c/source/i18n/smpdtfmt.cpp
View file

@ -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
}
}
//----------------------------------------------------------------------

26
icu4c/source/test/intltest/plurfmts.cpp
View file

@ -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;

10
icu4c/source/test/intltest/ssearch.cpp
View file

@ -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();

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

@ -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