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

Fix time-zone tests on macOS >= 10.13, which now knows what CET is

Browse Source 
These tests kludge round Apple's use of GMT+1 and GMT+2 as names for
CET and CEST on Darwin; but 10.13 actually gets the names right, so
side-step out of the kludge when on this version or later.

Change-Id: Icb8a2f3ac30f0f621a19042dc03e0d281782dd41
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
This commit is contained in:
Edward Welbourne 2018-08-09 15:20:50 +02:00
parent b7613fb10f
commit fd38c97a6c
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
View File

@ -2726,15 +2726,15 @@ void tst_QDateTime::timeZoneAbbreviation()
qDebug("(Skipped some CET-only tests)"); qDebug("(Skipped some CET-only tests)");
} }
QString cet(QStringLiteral("CET")), cest(QStringLiteral("CEST"));
#ifdef Q_OS_ANDROID // Only reports (general) zones as offsets (QTBUG-68837) #ifdef Q_OS_ANDROID // Only reports (general) zones as offsets (QTBUG-68837)
const QString cet(QStringLiteral("GMT+01:00")); cet = QStringLiteral("GMT+01:00");
const QString cest(QStringLiteral("GMT+02:00")); cest = QStringLiteral("GMT+02:00");
#elif defined Q_OS_DARWIN #elif defined Q_OS_DARWIN // Lacked real names until 10.13, High Sierra
const QString cet(QStringLiteral("GMT+1")); if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSHighSierra) {
const QString cest(QStringLiteral("GMT+2")); cet = QStringLiteral("GMT+1");
#else cest = QStringLiteral("GMT+2");
const QString cet(QStringLiteral("CET")); }
const QString cest(QStringLiteral("CEST"));
#endif #endif
QDateTime dt5(QDate(2013, 1, 1), QTime(0, 0, 0), QTimeZone("Europe/Berlin")); QDateTime dt5(QDate(2013, 1, 1), QTime(0, 0, 0), QTimeZone("Europe/Berlin"));

16
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
View File

@ -1585,15 +1585,15 @@ void tst_QLocale::formatTimeZone()
qDebug("(Skipped some CET-only tests)"); qDebug("(Skipped some CET-only tests)");
} }
QString cet(QStringLiteral("CET")), cest(QStringLiteral("CEST"));
#ifdef Q_OS_ANDROID // Only reports (general) zones as offsets (QTBUG-68837) #ifdef Q_OS_ANDROID // Only reports (general) zones as offsets (QTBUG-68837)
const QString cet(QStringLiteral("GMT+01:00")); cet = QStringLiteral("GMT+01:00");
const QString cest(QStringLiteral("GMT+02:00")); cest = QStringLiteral("GMT+02:00");
#elif defined Q_OS_DARWIN #elif defined Q_OS_DARWIN // Lacked real names until 10.13, High Sierra
const QString cet(QStringLiteral("GMT+1")); if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSHighSierra) {
const QString cest(QStringLiteral("GMT+2")); cet = QStringLiteral("GMT+1");
#else cest = QStringLiteral("GMT+2");
const QString cet(QStringLiteral("CET")); }
const QString cest(QStringLiteral("CEST"));
#endif #endif
QDateTime dt6(QDate(2013, 1, 1), QTime(0, 0, 0), QTimeZone("Europe/Berlin")); QDateTime dt6(QDate(2013, 1, 1), QTime(0, 0, 0), QTimeZone("Europe/Berlin"));