organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-21268 Add error checks to avoid segmentation faults if tests run with stubdata only.

Browse source 
ICU-21268 Use 'nullptr' instead of NULL when checking for pointer value.

ICU-21268: Fixes error message.

ICU-21268 Style fixes (space before '{').
This commit is contained in:
gnrunge 2020-09-03 16:28:38 -07:00 • committed by Norbert Runge
parent 2361a3258b
commit b6ff1393d5
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3478,6 +3478,7 @@ void DateFormatTest::TestTimeZoneInLocale()
UnicodeString actual;
SimpleDateFormat smptfmt("Z", locale, status);
ASSERT_OK(status);
assertEquals("TimeZone from SimpleDateFormat constructor",
expectedTimezone, smptfmt.getTimeZone().getID(actual));
assertEquals("Calendar from SimpleDateFormat constructor",
@ -3485,13 +3486,20 @@ void DateFormatTest::TestTimeZoneInLocale()
LocalPointer<DateFormat> datefmt(
DateFormat::createDateInstance(DateFormat::kDefault, locale));
if (datefmt == nullptr) {
dataerrln("Error calling DateFormat::createDateInstance()");
return;
}
assertEquals("TimeZone from DateFormat::createDateInstance",
expectedTimezone, datefmt->getTimeZone().getID(actual));
assertEquals("Calendar from DateFormat::createDateInstance",
testLine[2], datefmt->getCalendar()->getType());
LocalPointer<DateFormat> timefmt(
DateFormat::createTimeInstance(DateFormat::kDefault, locale));
if (timefmt == nullptr) {
dataerrln("Error calling DateFormat::createTimeInstance()");
return;
}
assertEquals("TimeZone from TimeFormat::createTimeInstance",
expectedTimezone, timefmt->getTimeZone().getID(actual));
assertEquals("Calendar from DateFormat::createTimeInstance",
@ -3500,6 +3508,10 @@ void DateFormatTest::TestTimeZoneInLocale()
LocalPointer<DateFormat> datetimefmt(
DateFormat::createDateTimeInstance(
DateFormat::kDefault, DateFormat::kDefault, locale));
if (datetimefmt == nullptr) {
dataerrln("Error calling DateFormat::createDateTimeInstance()");
return;
}
assertEquals("TimeZone from DateTimeFormat::createDateTimeInstance",
expectedTimezone, datetimefmt->getTimeZone().getID(actual));
assertEquals("Calendar from DateFormat::createDateTimeInstance",

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

@ -10013,7 +10013,13 @@ void NumberFormatTest::Test13733_StrictAndLenient() {
ParsePosition ppos;
DecimalFormatSymbols dfs(Locale::getEnglish(), status);
if (status.errDataIfFailureAndReset()) {
return;
}
DecimalFormat df(patternString, dfs, status);
if (status.errDataIfFailureAndReset()) {
return;
}
df.setLenient(FALSE);
LocalPointer<CurrencyAmount> ca_strict(df.parseCurrency(inputString, ppos));
if (ca_strict != nullptr) {