AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QDateTime: cope with MET masquerading as CET

Browse Source 
MET is an alias for CET, so the test's attempts to detect whether it's
in CET can't distinguish them other than by checking the abbreviation.

Change-Id: Ibb467d9bb2d983ca16302111b54f664a614057c2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2023-03-24 14:30:45 +01:00
parent cb54fa634a
commit fac6567208
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
View File

@ -3465,16 +3465,34 @@ void tst_QDateTime::timeZoneAbbreviation()
if (zoneIsCET) {
// Time definitely in Standard Time
QDateTime dt4 = QDate(2013, 1, 1).startOfDay();
/* Note that MET is functionally an alias for CET (their zoneinfo files
differ only in the first letter of the abbreviations), unlike the
various zones that give CET as their abbreviation.
*/
{
const auto abbrev = dt4.timeZoneAbbreviation();
auto reporter = qScopeGuard([abbrev]() {
qDebug() << "Unexpected abbreviation" << abbrev;
});
#ifdef Q_OS_WIN
QEXPECT_FAIL("", "Windows only reports long name (QTBUG-32759)", Continue);
QEXPECT_FAIL("", "Windows only reports long name (QTBUG-32759)", Continue);
#endif
QCOMPARE(dt4.timeZoneAbbreviation(), QStringLiteral("CET"));
QVERIFY(abbrev == u"CET"_s || abbrev == u"MET"_s);
reporter.dismiss();
}
// Time definitely in Daylight Time
QDateTime dt5 = QDate(2013, 6, 1).startOfDay();
{
const auto abbrev = dt5.timeZoneAbbreviation();
auto reporter = qScopeGuard([abbrev]() {
qDebug() << "Unexpected abbreviation" << abbrev;
});
#ifdef Q_OS_WIN
QEXPECT_FAIL("", "Windows only reports long name (QTBUG-32759)", Continue);
QEXPECT_FAIL("", "Windows only reports long name (QTBUG-32759)", Continue);
#endif
QCOMPARE(dt5.timeZoneAbbreviation(), QStringLiteral("CEST"));
QVERIFY(abbrev == u"CEST"_s || abbrev == u"MEST"_s);
reporter.dismiss();
}
} else {
qDebug("(Skipped some CET-only tests)");
}