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

Correct a test's precondition on the system zone

Browse Source 
America/Sao_Paulo was not alone in starting 2008-10-19 with a spring
forward. Include the other affected zones in the check to tune the
expected start-of-day time. See [0] for details.

[0] https://github.com/eggert/tz/blob/main/southamerica

Pick-to: 6.5
Change-Id: If251d8b715090319441790696983273637765d2e
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2023-03-24 14:26:35 +01:00
parent bab9af5891
commit b81515c58a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2679,10 +2679,16 @@ void tst_QDateTime::fromStringDateFormat_data()
QTest::newRow("ISO 24:00") << QString::fromLatin1("2012-06-04T24:00:00")
<< Qt::ISODate << QDate(2012, 6, 5).startOfDay();
#if QT_CONFIG(timezone)
QTest::newRow("ISO 24:00 in DST") // Only special if TZ=America/Sao_Paulo
const QByteArray sysId = QTimeZone::systemTimeZoneId();
const bool midnightSkip = sysId == "America/Sao_Paulo" || sysId == "America/Asuncion"
|| sysId == "America/Cordoba" || sysId == "America/Argentina/Cordoba"
|| sysId == "America/Campo_Grande"
|| sysId == "America/Cuiaba" || sysId == "America/Buenos_Aires"
|| sysId == "America/Argentina/Buenos_Aires"
|| sysId == "America/Argentina/Tucuman" || sysId == "Brazil/East";
QTest::newRow("ISO 24:00 in DST") // Midnight spring forward in some of South America.
<< QString::fromLatin1("2008-10-18T24:00") << Qt::ISODate
<< QDateTime(QDate(2008, 10, 19),
QTime(QTimeZone::systemTimeZoneId() == "America/Sao_Paulo" ? 1 : 0, 0));
<< QDateTime(QDate(2008, 10, 19), QTime(midnightSkip ? 1 : 0, 0));
#endif
QTest::newRow("ISO 24:00 end of month")
<< QString::fromLatin1("2012-06-30T24:00:00")