1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a local check-macro to save lots of repetition in time-zone tests

Browse Source 
Tests of QTimeZone::dispayName() were burying most of what was
interesting in the variations among them by repetition of a large
amount of boilerplate. Package the repetition in a macro so that
the differences between checks are more evident.

Change-Id: I23bcafab641b7d3bed50248ba5313250c150d30c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2021-11-03 16:46:34 +01:00
parent 30a70fc6e0
commit 6705707088
1 changed files with 53 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
View File

@ -1061,6 +1061,11 @@ void tst_QTimeZone::utcTest()
#endif // QT_BUILD_INTERNAL #endif // QT_BUILD_INTERNAL
} }
// Relies on local variable names: zone tzp and locale enUS.
#define ZONE_DNAME_CHECK(type, name, val) \
QCOMPARE(tzp.displayName(QTimeZone::type, QTimeZone::name, enUS), \
QStringLiteral(val));
void tst_QTimeZone::icuTest() void tst_QTimeZone::icuTest()
{ {
#if defined(QT_BUILD_INTERNAL) && QT_CONFIG(icu) #if defined(QT_BUILD_INTERNAL) && QT_CONFIG(icu)
@ -1084,25 +1089,16 @@ void tst_QTimeZone::icuTest()
if (debug) { if (debug) {
// Test display names by type // Test display names by type
QLocale enUS("en_US"); QLocale enUS("en_US");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::LongName, enUS), ZONE_DNAME_CHECK(StandardTime, LongName, "Central European Standard Time");
QString("Central European Standard Time")); ZONE_DNAME_CHECK(StandardTime, ShortName, "GMT+01:00");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::ShortName, enUS), ZONE_DNAME_CHECK(StandardTime, OffsetName, "UTC+01:00");
QString("GMT+01:00")); ZONE_DNAME_CHECK(DaylightTime, LongName, "Central European Summer Time");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::OffsetName, enUS), ZONE_DNAME_CHECK(DaylightTime, ShortName, "GMT+02:00");
QString("UTC+01:00")); ZONE_DNAME_CHECK(DaylightTime, OffsetName, "UTC+02:00");
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::LongName, enUS),
QString("Central European Summer Time"));
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::ShortName, enUS),
QString("GMT+02:00"));
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::OffsetName, enUS),
QString("UTC+02:00"));
// ICU C api does not support Generic Time yet, C++ api does // ICU C api does not support Generic Time yet, C++ api does
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::LongName, enUS), ZONE_DNAME_CHECK(GenericTime, LongName, "Central European Standard Time");
QString("Central European Standard Time")); ZONE_DNAME_CHECK(GenericTime, ShortName, "GMT+01:00");
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::ShortName, enUS), ZONE_DNAME_CHECK(GenericTime, OffsetName, "UTC+01:00");
QString("GMT+01:00"));
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::OffsetName, enUS),
QString("UTC+01:00"));
// Test Abbreviations // Test Abbreviations
QCOMPARE(tzp.abbreviation(std), QString("CET")); QCOMPARE(tzp.abbreviation(std), QString("CET"));
@ -1167,44 +1163,26 @@ void tst_QTimeZone::tzTest()
// Only test names in debug mode, names used can vary by ICU version installed // Only test names in debug mode, names used can vary by ICU version installed
if (debug) { if (debug) {
#if QT_CONFIG(icu) #if QT_CONFIG(icu)
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::LongName, enUS), ZONE_DNAME_CHECK(StandardTime, LongName, "Central European Standard Time");
QString("Central European Standard Time")); ZONE_DNAME_CHECK(StandardTime, ShortName, "GMT+01:00");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::ShortName, enUS), ZONE_DNAME_CHECK(StandardTime, OffsetName, "UTC+01:00");
QString("GMT+01:00")); ZONE_DNAME_CHECK(DaylightTime, LongName, "Central European Summer Time");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::OffsetName, enUS), ZONE_DNAME_CHECK(DaylightTime, ShortName, "GMT+02:00");
QString("UTC+01:00")); ZONE_DNAME_CHECK(DaylightTime, OffsetName, "UTC+02:00");
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::LongName, enUS),
QString("Central European Summer Time"));
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::ShortName, enUS),
QString("GMT+02:00"));
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::OffsetName, enUS),
QString("UTC+02:00"));
// ICU C api does not support Generic Time yet, C++ api does // ICU C api does not support Generic Time yet, C++ api does
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::LongName, enUS), ZONE_DNAME_CHECK(GenericTime, LongName, "Central European Standard Time");
QString("Central European Standard Time")); ZONE_DNAME_CHECK(GenericTime, ShortName, "GMT+01:00");
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::ShortName, enUS), ZONE_DNAME_CHECK(GenericTime, OffsetName, "UTC+01:00");
QString("GMT+01:00"));
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::OffsetName, enUS),
QString("UTC+01:00"));
#else #else
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::LongName, enUS), ZONE_DNAME_CHECK(StandardTime, LongName, "CET");
QString("CET")); ZONE_DNAME_CHECK(StandardTime, ShortName, "CET");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::ShortName, enUS), ZONE_DNAME_CHECK(StandardTime, OffsetName, "CET");
QString("CET")); ZONE_DNAME_CHECK(DaylightTime, LongName, "CEST");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::OffsetName, enUS), ZONE_DNAME_CHECK(DaylightTime, ShortName, "CEST");
QString("CET")); ZONE_DNAME_CHECK(DaylightTime, OffsetName, "CEST");
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::LongName, enUS), ZONE_DNAME_CHECK(GenericTime, LongName, "CET");
QString("CEST")); ZONE_DNAME_CHECK(GenericTime, ShortName, "CET");
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::ShortName, enUS), ZONE_DNAME_CHECK(GenericTime, OffsetName, "CET");
QString("CEST"));
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::OffsetName, enUS),
QString("CEST"));
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::LongName, enUS),
QString("CET"));
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::ShortName, enUS),
QString("CET"));
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::OffsetName, enUS),
QString("CET"));
#endif // icu #endif // icu
// Test Abbreviations // Test Abbreviations
@ -1354,25 +1332,16 @@ void tst_QTimeZone::macTest()
if (debug) { if (debug) {
// Test display names by type // Test display names by type
QLocale enUS("en_US"); QLocale enUS("en_US");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::LongName, enUS), ZONE_DNAME_CHECK(StandardTime, LongName, "Central European Standard Time");
QString("Central European Standard Time")); ZONE_DNAME_CHECK(StandardTime, ShortName, "GMT+01:00");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::ShortName, enUS), ZONE_DNAME_CHECK(StandardTime, OffsetName, "UTC+01:00");
QString("GMT+01:00")); ZONE_DNAME_CHECK(DaylightTime, LongName, "Central European Summer Time");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::OffsetName, enUS), ZONE_DNAME_CHECK(DaylightTime, ShortName, "GMT+02:00");
QString("UTC+01:00")); ZONE_DNAME_CHECK(DaylightTime, OffsetName, "UTC+02:00");
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::LongName, enUS),
QString("Central European Summer Time"));
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::ShortName, enUS),
QString("GMT+02:00"));
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::OffsetName, enUS),
QString("UTC+02:00"));
// ICU C api does not support Generic Time yet, C++ api does // ICU C api does not support Generic Time yet, C++ api does
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::LongName, enUS), ZONE_DNAME_CHECK(GenericTime, LongName, "Central European Time");
QString("Central European Time")); ZONE_DNAME_CHECK(GenericTime, ShortName, "Germany Time");
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::ShortName, enUS), ZONE_DNAME_CHECK(GenericTime, OffsetName, "UTC+01:00");
QString("Germany Time"));
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::OffsetName, enUS),
QString("UTC+01:00"));
// Test Abbreviations // Test Abbreviations
QCOMPARE(tzp.abbreviation(std), QString("CET")); QCOMPARE(tzp.abbreviation(std), QString("CET"));
@ -1423,24 +1392,17 @@ void tst_QTimeZone::winTest()
if (debug) { if (debug) {
// Test display names by type // Test display names by type
QLocale enUS("en_US"); QLocale enUS("en_US");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::LongName, enUS), ZONE_DNAME_CHECK(StandardTime, LongName, "W. Europe Standard Time");
QString("W. Europe Standard Time")); ZONE_DNAME_CHECK(StandardTime, ShortName, "W. Europe Standard Time");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::ShortName, enUS), ZONE_DNAME_CHECK(StandardTime, OffsetName, "UTC+01:00");
QString("W. Europe Standard Time")); ZONE_DNAME_CHECK(DaylightTime, LongName, "W. Europe Daylight Time");
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::OffsetName, enUS), ZONE_DNAME_CHECK(DaylightTime, ShortName, "W. Europe Daylight Time");
QString("UTC+01:00")); ZONE_DNAME_CHECK(DaylightTime, OffsetName, "UTC+02:00");
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::LongName, enUS), ZONE_DNAME_CHECK(GenericTime, LongName,
QString("W. Europe Daylight Time")); "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna");
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::ShortName, enUS), ZONE_DNAME_CHECK(GenericTime, ShortName,
QString("W. Europe Daylight Time")); "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna");
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::OffsetName, enUS), ZONE_DNAME_CHECK(GenericTime, OffsetName, "UTC+01:00");
QString("UTC+02:00"));
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::LongName, enUS),
QString("(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"));
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::ShortName, enUS),
QString("(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"));
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::OffsetName, enUS),
QString("UTC+01:00"));
// Test Abbreviations // Test Abbreviations
QCOMPARE(tzp.abbreviation(std), QString("W. Europe Standard Time")); QCOMPARE(tzp.abbreviation(std), QString("W. Europe Standard Time"));
@ -1453,6 +1415,7 @@ void tst_QTimeZone::winTest()
testEpochTranPrivate(QWinTimeZonePrivate("America/Toronto")); testEpochTranPrivate(QWinTimeZonePrivate("America/Toronto"));
#endif // QT_BUILD_INTERNAL && USING_WIN_TZ #endif // QT_BUILD_INTERNAL && USING_WIN_TZ
} }
#undef ZONE_DNAME_CHECK
#ifdef QT_BUILD_INTERNAL #ifdef QT_BUILD_INTERNAL
// Test each private produces the same basic results for CET // Test each private produces the same basic results for CET