diff options
Diffstat (limited to 'tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp')
-rw-r--r-- | tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp | 2041 |
1 files changed, 1258 insertions, 783 deletions
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp index 4f3fc881b4..f9c6afc795 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -1,14 +1,24 @@ // Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2016 Intel Corporation. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#include <QDateTime> #include <QTest> -#include <time.h> -#include <qdatetime.h> + +#include <QTimeZone> #include <private/qdatetime_p.h> +#include <private/qtenvironmentvariables_p.h> // for qTzSet(), qTzName() +#include <private/qcomparisontesthelper_p.h> #ifdef Q_OS_WIN -# include <qt_windows.h> +# include <qt_windows.h> +# if !QT_CONFIG(icu) +// The native MS back-end for time-zones lacks info about historic transitions: +# define INADEQUATE_TZ_DATA +# endif +#endif +#ifdef Q_OS_ANDROID // Also seems to lack full-day zone transitions: +# define INADEQUATE_TZ_DATA #endif using namespace Qt::StringLiterals; @@ -30,7 +40,9 @@ private Q_SLOTS: void isValid(); void date(); void time(); +#if QT_DEPRECATED_SINCE(6, 9) void timeSpec(); +#endif void toSecsSinceEpoch_data(); void toSecsSinceEpoch(); void daylightSavingsTimeChange_data(); @@ -40,13 +52,17 @@ private Q_SLOTS: void setDate(); void setTime_data(); void setTime(); + void setTimeZone_data(); + void setTimeZone(); +#if QT_DEPRECATED_SINCE(6, 9) void setTimeSpec_data(); void setTimeSpec(); +#endif void setSecsSinceEpoch(); void setMSecsSinceEpoch_data(); void setMSecsSinceEpoch(); void fromSecsSinceEpoch(); - void fromMSecsSinceEpoch_data(); + void fromMSecsSinceEpoch_data() { setMSecsSinceEpoch_data(); } void fromMSecsSinceEpoch(); #if QT_CONFIG(datestring) void toString_isoDate_data(); @@ -70,20 +86,25 @@ private Q_SLOTS: void addSecs(); void addMSecs_data(); void addMSecs(); +#if QT_DEPRECATED_SINCE(6, 9) void toTimeSpec_data(); void toTimeSpec(); - void toLocalTime_data(); + void toLocalTime_data() { toTimeSpec_data(); } void toLocalTime(); - void toUTC_data(); + void toUTC_data() { toTimeSpec_data(); } void toUTC(); void toUTC_extra(); +#endif void daysTo(); void secsTo_data(); void secsTo(); - void msecsTo_data(); + void msecsTo_data() { addMSecs_data(); } void msecsTo(); + void orderingCompiles(); void operator_eqeq_data(); void operator_eqeq(); + void ordering_data(); + void ordering(); void operator_insert_extract_data(); void operator_insert_extract(); void currentDateTime(); @@ -101,8 +122,10 @@ private Q_SLOTS: #endif void offsetFromUtc(); +#if QT_DEPRECATED_SINCE(6, 9) void setOffsetFromUtc(); void toOffsetFromUtc(); +#endif void zoneAtTime_data(); void zoneAtTime(); @@ -139,10 +162,34 @@ private Q_SLOTS: #endif private: - enum { LocalTimeIsUtc = 0, LocalTimeAheadOfUtc = 1, LocalTimeBehindUtc = -1} localTimeType; + /* + Various zones close to UTC (notably Iceland, the WET zones and several in + West Africa) or nominally assigned to it historically (north Canada, the + Antarctic) and those that have crossed the international date-line (by + skipping or repeating a day) don't have a consistent answer to "which side + of UTC is it ?" So the various LocalTimeType members may be different. + */ + enum LocalTimeType { LocalTimeIsUtc = 0, LocalTimeAheadOfUtc = 1, LocalTimeBehindUtc = -1}; + const LocalTimeType solarMeanType, epochTimeType, futureTimeType, distantTimeType; + static constexpr auto UTC = QTimeZone::UTC; + static constexpr qint64 epochJd = Q_INT64_C(2440588); int preZoneFix; bool zoneIsCET; + static LocalTimeType timeTypeFor(qint64 jand, qint64 juld) + { + constexpr uint day = 24 * 3600; // in seconds + QDateTime jan = QDateTime::fromSecsSinceEpoch(jand * day); + QDateTime jul = QDateTime::fromSecsSinceEpoch(juld * day); + if (jan.date().toJulianDay() < jand + epochJd || jul.date().toJulianDay() < juld + epochJd) + return LocalTimeBehindUtc; + if (jan.date().toJulianDay() > jand + epochJd || jul.date().toJulianDay() > juld + epochJd + || jan.time().hour() > 0 || jul.time().hour() > 0) { + return LocalTimeAheadOfUtc; + } + return LocalTimeIsUtc; + } + class TimeZoneRollback { const QByteArray prior; @@ -170,7 +217,18 @@ private: Q_DECLARE_METATYPE(Qt::TimeSpec) Q_DECLARE_METATYPE(Qt::DateFormat) -tst_QDateTime::tst_QDateTime() +tst_QDateTime::tst_QDateTime() : + // UTC starts of January and July in the commented years: + solarMeanType(timeTypeFor(-62091, -61910)), // 1800 + epochTimeType(timeTypeFor(0, 181)), // 1970 + // Use stable future, to which current rule is extrapolated, as surrogate for variable current: + futureTimeType(timeTypeFor(24837, 25018)), // 2038 + // The glibc functions only handle DST as far as a 32-bit signed day-count + // from some date in 1970 reaches; the future extreme of that is in the + // second half of 5'881'580 CE. Beyond 5'881'581 CE it treats all zones as + // being in their January state, regardless of time of year. So use data for + // this later year for tests of QDateTime's upper bound. + distantTimeType(timeTypeFor(0x800000adLL, 0x80000162LL)) { /* Due to some jurisdictions changing their zones and rules, it's possible @@ -184,7 +242,6 @@ tst_QDateTime::tst_QDateTime() might not be properly handled by our work-arounds for the MS backend and 32-bit time_t; so don't probe them here. */ - const uint day = 24 * 3600; // in seconds zoneIsCET = (QDateTime(QDate(2038, 1, 19), QTime(4, 14, 7)).toSecsSinceEpoch() == 0x7fffffff // Entries a year apart robustly differ by multiples of day. && QDate(2015, 7, 1).startOfDay().toSecsSinceEpoch() == 1435701600 @@ -214,31 +271,6 @@ tst_QDateTime::tst_QDateTime() Q_ASSERT(preZoneFix > -7200 && preZoneFix < 7200); // So it's OK to add it to a QTime() between 02:00 and 22:00, but otherwise // we must add it to the QDateTime constructed from it. - - /* - Again, rule changes can cause a TZ to look like UTC at some sample dates - but deviate at some date relevant to a test using localTimeType. These - tests mostly use years outside the 1970--2037 range, for which we trust - our TZ data, so we can't helpfully be exhaustive. Instead, scan a sample - of years' starts and middles. - */ - const int sampled = 3; - // UTC starts of months in 2004, 2038 and 1970: - qint64 jans[sampled] = { 12418 * day, 24837 * day, 0 }; - qint64 juls[sampled] = { 12600 * day, 25018 * day, 181 * day }; - localTimeType = LocalTimeIsUtc; - for (int i = sampled; i-- > 0; ) { - QDateTime jan = QDateTime::fromSecsSinceEpoch(jans[i]); - QDateTime jul = QDateTime::fromSecsSinceEpoch(juls[i]); - if (jan.date().year() < 1970 || jul.date().month() < 7) { - localTimeType = LocalTimeBehindUtc; - break; - } else if (jan.time().hour() > 0 || jul.time().hour() > 0 - || jan.date().day() > 1 || jul.date().day() > 1) { - localTimeType = LocalTimeAheadOfUtc; - break; - } - } } void tst_QDateTime::initTestCase() @@ -246,7 +278,7 @@ void tst_QDateTime::initTestCase() // Never construct a message like this in an i18n context... const char *typemsg1 = "exactly"; const char *typemsg2 = "and therefore not"; - switch (localTimeType) { + switch (futureTimeType) { case LocalTimeIsUtc: break; case LocalTimeBehindUtc: @@ -269,9 +301,9 @@ void tst_QDateTime::ctor() { QDateTime dt1(QDate(2004, 1, 2), QTime(1, 2, 3)); QCOMPARE(dt1.timeSpec(), Qt::LocalTime); - QDateTime dt2(QDate(2004, 1, 2), QTime(1, 2, 3), Qt::LocalTime); + QDateTime dt2(QDate(2004, 1, 2), QTime(1, 2, 3)); QCOMPARE(dt2.timeSpec(), Qt::LocalTime); - QDateTime dt3(QDate(2004, 1, 2), QTime(1, 2, 3), Qt::UTC); + QDateTime dt3(QDate(2004, 1, 2), QTime(1, 2, 3), UTC); QCOMPARE(dt3.timeSpec(), Qt::UTC); QVERIFY(dt1 == dt2); @@ -285,25 +317,26 @@ void tst_QDateTime::ctor() QDate offsetDate(2013, 1, 1); QTime offsetTime(1, 2, 3); - QDateTime offset1(offsetDate, offsetTime, Qt::OffsetFromUTC); + QDateTime offset1(offsetDate, offsetTime, QTimeZone::fromSecondsAheadOfUtc(0)); QCOMPARE(offset1.timeSpec(), Qt::UTC); QCOMPARE(offset1.offsetFromUtc(), 0); QCOMPARE(offset1.date(), offsetDate); QCOMPARE(offset1.time(), offsetTime); - QDateTime offset2(offsetDate, offsetTime, Qt::OffsetFromUTC, 0); + QDateTime offset2(offsetDate, offsetTime, + QTimeZone::fromDurationAheadOfUtc(std::chrono::seconds{})); QCOMPARE(offset2.timeSpec(), Qt::UTC); QCOMPARE(offset2.offsetFromUtc(), 0); QCOMPARE(offset2.date(), offsetDate); QCOMPARE(offset2.time(), offsetTime); - QDateTime offset3(offsetDate, offsetTime, Qt::OffsetFromUTC, 60 * 60); + QDateTime offset3(offsetDate, offsetTime, QTimeZone::fromSecondsAheadOfUtc(60 * 60)); QCOMPARE(offset3.timeSpec(), Qt::OffsetFromUTC); QCOMPARE(offset3.offsetFromUtc(), 60 * 60); QCOMPARE(offset3.date(), offsetDate); QCOMPARE(offset3.time(), offsetTime); - QDateTime offset4(offsetDate, QTime(0, 0), Qt::OffsetFromUTC, 60 * 60); + QDateTime offset4(offsetDate, QTime(0, 0), QTimeZone::fromSecondsAheadOfUtc(60 * 60)); QCOMPARE(offset4.timeSpec(), Qt::OffsetFromUTC); QCOMPARE(offset4.offsetFromUtc(), 60 * 60); QCOMPARE(offset4.date(), offsetDate); @@ -312,17 +345,17 @@ void tst_QDateTime::ctor() void tst_QDateTime::operator_eq() { - QVERIFY(QDateTime() != QDateTime(QDate(1970, 1, 1), QTime(0, 0))); // QTBUG-79006 - QDateTime dt1(QDate(2004, 3, 24), QTime(23, 45, 57), Qt::UTC); - QDateTime dt2(QDate(2005, 3, 11), QTime(0, 0), Qt::UTC); + QVERIFY(QDateTime() != QDate(1970, 1, 1).startOfDay()); // QTBUG-79006 + QDateTime dt1(QDate(2004, 3, 24), QTime(23, 45, 57), UTC); + QDateTime dt2(QDate(2005, 3, 11), QTime(0, 0), UTC); dt2 = dt1; QVERIFY(dt1 == dt2); } void tst_QDateTime::moveSemantics() { - QDateTime dt1{QDate{2004, 3, 24}, QTime{23, 45, 57}, Qt::UTC}; - QDateTime dt2{QDate{2005, 3, 11}, QTime{0, 0}, Qt::UTC}; + QDateTime dt1{QDate{2004, 3, 24}, QTime{23, 45, 57}, UTC}; + QDateTime dt2{QDate{2005, 3, 11}, QTime{0, 0}, UTC}; QDateTime copy = dt1; QDateTime moved = std::move(dt1); QCOMPARE(copy, moved); @@ -339,7 +372,7 @@ void tst_QDateTime::isNull() QVERIFY(dt1.isNull()); dt1.setTime(QTime()); QVERIFY(dt1.isNull()); - dt1.setTimeSpec(Qt::UTC); + dt1.setTimeZone(UTC); QVERIFY(dt1.isNull()); dt1.setTime(QTime(12, 34, 56)); @@ -370,7 +403,7 @@ void tst_QDateTime::isValid() QVERIFY(!dt1.isValid()); dt1.setTime(QTime()); QVERIFY(!dt1.isValid()); - dt1.setTimeSpec(Qt::UTC); + dt1.setTimeZone(UTC); QVERIFY(!dt1.isValid()); dt1.setDate(QDate(2004, 1, 2)); @@ -394,34 +427,37 @@ void tst_QDateTime::isValid() void tst_QDateTime::date() { - QDateTime dt1(QDate(2004, 3, 24), QTime(23, 45, 57), Qt::LocalTime); + QDateTime dt1(QDate(2004, 3, 24), QTime(23, 45, 57)); QCOMPARE(dt1.date(), QDate(2004, 3, 24)); - QDateTime dt2(QDate(2004, 3, 25), QTime(0, 45, 57), Qt::LocalTime); + QDateTime dt2(QDate(2004, 3, 25), QTime(0, 45, 57)); QCOMPARE(dt2.date(), QDate(2004, 3, 25)); - QDateTime dt3(QDate(2004, 3, 24), QTime(23, 45, 57), Qt::UTC); + QDateTime dt3(QDate(2004, 3, 24), QTime(23, 45, 57), UTC); QCOMPARE(dt3.date(), QDate(2004, 3, 24)); - QDateTime dt4(QDate(2004, 3, 25), QTime(0, 45, 57), Qt::UTC); + QDateTime dt4(QDate(2004, 3, 25), QTime(0, 45, 57), UTC); QCOMPARE(dt4.date(), QDate(2004, 3, 25)); } void tst_QDateTime::time() { - QDateTime dt1(QDate(2004, 3, 24), QTime(23, 45, 57), Qt::LocalTime); + QDateTime dt1(QDate(2004, 3, 24), QTime(23, 45, 57)); QCOMPARE(dt1.time(), QTime(23, 45, 57)); - QDateTime dt2(QDate(2004, 3, 25), QTime(0, 45, 57), Qt::LocalTime); + QDateTime dt2(QDate(2004, 3, 25), QTime(0, 45, 57)); QCOMPARE(dt2.time(), QTime(0, 45, 57)); - QDateTime dt3(QDate(2004, 3, 24), QTime(23, 45, 57), Qt::UTC); + QDateTime dt3(QDate(2004, 3, 24), QTime(23, 45, 57), UTC); QCOMPARE(dt3.time(), QTime(23, 45, 57)); - QDateTime dt4(QDate(2004, 3, 25), QTime(0, 45, 57), Qt::UTC); + QDateTime dt4(QDate(2004, 3, 25), QTime(0, 45, 57), UTC); QCOMPARE(dt4.time(), QTime(0, 45, 57)); } +#if QT_DEPRECATED_SINCE(6, 9) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED void tst_QDateTime::timeSpec() { QDateTime dt1(QDate(2004, 1, 24), QTime(23, 45, 57)); @@ -435,49 +471,51 @@ void tst_QDateTime::timeSpec() QCOMPARE(dt1.toTimeSpec(Qt::LocalTime).timeSpec(), Qt::LocalTime); QCOMPARE(dt1.toTimeSpec(Qt::UTC).timeSpec(), Qt::UTC); - QDateTime dt2(QDate(2004, 1, 24), QTime(23, 45, 57), Qt::LocalTime); + QDateTime dt2(QDate(2004, 1, 24), QTime(23, 45, 57)); QCOMPARE(dt2.timeSpec(), Qt::LocalTime); - QDateTime dt3(QDate(2004, 1, 25), QTime(0, 45, 57), Qt::UTC); + QDateTime dt3(QDate(2004, 1, 25), QTime(0, 45, 57), UTC); QCOMPARE(dt3.timeSpec(), Qt::UTC); QDateTime dt4 = QDateTime::currentDateTime(); QCOMPARE(dt4.timeSpec(), Qt::LocalTime); } +QT_WARNING_POP +#endif void tst_QDateTime::setDate() { - QDateTime dt1(QDate(2004, 3, 25), QTime(0, 45, 57), Qt::UTC); + QDateTime dt1(QDate(2004, 3, 25), QTime(0, 45, 57), UTC); dt1.setDate(QDate(2004, 6, 25)); QCOMPARE(dt1.date(), QDate(2004, 6, 25)); QCOMPARE(dt1.time(), QTime(0, 45, 57)); QCOMPARE(dt1.timeSpec(), Qt::UTC); - QDateTime dt2(QDate(2004, 3, 25), QTime(0, 45, 57), Qt::LocalTime); + QDateTime dt2(QDate(2004, 3, 25), QTime(0, 45, 57)); dt2.setDate(QDate(2004, 6, 25)); QCOMPARE(dt2.date(), QDate(2004, 6, 25)); QCOMPARE(dt2.time(), QTime(0, 45, 57)); QCOMPARE(dt2.timeSpec(), Qt::LocalTime); - QDateTime dt3(QDate(4004, 3, 25), QTime(0, 45, 57), Qt::UTC); + QDateTime dt3(QDate(4004, 3, 25), QTime(0, 45, 57), UTC); dt3.setDate(QDate(4004, 6, 25)); QCOMPARE(dt3.date(), QDate(4004, 6, 25)); QCOMPARE(dt3.time(), QTime(0, 45, 57)); QCOMPARE(dt3.timeSpec(), Qt::UTC); - QDateTime dt4(QDate(4004, 3, 25), QTime(0, 45, 57), Qt::LocalTime); + QDateTime dt4(QDate(4004, 3, 25), QTime(0, 45, 57)); dt4.setDate(QDate(4004, 6, 25)); QCOMPARE(dt4.date(), QDate(4004, 6, 25)); QCOMPARE(dt4.time(), QTime(0, 45, 57)); QCOMPARE(dt4.timeSpec(), Qt::LocalTime); - QDateTime dt5(QDate(1760, 3, 25), QTime(0, 45, 57), Qt::UTC); + QDateTime dt5(QDate(1760, 3, 25), QTime(0, 45, 57), UTC); dt5.setDate(QDate(1760, 6, 25)); QCOMPARE(dt5.date(), QDate(1760, 6, 25)); QCOMPARE(dt5.time(), QTime(0, 45, 57)); QCOMPARE(dt5.timeSpec(), Qt::UTC); - QDateTime dt6(QDate(1760, 3, 25), QTime(0, 45, 57), Qt::LocalTime); + QDateTime dt6(QDate(1760, 3, 25), QTime(0, 45, 57)); dt6.setDate(QDate(1760, 6, 25)); QCOMPARE(dt6.date(), QDate(1760, 6, 25)); QCOMPARE(dt6.time(), QTime(0, 45, 57)); @@ -489,12 +527,18 @@ void tst_QDateTime::setTime_data() QTest::addColumn<QDateTime>("dateTime"); QTest::addColumn<QTime>("newTime"); - QTest::newRow("data0") << QDateTime(QDate(2004, 3, 25), QTime(0, 45, 57), Qt::UTC) << QTime(23, 11, 22); - QTest::newRow("data1") << QDateTime(QDate(2004, 3, 25), QTime(0, 45, 57), Qt::LocalTime) << QTime(23, 11, 22); - QTest::newRow("data2") << QDateTime(QDate(4004, 3, 25), QTime(0, 45, 57), Qt::UTC) << QTime(23, 11, 22); - QTest::newRow("data3") << QDateTime(QDate(4004, 3, 25), QTime(0, 45, 57), Qt::LocalTime) << QTime(23, 11, 22); - QTest::newRow("data4") << QDateTime(QDate(1760, 3, 25), QTime(0, 45, 57), Qt::UTC) << QTime(23, 11, 22); - QTest::newRow("data5") << QDateTime(QDate(1760, 3, 25), QTime(0, 45, 57), Qt::LocalTime) << QTime(23, 11, 22); + QTest::newRow("data0") + << QDateTime(QDate(2004, 3, 25), QTime(0, 45, 57), UTC) << QTime(23, 11, 22); + QTest::newRow("data1") + << QDateTime(QDate(2004, 3, 25), QTime(0, 45, 57)) << QTime(23, 11, 22); + QTest::newRow("data2") + << QDateTime(QDate(4004, 3, 25), QTime(0, 45, 57), UTC) << QTime(23, 11, 22); + QTest::newRow("data3") + << QDateTime(QDate(4004, 3, 25), QTime(0, 45, 57)) << QTime(23, 11, 22); + QTest::newRow("data4") + << QDateTime(QDate(1760, 3, 25), QTime(0, 45, 57), UTC) << QTime(23, 11, 22); + QTest::newRow("data5") + << QDateTime(QDate(1760, 3, 25), QTime(0, 45, 57)) << QTime(23, 11, 22); QTest::newRow("set on std/dst") << QDateTime::currentDateTime() << QTime(23, 11, 22); } @@ -514,16 +558,73 @@ void tst_QDateTime::setTime() QCOMPARE(dateTime.timeSpec(), expectedTimeSpec); } +void tst_QDateTime::setTimeZone_data() +{ + QTest::addColumn<QDateTime>("dateTime"); + QTest::addColumn<QTimeZone>("zone"); + const QDate day(2004, 3, 25); + const QTime time(0, 45, 57); + struct { + const char *id; + QTimeZone zone; + } data[] = { + { nullptr, QTimeZone() }, // For time-zone, when supported. + { "UTC", UTC }, + { "LocalTime", QTimeZone() }, + { "Offset", QTimeZone::fromSecondsAheadOfUtc(3600) } + }; +#if QT_CONFIG(timezone) + const QTimeZone cet("Europe/Oslo"); + if (cet.isValid()) { + data[0].zone = cet; + data[0].id = "Zone"; + } +#endif + for (const auto &from : data) { + if (from.id) { + for (const auto &to : data) { + if (to.id) { + QTest::addRow("%s => %s", from.id, to.id) + << QDateTime(day, time, from.zone) << to.zone; + } + } + } + } +} + +void tst_QDateTime::setTimeZone() +{ + QFETCH(QDateTime, dateTime); + QFETCH(QTimeZone, zone); + + // QDateTime::setTimeZone() preserves the date and time rather than + // converting to the new time representation. + const QDate expectedDate(dateTime.date()); + const QTime expectedTime(dateTime.time()); + + dateTime.setTimeZone(zone); + + QCOMPARE(dateTime.date(), expectedDate); + QCOMPARE(dateTime.time(), expectedTime); + QCOMPARE(dateTime.timeRepresentation(), zone); +} + +#if QT_DEPRECATED_SINCE(6, 9) void tst_QDateTime::setTimeSpec_data() { QTest::addColumn<QDateTime>("dateTime"); QTest::addColumn<Qt::TimeSpec>("newTimeSpec"); - QTest::newRow("UTC => UTC") << QDateTime(QDate(2004, 3, 25), QTime(0, 45, 57), Qt::UTC) << Qt::UTC; - QTest::newRow("UTC => LocalTime") << QDateTime(QDate(2004, 3, 25), QTime(0, 45, 57), Qt::UTC) << Qt::LocalTime; - QTest::newRow("UTC => OffsetFromUTC") << QDateTime(QDate(2004, 3, 25), QTime(0, 45, 57), Qt::UTC) << Qt::OffsetFromUTC; + QTest::newRow("UTC => UTC") + << QDateTime(QDate(2004, 3, 25), QTime(0, 45, 57), UTC) << Qt::UTC; + QTest::newRow("UTC => LocalTime") + << QDateTime(QDate(2004, 3, 25), QTime(0, 45, 57), UTC) << Qt::LocalTime; + QTest::newRow("UTC => OffsetFromUTC") + << QDateTime(QDate(2004, 3, 25), QTime(0, 45, 57), UTC) << Qt::OffsetFromUTC; } +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED void tst_QDateTime::setTimeSpec() { QFETCH(QDateTime, dateTime); @@ -541,59 +642,61 @@ void tst_QDateTime::setTimeSpec() else QCOMPARE(dateTime.timeSpec(), newTimeSpec); } +QT_WARNING_POP +#endif void tst_QDateTime::setSecsSinceEpoch() { QDateTime dt1; dt1.setSecsSinceEpoch(0); - QCOMPARE(dt1.toUTC(), QDate(1970, 1, 1).startOfDay(Qt::UTC)); + QCOMPARE(dt1.toUTC(), QDate(1970, 1, 1).startOfDay(UTC)); QCOMPARE(dt1.timeSpec(), Qt::LocalTime); - dt1.setTimeSpec(Qt::UTC); + dt1.setTimeZone(UTC); dt1.setSecsSinceEpoch(0); - QCOMPARE(dt1, QDate(1970, 1, 1).startOfDay(Qt::UTC)); + QCOMPARE(dt1, QDate(1970, 1, 1).startOfDay(UTC)); QCOMPARE(dt1.timeSpec(), Qt::UTC); dt1.setSecsSinceEpoch(123456); - QCOMPARE(dt1, QDateTime(QDate(1970, 1, 2), QTime(10, 17, 36), Qt::UTC)); + QCOMPARE(dt1, QDateTime(QDate(1970, 1, 2), QTime(10, 17, 36), UTC)); if (zoneIsCET) { QDateTime dt2; dt2.setSecsSinceEpoch(123456); - QCOMPARE(dt2, QDateTime(QDate(1970, 1, 2), QTime(11, 17, 36), Qt::LocalTime)); + QCOMPARE(dt2, QDateTime(QDate(1970, 1, 2), QTime(11, 17, 36))); } dt1.setSecsSinceEpoch((uint)(quint32)-123456); - QCOMPARE(dt1, QDateTime(QDate(2106, 2, 5), QTime(20, 10, 40), Qt::UTC)); + QCOMPARE(dt1, QDateTime(QDate(2106, 2, 5), QTime(20, 10, 40), UTC)); if (zoneIsCET) { QDateTime dt2; dt2.setSecsSinceEpoch((uint)(quint32)-123456); - QCOMPARE(dt2, QDateTime(QDate(2106, 2, 5), QTime(21, 10, 40), Qt::LocalTime)); + QCOMPARE(dt2, QDateTime(QDate(2106, 2, 5), QTime(21, 10, 40))); } dt1.setSecsSinceEpoch(1214567890); - QCOMPARE(dt1, QDateTime(QDate(2008, 6, 27), QTime(11, 58, 10), Qt::UTC)); + QCOMPARE(dt1, QDateTime(QDate(2008, 6, 27), QTime(11, 58, 10), UTC)); if (zoneIsCET) { QDateTime dt2; dt2.setSecsSinceEpoch(1214567890); - QCOMPARE(dt2, QDateTime(QDate(2008, 6, 27), QTime(13, 58, 10), Qt::LocalTime)); + QCOMPARE(dt2, QDateTime(QDate(2008, 6, 27), QTime(13, 58, 10))); } dt1.setSecsSinceEpoch(0x7FFFFFFF); - QCOMPARE(dt1, QDateTime(QDate(2038, 1, 19), QTime(3, 14, 7), Qt::UTC)); + QCOMPARE(dt1, QDateTime(QDate(2038, 1, 19), QTime(3, 14, 7), UTC)); if (zoneIsCET) { QDateTime dt2; dt2.setSecsSinceEpoch(0x7FFFFFFF); - QCOMPARE(dt2, QDateTime(QDate(2038, 1, 19), QTime(4, 14, 7), Qt::LocalTime)); + QCOMPARE(dt2, QDateTime(QDate(2038, 1, 19), QTime(4, 14, 7))); } - dt1 = QDateTime(QDate(2013, 1, 1), QTime(0, 0), Qt::OffsetFromUTC, 60 * 60); + dt1 = QDateTime(QDate(2013, 1, 1), QTime(0, 0), QTimeZone::fromSecondsAheadOfUtc(60 * 60)); dt1.setSecsSinceEpoch(123456); - QCOMPARE(dt1, QDateTime(QDate(1970, 1, 2), QTime(10, 17, 36), Qt::UTC)); + QCOMPARE(dt1, QDateTime(QDate(1970, 1, 2), QTime(10, 17, 36), UTC)); QCOMPARE(dt1.timeSpec(), Qt::OffsetFromUTC); QCOMPARE(dt1.offsetFromUtc(), 60 * 60); // Only testing UTC; see fromSecsSinceEpoch() for fuller test. - dt1.setTimeSpec(Qt::UTC); + dt1.setTimeZone(UTC); const qint64 maxSeconds = std::numeric_limits<qint64>::max() / 1000; dt1.setSecsSinceEpoch(maxSeconds); QVERIFY(dt1.isValid()); @@ -615,56 +718,56 @@ void tst_QDateTime::setMSecsSinceEpoch_data() QTest::newRow("zero") << Q_INT64_C(0) - << QDateTime(QDate(1970, 1, 1), QTime(0, 0), Qt::UTC) + << QDateTime(QDate(1970, 1, 1), QTime(0, 0), UTC) << QDateTime(QDate(1970, 1, 1), QTime(1, 0)); QTest::newRow("+1ms") << Q_INT64_C(+1) - << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 0, 1), Qt::UTC) + << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 0, 1), UTC) << QDateTime(QDate(1970, 1, 1), QTime(1, 0, 0, 1)); QTest::newRow("+1s") << Q_INT64_C(+1000) - << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 1), Qt::UTC) + << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 1), UTC) << QDateTime(QDate(1970, 1, 1), QTime(1, 0, 1)); QTest::newRow("-1ms") << Q_INT64_C(-1) - << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59, 999), Qt::UTC) + << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59, 999), UTC) << QDateTime(QDate(1970, 1, 1), QTime(0, 59, 59, 999)); QTest::newRow("-1s") << Q_INT64_C(-1000) - << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), Qt::UTC) + << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), UTC) << QDateTime(QDate(1970, 1, 1), QTime(0, 59, 59)); QTest::newRow("123456789") << Q_INT64_C(123456789) - << QDateTime(QDate(1970, 1, 2), QTime(10, 17, 36, 789), Qt::UTC) - << QDateTime(QDate(1970, 1, 2), QTime(11, 17, 36, 789), Qt::LocalTime); + << QDateTime(QDate(1970, 1, 2), QTime(10, 17, 36, 789), UTC) + << QDateTime(QDate(1970, 1, 2), QTime(11, 17, 36, 789)); QTest::newRow("-123456789") << Q_INT64_C(-123456789) - << QDateTime(QDate(1969, 12, 30), QTime(13, 42, 23, 211), Qt::UTC) - << QDateTime(QDate(1969, 12, 30), QTime(14, 42, 23, 211), Qt::LocalTime); + << QDateTime(QDate(1969, 12, 30), QTime(13, 42, 23, 211), UTC) + << QDateTime(QDate(1969, 12, 30), QTime(14, 42, 23, 211)); QTest::newRow("post-32-bit-time_t") << (Q_INT64_C(1000) << 32) - << QDateTime(QDate(2106, 2, 7), QTime(6, 28, 16), Qt::UTC) + << QDateTime(QDate(2106, 2, 7), QTime(6, 28, 16), UTC) << QDateTime(QDate(2106, 2, 7), QTime(7, 28, 16)); QTest::newRow("very-large") << (Q_INT64_C(123456) << 32) - << QDateTime(QDate(18772, 8, 15), QTime(1, 8, 14, 976), Qt::UTC) + << QDateTime(QDate(18772, 8, 15), QTime(1, 8, 14, 976), UTC) << QDateTime(QDate(18772, 8, 15), QTime(3, 8, 14, 976)); QTest::newRow("old min (Tue Nov 25 00:00:00 -4714)") << Q_INT64_C(-210866716800000) - << QDateTime(QDate::fromJulianDay(1), QTime(0, 0), Qt::UTC) + << QDateTime(QDate::fromJulianDay(1), QTime(0, 0), UTC) << QDateTime(QDate::fromJulianDay(1), QTime(1, 0)).addSecs(preZoneFix); QTest::newRow("old max (Tue Jun 3 21:59:59 5874898)") << Q_INT64_C(185331720376799999) - << QDateTime(QDate::fromJulianDay(0x7fffffff), QTime(21, 59, 59, 999), Qt::UTC) + << QDateTime(QDate::fromJulianDay(0x7fffffff), QTime(21, 59, 59, 999), UTC) << QDateTime(QDate::fromJulianDay(0x7fffffff), QTime(23, 59, 59, 999)); QTest::newRow("min") << std::numeric_limits<qint64>::min() - << QDateTime(QDate(-292275056, 5, 16), QTime(16, 47, 4, 192), Qt::UTC) + << QDateTime(QDate(-292275056, 5, 16), QTime(16, 47, 4, 192), UTC) << QDateTime(QDate(-292275056, 5, 16), QTime(17, 47, 4, 192).addSecs(preZoneFix)); QTest::newRow("max") << std::numeric_limits<qint64>::max() - << QDateTime(QDate(292278994, 8, 17), QTime(7, 12, 55, 807), Qt::UTC) - << QDateTime(QDate(292278994, 8, 17), QTime(9, 12, 55, 807), Qt::LocalTime); + << QDateTime(QDate(292278994, 8, 17), QTime(7, 12, 55, 807), UTC) + << QDateTime(QDate(292278994, 8, 17), QTime(9, 12, 55, 807)); } void tst_QDateTime::setMSecsSinceEpoch() @@ -672,9 +775,10 @@ void tst_QDateTime::setMSecsSinceEpoch() QFETCH(qint64, msecs); QFETCH(QDateTime, utc); QFETCH(QDateTime, cet); + using Bound = std::numeric_limits<qint64>; QDateTime dt; - dt.setTimeSpec(Qt::UTC); + dt.setTimeZone(UTC); dt.setMSecsSinceEpoch(msecs); QCOMPARE(dt, utc); @@ -683,14 +787,14 @@ void tst_QDateTime::setMSecsSinceEpoch() QCOMPARE(dt.timeSpec(), Qt::UTC); { - QDateTime dt1 = QDateTime::fromMSecsSinceEpoch(msecs, Qt::UTC); + QDateTime dt1 = QDateTime::fromMSecsSinceEpoch(msecs, UTC); QCOMPARE(dt1, utc); QCOMPARE(dt1.date(), utc.date()); QCOMPARE(dt1.time(), utc.time()); QCOMPARE(dt1.timeSpec(), Qt::UTC); } { - QDateTime dt1(utc.date(), utc.time(), Qt::UTC); + QDateTime dt1(utc.date(), utc.time(), UTC); QCOMPARE(dt1, utc); QCOMPARE(dt1.date(), utc.date()); QCOMPARE(dt1.time(), utc.time()); @@ -705,10 +809,10 @@ void tst_QDateTime::setMSecsSinceEpoch() QCOMPARE(dt1.timeSpec(), Qt::UTC); } - if (zoneIsCET && (msecs == std::numeric_limits<qint64>::max() + if (zoneIsCET && (msecs == Bound::max() // LocalTime will also overflow for min in a CET zone west // of Greenwich (Europe/Madrid): - || (preZoneFix < -3600 && msecs == std::numeric_limits<qint64>::min()))) { + || (preZoneFix < -3600 && msecs == Bound::min()))) { QVERIFY(!cet.isValid()); // overflows } else if (zoneIsCET) { QVERIFY(cet.isValid()); @@ -716,7 +820,7 @@ void tst_QDateTime::setMSecsSinceEpoch() // Test converting from LocalTime to UTC back to LocalTime. QDateTime localDt; - localDt.setTimeSpec(Qt::LocalTime); + localDt.setTimeZone(QTimeZone::LocalTime); localDt.setMSecsSinceEpoch(msecs); QCOMPARE(localDt, utc); @@ -746,53 +850,51 @@ void tst_QDateTime::setMSecsSinceEpoch() QCOMPARE(dt.toMSecsSinceEpoch(), msecs); QCOMPARE(qint64(dt.toSecsSinceEpoch()), msecs / 1000); - QDateTime reference(QDate(1970, 1, 1), QTime(0, 0), Qt::UTC); + QDateTime reference(QDate(1970, 1, 1), QTime(0, 0), UTC); QCOMPARE(dt, reference.addMSecs(msecs)); // Tests that we correctly recognize when we fall off the extremities: - if (msecs == std::numeric_limits<qint64>::max()) { - QDateTime off(QDate(1970, 1, 1).startOfDay(Qt::OffsetFromUTC, 1)); + if (msecs == Bound::max()) { + QDateTime off(QDate(1970, 1, 1).startOfDay(QTimeZone::fromSecondsAheadOfUtc(1))); off.setMSecsSinceEpoch(msecs); QVERIFY(!off.isValid()); - } else if (msecs == std::numeric_limits<qint64>::min()) { - QDateTime off(QDate(1970, 1, 1).startOfDay(Qt::OffsetFromUTC, -1)); + } else if (msecs == Bound::min()) { + QDateTime off(QDate(1970, 1, 1).startOfDay(QTimeZone::fromSecondsAheadOfUtc(-1))); off.setMSecsSinceEpoch(msecs); QVERIFY(!off.isValid()); } - if ((localTimeType == LocalTimeAheadOfUtc && msecs == std::numeric_limits<qint64>::max()) - || (localTimeType == LocalTimeBehindUtc && msecs == std::numeric_limits<qint64>::min())) { + // Check overflow; only robust if local time is the same at epoch as relevant bound. + // See setting of LocalTimeType values for details. + if (epochTimeType == LocalTimeAheadOfUtc + ? distantTimeType == LocalTimeAheadOfUtc && msecs == Bound::max() + : (solarMeanType == LocalTimeBehindUtc && msecs == Bound::min() + && epochTimeType == LocalTimeBehindUtc)) { QDateTime curt = QDate(1970, 1, 1).startOfDay(); // initially in short-form curt.setMSecsSinceEpoch(msecs); // Overflows due to offset QVERIFY(!curt.isValid()); } } -void tst_QDateTime::fromMSecsSinceEpoch_data() -{ - setMSecsSinceEpoch_data(); -} - void tst_QDateTime::fromMSecsSinceEpoch() { QFETCH(qint64, msecs); QFETCH(QDateTime, utc); QFETCH(QDateTime, cet); using Bound = std::numeric_limits<qint64>; - if (msecs == Bound::min()) - qDebug() << "Local overflow:" << preZoneFix << Qt::hex; - QDateTime dtLocal = QDateTime::fromMSecsSinceEpoch(msecs, Qt::LocalTime); - QDateTime dtUtc = QDateTime::fromMSecsSinceEpoch(msecs, Qt::UTC); - QDateTime dtOffset = QDateTime::fromMSecsSinceEpoch(msecs, Qt::OffsetFromUTC, 60*60); + QDateTime dtLocal = QDateTime::fromMSecsSinceEpoch(msecs); + QDateTime dtUtc = QDateTime::fromMSecsSinceEpoch(msecs, UTC); + QDateTime dtOffset + = QDateTime::fromMSecsSinceEpoch(msecs, QTimeZone::fromSecondsAheadOfUtc(60 * 60)); // LocalTime will overflow for "min" or "max" tests, depending on whether // you're East or West of Greenwich. In UTC, we won't overflow. If we're // actually west of Greenwich but (e.g. Europe/Madrid) our zone claims east, // "min" can also overflow (case only caught if local time is CET). - const bool localOverflow = (localTimeType == LocalTimeAheadOfUtc - ? msecs == Bound::max() || preZoneFix < -3600 - : localTimeType == LocalTimeBehindUtc && msecs == Bound::min()); - if (!localOverflow) + const bool localOverflow = + (distantTimeType == LocalTimeAheadOfUtc && (msecs == Bound::max() || preZoneFix < -3600)) + || (solarMeanType == LocalTimeBehindUtc && msecs == Bound::min()); + if (!localOverflow) // Can fail if offset changes sign, e.g. Alaska, Philippines. QCOMPARE(dtLocal, utc); QCOMPARE(dtUtc, utc); @@ -826,7 +928,7 @@ void tst_QDateTime::fromMSecsSinceEpoch() if (msecs != Bound::max()) QCOMPARE(qint64(dtOffset.toSecsSinceEpoch()), msecs / 1000); - QDateTime reference(QDate(1970, 1, 1), QTime(0, 0), Qt::UTC); + QDateTime reference(QDate(1970, 1, 1), QTime(0, 0), UTC); if (!localOverflow) QCOMPARE(dtLocal, reference.addMSecs(msecs)); QCOMPARE(dtUtc, reference.addMSecs(msecs)); @@ -838,16 +940,31 @@ void tst_QDateTime::fromSecsSinceEpoch() { // Compare setSecsSinceEpoch() const qint64 maxSeconds = std::numeric_limits<qint64>::max() / 1000; - const QDateTime early = QDateTime::fromSecsSinceEpoch(-maxSeconds, Qt::UTC); - const QDateTime late = QDateTime::fromSecsSinceEpoch(maxSeconds, Qt::UTC); + const QDateTime early = QDateTime::fromSecsSinceEpoch(-maxSeconds, UTC); + const QDateTime late = QDateTime::fromSecsSinceEpoch(maxSeconds, UTC); QVERIFY(late.isValid()); - QVERIFY(!QDateTime::fromSecsSinceEpoch(maxSeconds + 1, Qt::UTC).isValid()); + QVERIFY(!QDateTime::fromSecsSinceEpoch(maxSeconds + 1, UTC).isValid()); QVERIFY(early.isValid()); - QVERIFY(!QDateTime::fromSecsSinceEpoch(-maxSeconds - 1, Qt::UTC).isValid()); + QVERIFY(!QDateTime::fromSecsSinceEpoch(-maxSeconds - 1, UTC).isValid()); // Local time: need to adjust for its zone offset - const qint64 last = maxSeconds - qMax(late.addYears(-1).toLocalTime().offsetFromUtc(), 0); + const int lateOffset = late.addYears(-1).toLocalTime().offsetFromUtc(); +#if QT_CONFIG(timezone) + // Check what system zone believes in, as it's used as fall-back to cope + // with times outside the system time_t functions' range, or overflow on the + // results of using those functions. (It seems glibc's handling of + // Australasian zones parts company with the IANA DB after about 5881580 CE, + // leaving NZ in permanent DST after that, for example.) Of course, if + // that's less than lateOffset (as it is for glibc's similar handling of + // MET), the fall-back code will also fail when the primary code fails, so + // use the lesser of these late offsets. + const int lateZone = qMin(QTimeZone::systemTimeZone().offsetFromUtc(late), lateOffset); +#else + const int lateZone = lateOffset; +#endif + + const qint64 last = maxSeconds - qMax(lateZone, 0); QVERIFY(QDateTime::fromSecsSinceEpoch(last).isValid()); QVERIFY(!QDateTime::fromSecsSinceEpoch(last + 1).isValid()); const qint64 first = -maxSeconds - qMin(early.addYears(1).toLocalTime().offsetFromUtc(), 0); @@ -855,10 +972,14 @@ void tst_QDateTime::fromSecsSinceEpoch() QVERIFY(!QDateTime::fromSecsSinceEpoch(first - 1).isValid()); // Use an offset for which .toUTC()'s return would flip the validity: - QVERIFY(QDateTime::fromSecsSinceEpoch(maxSeconds - 7200, Qt::OffsetFromUTC, 7200).isValid()); - QVERIFY(!QDateTime::fromSecsSinceEpoch(maxSeconds - 7199, Qt::OffsetFromUTC, 7200).isValid()); - QVERIFY(QDateTime::fromSecsSinceEpoch(7200 - maxSeconds, Qt::OffsetFromUTC, -7200).isValid()); - QVERIFY(!QDateTime::fromSecsSinceEpoch(7199 - maxSeconds, Qt::OffsetFromUTC, -7200).isValid()); + QVERIFY(QDateTime::fromSecsSinceEpoch(maxSeconds - 7200, + QTimeZone::fromSecondsAheadOfUtc(7200)).isValid()); + QVERIFY(!QDateTime::fromSecsSinceEpoch(maxSeconds - 7199, + QTimeZone::fromSecondsAheadOfUtc(7200)).isValid()); + QVERIFY(QDateTime::fromSecsSinceEpoch(7200 - maxSeconds, + QTimeZone::fromSecondsAheadOfUtc(-7200)).isValid()); + QVERIFY(!QDateTime::fromSecsSinceEpoch(7199 - maxSeconds, + QTimeZone::fromSecondsAheadOfUtc(-7200)).isValid()); #if QT_CONFIG(timezone) // As for offset, use zones each side of UTC: @@ -881,23 +1002,23 @@ void tst_QDateTime::toString_isoDate_data() << QDateTime(QDate(1978, 11, 9), QTime(13, 28, 34)) << Qt::ISODate << QString("1978-11-09T13:28:34"); QTest::newRow("UTC") - << QDateTime(QDate(1978, 11, 9), QTime(13, 28, 34), Qt::UTC) + << QDateTime(QDate(1978, 11, 9), QTime(13, 28, 34), UTC) << Qt::ISODate << QString("1978-11-09T13:28:34Z"); QDateTime dt(QDate(1978, 11, 9), QTime(13, 28, 34)); - dt.setOffsetFromUtc(19800); + dt.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(19800)); QTest::newRow("positive OffsetFromUTC") << dt << Qt::ISODate << QString("1978-11-09T13:28:34+05:30"); - dt.setOffsetFromUtc(-7200); + dt.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(-7200)); QTest::newRow("negative OffsetFromUTC") << dt << Qt::ISODate << QString("1978-11-09T13:28:34-02:00"); - dt.setOffsetFromUtc(-900); + dt.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(-900)); QTest::newRow("negative non-integral OffsetFromUTC") << dt << Qt::ISODate << QString("1978-11-09T13:28:34-00:15"); QTest::newRow("invalid") // ISODate < 2019 doesn't allow -ve year numbers; QTBUG-91070 - << QDateTime(QDate(-1, 11, 9), QTime(13, 28, 34), Qt::UTC) + << QDateTime(QDate(-1, 11, 9), QTime(13, 28, 34), UTC) << Qt::ISODate << QString(); QTest::newRow("without-ms") << QDateTime(QDate(1978, 11, 9), QTime(13, 28, 34, 20)) @@ -934,7 +1055,7 @@ void tst_QDateTime::toString_isoDate() void tst_QDateTime::toString_isoDate_extra() { - QDateTime dt = QDateTime::fromMSecsSinceEpoch(0, Qt::UTC); + QDateTime dt = QDateTime::fromMSecsSinceEpoch(0, UTC); QCOMPARE(dt.toString(Qt::ISODate), QLatin1String("1970-01-01T00:00:00Z")); #if QT_CONFIG(timezone) QTimeZone PST("America/Vancouver"); @@ -963,15 +1084,15 @@ void tst_QDateTime::toString_textDate_data() + ' ' + QLocale::c().monthName(1, QLocale::ShortFormat); // ### Qt 7 GMT: change to UTC - see matching QDateTime::fromString() comment - QTest::newRow("localtime") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::LocalTime) + QTest::newRow("localtime") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3)) << wednesdayJanuary + QString(" 2 01:02:03 2013"); - QTest::newRow("utc") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::UTC) + QTest::newRow("utc") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), UTC) << wednesdayJanuary + QString(" 2 01:02:03 2013 GMT"); - QTest::newRow("offset+") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::OffsetFromUTC, - 10 * 60 * 60) + QTest::newRow("offset+") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), + QTimeZone::fromSecondsAheadOfUtc(10 * 60 * 60)) << wednesdayJanuary + QString(" 2 01:02:03 2013 GMT+1000"); - QTest::newRow("offset-") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::OffsetFromUTC, - -10 * 60 * 60) + QTest::newRow("offset-") << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), + QTimeZone::fromSecondsAheadOfUtc(-10 * 60 * 60)) << wednesdayJanuary + QString(" 2 01:02:03 2013 GMT-1000"); QTest::newRow("invalid") << QDateTime() << QString(""); @@ -1001,9 +1122,9 @@ void tst_QDateTime::toString_textDate_extra() auto endsWithGmt = [](const QDateTime &dt) { return dt.toString().endsWith(QLatin1String("GMT")); }; - QDateTime dt = QDateTime::fromMSecsSinceEpoch(0, Qt::LocalTime); + QDateTime dt = QDateTime::fromMSecsSinceEpoch(0); QVERIFY(!endsWithGmt(dt)); - dt = QDateTime::fromMSecsSinceEpoch(0, Qt::UTC).toLocalTime(); + dt = QDateTime::fromMSecsSinceEpoch(0, UTC).toLocalTime(); QVERIFY(!endsWithGmt(dt)); #if QT_CONFIG(timezone) @@ -1036,7 +1157,7 @@ void tst_QDateTime::toString_textDate_extra() else QCOMPARE(dt.toString(), QLatin1String("Thu Jan 1 00:00:00 1970")); #endif - dt = QDateTime::fromMSecsSinceEpoch(0, Qt::UTC); + dt = QDateTime::fromMSecsSinceEpoch(0, UTC); QVERIFY(endsWithGmt(dt)); } @@ -1051,22 +1172,22 @@ void tst_QDateTime::toString_rfcDate_data() << QString("09 Nov 1978 13:28:34 +0100"); } QTest::newRow("UTC") - << QDateTime(QDate(1978, 11, 9), QTime(13, 28, 34), Qt::UTC) + << QDateTime(QDate(1978, 11, 9), QTime(13, 28, 34), UTC) << QString("09 Nov 1978 13:28:34 +0000"); QDateTime dt(QDate(1978, 11, 9), QTime(13, 28, 34)); - dt.setOffsetFromUtc(19800); + dt.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(19800)); QTest::newRow("positive OffsetFromUTC") << dt << QString("09 Nov 1978 13:28:34 +0530"); - dt.setOffsetFromUtc(-7200); + dt.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(-7200)); QTest::newRow("negative OffsetFromUTC") << dt << QString("09 Nov 1978 13:28:34 -0200"); QTest::newRow("invalid") - << QDateTime(QDate(1978, 13, 9), QTime(13, 28, 34), Qt::UTC) + << QDateTime(QDate(1978, 13, 9), QTime(13, 28, 34), UTC) << QString(); QTest::newRow("999 milliseconds UTC") - << QDateTime(QDate(2000, 1, 1), QTime(13, 28, 34, 999), Qt::UTC) + << QDateTime(QDate(2000, 1, 1), QTime(13, 28, 34, 999), UTC) << QString("01 Jan 2000 13:28:34 +0000"); } @@ -1099,7 +1220,7 @@ void tst_QDateTime::toString_strformat() // Most tests are in QLocale, just test that the api works. QDate testDate(2013, 1, 1); QTime testTime(1, 2, 3, 456); - QDateTime testDateTime(testDate, testTime, Qt::UTC); + QDateTime testDateTime(testDate, testTime, UTC); QCOMPARE(testDate.toString("yyyy-MM-dd"), QString("2013-01-01")); QCOMPARE(testTime.toString("hh:mm:ss"), QString("01:02:03")); QCOMPARE(testTime.toString("hh:mm:ss.zz"), QString("01:02:03.456")); @@ -1112,17 +1233,30 @@ void tst_QDateTime::toString_strformat() void tst_QDateTime::addDays() { - for (int pass = 0; pass < 2; ++pass) { - QDateTime dt(QDate(2004, 1, 1), QTime(12, 34, 56), pass == 0 ? Qt::LocalTime : Qt::UTC); - dt = dt.addDays(185); + const QTimeZone zones[] = { + QTimeZone(QTimeZone::LocalTime), + QTimeZone(QTimeZone::UTC), +#if QT_CONFIG(timezone) + QTimeZone("Europe/Oslo"), +#endif + QTimeZone::fromSecondsAheadOfUtc(3600) + }; + for (const auto &zone : zones) { + QDateTime dt = QDateTime(QDate(2004, 1, 1), QTime(12, 34, 56), zone).addDays(185); QVERIFY(dt.date().year() == 2004 && dt.date().month() == 7 && dt.date().day() == 4); QVERIFY(dt.time().hour() == 12 && dt.time().minute() == 34 && dt.time().second() == 56 && dt.time().msec() == 0); - QCOMPARE(dt.timeSpec(), (pass == 0 ? Qt::LocalTime : Qt::UTC)); + QCOMPARE(dt.timeRepresentation(), zone); dt = dt.addDays(-185); QCOMPARE(dt.date(), QDate(2004, 1, 1)); QCOMPARE(dt.time(), QTime(12, 34, 56)); + + // Test we can do this before time-zones existed: + dt = QDateTime(QDate(1704, 1, 1), QTime(12, 0), zone).addDays(185); + QCOMPARE(dt.date(), QDate(1704, 7, 4)); + QCOMPARE(dt.time(), QTime(12, 0)); + QCOMPARE(dt.timeRepresentation(), zone); } QDateTime dt(QDate(1752, 9, 14), QTime(12, 34, 56)); @@ -1137,19 +1271,19 @@ void tst_QDateTime::addDays() } // Test preserves TimeSpec - QDateTime dt1(QDate(2013, 1, 1), QTime(0, 0), Qt::UTC); + QDateTime dt1(QDate(2013, 1, 1), QTime(0, 0), UTC); QDateTime dt2 = dt1.addDays(2); QCOMPARE(dt2.date(), QDate(2013, 1, 3)); QCOMPARE(dt2.time(), QTime(0, 0)); QCOMPARE(dt2.timeSpec(), Qt::UTC); - dt1 = QDateTime(QDate(2013, 1, 1), QTime(0, 0), Qt::LocalTime); + dt1 = QDateTime(QDate(2013, 1, 1), QTime(0, 0)); dt2 = dt1.addDays(2); QCOMPARE(dt2.date(), QDate(2013, 1, 3)); QCOMPARE(dt2.time(), QTime(0, 0)); QCOMPARE(dt2.timeSpec(), Qt::LocalTime); - dt1 = QDateTime(QDate(2013, 1, 1), QTime(0, 0), Qt::OffsetFromUTC, 60*60); + dt1 = QDateTime(QDate(2013, 1, 1), QTime(0, 0), QTimeZone::fromSecondsAheadOfUtc(60 * 60)); dt2 = dt1.addDays(2); QCOMPARE(dt2.date(), QDate(2013, 1, 3)); QCOMPARE(dt2.time(), QTime(0, 0)); @@ -1166,15 +1300,62 @@ void tst_QDateTime::addDays() QCOMPARE(dt2.timeSpec(), Qt::TimeZone); QCOMPARE(dt2.timeZone(), cet); } -#endif +# ifndef INADEQUATE_TZ_DATA + if (const QTimeZone lint("Pacific/Kiritimati"); lint.isValid()) { + // Line Islands Time skipped Sat 1994-12-31: + dt1 = QDateTime(QDate(1994, 12, 30), QTime(12, 0), lint); + dt2 = QDateTime(QDate(1995, 1, 1), QTime(12, 0), lint); + // Trying to step into the hole gets the other side: + QCOMPARE(dt1.addDays(1), dt2); + QCOMPARE(dt2.addDays(-1), dt1); + // But the other side is in fact two days away: + QCOMPARE(dt1.addDays(2), dt2); + QCOMPARE(dt2.addDays(-2), dt1); + QCOMPARE(dt1.daysTo(dt2), 2); + } +# ifndef Q_OS_DARWIN + if (const QTimeZone alaska("America/Anchorage"); alaska.isValid()) { + // On Julian date 1867, Sat Oct 7 (at 14:31 local solar mean time for + // Anchorage, 15:30 LMT in Sitka, which hosted the transfer ceremony) + // Russia sold Alaska to the USA, which changed the calendar to + // Gregorian, hence the date to Fri Oct 18. Compare addSecs:Alaska-Day. + // Friday evening and Saturday morning were repeated, with different dates. + // Friday noon, as described by the Russians: + dt1 = QDateTime(QDate(1867, 10, 6, QCalendar(QCalendar::System::Julian)), + QTime(12, 0), alaska); + // Sunday noon, as described by the Americans: + dt2 = QDateTime(QDate(1867, 10, 20), QTime(12, 0), alaska); + // Three elapsed days, but daysTo() and addDays only see two: + QCOMPARE(dt1.addDays(2), dt2); + QCOMPARE(dt2.addDays(-2), dt1); + QCOMPARE(dt1.daysTo(dt2), 2); + // Stepping into the duplicated day (Julian 7th, Gregorian 19th) gets + // the nearer side, with the same nominal date (and time): + QCOMPARE(dt1.addDays(1).date(), dt2.addDays(-1).date()); + QCOMPARE(dt1.addDays(1).time(), dt2.addDays(-1).time()); + QCOMPARE(dt1.addDays(1).daysTo(dt2.addDays(-1)), 0); + // Yet they differ by a day: + QCOMPARE_NE(dt1.addDays(1), dt2.addDays(-1)); + QCOMPARE(dt1.addDays(1).secsTo(dt2.addDays(-1)), 24 * 60 * 60); + // Stepping from one duplicate one day towards the other jumps it: + QCOMPARE(dt1, dt2.addDays(-1).addDays(-1)); + QCOMPARE(dt1.addDays(1).addDays(1), dt2); + } +# endif // Darwin +# endif // inadequate zone data +#endif // timezone - // Test last UTC second of 1969 *is* valid (despite being time_t(-1)) - dt1 = QDateTime(QDate(1969, 12, 30), QTime(23, 59, 59), Qt::UTC).toLocalTime().addDays(1); - QVERIFY(dt1.isValid()); - QCOMPARE(dt1.toSecsSinceEpoch(), -1); - dt2 = QDateTime(QDate(1970, 1, 1), QTime(23, 59, 59), Qt::UTC).toLocalTime().addDays(-1); - QVERIFY(dt2.isValid()); - QCOMPARE(dt2.toSecsSinceEpoch(), -1); + // Baja Mexico has a transition at the epoch, see fromStringDateFormat_data(). + if (QDateTime(QDate(1969, 12, 30), QTime(0, 0)).secsTo( + QDateTime(QDate(1970, 1, 2), QTime(0, 0))) == 3 * 24 * 60 * 60) { + // Test last UTC second of 1969 *is* valid (despite being time_t(-1)) + dt1 = QDateTime(QDate(1969, 12, 30), QTime(23, 59, 59), UTC).toLocalTime().addDays(1); + QVERIFY(dt1.isValid()); + QCOMPARE(dt1.toSecsSinceEpoch(), -1); + dt2 = QDateTime(QDate(1970, 1, 1), QTime(23, 59, 59), UTC).toLocalTime().addDays(-1); + QVERIFY(dt2.isValid()); + QCOMPARE(dt2.toSecsSinceEpoch(), -1); + } } void tst_QDateTime::addInvalid() @@ -1194,7 +1375,7 @@ void tst_QDateTime::addInvalid() offset = bad.addMSecs(73); QVERIFY(offset.isNull()); - QDateTime bound = QDateTime::fromMSecsSinceEpoch(std::numeric_limits<qint64>::min(), Qt::UTC); + QDateTime bound = QDateTime::fromMSecsSinceEpoch(std::numeric_limits<qint64>::min(), UTC); QVERIFY(bound.isValid()); offset = bound.addMSecs(-1); QVERIFY(!offset.isValid()); @@ -1273,13 +1454,13 @@ void tst_QDateTime::addMonths() QCOMPARE(end.time(), testTime); QCOMPARE(end.timeSpec(), Qt::LocalTime); - start = QDateTime(testDate, testTime, Qt::UTC); + start = QDateTime(testDate, testTime, UTC); end = start.addMonths(months); QCOMPARE(end.date(), resultDate); QCOMPARE(end.time(), testTime); QCOMPARE(end.timeSpec(), Qt::UTC); - start = QDateTime(testDate, testTime, Qt::OffsetFromUTC, 60 * 60); + start = QDateTime(testDate, testTime, QTimeZone::fromSecondsAheadOfUtc(60 * 60)); end = start.addMonths(months); QCOMPARE(end.date(), resultDate); QCOMPARE(end.time(), testTime); @@ -1325,13 +1506,13 @@ void tst_QDateTime::addYears() QCOMPARE(end.time(), testTime); QCOMPARE(end.timeSpec(), Qt::LocalTime); - start = QDateTime(startDate, testTime, Qt::UTC); + start = QDateTime(startDate, testTime, UTC); end = start.addYears(years1).addYears(years2); QCOMPARE(end.date(), resultDate); QCOMPARE(end.time(), testTime); QCOMPARE(end.timeSpec(), Qt::UTC); - start = QDateTime(startDate, testTime, Qt::OffsetFromUTC, 60 * 60); + start = QDateTime(startDate, testTime, QTimeZone::fromSecondsAheadOfUtc(60 * 60)); end = start.addYears(years1).addYears(years2); QCOMPARE(end.date(), resultDate); QCOMPARE(end.time(), testTime); @@ -1350,107 +1531,144 @@ void tst_QDateTime::addMSecs_data() const qint64 daySecs(86400); QTest::newRow("utc0") - << QDateTime(QDate(2004, 1, 1), standardTime, Qt::UTC) << daySecs - << QDateTime(QDate(2004, 1, 2), standardTime, Qt::UTC); + << QDateTime(QDate(2004, 1, 1), standardTime, UTC) << daySecs + << QDateTime(QDate(2004, 1, 2), standardTime, UTC); QTest::newRow("utc1") - << QDateTime(QDate(2004, 1, 1), standardTime, Qt::UTC) << (daySecs * 185) - << QDateTime(QDate(2004, 7, 4), standardTime, Qt::UTC); + << QDateTime(QDate(2004, 1, 1), standardTime, UTC) << (daySecs * 185) + << QDateTime(QDate(2004, 7, 4), standardTime, UTC); QTest::newRow("utc2") - << QDateTime(QDate(2004, 1, 1), standardTime, Qt::UTC) << (daySecs * 366) - << QDateTime(QDate(2005, 1, 1), standardTime, Qt::UTC); + << QDateTime(QDate(2004, 1, 1), standardTime, UTC) << (daySecs * 366) + << QDateTime(QDate(2005, 1, 1), standardTime, UTC); QTest::newRow("utc3") - << QDateTime(QDate(1760, 1, 1), standardTime, Qt::UTC) << daySecs - << QDateTime(QDate(1760, 1, 2), standardTime, Qt::UTC); + << QDateTime(QDate(1760, 1, 1), standardTime, UTC) << daySecs + << QDateTime(QDate(1760, 1, 2), standardTime, UTC); QTest::newRow("utc4") - << QDateTime(QDate(1760, 1, 1), standardTime, Qt::UTC) << (daySecs * 185) - << QDateTime(QDate(1760, 7, 4), standardTime, Qt::UTC); + << QDateTime(QDate(1760, 1, 1), standardTime, UTC) << (daySecs * 185) + << QDateTime(QDate(1760, 7, 4), standardTime, UTC); QTest::newRow("utc5") - << QDateTime(QDate(1760, 1, 1), standardTime, Qt::UTC) << (daySecs * 366) - << QDateTime(QDate(1761, 1, 1), standardTime, Qt::UTC); + << QDateTime(QDate(1760, 1, 1), standardTime, UTC) << (daySecs * 366) + << QDateTime(QDate(1761, 1, 1), standardTime, UTC); QTest::newRow("utc6") - << QDateTime(QDate(4000, 1, 1), standardTime, Qt::UTC) << daySecs - << QDateTime(QDate(4000, 1, 2), standardTime, Qt::UTC); + << QDateTime(QDate(4000, 1, 1), standardTime, UTC) << daySecs + << QDateTime(QDate(4000, 1, 2), standardTime, UTC); QTest::newRow("utc7") - << QDateTime(QDate(4000, 1, 1), standardTime, Qt::UTC) << (daySecs * 185) - << QDateTime(QDate(4000, 7, 4), standardTime, Qt::UTC); + << QDateTime(QDate(4000, 1, 1), standardTime, UTC) << (daySecs * 185) + << QDateTime(QDate(4000, 7, 4), standardTime, UTC); QTest::newRow("utc8") - << QDateTime(QDate(4000, 1, 1), standardTime, Qt::UTC) << (daySecs * 366) - << QDateTime(QDate(4001, 1, 1), standardTime, Qt::UTC); + << QDateTime(QDate(4000, 1, 1), standardTime, UTC) << (daySecs * 366) + << QDateTime(QDate(4001, 1, 1), standardTime, UTC); QTest::newRow("utc9") - << QDateTime(QDate(4000, 1, 1), standardTime, Qt::UTC) << qint64(0) - << QDateTime(QDate(4000, 1, 1), standardTime, Qt::UTC); + << QDateTime(QDate(4000, 1, 1), standardTime, UTC) << qint64(0) + << QDateTime(QDate(4000, 1, 1), standardTime, UTC); if (zoneIsCET) { QTest::newRow("cet0") - << QDateTime(QDate(2004, 1, 1), standardTime, Qt::LocalTime) << daySecs - << QDateTime(QDate(2004, 1, 2), standardTime, Qt::LocalTime); + << QDateTime(QDate(2004, 1, 1), standardTime) << daySecs + << QDateTime(QDate(2004, 1, 2), standardTime); QTest::newRow("cet1") - << QDateTime(QDate(2004, 1, 1), standardTime, Qt::LocalTime) << (daySecs * 185) - << QDateTime(QDate(2004, 7, 4), daylightTime, Qt::LocalTime); + << QDateTime(QDate(2004, 1, 1), standardTime) << (daySecs * 185) + << QDateTime(QDate(2004, 7, 4), daylightTime); QTest::newRow("cet2") - << QDateTime(QDate(2004, 1, 1), standardTime, Qt::LocalTime) << (daySecs * 366) - << QDateTime(QDate(2005, 1, 1), standardTime, Qt::LocalTime); + << QDateTime(QDate(2004, 1, 1), standardTime) << (daySecs * 366) + << QDateTime(QDate(2005, 1, 1), standardTime); QTest::newRow("cet3") - << QDateTime(QDate(1760, 1, 1), standardTime, Qt::LocalTime) << daySecs - << QDateTime(QDate(1760, 1, 2), standardTime, Qt::LocalTime); + << QDateTime(QDate(1760, 1, 1), standardTime) << daySecs + << QDateTime(QDate(1760, 1, 2), standardTime); QTest::newRow("cet4") - << QDateTime(QDate(1760, 1, 1), standardTime, Qt::LocalTime) << (daySecs * 185) - << QDateTime(QDate(1760, 7, 4), standardTime, Qt::LocalTime); + << QDateTime(QDate(1760, 1, 1), standardTime) << (daySecs * 185) + << QDateTime(QDate(1760, 7, 4), standardTime); QTest::newRow("cet5") - << QDateTime(QDate(1760, 1, 1), standardTime, Qt::LocalTime) << (daySecs * 366) - << QDateTime(QDate(1761, 1, 1), standardTime, Qt::LocalTime); + << QDateTime(QDate(1760, 1, 1), standardTime) << (daySecs * 366) + << QDateTime(QDate(1761, 1, 1), standardTime); QTest::newRow("cet6") - << QDateTime(QDate(4000, 1, 1), standardTime, Qt::LocalTime) << daySecs - << QDateTime(QDate(4000, 1, 2), standardTime, Qt::LocalTime); + << QDateTime(QDate(4000, 1, 1), standardTime) << daySecs + << QDateTime(QDate(4000, 1, 2), standardTime); QTest::newRow("cet7") - << QDateTime(QDate(4000, 1, 1), standardTime, Qt::LocalTime) << (daySecs * 185) - << QDateTime(QDate(4000, 7, 4), daylightTime, Qt::LocalTime); + << QDateTime(QDate(4000, 1, 1), standardTime) << (daySecs * 185) + << QDateTime(QDate(4000, 7, 4), daylightTime); QTest::newRow("cet8") - << QDateTime(QDate(4000, 1, 1), standardTime, Qt::LocalTime) << (daySecs * 366) - << QDateTime(QDate(4001, 1, 1), standardTime, Qt::LocalTime); + << QDateTime(QDate(4000, 1, 1), standardTime) << (daySecs * 366) + << QDateTime(QDate(4001, 1, 1), standardTime); QTest::newRow("cet9") - << QDateTime(QDate(4000, 1, 1), standardTime, Qt::LocalTime) << qint64(0) - << QDateTime(QDate(4000, 1, 1), standardTime, Qt::LocalTime); + << QDateTime(QDate(4000, 1, 1), standardTime) << qint64(0) + << QDateTime(QDate(4000, 1, 1), standardTime); } // Year sign change QTest::newRow("toNegative") - << QDateTime(QDate(1, 1, 1), QTime(0, 0), Qt::UTC) << qint64(-1) - << QDateTime(QDate(-1, 12, 31), QTime(23, 59, 59), Qt::UTC); + << QDateTime(QDate(1, 1, 1), QTime(0, 0), UTC) << qint64(-1) + << QDateTime(QDate(-1, 12, 31), QTime(23, 59, 59), UTC); QTest::newRow("toPositive") - << QDateTime(QDate(-1, 12, 31), QTime(23, 59, 59), Qt::UTC) << qint64(1) - << QDateTime(QDate(1, 1, 1), QTime(0, 0), Qt::UTC); + << QDateTime(QDate(-1, 12, 31), QTime(23, 59, 59), UTC) << qint64(1) + << QDateTime(QDate(1, 1, 1), QTime(0, 0), UTC); QTest::newRow("invalid") << QDateTime() << qint64(1) << QDateTime(); // Check Offset details are preserved QTest::newRow("offset0") - << QDateTime(QDate(2013, 1, 1), QTime(1, 2, 3), Qt::OffsetFromUTC, 60 * 60) + << QDateTime(QDate(2013, 1, 1), QTime(1, 2, 3), QTimeZone::fromSecondsAheadOfUtc(60 * 60)) << qint64(60 * 60) - << QDateTime(QDate(2013, 1, 1), QTime(2, 2, 3), Qt::OffsetFromUTC, 60 * 60); + << QDateTime(QDate(2013, 1, 1), QTime(2, 2, 3), QTimeZone::fromSecondsAheadOfUtc(60 * 60)); // Check last second of 1969 QTest::newRow("epoch-1s-utc") - << QDateTime(QDate(1970, 1, 1), QTime(0, 0), Qt::UTC) << qint64(-1) - << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), Qt::UTC); + << QDate(1970, 1, 1).startOfDay(UTC) << qint64(-1) + << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), UTC); QTest::newRow("epoch-1s-local") - << QDateTime(QDate(1970, 1, 1), QTime(0, 0)) << qint64(-1) + << QDate(1970, 1, 1).startOfDay() << qint64(-1) << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59)); QTest::newRow("epoch-1s-utc-as-local") - << QDate(1970, 1, 1).startOfDay(Qt::UTC).toLocalTime() << qint64(-1) - << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), Qt::UTC).toLocalTime(); + << QDate(1970, 1, 1).startOfDay(UTC).toLocalTime() << qint64(-1) + << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), UTC).toLocalTime(); // Overflow and Underflow const qint64 maxSeconds = std::numeric_limits<qint64>::max() / 1000; QTest::newRow("after-last") - << QDateTime::fromSecsSinceEpoch(maxSeconds, Qt::UTC) << qint64(1) << QDateTime(); + << QDateTime::fromSecsSinceEpoch(maxSeconds, UTC) << qint64(1) << QDateTime(); QTest::newRow("to-last") - << QDateTime::fromSecsSinceEpoch(maxSeconds - 1, Qt::UTC) << qint64(1) - << QDateTime::fromSecsSinceEpoch(maxSeconds, Qt::UTC); + << QDateTime::fromSecsSinceEpoch(maxSeconds - 1, UTC) << qint64(1) + << QDateTime::fromSecsSinceEpoch(maxSeconds, UTC); QTest::newRow("before-first") - << QDateTime::fromSecsSinceEpoch(-maxSeconds, Qt::UTC) << qint64(-1) << QDateTime(); + << QDateTime::fromSecsSinceEpoch(-maxSeconds, UTC) << qint64(-1) << QDateTime(); QTest::newRow("to-first") - << QDateTime::fromSecsSinceEpoch(1 - maxSeconds, Qt::UTC) << qint64(-1) - << QDateTime::fromSecsSinceEpoch(-maxSeconds, Qt::UTC); + << QDateTime::fromSecsSinceEpoch(1 - maxSeconds, UTC) << qint64(-1) + << QDateTime::fromSecsSinceEpoch(-maxSeconds, UTC); + +#if QT_CONFIG(timezone) + if (const QTimeZone cet("Europe/Oslo"); cet.isValid()) { + QTest::newRow("CET-spring-forward") + << QDateTime(QDate(2023, 3, 26), QTime(1, 30), cet) << qint64(60 * 60) + << QDateTime(QDate(2023, 3, 26), QTime(3, 30), cet); + QTest::newRow("CET-fall-back") + << QDateTime(QDate(2023, 10, 29), QTime(1, 30), cet) << qint64(3 * 60 * 60) + << QDateTime(QDate(2023, 10, 29), QTime(3, 30), cet); + } +# ifndef INADEQUATE_TZ_DATA + const QTimeZone lint("Pacific/Kiritimati"); + if (lint.isValid()) { + // Line Islands Time skipped Sat 1994-12-31: + QTest::newRow("Kiritimati-day-off") + << QDateTime(QDate(1994, 12, 30), QTime(23, 30), lint) << qint64(60 * 60) + << QDateTime(QDate(1995, 1, 1), QTime(0, 30), lint); + } +# ifndef Q_OS_DARWIN + if (const QTimeZone alaska("America/Anchorage"); alaska.isValid()) { + // On Julian date 1867, Sat Oct 7 (at 14:31 local solar mean time for + // Anchorage, 15:30 LMT in Sitka, which hosted the transfer ceremony) + // Russia sold Alaska to the USA, which changed the calendar to + // Gregorian, hence the date to Fri Oct 18. Contrast addDays(). + const QDate sat(1867, 10, 19); + Q_ASSERT(sat == QDate(1867, 10, 7, QCalendar(QCalendar::System::Julian))); + // At the start of the day, it was Sat 7th; by evening it was Fri 18th; + // then the next day was Sat 19th. + QTest::newRow("Alaska-Day") + // The actual morning of the hand-over: + << QDateTime(sat, QTime(6, 0), alaska) << qint64(12 * 60 * 60) + // The evening of the same day. + << QDateTime(sat, QTime(18, 0), alaska).addDays(-1); + } +# endif // Darwin +# endif // inadequate zone data +#endif // timezone } void tst_QDateTime::addSecs_data() @@ -1460,9 +1678,9 @@ void tst_QDateTime::addSecs_data() const qint64 maxSeconds = std::numeric_limits<qint64>::max() / 1000; // Results would be representable, but the step isn't QTest::newRow("leap-up") - << QDateTime::fromSecsSinceEpoch(-1, Qt::UTC) << 1 + maxSeconds << QDateTime(); + << QDateTime::fromSecsSinceEpoch(-1, UTC) << 1 + maxSeconds << QDateTime(); QTest::newRow("leap-down") - << QDateTime::fromSecsSinceEpoch(1, Qt::UTC) << -1 - maxSeconds << QDateTime(); + << QDateTime::fromSecsSinceEpoch(1, UTC) << -1 - maxSeconds << QDateTime(); } void tst_QDateTime::addSecs() @@ -1494,6 +1712,7 @@ void tst_QDateTime::addSecs() QCOMPARE(result - std::chrono::seconds(nsecs), dt); test3 -= std::chrono::seconds(nsecs); QCOMPARE(test3, dt); + QCOMPARE(dt.secsTo(result), nsecs); } } @@ -1514,12 +1733,18 @@ void tst_QDateTime::addMSecs() QCOMPARE(result.addMSecs(qint64(-nsecs) * 1000), dt); } }; - - verify(dt.addMSecs(qint64(nsecs) * 1000)); - verify(dt.addDuration(std::chrono::seconds(nsecs))); - verify(dt.addDuration(std::chrono::milliseconds(nsecs * 1000))); +#define VERIFY(datum) \ + verify(datum); \ + if (QTest::currentTestFailed()) \ + return + + VERIFY(dt.addMSecs(qint64(nsecs) * 1000)); + VERIFY(dt.addDuration(std::chrono::seconds(nsecs))); + VERIFY(dt.addDuration(std::chrono::milliseconds(nsecs * 1000))); +#undef VERIFY } +#if QT_DEPRECATED_SINCE(6, 9) void tst_QDateTime::toTimeSpec_data() { if (!zoneIsCET) @@ -1532,56 +1757,64 @@ void tst_QDateTime::toTimeSpec_data() QTime localStandardTime(5, 20, 30); QTime localDaylightTime(6, 20, 30); - QTest::newRow("winter1") << QDateTime(QDate(2004, 1, 1), utcTime, Qt::UTC) - << QDateTime(QDate(2004, 1, 1), localStandardTime, Qt::LocalTime); - QTest::newRow("winter2") << QDateTime(QDate(2004, 2, 29), utcTime, Qt::UTC) - << QDateTime(QDate(2004, 2, 29), localStandardTime, Qt::LocalTime); + QTest::newRow("winter1") + << QDateTime(QDate(2004, 1, 1), utcTime, UTC) + << QDateTime(QDate(2004, 1, 1), localStandardTime); + QTest::newRow("winter2") + << QDateTime(QDate(2004, 2, 29), utcTime, UTC) + << QDateTime(QDate(2004, 2, 29), localStandardTime); QTest::newRow("winter3") - << QDateTime(QDate(1760, 2, 29), utcTime, Qt::UTC) + << QDateTime(QDate(1760, 2, 29), utcTime, UTC) << QDateTime(QDate(1760, 2, 29), localStandardTime.addSecs(preZoneFix)); - QTest::newRow("winter4") << QDateTime(QDate(6000, 2, 29), utcTime, Qt::UTC) - << QDateTime(QDate(6000, 2, 29), localStandardTime, Qt::LocalTime); + QTest::newRow("winter4") + << QDateTime(QDate(6000, 2, 29), utcTime, UTC) + << QDateTime(QDate(6000, 2, 29), localStandardTime); // Test mktime boundaries (1970 - 2038) and adjustDate(). QTest::newRow("1969/12/31 23:00 UTC") - << QDateTime(QDate(1969, 12, 31), QTime(23, 0), Qt::UTC) - << QDateTime(QDate(1970, 1, 1), QTime(0, 0), Qt::LocalTime); + << QDateTime(QDate(1969, 12, 31), QTime(23, 0), UTC) + << QDateTime(QDate(1970, 1, 1), QTime(0, 0)); QTest::newRow("1969/12/31 23:59:59 UTC") - << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), Qt::UTC) - << QDateTime(QDate(1970, 1, 1), QTime(0, 59, 59), Qt::LocalTime); + << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), UTC) + << QDateTime(QDate(1970, 1, 1), QTime(0, 59, 59)); QTest::newRow("2037/12/31 23:00 UTC") - << QDateTime(QDate(2037, 12, 31), QTime(23, 0), Qt::UTC) - << QDateTime(QDate(2038, 1, 1), QTime(0, 0), Qt::LocalTime); + << QDateTime(QDate(2037, 12, 31), QTime(23, 0), UTC) + << QDateTime(QDate(2038, 1, 1), QTime(0, 0)); QTest::newRow("-271821/4/20 00:00 UTC (JavaScript min date, start of day)") - << QDateTime(QDate(-271821, 4, 20), QTime(0, 0), Qt::UTC) + << QDateTime(QDate(-271821, 4, 20), QTime(0, 0), UTC) << QDateTime(QDate(-271821, 4, 20), QTime(1, 0)).addSecs(preZoneFix); QTest::newRow("-271821/4/20 23:00 UTC (JavaScript min date, end of day)") - << QDateTime(QDate(-271821, 4, 20), QTime(23, 0), Qt::UTC) + << QDateTime(QDate(-271821, 4, 20), QTime(23, 0), UTC) << QDateTime(QDate(-271821, 4, 21), QTime(0, 0)).addSecs(preZoneFix); if (zoneIsCET) { - QTest::newRow("summer1") << QDateTime(QDate(2004, 6, 30), utcTime, Qt::UTC) - << QDateTime(QDate(2004, 6, 30), localDaylightTime, Qt::LocalTime); + QTest::newRow("summer1") + << QDateTime(QDate(2004, 6, 30), utcTime, UTC) + << QDateTime(QDate(2004, 6, 30), localDaylightTime); QTest::newRow("summer2") - << QDateTime(QDate(1760, 6, 30), utcTime, Qt::UTC) + << QDateTime(QDate(1760, 6, 30), utcTime, UTC) << QDateTime(QDate(1760, 6, 30), localStandardTime.addSecs(preZoneFix)); - QTest::newRow("summer3") << QDateTime(QDate(4000, 6, 30), utcTime, Qt::UTC) - << QDateTime(QDate(4000, 6, 30), localDaylightTime, Qt::LocalTime); + QTest::newRow("summer3") + << QDateTime(QDate(4000, 6, 30), utcTime, UTC) + << QDateTime(QDate(4000, 6, 30), localDaylightTime); QTest::newRow("275760/9/23 00:00 UTC (JavaScript max date, start of day)") - << QDateTime(QDate(275760, 9, 23), QTime(0, 0), Qt::UTC) - << QDateTime(QDate(275760, 9, 23), QTime(2, 0), Qt::LocalTime); + << QDate(275760, 9, 23).startOfDay(UTC) + << QDateTime(QDate(275760, 9, 23), QTime(2, 0)); QTest::newRow("275760/9/23 22:00 UTC (JavaScript max date, end of day)") - << QDateTime(QDate(275760, 9, 23), QTime(22, 0), Qt::UTC) - << QDateTime(QDate(275760, 9, 24), QTime(0, 0), Qt::LocalTime); + << QDateTime(QDate(275760, 9, 23), QTime(22, 0), UTC) + << QDate(275760, 9, 24).startOfDay(); } - QTest::newRow("msec") << QDateTime(QDate(4000, 6, 30), utcTime.addMSecs(1), Qt::UTC) - << QDateTime(QDate(4000, 6, 30), localDaylightTime.addMSecs(1), Qt::LocalTime); + QTest::newRow("msec") + << QDateTime(QDate(4000, 6, 30), utcTime.addMSecs(1), UTC) + << QDateTime(QDate(4000, 6, 30), localDaylightTime.addMSecs(1)); } +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED void tst_QDateTime::toTimeSpec() { QFETCH(QDateTime, fromUtc); @@ -1640,11 +1873,6 @@ void tst_QDateTime::toTimeSpec() QCOMPARE(localToOffset.toTimeSpec(Qt::LocalTime), fromLocal); } -void tst_QDateTime::toLocalTime_data() -{ - toTimeSpec_data(); -} - void tst_QDateTime::toLocalTime() { QFETCH(QDateTime, fromUtc); @@ -1655,11 +1883,6 @@ void tst_QDateTime::toLocalTime() QCOMPARE(fromUtc.toLocalTime(), fromLocal.toLocalTime()); } -void tst_QDateTime::toUTC_data() -{ - toTimeSpec_data(); -} - void tst_QDateTime::toUTC() { QFETCH(QDateTime, fromUtc); @@ -1679,6 +1902,8 @@ void tst_QDateTime::toUTC_extra() QString t = dt.toUTC().toString("zzz"); QCOMPARE(s, t); } +QT_WARNING_POP +#endif // 6.9 deprecation void tst_QDateTime::daysTo() { @@ -1710,11 +1935,11 @@ void tst_QDateTime::secsTo_data() addSecs_data(); QTest::newRow("disregard milliseconds #1") - << QDateTime(QDate(2012, 3, 7), QTime(0, 58, 0, 0)) << qint64(60) + << QDateTime(QDate(2012, 3, 7), QTime(0, 58)) << qint64(60) << QDateTime(QDate(2012, 3, 7), QTime(0, 59, 0, 400)); QTest::newRow("disregard milliseconds #2") - << QDateTime(QDate(2012, 3, 7), QTime(0, 59, 0, 0)) << qint64(60) + << QDateTime(QDate(2012, 3, 7), QTime(0, 59)) << qint64(60) << QDateTime(QDate(2012, 3, 7), QTime(1, 0, 0, 400)); } @@ -1739,11 +1964,6 @@ void tst_QDateTime::secsTo() } } -void tst_QDateTime::msecsTo_data() -{ - addMSecs_data(); -} - void tst_QDateTime::msecsTo() { QFETCH(const QDateTime, dt); @@ -1769,6 +1989,11 @@ void tst_QDateTime::msecsTo() } } +void tst_QDateTime::orderingCompiles() +{ + QTestPrivate::testAllComparisonOperatorsCompile<QDateTime>(); +} + void tst_QDateTime::currentDateTime() { time_t buf1, buf2; @@ -1788,30 +2013,32 @@ void tst_QDateTime::currentDateTime() // 1 second difference from the more accurate method used by QDateTime::currentDateTime() upperBound = upperBound.addSecs(2); - QString details = QString("\n" - "lowerBound: %1\n" - "dt1: %2\n" - "dt2: %3\n" - "dt3: %4\n" - "upperBound: %5\n") - .arg(lowerBound.toSecsSinceEpoch()) - .arg(dt1.toSecsSinceEpoch()) - .arg(dt2.toSecsSinceEpoch()) - .arg(dt3.toSecsSinceEpoch()) - .arg(upperBound.toSecsSinceEpoch()); - - QVERIFY2(lowerBound < upperBound, qPrintable(details)); - - QVERIFY2(lowerBound <= dt1, qPrintable(details)); - QVERIFY2(dt1 < upperBound, qPrintable(details)); - QVERIFY2(lowerBound <= dt2, qPrintable(details)); - QVERIFY2(dt2 < upperBound, qPrintable(details)); - QVERIFY2(lowerBound <= dt3, qPrintable(details)); - QVERIFY2(dt3 < upperBound, qPrintable(details)); - - QVERIFY(dt1.timeSpec() == Qt::LocalTime); - QVERIFY(dt2.timeSpec() == Qt::LocalTime); - QVERIFY(dt3.timeSpec() == Qt::UTC); + auto reporter = qScopeGuard([=]() { + qInfo("\n" + "lowerBound: %lld\n" + "dt1: %lld\n" + "dt2: %lld\n" + "dt3: %lld\n" + "upperBound: %lld\n", + lowerBound.toSecsSinceEpoch(), + dt1.toSecsSinceEpoch(), + dt2.toSecsSinceEpoch(), + dt3.toSecsSinceEpoch(), + upperBound.toSecsSinceEpoch()); + }); + + QCOMPARE_LT(lowerBound, upperBound); + QCOMPARE_LE(lowerBound, dt1); + QCOMPARE_LT(dt1, upperBound); + QCOMPARE_LE(lowerBound, dt2); + QCOMPARE_LT(dt2, upperBound); + QCOMPARE_LE(lowerBound, dt3); + QCOMPARE_LT(dt3, upperBound); + reporter.dismiss(); + + QCOMPARE(dt1.timeSpec(), Qt::LocalTime); + QCOMPARE(dt2.timeSpec(), Qt::LocalTime); + QCOMPARE(dt3.timeSpec(), Qt::UTC); } void tst_QDateTime::currentDateTimeUtc() @@ -1834,30 +2061,32 @@ void tst_QDateTime::currentDateTimeUtc() // 1 second difference from the more accurate method used by QDateTime::currentDateTime() upperBound = upperBound.addSecs(2); - QString details = QString("\n" - "lowerBound: %1\n" - "dt1: %2\n" - "dt2: %3\n" - "dt3: %4\n" - "upperBound: %5\n") - .arg(lowerBound.toSecsSinceEpoch()) - .arg(dt1.toSecsSinceEpoch()) - .arg(dt2.toSecsSinceEpoch()) - .arg(dt3.toSecsSinceEpoch()) - .arg(upperBound.toSecsSinceEpoch()); - - QVERIFY2(lowerBound < upperBound, qPrintable(details)); - - QVERIFY2(lowerBound <= dt1, qPrintable(details)); - QVERIFY2(dt1 < upperBound, qPrintable(details)); - QVERIFY2(lowerBound <= dt2, qPrintable(details)); - QVERIFY2(dt2 < upperBound, qPrintable(details)); - QVERIFY2(lowerBound <= dt3, qPrintable(details)); - QVERIFY2(dt3 < upperBound, qPrintable(details)); - - QVERIFY(dt1.timeSpec() == Qt::UTC); - QVERIFY(dt2.timeSpec() == Qt::LocalTime); - QVERIFY(dt3.timeSpec() == Qt::UTC); + auto reporter = qScopeGuard([=]() { + qInfo("\n" + "lowerBound: %lld\n" + "dt1: %lld\n" + "dt2: %lld\n" + "dt3: %lld\n" + "upperBound: %lld\n", + lowerBound.toSecsSinceEpoch(), + dt1.toSecsSinceEpoch(), + dt2.toSecsSinceEpoch(), + dt3.toSecsSinceEpoch(), + upperBound.toSecsSinceEpoch()); + }); + + QCOMPARE_LT(lowerBound, upperBound); + QCOMPARE_LE(lowerBound, dt1); + QCOMPARE_LT(dt1, upperBound); + QCOMPARE_LE(lowerBound, dt2); + QCOMPARE_LT(dt2, upperBound); + QCOMPARE_LE(lowerBound, dt3); + QCOMPARE_LT(dt3, upperBound); + reporter.dismiss(); + + QCOMPARE(dt1.timeSpec(), Qt::UTC); + QCOMPARE(dt2.timeSpec(), Qt::LocalTime); + QCOMPARE(dt3.timeSpec(), Qt::UTC); } void tst_QDateTime::currentDateTimeUtc2() @@ -1956,7 +2185,7 @@ void tst_QDateTime::daylightSavingsTimeChange() QFETCH(int, months); // First with simple construction - QDateTime dt = QDateTime(outDST, QTime(0, 0, 0), Qt::LocalTime); + QDateTime dt = outDST.startOfDay(); int outDSTsecs = dt.toSecsSinceEpoch(); dt.setDate(inDST); @@ -1981,29 +2210,29 @@ void tst_QDateTime::daylightSavingsTimeChange() // now using fromSecsSinceEpoch dt = QDateTime::fromSecsSinceEpoch(outDSTsecs); - QCOMPARE(dt, QDateTime(outDST, QTime(0, 0, 0))); + QCOMPARE(dt, outDST.startOfDay()); dt.setDate(inDST); dt = dt.addSecs(60); - QCOMPARE(dt, QDateTime(inDST, QTime(0, 1, 0))); + QCOMPARE(dt, QDateTime(inDST, QTime(0, 1))); // using addMonths: dt = dt.addMonths(months).addSecs(60); - QCOMPARE(dt, QDateTime(outDST, QTime(0, 2, 0))); + QCOMPARE(dt, QDateTime(outDST, QTime(0, 2))); // back again: dt = dt.addMonths(-months).addSecs(60); - QCOMPARE(dt, QDateTime(inDST, QTime(0, 3, 0))); + QCOMPARE(dt, QDateTime(inDST, QTime(0, 3))); // using addDays: dt = dt.addDays(days).addSecs(60); - QCOMPARE(dt, QDateTime(outDST, QTime(0, 4, 0))); + QCOMPARE(dt, QDateTime(outDST, QTime(0, 4))); // back again: dt = dt.addDays(-days).addSecs(60); - QCOMPARE(dt, QDateTime(inDST, QTime(0, 5, 0))); + QCOMPARE(dt, QDateTime(inDST, QTime(0, 5))); // Now use the result of a UTC -> LocalTime conversion - dt = QDateTime(outDST, QTime(0, 0), Qt::LocalTime).toUTC(); - dt = QDateTime(dt.date(), dt.time(), Qt::UTC).toLocalTime(); + dt = outDST.startOfDay().toUTC(); + dt = QDateTime(dt.date(), dt.time(), UTC).toLocalTime(); QCOMPARE(dt, QDateTime(outDST, QTime(0, 0))); // using addDays: @@ -2028,6 +2257,7 @@ void tst_QDateTime::daylightSavingsTimeChange() void tst_QDateTime::springForward_data() { + QTest::addColumn<QTimeZone>("zone"); QTest::addColumn<QDate>("day"); // day of DST transition QTest::addColumn<QTime>("time"); // in the "missing hour" QTest::addColumn<int>("step"); // days to step; +ve from before, -ve from after @@ -2041,67 +2271,136 @@ void tst_QDateTime::springForward_data() document any such conflicts, if discovered. See http://www.timeanddate.com/time/zones/ for data on more candidates to - test. - */ + test. Note, however, that the IANA DB disagrees with it for some zones, + and is authoritative. + */ - uint winter = QDate(2015, 1, 1).startOfDay().toSecsSinceEpoch(); - uint summer = QDate(2015, 7, 1).startOfDay().toSecsSinceEpoch(); + const QTimeZone local(QTimeZone::LocalTime); + const uint winter = QDate(2015, 1, 1).startOfDay(local).toSecsSinceEpoch(); + const uint summer = QDate(2015, 7, 1).startOfDay(local).toSecsSinceEpoch(); if (winter == 1420066800 && summer == 1435701600) { - QTest::newRow("CET from day before") << QDate(2015, 3, 29) << QTime(2, 30, 0) << 1 << 60; - QTest::newRow("CET from day after") << QDate(2015, 3, 29) << QTime(2, 30, 0) << -1 << 120; + QTest::newRow("Local (CET) from day before") + << local << QDate(2015, 3, 29) << QTime(2, 30) << 1 << 60; + QTest::newRow("Local (CET) from day after") + << local << QDate(2015, 3, 29) << QTime(2, 30) << -1 << 120; } else if (winter == 1420063200 && summer == 1435698000) { - // e.g. Finland, where our CI runs ... - QTest::newRow("EET from day before") << QDate(2015, 3, 29) << QTime(3, 30, 0) << 1 << 120; - QTest::newRow("EET from day after") << QDate(2015, 3, 29) << QTime(3, 30, 0) << -1 << 180; + // EET: but there's some variation in the date and time. + // Asia/{Amman,Beirut,Gaza,Hebron}, Europe/Chisinau and Israel: at start of + QDate date(2015, 3, 29); // Sunday by default. + QTime time(0, 30); + if (auto thursday = QDate(2015, 3, 26); thursday.startOfDay(local).time() > time) { + // Asia/Damascus: start of March 26th. + date = thursday; + } else if (auto friday = QDate(2015, 3, 27); friday.startOfDay(local).time() > time) { + // Israel, Asia/{Jerusalem,Tel_Aviv}: start of March 27th (IANA DB). + date = friday; + } else if (friday.startOfDay(local).addSecs(2 * 60 * 60).time() == QTime(3, 0)) { + // Israel, Asia/{Jerusalem,Tel_Aviv} according to glibc at 02:00 on March 27th. + date = friday; + time = QTime(2, 30); + } else if (date.startOfDay(local).time() < time) { + // Most of Europeean EET, e.g. Finland. + time = QTime(3, 30); + } + QTest::newRow("Local (EET) from day before") + << local << date << time << 1 << 120; + QTest::newRow("Local (EET) from day after") + << local << date << time << -1 << 180; } else if (winter == 1420070400 && summer == 1435705200) { // Western European Time, WET/WEST; a.k.a. GMT/BST - QTest::newRow("WET from day before") << QDate(2015, 3, 29) << QTime(1, 30, 0) << 1 << 0; - QTest::newRow("WET from day after") << QDate(2015, 3, 29) << QTime(1, 30, 0) << -1 << 60; + QTest::newRow("Local (WET) from day before") + << local << QDate(2015, 3, 29) << QTime(1, 30) << 1 << 0; + QTest::newRow("Local (WET) from day after") + << local << QDate(2015, 3, 29) << QTime(1, 30) << -1 << 60; } else if (winter == 1420099200 && summer == 1435734000) { // Western USA, Canada: Pacific Time (e.g. US/Pacific) - QTest::newRow("PT from day before") << QDate(2015, 3, 8) << QTime(2, 30, 0) << 1 << -480; - QTest::newRow("PT from day after") << QDate(2015, 3, 8) << QTime(2, 30, 0) << -1 << -420; + QDate date(2015, 3, 8); + // America/Ensenada did its transition on April 5th, like the rest of Mexico. + if (QDate(2015, 4, 1).startOfDay().toSecsSinceEpoch() == 1427875200) + date = QDate(2015, 4, 5); + QTest::newRow("Local (PT) from day before") + << local << date << QTime(2, 30) << 1 << -480; + QTest::newRow("Local (PT) from day after") + << local << date << QTime(2, 30) << -1 << -420; } else if (winter == 1420088400 && summer == 1435723200) { // Eastern USA, Canada: Eastern Time (e.g. US/Eastern) - QTest::newRow("ET from day before") << QDate(2015, 3, 8) << QTime(2, 30, 0) << 1 << -300; - QTest::newRow("ET from day after") << QDate(2015, 3, 8) << QTime(2, 30, 0) << -1 << -240; + // Havana matches offset and date, but at midnight. + const QTime start = QDate(2015, 3, 8).startOfDay(local).time(); + const QTime when = start == QTime(0, 0) ? QTime(2, 30) : QTime(0, 30); + QTest::newRow("Local(ET) from day before") + << local << QDate(2015, 3, 8) << when << 1 << -300; + QTest::newRow("Local(ET) from day after") + << local << QDate(2015, 3, 8) << when << -1 << -240; +#if !QT_CONFIG(timezone) } else { // Includes the numbers you need to test for your zone, as above: QString msg(QString::fromLatin1("No spring forward test data for this TZ (%1, %2)" ).arg(winter).arg(summer)); QSKIP(qPrintable(msg)); +#endif + } +#if QT_CONFIG(timezone) + if (const QTimeZone cet("Europe/Oslo"); cet.isValid()) { + QTest::newRow("CET from day before") + << cet << QDate(2015, 3, 29) << QTime(2, 30) << 1 << 60; + QTest::newRow("CET from day after") + << cet << QDate(2015, 3, 29) << QTime(2, 30) << -1 << 120; + } + if (const QTimeZone eet("Europe/Helsinki"); eet.isValid()) { + QTest::newRow("EET from day before") + << eet << QDate(2015, 3, 29) << QTime(3, 30) << 1 << 120; + QTest::newRow("EET from day after") + << eet << QDate(2015, 3, 29) << QTime(3, 30) << -1 << 180; + } + if (const QTimeZone wet("Europe/Lisbon"); wet.isValid()) { + QTest::newRow("WET from day before") + << wet << QDate(2015, 3, 29) << QTime(1, 30) << 1 << 0; + QTest::newRow("WET from day after") + << wet << QDate(2015, 3, 29) << QTime(1, 30) << -1 << 60; } + if (const QTimeZone pacific("America/Vancouver"); pacific.isValid()) { + QTest::newRow("PT from day before") + << pacific << QDate(2015, 3, 8) << QTime(2, 30) << 1 << -480; + QTest::newRow("PT from day after") + << pacific << QDate(2015, 3, 8) << QTime(2, 30) << -1 << -420; + } + if (const QTimeZone eastern("America/Ottawa"); eastern.isValid()) { + QTest::newRow("ET from day before") + << eastern << QDate(2015, 3, 8) << QTime(2, 30) << 1 << -300; + QTest::newRow("ET from day after") + << eastern << QDate(2015, 3, 8) << QTime(2, 30) << -1 << -240; + } +#endif } void tst_QDateTime::springForward() { + QFETCH(QTimeZone, zone); QFETCH(QDate, day); QFETCH(QTime, time); QFETCH(int, step); QFETCH(int, adjust); - QDateTime direct = QDateTime(day.addDays(-step), time, Qt::LocalTime).addDays(step); - if (direct.isValid()) { // mktime() may deem a time in the gap invalid - QCOMPARE(direct.date(), day); - QCOMPARE(direct.time().minute(), time.minute()); - QCOMPARE(direct.time().second(), time.second()); - int off = direct.time().hour() - time.hour(); - QVERIFY(off == 1 || off == -1); - // Note: function doc claims always +1, but this should be reviewed ! - } - - // Repeat, but getting there via .toLocalTime(): - QDateTime detour = QDateTime(day.addDays(-step), - time.addSecs(-60 * adjust), - Qt::UTC).toLocalTime(); + QDateTime direct = QDateTime(day.addDays(-step), time, zone).addDays(step); + QVERIFY(direct.isValid()); + QCOMPARE(direct.date(), day); + QCOMPARE(direct.time().minute(), time.minute()); + QCOMPARE(direct.time().second(), time.second()); + const int off = step < 0 ? -1 : 1; + QCOMPARE(direct.time().hour() - time.hour(), off); + // adjust is the offset on the other side of the gap: + QCOMPARE(direct.offsetFromUtc(), (adjust + off * 60) * 60); + + // Repeat, but getting there via .toTimeZone(). Apply adjust to datetime, + // not time, as the time wraps round if the adjustment crosses midnight. + QDateTime detour = QDateTime(day.addDays(-step), time, + UTC).addSecs(-60 * adjust).toTimeZone(zone); QCOMPARE(detour.time(), time); detour = detour.addDays(step); // Insist on consistency: - if (direct.isValid()) - QCOMPARE(detour, direct); - else - QVERIFY(!detour.isValid()); + QCOMPARE(detour, direct); + QCOMPARE(detour.offsetFromUtc(), direct.offsetFromUtc()); } void tst_QDateTime::operator_eqeq_data() @@ -2115,14 +2414,14 @@ void tst_QDateTime::operator_eqeq_data() QDateTime dateTime1a = dateTime1.addMSecs(1); QDateTime dateTime2(QDate(2012, 20, 6), QTime(14, 33, 2, 500)); // Invalid QDateTime dateTime2a = dateTime2.addMSecs(-1); // Still invalid - QDateTime dateTime3(QDate(1970, 1, 1), QTime(0, 0), Qt::UTC); // UTC epoch + QDateTime dateTime3(QDate(1970, 1, 1), QTime(0, 0), UTC); // UTC epoch QDateTime dateTime3a = dateTime3.addDays(1); QDateTime dateTime3b = dateTime3.addDays(-1); // Ensure that different times may be equal when considering timezone. QDateTime dateTime3c(dateTime3.addSecs(3600)); - dateTime3c.setOffsetFromUtc(3600); + dateTime3c.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(3600)); QDateTime dateTime3d(dateTime3.addSecs(-3600)); - dateTime3d.setOffsetFromUtc(-3600); + dateTime3d.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(-3600)); QDateTime dateTime3e(dateTime3.date(), dateTime3.time()); // Local time's epoch QTest::newRow("data0") << dateTime1 << dateTime1 << true << false; @@ -2138,7 +2437,7 @@ void tst_QDateTime::operator_eqeq_data() QTest::newRow("data10") << dateTime3 << dateTime3c << true << false; QTest::newRow("data11") << dateTime3 << dateTime3d << true << false; QTest::newRow("data12") << dateTime3c << dateTime3d << true << false; - if (localTimeType == LocalTimeIsUtc) + if (epochTimeType == LocalTimeIsUtc) QTest::newRow("data13") << dateTime3 << dateTime3e << true << false; // ... but a zone (sometimes) ahead of or behind UTC (e.g. Europe/London) // might agree with UTC about the epoch, all the same. @@ -2148,8 +2447,8 @@ void tst_QDateTime::operator_eqeq_data() if (zoneIsCET) { QTest::newRow("data14") - << QDateTime(QDate(2004, 1, 2), QTime(2, 2, 3), Qt::LocalTime) - << QDateTime(QDate(2004, 1, 2), QTime(1, 2, 3), Qt::UTC) << true << true; + << QDateTime(QDate(2004, 1, 2), QTime(2, 2, 3)) + << QDateTime(QDate(2004, 1, 2), QTime(1, 2, 3), UTC) << true << true; QTest::newRow("local-fall-back") // Sun, 31 Oct 2004, 02:30, both ways round: << QDateTime::fromMSecsSinceEpoch(Q_INT64_C(1099186200000)) << QDateTime::fromMSecsSinceEpoch(Q_INT64_C(1099182600000)) @@ -2173,23 +2472,16 @@ void tst_QDateTime::operator_eqeq() QFETCH(bool, expectEqual); QFETCH(bool, checkEuro); - QVERIFY(dt1 == dt1); - QVERIFY(!(dt1 != dt1)); - - QVERIFY(dt2 == dt2); - QVERIFY(!(dt2 != dt2)); + QT_TEST_EQUALITY_OPS(dt1, dt1, true); + QT_TEST_EQUALITY_OPS(dt2, dt2, true); + QT_TEST_EQUALITY_OPS(dt1, dt2, expectEqual); QVERIFY(dt1 != QDateTime::currentDateTime()); QVERIFY(dt2 != QDateTime::currentDateTime()); QVERIFY(dt1.toUTC() == dt1.toUTC()); - bool equal = dt1 == dt2; - QCOMPARE(equal, expectEqual); - bool notEqual = dt1 != dt2; - QCOMPARE(notEqual, !expectEqual); - - if (equal) + if (expectEqual) QVERIFY(qHash(dt1) == qHash(dt2)); if (checkEuro && zoneIsCET) { @@ -2198,6 +2490,64 @@ void tst_QDateTime::operator_eqeq() } } +void tst_QDateTime::ordering_data() +{ + QTest::addColumn<QDateTime>("left"); + QTest::addColumn<QDateTime>("right"); + QTest::addColumn<Qt::weak_ordering>("expectedOrdering"); + + Q_CONSTINIT static const auto constructName = [](const QDateTime &dt) -> QByteArray { + if (dt.isNull()) + return "null"; + if (!dt.isValid()) + return "invalid"; + return dt.toString(Qt::ISODateWithMs).toLatin1(); + }; + + Q_CONSTINIT static const auto generateRow = + [](const QDateTime &left, const QDateTime &right, Qt::weak_ordering ordering) { + const QByteArray leftStr = constructName(left); + const QByteArray rightStr = constructName(right); + QTest::addRow("%s_vs_%s", leftStr.constData(), rightStr.constData()) + << left << right << ordering; + }; + + QDateTime june(QDate(2012, 6, 20), QTime(14, 33, 2, 500)); + QDateTime juneLater = june.addMSecs(1); + QDateTime badDay(QDate(2012, 20, 6), QTime(14, 33, 2, 500)); // Invalid + QDateTime epoch(QDate(1970, 1, 1), QTime(0, 0), UTC); // UTC epoch + QDateTime nextDay = epoch.addDays(1); + QDateTime prevDay = epoch.addDays(-1); + // Ensure that different times may be equal when considering timezone. + QDateTime epochEast1h(epoch.addSecs(3600)); + epochEast1h.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(3600)); + QDateTime epochWest1h(epoch.addSecs(-3600)); + epochWest1h.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(-3600)); + QDateTime local1970(epoch.date(), epoch.time()); // Local time's epoch + + generateRow(june, june, Qt::weak_ordering::equivalent); + generateRow(june, juneLater, Qt::weak_ordering::less); + generateRow(june, badDay, Qt::weak_ordering::greater); + generateRow(badDay, QDateTime(), Qt::weak_ordering::equivalent); + generateRow(june, QDateTime(), Qt::weak_ordering::greater); + generateRow(epoch, nextDay, Qt::weak_ordering::less); + generateRow(epoch, prevDay, Qt::weak_ordering::greater); + generateRow(epoch, epochEast1h, Qt::weak_ordering::equivalent); + generateRow(epoch, epochWest1h, Qt::weak_ordering::equivalent); + generateRow(epochEast1h, epochWest1h, Qt::weak_ordering::equivalent); + if (epochTimeType == LocalTimeIsUtc) + generateRow(epoch, local1970, Qt::weak_ordering::equivalent); +} + +void tst_QDateTime::ordering() +{ + QFETCH(QDateTime, left); + QFETCH(QDateTime, right); + QFETCH(Qt::weak_ordering, expectedOrdering); + + QT_TEST_ALL_COMPARISON_OPS(left, right, expectedOrdering); +} + Q_DECLARE_METATYPE(QDataStream::Version) void tst_QDateTime::operator_insert_extract_data() @@ -2237,7 +2587,7 @@ void tst_QDateTime::operator_insert_extract() TimeZoneRollback useZone(serialiseAs); // It is important that dateTime is created after the time zone shift - QDateTime dateTime(QDate(yearNumber, 8, 14), QTime(8, 0), Qt::LocalTime); + QDateTime dateTime(QDate(yearNumber, 8, 14), QTime(8, 0)); QDateTime dateTimeAsUTC(dateTime.toUTC()); QByteArray byteArray; @@ -2263,7 +2613,8 @@ void tst_QDateTime::operator_insert_extract() // Ensure that a change in timezone between serialisation and deserialisation // still results in identical UTC-converted datetimes. useZone.reset(deserialiseAs); - QDateTime expectedLocalTime(dateTimeAsUTC.toLocalTime()); + QDateTime expectedLocalTime(dateTimeAsUTC.toLocalTime()); // *After* resetting zone. + QCOMPARE(expectedLocalTime, dateTimeAsUTC); // Different description, same moment in time. { // Deserialise whole QDateTime at once. QDataStream dataStream(&byteArray, QIODevice::ReadOnly); @@ -2279,7 +2630,7 @@ void tst_QDateTime::operator_insert_extract() if (dataStreamVersion < QDataStream::Qt_4_0) { // Versions lower than Qt 4 don't serialise the timeSpec, instead // assuming that everything is LocalTime. - deserialised.setTimeSpec(Qt::UTC); + deserialised.setTimeZone(UTC); } // Qt 4.* versions do serialise the timeSpec, so we only need to convert from UTC here. deserialised = deserialised.toLocalTime(); @@ -2297,9 +2648,17 @@ void tst_QDateTime::operator_insert_extract() qint8 deserialisedSpec; if (dataStreamVersion >= QDataStream::Qt_4_0) dataStream >> deserialisedSpec; - deserialised = QDateTime(deserialisedDate, deserialisedTime, Qt::UTC); - if (dataStreamVersion >= QDataStream::Qt_4_0) - deserialised = deserialised.toTimeSpec(static_cast<Qt::TimeSpec>(deserialisedSpec)); + deserialised = QDateTime(deserialisedDate, deserialisedTime, UTC); + QCOMPARE(deserialised.toLocalTime(), deserialised); + const auto isLocalTime = [](qint8 spec) -> bool { + // The spec is in fact a QDateTimePrivate::Spec, not Qt::TimeSpec; + // and no offset or zone is stored, so only UTC and LocalTime are + // really supported. Fortunately this test only uses those. + const auto decoded = static_cast<QDateTimePrivate::Spec>(spec); + return decoded != QDateTimePrivate::UTC && decoded != QDateTimePrivate::OffsetFromUTC; + }; + if (dataStreamVersion >= QDataStream::Qt_4_0 && isLocalTime(deserialisedSpec)) + deserialised = deserialised.toTimeZone(QTimeZone::LocalTime); // Ensure local time is still correct. QCOMPARE(deserialised, expectedLocalTime); // Sanity check UTC times. @@ -2322,54 +2681,61 @@ void tst_QDateTime::fromStringDateFormat_data() QTest::addColumn<Qt::DateFormat>("dateFormat"); QTest::addColumn<QDateTime>("expected"); + // Fails 1970 start dates in western Mexico + // due to changing from PST to MST at the start of 1970. + const bool goodEpochStart = QDateTime(QDate(1970, 1, 1), QTime(0, 0)).isValid(); + // Test Qt::TextDate format. QTest::newRow("text date") << QString::fromLatin1("Tue Jun 17 08:00:10 2003") - << Qt::TextDate << QDateTime(QDate(2003, 6, 17), QTime(8, 0, 10, 0), Qt::LocalTime); + << Qt::TextDate << QDateTime(QDate(2003, 6, 17), QTime(8, 0, 10)); QTest::newRow("text date Year 0999") << QString::fromLatin1("Tue Jun 17 08:00:10 0999") - << Qt::TextDate << QDateTime(QDate(999, 6, 17), QTime(8, 0, 10, 0), Qt::LocalTime); + << Qt::TextDate << QDateTime(QDate(999, 6, 17), QTime(8, 0, 10)); QTest::newRow("text date Year 999") << QString::fromLatin1("Tue Jun 17 08:00:10 999") - << Qt::TextDate << QDateTime(QDate(999, 6, 17), QTime(8, 0, 10, 0), Qt::LocalTime); + << Qt::TextDate << QDateTime(QDate(999, 6, 17), QTime(8, 0, 10)); QTest::newRow("text date Year 12345") << QString::fromLatin1("Tue Jun 17 08:00:10 12345") - << Qt::TextDate << QDateTime(QDate(12345, 6, 17), QTime(8, 0, 10, 0), Qt::LocalTime); + << Qt::TextDate << QDateTime(QDate(12345, 6, 17), QTime(8, 0, 10)); QTest::newRow("text date Year -4712") << QString::fromLatin1("Tue Jan 1 00:01:02 -4712") - << Qt::TextDate << QDateTime(QDate(-4712, 1, 1), QTime(0, 1, 2, 0), Qt::LocalTime); - QTest::newRow("text epoch") - << QString::fromLatin1("Thu Jan 1 00:00:00 1970") << Qt::TextDate - << QDateTime(QDate(1970, 1, 1), QTime(0, 0), Qt::LocalTime); + << Qt::TextDate << QDateTime(QDate(-4712, 1, 1), QTime(0, 1, 2)); QTest::newRow("text data1") << QString::fromLatin1("Thu Jan 2 12:34 1970") - << Qt::TextDate << QDateTime(QDate(1970, 1, 2), QTime(12, 34, 0), Qt::LocalTime); + << Qt::TextDate << QDateTime(QDate(1970, 1, 2), QTime(12, 34)); + if (goodEpochStart) { + QTest::newRow("text epoch year after time") + << QString::fromLatin1("Thu Jan 1 00:00:00 1970") << Qt::TextDate + << QDate(1970, 1, 1).startOfDay(); + QTest::newRow("text epoch spaced") + << QString::fromLatin1(" Thu Jan 1 00:00:00 1970 ") + << Qt::TextDate << QDate(1970, 1, 1).startOfDay(); + QTest::newRow("text epoch time after year") + << QString::fromLatin1("Thu Jan 1 1970 00:00:00") + << Qt::TextDate << QDate(1970, 1, 1).startOfDay(); + } QTest::newRow("text epoch terse") << QString::fromLatin1("Thu Jan 1 00 1970") << Qt::TextDate << QDateTime(); QTest::newRow("text epoch stray :00") << QString::fromLatin1("Thu Jan 1 00:00:00:00 1970") << Qt::TextDate << QDateTime(); - QTest::newRow("text epoch spaced") - << QString::fromLatin1(" Thu Jan 1 00:00:00 1970 ") - << Qt::TextDate << QDateTime(QDate(1970, 1, 1), QTime(0, 0), Qt::LocalTime); QTest::newRow("text data6") << QString::fromLatin1("Thu Jan 1 00:00:00") << Qt::TextDate << QDateTime(); - QTest::newRow("text data7") << QString::fromLatin1("Thu Jan 1 1970 00:00:00") - << Qt::TextDate << QDateTime(QDate(1970, 1, 1), QTime(0, 0), Qt::LocalTime); QTest::newRow("text bad offset") << QString::fromLatin1("Thu Jan 1 00:12:34 1970 UTC+foo") << Qt::TextDate << QDateTime(); QTest::newRow("text UTC early") << QString::fromLatin1("Thu Jan 1 00:12:34 1970 UTC") - << Qt::TextDate << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << Qt::TextDate << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), UTC); QTest::newRow("text UTC-3 early") << QString::fromLatin1("Thu Jan 1 00:12:34 1970 UTC-0300") - << Qt::TextDate << QDateTime(QDate(1970, 1, 1), QTime(3, 12, 34), Qt::UTC); + << Qt::TextDate << QDateTime(QDate(1970, 1, 1), QTime(3, 12, 34), UTC); QTest::newRow("text UTC+3 early") << QString::fromLatin1("Thu Jan 1 00:12:34 1970 UTC+0300") - << Qt::TextDate << QDateTime(QDate(1969, 12, 31), QTime(21, 12, 34), Qt::UTC); + << Qt::TextDate << QDateTime(QDate(1969, 12, 31), QTime(21, 12, 34), UTC); QTest::newRow("text UTC+1 early") << QString::fromLatin1("Thu Jan 1 1970 00:12:34 UTC+0100") - << Qt::TextDate << QDateTime(QDate(1969, 12, 31), QTime(23, 12, 34), Qt::UTC); + << Qt::TextDate << QDateTime(QDate(1969, 12, 31), QTime(23, 12, 34), UTC); // We produce use GMT as prefix, so need to parse it: QTest::newRow("text GMT early") << QString::fromLatin1("Thu Jan 1 00:12:34 1970 GMT") << Qt::TextDate - << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), UTC); QTest::newRow("text GMT+3 early") << QString::fromLatin1("Thu Jan 1 00:12:34 1970 GMT+0300") << Qt::TextDate - << QDateTime(QDate(1969, 12, 31), QTime(21, 12, 34), Qt::UTC); + << QDateTime(QDate(1969, 12, 31), QTime(21, 12, 34), UTC); // ... and we match (only) it case-insensitively: QTest::newRow("text gmt early") << QString::fromLatin1("Thu Jan 1 00:12:34 1970 gmt") << Qt::TextDate - << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), UTC); QTest::newRow("text empty") << QString::fromLatin1("") << Qt::TextDate << QDateTime(); @@ -2465,85 +2831,95 @@ void tst_QDateTime::fromStringDateFormat_data() // Normal usage: QTest::newRow("ISO +01:00") << QString::fromLatin1("1987-02-13T13:24:51+01:00") - << Qt::ISODate << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), UTC); QTest::newRow("ISO +00:01") << QString::fromLatin1("1987-02-13T13:24:51+00:01") - << Qt::ISODate << QDateTime(QDate(1987, 2, 13), QTime(13, 23, 51), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(1987, 2, 13), QTime(13, 23, 51), UTC); QTest::newRow("ISO -01:00") << QString::fromLatin1("1987-02-13T13:24:51-01:00") - << Qt::ISODate << QDateTime(QDate(1987, 2, 13), QTime(14, 24, 51), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(1987, 2, 13), QTime(14, 24, 51), UTC); QTest::newRow("ISO -00:01") << QString::fromLatin1("1987-02-13T13:24:51-00:01") - << Qt::ISODate << QDateTime(QDate(1987, 2, 13), QTime(13, 25, 51), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(1987, 2, 13), QTime(13, 25, 51), UTC); QTest::newRow("ISO +0000") << QString::fromLatin1("1970-01-01T00:12:34+0000") - << Qt::ISODate << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), UTC); QTest::newRow("ISO +00:00") << QString::fromLatin1("1970-01-01T00:12:34+00:00") - << Qt::ISODate << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), UTC); QTest::newRow("ISO -03") << QString::fromLatin1("2014-12-15T12:37:09-03") - << Qt::ISODate << QDateTime(QDate(2014, 12, 15), QTime(15, 37, 9), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(2014, 12, 15), QTime(15, 37, 9), UTC); QTest::newRow("ISO zzz-03") << QString::fromLatin1("2014-12-15T12:37:09.745-03") - << Qt::ISODate << QDateTime(QDate(2014, 12, 15), QTime(15, 37, 9, 745), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(2014, 12, 15), QTime(15, 37, 9, 745), UTC); QTest::newRow("ISO -3") << QString::fromLatin1("2014-12-15T12:37:09-3") - << Qt::ISODate << QDateTime(QDate(2014, 12, 15), QTime(15, 37, 9), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(2014, 12, 15), QTime(15, 37, 9), UTC); QTest::newRow("ISO zzz-3") << QString::fromLatin1("2014-12-15T12:37:09.745-3") - << Qt::ISODate << QDateTime(QDate(2014, 12, 15), QTime(15, 37, 9, 745), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(2014, 12, 15), QTime(15, 37, 9, 745), UTC); QTest::newRow("ISO lower-case") << QString::fromLatin1("2005-06-28T07:57:30.002z") - << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 2), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 2), UTC); // No time specified - defaults to Qt::LocalTime. QTest::newRow("ISO data3") << QString::fromLatin1("2002-10-01") - << Qt::ISODate << QDateTime(QDate(2002, 10, 1), QTime(0, 0), Qt::LocalTime); + << Qt::ISODate << QDate(2002, 10, 1).startOfDay(); // Excess digits in milliseconds, round correctly: QTest::newRow("ISO") << QString::fromLatin1("2005-06-28T07:57:30.0010000000Z") - << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 1), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 1), UTC); QTest::newRow("ISO rounding") << QString::fromLatin1("2005-06-28T07:57:30.0015Z") - << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 2), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 2), UTC); // ... and accept comma as separator: QTest::newRow("ISO with comma 1") << QString::fromLatin1("2005-06-28T07:57:30,0040000000Z") - << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 4), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 4), UTC); QTest::newRow("ISO with comma 2") << QString::fromLatin1("2005-06-28T07:57:30,0015Z") - << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 2), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 2), UTC); QTest::newRow("ISO with comma 3") << QString::fromLatin1("2005-06-28T07:57:30,0014Z") - << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 1), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 1), UTC); QTest::newRow("ISO with comma 4") << QString::fromLatin1("2005-06-28T07:57:30,1Z") - << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 100), Qt::UTC); + << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 100), UTC); QTest::newRow("ISO with comma 5") << QString::fromLatin1("2005-06-28T07:57:30,11") - << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 110), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 110)); // 24:00:00 Should be next day according to ISO 8601 section 4.2.3. QTest::newRow("ISO 24:00") << QString::fromLatin1("2012-06-04T24:00:00") - << Qt::ISODate << QDateTime(QDate(2012, 6, 5), QTime(0, 0), Qt::LocalTime); + << 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), - Qt::LocalTime); + << 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") - << Qt::ISODate << QDateTime(QDate(2012, 7, 1), QTime(0, 0), Qt::LocalTime); - QTest::newRow("ISO 24:00 end of year") << QString::fromLatin1("2012-12-31T24:00:00") - << Qt::ISODate << QDateTime(QDate(2013, 1, 1), QTime(0, 0), Qt::LocalTime); - QTest::newRow("ISO 24:00, fract ms") << QString::fromLatin1("2012-01-01T24:00:00.000") - << Qt::ISODate << QDateTime(QDate(2012, 1, 2), QTime(0, 0), Qt::LocalTime); - QTest::newRow("ISO 24:00 end of year, fract ms") << QString::fromLatin1("2012-12-31T24:00:00.000") - << Qt::ISODate << QDateTime(QDate(2013, 1, 1), QTime(0, 0), Qt::LocalTime); + QTest::newRow("ISO 24:00 end of month") + << QString::fromLatin1("2012-06-30T24:00:00") + << Qt::ISODate << QDate(2012, 7, 1).startOfDay(); + QTest::newRow("ISO 24:00 end of year") + << QString::fromLatin1("2012-12-31T24:00:00") + << Qt::ISODate << QDate(2013, 1, 1).startOfDay(); + QTest::newRow("ISO 24:00, fract ms") + << QString::fromLatin1("2012-01-01T24:00:00.000") + << Qt::ISODate << QDate(2012, 1, 2).startOfDay(); + QTest::newRow("ISO 24:00 end of year, fract ms") + << QString::fromLatin1("2012-12-31T24:00:00.000") + << Qt::ISODate << QDate(2013, 1, 1).startOfDay(); // Test fractional seconds. - QTest::newRow("ISO .0 of a second (period)") << QString::fromLatin1("2012-01-01T08:00:00.0") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 0), Qt::LocalTime); + QTest::newRow("ISO .0 of a second (period)") + << QString::fromLatin1("2012-01-01T08:00:00.0") + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0)); QTest::newRow("ISO .00 of a second (period)") << QString::fromLatin1("2012-01-01T08:00:00.00") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 0), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0)); QTest::newRow("ISO .000 of a second (period)") << QString::fromLatin1("2012-01-01T08:00:00.000") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 0), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0)); QTest::newRow("ISO .1 of a second (comma)") << QString::fromLatin1("2012-01-01T08:00:00,1") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 100), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 100)); QTest::newRow("ISO .99 of a second (comma)") << QString::fromLatin1("2012-01-01T08:00:00,99") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 990), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 990)); QTest::newRow("ISO .998 of a second (comma)") << QString::fromLatin1("2012-01-01T08:00:00,998") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 998), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 998)); QTest::newRow("ISO .999 of a second (comma)") << QString::fromLatin1("2012-01-01T08:00:00,999") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 999), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 999)); QTest::newRow("ISO .3335 of a second (comma)") << QString::fromLatin1("2012-01-01T08:00:00,3335") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 334), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 334)); QTest::newRow("ISO .333333 of a second (comma)") << QString::fromLatin1("2012-01-01T08:00:00,333333") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 333), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 333)); QTest::newRow("ISO .00009 of a second (period)") << QString::fromLatin1("2012-01-01T08:00:00.00009") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 0), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0)); QTest::newRow("ISO second fraction") << QString::fromLatin1("2013-05-06T01:02:03.456") << Qt::ISODate << QDateTime(QDate(2013, 5, 6), QTime(1, 2, 3, 456)); QTest::newRow("ISO max milli") @@ -2570,17 +2946,17 @@ void tst_QDateTime::fromStringDateFormat_data() << Qt::ISODate << QDateTime(); // Test fractional minutes. QTest::newRow("ISO .0 of a minute (period)") << QString::fromLatin1("2012-01-01T08:00.0") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 0), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0)); QTest::newRow("ISO .8 of a minute (period)") << QString::fromLatin1("2012-01-01T08:00.8") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 48, 0), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 48)); QTest::newRow("ISO .99999 of a minute (period)") << QString::fromLatin1("2012-01-01T08:00.99999") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 59, 999), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 59, 999)); QTest::newRow("ISO .0 of a minute (comma)") << QString::fromLatin1("2012-01-01T08:00,0") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 0, 0), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0)); QTest::newRow("ISO .8 of a minute (comma)") << QString::fromLatin1("2012-01-01T08:00,8") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 48, 0), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 48)); QTest::newRow("ISO .99999 of a minute (comma)") << QString::fromLatin1("2012-01-01T08:00,99999") - << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 59, 999), Qt::LocalTime); + << Qt::ISODate << QDateTime(QDate(2012, 1, 1), QTime(8, 0, 59, 999)); QTest::newRow("ISO empty") << QString::fromLatin1("") << Qt::ISODate << QDateTime(); QTest::newRow("ISO short") << QString::fromLatin1("2017-07-01T") << Qt::ISODate << QDateTime(); QTest::newRow("ISO zoned date") @@ -2592,32 +2968,28 @@ void tst_QDateTime::fromStringDateFormat_data() // Test Qt::RFC2822Date format (RFC 2822). QTest::newRow("RFC 2822 +0100") << QString::fromLatin1("13 Feb 1987 13:24:51 +0100") - << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), UTC); QTest::newRow("RFC 2822 after space +0100") << QString::fromLatin1(" 13 Feb 1987 13:24:51 +0100") - << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), UTC); QTest::newRow("RFC 2822 with day +0100") << QString::fromLatin1("Fri, 13 Feb 1987 13:24:51 +0100") - << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), UTC); QTest::newRow("RFC 2822 with day after space +0100") << QString::fromLatin1(" Fri, 13 Feb 1987 13:24:51 +0100") - << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), UTC); QTest::newRow("RFC 2822 -0100") << QString::fromLatin1("13 Feb 1987 13:24:51 -0100") - << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(14, 24, 51), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(14, 24, 51), UTC); QTest::newRow("RFC 2822 with day -0100") << QString::fromLatin1("Fri, 13 Feb 1987 13:24:51 -0100") - << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(14, 24, 51), Qt::UTC); - QTest::newRow("RFC 2822 +0000") << QString::fromLatin1("01 Jan 1970 00:12:34 +0000") - << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); - QTest::newRow("RFC 2822 with day +0000") << QString::fromLatin1("Thu, 01 Jan 1970 00:12:34 +0000") - << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(14, 24, 51), UTC); QTest::newRow("RFC 2822 +0000") << QString::fromLatin1("01 Jan 1970 00:12:34 +0000") - << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), UTC); QTest::newRow("RFC 2822 with day +0000") << QString::fromLatin1("Thu, 01 Jan 1970 00:12:34 +0000") - << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), UTC); QTest::newRow("RFC 2822 missing space before +0100") << QString::fromLatin1("Thu, 01 Jan 1970 00:12:34+0100") << Qt::RFC2822Date << QDateTime(); // No timezone assume UTC QTest::newRow("RFC 2822 no timezone") << QString::fromLatin1("01 Jan 1970 00:12:34") - << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), UTC); // No time specified QTest::newRow("RFC 2822 date only") << QString::fromLatin1("01 Nov 2002") << Qt::RFC2822Date << QDateTime(); @@ -2662,23 +3034,21 @@ void tst_QDateTime::fromStringDateFormat_data() // sure *it's* not what's invalid: QTest::newRow("RFC 2822 (not invalid)") << QString::fromLatin1("01 Jan 2012 08:00:00 +0100") - << Qt::RFC2822Date << QDateTime(QDate(2012, 1, 1), QTime(7, 0), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(2012, 1, 1), QTime(7, 0), UTC); // Test Qt::RFC2822Date format (RFC 850 and 1036, permissive). QTest::newRow("RFC 850 and 1036 +0100") << QString::fromLatin1("Fri Feb 13 13:24:51 1987 +0100") - << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), UTC); QTest::newRow("RFC 1036 after space +0100") << QString::fromLatin1(" Fri Feb 13 13:24:51 1987 +0100") - << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), UTC); QTest::newRow("RFC 850 and 1036 -0100") << QString::fromLatin1("Fri Feb 13 13:24:51 1987 -0100") - << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(14, 24, 51), Qt::UTC); - QTest::newRow("RFC 850 and 1036 +0000") << QString::fromLatin1("Thu Jan 01 00:12:34 1970 +0000") - << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1987, 2, 13), QTime(14, 24, 51), UTC); QTest::newRow("RFC 850 and 1036 +0000") << QString::fromLatin1("Thu Jan 01 00:12:34 1970 +0000") - << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), UTC); // No timezone assume UTC QTest::newRow("RFC 850 and 1036 no timezone") << QString::fromLatin1("Thu Jan 01 00:12:34 1970") - << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), UTC); // No time specified QTest::newRow("RFC 850 and 1036 date only") << QString::fromLatin1("Fri Nov 01 2002") @@ -2702,7 +3072,7 @@ void tst_QDateTime::fromStringDateFormat_data() // Again, check the text in the "invalid character" tests isn't the source of invalidity: QTest::newRow("RFC 850 and 1036 (not invalid)") << QString::fromLatin1("Sun Jan 01 08:00:00 2012 +0100") - << Qt::RFC2822Date << QDateTime(QDate(2012, 1, 1), QTime(7, 0), Qt::UTC); + << Qt::RFC2822Date << QDateTime(QDate(2012, 1, 1), QTime(7, 0), UTC); QTest::newRow("RFC empty") << QString::fromLatin1("") << Qt::RFC2822Date << QDateTime(); } @@ -2722,252 +3092,271 @@ void tst_QDateTime::fromStringStringFormat_data() { QTest::addColumn<QString>("string"); QTest::addColumn<QString>("format"); + QTest::addColumn<int>("baseYear"); QTest::addColumn<QDateTime>("expected"); - const QDate defDate(1900, 1, 1); - QTest::newRow("data0") - << QString("101010") << QString("dMyy") << QDate(1910, 10, 10).startOfDay(); - QTest::newRow("data1") << QString("1020") << QString("sss") << QDateTime(); - QTest::newRow("data2") - << QString("1010") << QString("sss") << QDateTime(defDate, QTime(0, 0, 10)); - QTest::newRow("data3") << QString("10hello20") << QString("ss'hello'ss") << QDateTime(); - QTest::newRow("data4") << QString("10") << QString("''") << QDateTime(); - QTest::newRow("data5") << QString("10") << QString("'") << QDateTime(); - QTest::newRow("data6") << QString("pm") << QString("ap") << QDateTime(defDate, QTime(12, 0)); - QTest::newRow("data7") << QString("foo") << QString("ap") << QDateTime(); + // Indian/Cocos had a transition at the start of 1900, so its Jan 1st starts + // at 00:02:20 on that day; this leads to perverse results. QTBUG-77948. + if (const QDate defDate(1900, 1, 1); defDate.startOfDay().time() == QTime(0, 0)) { + QTest::newRow("dMyy-only:19") + << u"101010"_s << u"dMyy"_s << 1900 << QDate(1910, 10, 10).startOfDay(); + QTest::newRow("dMyy-only:20") + << u"101010"_s << u"dMyy"_s << 1911 << QDate(2010, 10, 10).startOfDay(); + QTest::newRow("secs-repeat-valid") + << u"1010"_s << u"sss"_s << 1900 << QDateTime(defDate, QTime(0, 0, 10)); + QTest::newRow("pm-only") + << u"pm"_s << u"ap"_s << 1900 << QDateTime(defDate, QTime(12, 0)); + QTest::newRow("date-only:19") + << u"10 Oct 10"_s << u"dd MMM yy"_s << 1900 << QDate(1910, 10, 10).startOfDay(); + QTest::newRow("date-only:20") + << u"10 Oct 10"_s << u"dd MMM yy"_s << 1950 << QDate(2010, 10, 10).startOfDay(); + QTest::newRow("dow-date-only") + << u"Fri December 3 2004"_s << u"ddd MMMM d yyyy"_s << 1900 + << QDate(2004, 12, 3).startOfDay(); + QTest::newRow("dow-mon-yr-only") + << u"Thu January 2004"_s << u"ddd MMMM yyyy"_s << 1900 + << QDate(2004, 1, 1).startOfDay(); + } + QTest::newRow("yy=24/Mar/20") // QTBUG-123579 + << u"Wed, 20 Mar 24 16:17:00"_s << u"ddd, dd MMM yy HH:mm:ss"_s << 1900 + << QDateTime(QDate(2024, 3, 20), QTime(16, 17)); + QTest::newRow("secs-conflict") << u"1020"_s << u"sss"_s << 1900 << QDateTime(); + QTest::newRow("secs-split-conflict") + << u"10hello20"_s << u"ss'hello'ss"_s << 1900 << QDateTime(); + QTest::newRow("nomatch-quote-twice") << u"10"_s << u"''"_s << 1900 << QDateTime(); + QTest::newRow("momatch-quote") << u"10"_s << u"'"_s << 1900 << QDateTime(); + QTest::newRow("nomatch-am-pm") << u"foo"_s << u"ap"_s << 1900 << QDateTime(); // Day non-conflict should not hide earlier year conflict (1963-03-01 was a // Friday; asking for Thursday moves this, without conflict, to the 7th): - QTest::newRow("data8") - << QString("77 03 1963 Thu") << QString("yy MM yyyy ddd") << QDateTime(); - QTest::newRow("data9") - << QString("101010") << QString("dMyy") << QDate(1910, 10, 10).startOfDay(); - QTest::newRow("data10") - << QString("101010") << QString("dMyy") << QDate(1910, 10, 10).startOfDay(); - QTest::newRow("data11") - << QString("10 Oct 10") << QString("dd MMM yy") << QDate(1910, 10, 10).startOfDay(); - QTest::newRow("data12") - << QString("Fri December 3 2004") << QString("ddd MMMM d yyyy") - << QDate(2004, 12, 3).startOfDay(); - QTest::newRow("data13") << QString("30.02.2004") << QString("dd.MM.yyyy") << QDateTime(); - QTest::newRow("data14") << QString("32.01.2004") << QString("dd.MM.yyyy") << QDateTime(); - QTest::newRow("data15") - << QString("Thu January 2004") << QString("ddd MMMM yyyy") - << QDate(2004, 1, 1).startOfDay(); + QTest::newRow("year-conflict") + << u"77 03 1963 Thu"_s << u"yy MM yyyy ddd"_s << 1900 << QDateTime(); + QTest::newRow("Feb-overflow") << u"30.02.2004"_s << u"dd.MM.yyyy"_s << 1900 << QDateTime(); + QTest::newRow("Jan-overflow") << u"32.01.2004"_s << u"dd.MM.yyyy"_s << 1900 << QDateTime(); QTest::newRow("zulu-time-with-z-centisec") - << QString("2005-06-28T07:57:30.01Z") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(QDate(2005, 06, 28), QTime(07, 57, 30, 10), Qt::UTC); + << u"2005-06-28T07:57:30.01Z"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(QDate(2005, 06, 28), QTime(07, 57, 30, 10), UTC); QTest::newRow("zulu-time-with-zz-decisec") - << QString("2005-06-28T07:57:30.1Z") << QString("yyyy-MM-ddThh:mm:ss.zzt") - << QDateTime(QDate(2005, 06, 28), QTime(07, 57, 30, 100), Qt::UTC); + << u"2005-06-28T07:57:30.1Z"_s << u"yyyy-MM-ddThh:mm:ss.zzt"_s << 1900 + << QDateTime(QDate(2005, 06, 28), QTime(07, 57, 30, 100), UTC); QTest::newRow("zulu-time-with-zzz-centisec") - << QString("2005-06-28T07:57:30.01Z") << QString("yyyy-MM-ddThh:mm:ss.zzzt") - << QDateTime(); // Invalid because too few digits for zzz + << u"2005-06-28T07:57:30.01Z"_s << u"yyyy-MM-ddThh:mm:ss.zzzt"_s << 1900 + << QDateTime(); // Invalid because too few digits for zzz + QTest::newRow("zulu-time-with-z-millisec") + << u"2005-06-28T07:57:30.001Z"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(QDate(2005, 06, 28), QTime(07, 57, 30, 1), UTC); QTest::newRow("utc-time-spec-as:UTC+0") - << QString("2005-06-28T07:57:30.001UTC+0") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 1), Qt::UTC); + << u"2005-06-28T07:57:30.001UTC+0"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 1), UTC); QTest::newRow("utc-time-spec-as:UTC-0") - << QString("2005-06-28T07:57:30.001UTC-0") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 1), Qt::UTC); + << u"2005-06-28T07:57:30.001UTC-0"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 1), UTC); QTest::newRow("offset-from-utc:UTC+1") - << QString("2001-09-13T07:33:01.001 UTC+1") << QString("yyyy-MM-ddThh:mm:ss.z t") - << QDateTime(QDate(2001, 9, 13), QTime(7, 33, 1, 1), Qt::OffsetFromUTC, 3600); + << u"2001-09-13T07:33:01.001 UTC+1"_s << u"yyyy-MM-ddThh:mm:ss.z t"_s << 1900 + << QDateTime(QDate(2001, 9, 13), QTime(7, 33, 1, 1), + QTimeZone::fromSecondsAheadOfUtc(3600)); QTest::newRow("offset-from-utc:UTC-11:01") - << QString("2008-09-13T07:33:01.001 UTC-11:01") << QString("yyyy-MM-ddThh:mm:ss.z t") - << QDateTime(QDate(2008, 9, 13), QTime(7, 33, 1, 1), Qt::OffsetFromUTC, -39660); + << u"2008-09-13T07:33:01.001 UTC-11:01"_s << u"yyyy-MM-ddThh:mm:ss.z t"_s << 1900 + << QDateTime(QDate(2008, 9, 13), QTime(7, 33, 1, 1), + QTimeZone::fromSecondsAheadOfUtc(-39660)); QTest::newRow("offset-from-utc:UTC+02:57") - << QString("2001-09-15T09:33:01.001UTC+02:57") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(QDate(2001, 9, 15), QTime(9, 33, 1, 1), Qt::OffsetFromUTC, 10620); + << u"2001-09-15T09:33:01.001UTC+02:57"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(QDate(2001, 9, 15), QTime(9, 33, 1, 1), + QTimeZone::fromSecondsAheadOfUtc(10620)); QTest::newRow("offset-from-utc:-03:00") // RFC 3339 offset format - << QString("2001-09-15T09:33:01.001-03:00") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(QDate(2001, 9, 15), QTime(9, 33, 1, 1), Qt::OffsetFromUTC, -10800); + << u"2001-09-15T09:33:01.001-03:00"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(QDate(2001, 9, 15), QTime(9, 33, 1, 1), + QTimeZone::fromSecondsAheadOfUtc(-10800)); QTest::newRow("offset-from-utc:+0205") // ISO 8601 basic offset format - << QString("2001-09-15T09:33:01.001+0205") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(QDate(2001, 9, 15), QTime(9, 33, 1, 1), Qt::OffsetFromUTC, 7500); + << u"2001-09-15T09:33:01.001+0205"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(QDate(2001, 9, 15), QTime(9, 33, 1, 1), + QTimeZone::fromSecondsAheadOfUtc(7500)); QTest::newRow("offset-from-utc:-0401") // ISO 8601 basic offset format - << QString("2001-09-15T09:33:01.001-0401") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(QDate(2001, 9, 15), QTime(9, 33, 1, 1), Qt::OffsetFromUTC, -14460); + << u"2001-09-15T09:33:01.001-0401"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(QDate(2001, 9, 15), QTime(9, 33, 1, 1), + QTimeZone::fromSecondsAheadOfUtc(-14460)); QTest::newRow("offset-from-utc:+10") // ISO 8601 basic (hour-only) offset format - << QString("2001-09-15T09:33:01.001 +10") << QString("yyyy-MM-ddThh:mm:ss.z t") - << QDateTime(QDate(2001, 9, 15), QTime(9, 33, 1, 1), Qt::OffsetFromUTC, 36000); + << u"2001-09-15T09:33:01.001 +10"_s << u"yyyy-MM-ddThh:mm:ss.z t"_s << 1900 + << QDateTime(QDate(2001, 9, 15), QTime(9, 33, 1, 1), + QTimeZone::fromSecondsAheadOfUtc(36000)); QTest::newRow("offset-from-utc:UTC+10:00") // Time-spec specifier at the beginning - << QString("UTC+10:00 2008-10-13T07:33") << QString("t yyyy-MM-ddThh:mm") - << QDateTime(QDate(2008, 10, 13), QTime(7, 33), Qt::OffsetFromUTC, 36000); + << u"UTC+10:00 2008-10-13T07:33"_s << u"t yyyy-MM-ddThh:mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(7, 33), + QTimeZone::fromSecondsAheadOfUtc(36000)); QTest::newRow("offset-from-utc:UTC-03:30") // Time-spec specifier in the middle - << QString("2008-10-13 UTC-03:30 11.50") << QString("yyyy-MM-dd t hh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, -12600); + << u"2008-10-13 UTC-03:30 11.50"_s << u"yyyy-MM-dd t hh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), + QTimeZone::fromSecondsAheadOfUtc(-12600)); QTest::newRow("offset-from-utc:UTC-2") // Time-spec specifier joined with text/time - << QString("2008-10-13 UTC-2Z11.50") << QString("yyyy-MM-dd tZhh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, -7200); + << u"2008-10-13 UTC-2Z11.50"_s << u"yyyy-MM-dd tZhh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), + QTimeZone::fromSecondsAheadOfUtc(-7200)); QTest::newRow("offset-from-utc:followed-by-colon") - << QString("2008-10-13 UTC-0100:11.50") << QString("yyyy-MM-dd t:hh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, -3600); + << u"2008-10-13 UTC-0100:11.50"_s << u"yyyy-MM-dd t:hh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), + QTimeZone::fromSecondsAheadOfUtc(-3600)); QTest::newRow("offset-from-utc:late-colon") - << QString("2008-10-13 UTC+05T:11.50") << QString("yyyy-MM-dd tT:hh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, 18000); + << u"2008-10-13 UTC+05T:11.50"_s << u"yyyy-MM-dd tT:hh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), + QTimeZone::fromSecondsAheadOfUtc(18000)); QTest::newRow("offset-from-utc:merged-with-time") - << QString("2008-10-13 UTC+010011.50") << QString("yyyy-MM-dd thh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, 3600); + << u"2008-10-13 UTC+010011.50"_s << u"yyyy-MM-dd thh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), + QTimeZone::fromSecondsAheadOfUtc(3600)); QTest::newRow("offset-from-utc:double-colon-delimiter") - << QString("2008-10-13 UTC+12::11.50") << QString("yyyy-MM-dd t::hh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, 43200); + << u"2008-10-13 UTC+12::11.50"_s << u"yyyy-MM-dd t::hh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), + QTimeZone::fromSecondsAheadOfUtc(43200)); QTest::newRow("offset-from-utc:3-digit-with-colon") - << QString("2008-10-13 -4:30 11.50") << QString("yyyy-MM-dd t hh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, -16200); - QTest::newRow("offset-from-utc:merged-with-time") - << QString("2008-10-13 UTC+010011.50") << QString("yyyy-MM-dd thh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, 3600); + << u"2008-10-13 -4:30 11.50"_s << u"yyyy-MM-dd t hh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), + QTimeZone::fromSecondsAheadOfUtc(-16200)); QTest::newRow("offset-from-utc:with-colon-merged-with-time") - << QString("2008-10-13 UTC+01:0011.50") << QString("yyyy-MM-dd thh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, 3600); + << u"2008-10-13 UTC+01:0011.50"_s << u"yyyy-MM-dd thh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), + QTimeZone::fromSecondsAheadOfUtc(3600)); QTest::newRow("invalid-offset-from-utc:out-of-range") - << QString("2001-09-15T09:33:01.001-50") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(); + << u"2001-09-15T09:33:01.001-50"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(); QTest::newRow("invalid-offset-from-utc:single-digit-format") - << QString("2001-09-15T09:33:01.001+5") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(); + << u"2001-09-15T09:33:01.001+5"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 << QDateTime(); QTest::newRow("invalid-offset-from-utc:three-digit-format") - << QString("2001-09-15T09:33:01.001-701") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(); + << u"2001-09-15T09:33:01.001-701"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(); QTest::newRow("invalid-offset-from-utc:three-digit-minutes") - << QString("2001-09-15T09:33:01.001+11:570") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(); + << u"2001-09-15T09:33:01.001+11:570"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(); QTest::newRow("invalid-offset-from-utc:single-digit-minutes") - << QString("2001-09-15T09:33:01.001+11:5") << QString("yyyy-MM-ddThh:mm:ss.zt") - << QDateTime(); + << u"2001-09-15T09:33:01.001+11:5"_s << u"yyyy-MM-ddThh:mm:ss.zt"_s << 1900 + << QDateTime(); QTest::newRow("invalid-offset-from-utc:invalid-sign-symbol") - << QString("2001-09-15T09:33:01.001 ~11:30") << QString("yyyy-MM-ddThh:mm:ss.z t") - << QDateTime(); + << u"2001-09-15T09:33:01.001 ~11:30"_s << u"yyyy-MM-ddThh:mm:ss.z t"_s << 1900 + << QDateTime(); QTest::newRow("invalid-offset-from-utc:symbol-in-hours") - << QString("2001-09-15T09:33:01.001 UTC+o8:30") << QString("yyyy-MM-ddThh:mm:ss.z t") - << QDateTime(); + << u"2001-09-15T09:33:01.001 UTC+o8:30"_s << u"yyyy-MM-ddThh:mm:ss.z t"_s << 1900 + << QDateTime(); QTest::newRow("invalid-offset-from-utc:symbol-in-minutes") - << QString("2001-09-15T09:33:01.001 UTC+08:3i") << QString("yyyy-MM-ddThh:mm:ss.z t") - << QDateTime(); + << u"2001-09-15T09:33:01.001 UTC+08:3i"_s << u"yyyy-MM-ddThh:mm:ss.z t"_s << 1900 + << QDateTime(); QTest::newRow("invalid-offset-from-utc:UTC+123") // Invalid offset (UTC and 3 digit format) - << QString("2001-09-15T09:33:01.001 UTC+123") << QString("yyyy-MM-ddThh:mm:ss.z t") - << QDateTime(); + << u"2001-09-15T09:33:01.001 UTC+123"_s << u"yyyy-MM-ddThh:mm:ss.z t"_s << 1900 + << QDateTime(); QTest::newRow("invalid-offset-from-utc:UTC+00005") // Invalid offset with leading zeroes - << QString("2001-09-15T09:33:01.001 UTC+00005") << QString("yyyy-MM-ddThh:mm:ss.z t") - << QDateTime(); + << u"2001-09-15T09:33:01.001 UTC+00005"_s << u"yyyy-MM-ddThh:mm:ss.z t"_s << 1900 + << QDateTime(); QTest::newRow("invalid-offset-from-utc:three-digit-with-colon-delimiter") - << QString("2008-10-13 +123:11.50") << QString("yyyy-MM-dd t:hh.mm") - << QDateTime(); + << u"2008-10-13 +123:11.50"_s << u"yyyy-MM-dd t:hh.mm"_s << 1900 << QDateTime(); QTest::newRow("invalid-offset-from-utc:double-colon-as-part-of-offset") - << QString("2008-10-13 UTC+12::11.50") << QString("yyyy-MM-dd thh.mm") - << QDateTime(); + << u"2008-10-13 UTC+12::11.50"_s << u"yyyy-MM-dd thh.mm"_s << 1900 << QDateTime(); QTest::newRow("invalid-offset-from-utc:single-colon-as-part-of-offset") - << QString("2008-10-13 UTC+12::11.50") << QString("yyyy-MM-dd t:hh.mm") - << QDateTime(); + << u"2008-10-13 UTC+12::11.50"_s << u"yyyy-MM-dd t:hh.mm"_s << 1900 << QDateTime(); QTest::newRow("invalid-offset-from-utc:starts-with-colon") - << QString("2008-10-13 UTC+:59 11.50") << QString("yyyy-MM-dd t hh.mm") - << QDateTime(); + << u"2008-10-13 UTC+:59 11.50"_s << u"yyyy-MM-dd t hh.mm"_s << 1900 << QDateTime(); QTest::newRow("invalid-offset-from-utc:empty-offset") - << QString("2008-10-13 UTC+ 11.50") << QString("yyyy-MM-dd t hh.mm") - << QDateTime(); + << u"2008-10-13 UTC+ 11.50"_s << u"yyyy-MM-dd t hh.mm"_s << 1900 << QDateTime(); QTest::newRow("invalid-offset-from-utc:time-section-instead-of-offset") - << QString("2008-10-13 UTC+11.50") << QString("yyyy-MM-dd thh.mm") - << QDateTime(); + << u"2008-10-13 UTC+11.50"_s << u"yyyy-MM-dd thh.mm"_s << 1900 << QDateTime(); QTest::newRow("invalid-offset-from-utc:missing-minutes-if-colon") - << QString("2008-10-13 +05: 11.50") << QString("yyyy-MM-dd t hh.mm") - << QDateTime(); + << u"2008-10-13 +05: 11.50"_s << u"yyyy-MM-dd t hh.mm"_s << 1900 << QDateTime(); QTest::newRow("invalid-offset-from-utc:1-digit-minutes-if-colon") - << QString("2008-10-13 UTC+05:1 11.50") << QString("yyyy-MM-dd t hh.mm") - << QDateTime(); + << u"2008-10-13 UTC+05:1 11.50"_s << u"yyyy-MM-dd t hh.mm"_s << 1900 << QDateTime(); QTest::newRow("invalid-time-spec:random-symbol") - << QString("2001-09-15T09:33:01.001 $") << QString("yyyy-MM-ddThh:mm:ss.z t") - << QDateTime(); + << u"2001-09-15T09:33:01.001 $"_s << u"yyyy-MM-ddThh:mm:ss.z t"_s << 1900 + << QDateTime(); QTest::newRow("invalid-time-spec:random-digit") - << QString("2001-09-15T09:33:01.001 1") << QString("yyyy-MM-ddThh:mm:ss.z t") - << QDateTime(); + << u"2001-09-15T09:33:01.001 1"_s << u"yyyy-MM-ddThh:mm:ss.z t"_s << 1900 + << QDateTime(); QTest::newRow("invalid-offset-from-utc:merged-with-time") - << QString("2008-10-13 UTC+0111.50") << QString("yyyy-MM-dd thh.mm") - << QDateTime(); + << u"2008-10-13 UTC+0111.50"_s << u"yyyy-MM-dd thh.mm"_s << 1900 << QDateTime(); QTest::newRow("invalid-offset-from-utc:with-colon-3-digit-merged-with-time") - << QString("2008-10-13 UTC+01:011.50") << QString("yyyy-MM-dd thh.mm") - << QDateTime(); + << u"2008-10-13 UTC+01:011.50"_s << u"yyyy-MM-dd thh.mm"_s << 1900 << QDateTime(); QTest::newRow("invalid-time-spec:empty") - << QString("2001-09-15T09:33:01.001 ") << QString("yyyy-MM-ddThh:mm:ss.z t") - << QDateTime(); + << u"2001-09-15T09:33:01.001 "_s << u"yyyy-MM-ddThh:mm:ss.z t"_s << 1900 << QDateTime(); #if QT_CONFIG(timezone) QTimeZone southBrazil("America/Sao_Paulo"); if (southBrazil.isValid()) { QTest::newRow("spring-forward-midnight") - << QString("2008-10-19 23:45.678 America/Sao_Paulo") << QString("yyyy-MM-dd mm:ss.zzz t") - // That's in the hour skipped - expect the matching time after the spring-forward, in DST: - << QDateTime(QDate(2008, 10, 19), QTime(1, 23, 45, 678), southBrazil); + // NB: no hour field, so hour takes its default, 0, so that + // default can be over-ridden: + << u"2008-10-19 23:45.678 America/Sao_Paulo"_s << u"yyyy-MM-dd mm:ss.zzz t"_s << 1900 + // That's in the hour skipped - expect the matching time after + // the spring-forward, in DST: + << QDateTime(QDate(2008, 10, 19), QTime(1, 23, 45, 678), southBrazil); } QTimeZone berlintz("Europe/Berlin"); if (berlintz.isValid()) { QTest::newRow("begin-of-high-summer-time-with-tz") - << QString("1947-05-11 03:23:45.678 Europe/Berlin") - << QString("yyyy-MM-dd hh:mm:ss.zzz t") - // That's in the hour skipped - expecting an invalid DateTime - << QDateTime(QDate(1947, 5, 11), QTime(3, 23, 45, 678), berlintz); + << u"1947-05-11 03:23:45.678 Europe/Berlin"_s << u"yyyy-MM-dd hh:mm:ss.zzz t"_s + // That's in the hour skipped - expecting an invalid DateTime + << 1900 << QDateTime(QDate(1947, 5, 11), QTime(3, 23, 45, 678), berlintz); } #endif - QTest::newRow("late") << QString("9999-12-31T23:59:59.999Z") - << QString("yyyy-MM-ddThh:mm:ss.zZ") - << QDateTime(QDate(9999, 12, 31), QTime(23, 59, 59, 999)); + QTest::newRow("late") + << u"9999-12-31T23:59:59.999Z"_s << u"yyyy-MM-ddThh:mm:ss.zZ"_s << 1900 + << QDateTime(QDate(9999, 12, 31), QTime(23, 59, 59, 999)); // Separators match /([^aAdhHMmstyz]*)/ QTest::newRow("oddly-separated") // To show broken-separator's format is valid. - << QStringLiteral("2018 wilful long working block relief 12-19T21:09 cruel blurb encore flux") - << QStringLiteral("yyyy wilful long working block relief MM-ddThh:mm cruel blurb encore flux") - << QDateTime(QDate(2018, 12, 19), QTime(21, 9)); + << u"2018 wilful long working block relief 12-19T21:09 cruel blurb encore flux"_s + << u"yyyy wilful long working block relief MM-ddThh:mm cruel blurb encore flux"_s + << 1900 << QDateTime(QDate(2018, 12, 19), QTime(21, 9)); QTest::newRow("broken-separator") - << QStringLiteral("2018 wilful") - << QStringLiteral("yyyy wilful long working block relief MM-ddThh:mm cruel blurb encore flux") - << QDateTime(); + << u"2018 wilful"_s + << u"yyyy wilful long working block relief MM-ddThh:mm cruel blurb encore flux"_s + << 1900 << QDateTime(); QTest::newRow("broken-terminator") - << QStringLiteral("2018 wilful long working block relief 12-19T21:09 cruel") - << QStringLiteral("yyyy wilful long working block relief MM-ddThh:mm cruel blurb encore flux") - << QDateTime(); + << u"2018 wilful long working block relief 12-19T21:09 cruel"_s + << u"yyyy wilful long working block relief MM-ddThh:mm cruel blurb encore flux"_s + << 1900 << QDateTime(); // test unicode - QTest::newRow("unicode handling") << QString(u8"2005🤣06🤣28T07🤣57🤣30.001Z") - << QString(u8"yyyy🤣MM🤣ddThh🤣mm🤣ss.zt") - << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 1), Qt::UTC); + QTest::newRow("unicode handling") + << QString(u8"2005🤣06🤣28T07🤣57🤣30.001Z") + << QString(u8"yyyy🤣MM🤣ddThh🤣mm🤣ss.zt") << 1900 + << QDateTime(QDate(2005, 6, 28), QTime(7, 57, 30, 1), UTC); // Two tests derived from malformed ASN.1 strings (QTBUG-84349): - QTest::newRow("ASN.1:UTC") - << u"22+221102233Z"_s << u"yyMMddHHmmsst"_s << QDateTime(); - QTest::newRow("ASN.1:Generalized") - << u"9922+221102233Z"_s << u"yyyyMMddHHmmsst"_s << QDateTime(); + QTest::newRow("curft+ASN.1:UTC") + << u"22+221102233Z"_s << u"yyMMddHHmmsst"_s << 1900 << QDateTime(); + QTest::newRow("curft+ASN.1:Generalized") + << u"9922+221102233Z"_s << u"yyyyMMddHHmmsst"_s << 1900 << QDateTime(); + // Verify baseYear needed by plain ASN.1 works: + QTest::newRow("ASN.1:UTC-start") + << u"500101000000Z"_s << u"yyMMddHHmmsst"_s << 1950 + << QDate(1950, 1, 1).startOfDay(QTimeZone::UTC); + QTest::newRow("ASN.1:UTC-end") + << u"491231235959Z"_s << u"yyMMddHHmmsst"_s << 1950 + << QDate(2049, 12, 31).endOfDay(QTimeZone::UTC).addMSecs(-999); // fuzzer test QTest::newRow("integer overflow found by fuzzer") - << QStringLiteral("EEE1200000MUB") << QStringLiteral("t") - << QDateTime(); + << u"EEE1200000MUB"_s << u"t"_s << 1900 << QDateTime(); // Rich time-zone specifiers (QTBUG-95966): + const auto east3hours = QTimeZone::fromSecondsAheadOfUtc(10800); QTest::newRow("timezone-tt-with-offset:+0300") - << QString("2008-10-13 +0300 11.50") << QString("yyyy-MM-dd tt hh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, 10800); + << u"2008-10-13 +0300 11.50"_s << u"yyyy-MM-dd tt hh.mm"_s + << 1900 << QDateTime(QDate(2008, 10, 13), QTime(11, 50), east3hours); QTest::newRow("timezone-ttt-with-offset:+03:00") - << QString("2008-10-13 +03:00 11.50") << QString("yyyy-MM-dd ttt hh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), Qt::OffsetFromUTC, 10800); + << u"2008-10-13 +03:00 11.50"_s << u"yyyy-MM-dd ttt hh.mm"_s + << 1900 << QDateTime(QDate(2008, 10, 13), QTime(11, 50), east3hours); QTest::newRow("timezone-tttt-with-offset:+03:00") - << QString("2008-10-13 +03:00 11.50") << QString("yyyy-MM-dd tttt hh.mm") - << QDateTime(); // Offset not valid when zone name expected. + << u"2008-10-13 +03:00 11.50"_s << u"yyyy-MM-dd tttt hh.mm"_s + << 1900 << QDateTime(); // Offset not valid when zone name expected. } void tst_QDateTime::fromStringStringFormat() { QFETCH(QString, string); QFETCH(QString, format); + QFETCH(int, baseYear); QFETCH(QDateTime, expected); - QDateTime dt = QDateTime::fromString(string, format); + QDateTime dt = QDateTime::fromString(string, format, baseYear); QCOMPARE(dt, expected); if (expected.isValid()) { QCOMPARE(dt.timeSpec(), expected.timeSpec()); -#if QT_CONFIG(timezone) - if (expected.timeSpec() == Qt::TimeZone) - QCOMPARE(dt.timeZone(), expected.timeZone()); -#endif - // OffsetFromUTC needs an offset check - we may as well do it for all: - QCOMPARE(dt.offsetFromUtc(), expected.offsetFromUtc()); + QCOMPARE(dt.timeRepresentation(), dt.timeRepresentation()); } else { QCOMPARE(dt.isValid(), expected.isValid()); QCOMPARE(dt.toMSecsSinceEpoch(), expected.toMSecsSinceEpoch()); @@ -2979,6 +3368,7 @@ void tst_QDateTime::fromStringStringFormat_localTimeZone_data() QTest::addColumn<QByteArray>("localTimeZone"); QTest::addColumn<QString>("string"); QTest::addColumn<QString>("format"); + QTest::addColumn<int>("baseYear"); QTest::addColumn<QDateTime>("expected"); #if QT_CONFIG(timezone) @@ -2991,48 +3381,55 @@ void tst_QDateTime::fromStringStringFormat_localTimeZone_data() if (etcGmtWithOffset.isValid()) { lacksRows = false; QTest::newRow("local-timezone-t-with-zone:Etc/GMT+3") - << QByteArrayLiteral("GMT") - << QString("2008-10-13 Etc/GMT+3 11.50") << QString("yyyy-MM-dd t hh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), etcGmtWithOffset); + << "GMT"_ba << u"2008-10-13 Etc/GMT+3 11.50"_s << u"yyyy-MM-dd t hh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), etcGmtWithOffset); QTest::newRow("local-timezone-tttt-with-zone:Etc/GMT+3") - << QByteArrayLiteral("GMT") - << QString("2008-10-13 Etc/GMT+3 11.50") << QString("yyyy-MM-dd tttt hh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), etcGmtWithOffset); + << "GMT"_ba << u"2008-10-13 Etc/GMT+3 11.50"_s << u"yyyy-MM-dd tttt hh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), etcGmtWithOffset); } QTest::newRow("local-timezone-tt-with-zone:Etc/GMT+3") - << QByteArrayLiteral("GMT") - << QString("2008-10-13 Etc/GMT+3 11.50") << QString("yyyy-MM-dd tt hh.mm") - << QDateTime(); // Zone name not valid when offset expected + << "GMT"_ba << u"2008-10-13 Etc/GMT+3 11.50"_s << u"yyyy-MM-dd tt hh.mm"_s << 1900 + << QDateTime(); // Zone name not valid when offset expected QTest::newRow("local-timezone-ttt-with-zone:Etc/GMT+3") - << QByteArrayLiteral("GMT") - << QString("2008-10-13 Etc/GMT+3 11.50") << QString("yyyy-MM-dd ttt hh.mm") - << QDateTime(); // Zone name not valid when offset expected + << "GMT"_ba << u"2008-10-13 Etc/GMT+3 11.50"_s << u"yyyy-MM-dd ttt hh.mm"_s << 1900 + << QDateTime(); // Zone name not valid when offset expected QTimeZone gmtWithOffset("GMT-2"); if (gmtWithOffset.isValid()) { lacksRows = false; - QTest::newRow("local-timezone-with-offset:GMT-2") << QByteArrayLiteral("GMT") - << QString("2008-10-13 GMT-2 11.50") << QString("yyyy-MM-dd t hh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), gmtWithOffset); + QTest::newRow("local-timezone-with-offset:GMT-2") + << "GMT"_ba << u"2008-10-13 GMT-2 11.50"_s << u"yyyy-MM-dd t hh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), gmtWithOffset); } QTimeZone gmt("GMT"); if (gmt.isValid()) { lacksRows = false; - QTest::newRow("local-timezone-with-offset:GMT") << QByteArrayLiteral("GMT") - << QString("2008-10-13 GMT 11.50") << QString("yyyy-MM-dd t hh.mm") - << QDateTime(QDate(2008, 10, 13), QTime(11, 50), gmt); + const bool fullyLocal = ([]() { + TimeZoneRollback useZone("GMT"); + return qTzName(0) == u"GMT"_s; + })(); + QTest::newRow("local-timezone-with-offset:GMT") + << "GMT"_ba << u"2008-10-13 GMT 11.50"_s << u"yyyy-MM-dd t hh.mm"_s << 1900 + << QDateTime(QDate(2008, 10, 13), QTime(11, 50), + fullyLocal ? QTimeZone(QTimeZone::LocalTime) : gmt); } QTimeZone helsinki("Europe/Helsinki"); if (helsinki.isValid()) { lacksRows = false; - // QTBUG-96861: QAsn1Element::toDateTime() tripped over an assert in - // QTimeZonePrivate::dataForLocalTime() on macOS and iOS. - // The first 20m 11s of 1921-05-01 were skipped, so the parser's attempt - // to construct a local time after scanning yyMM tripped up on the start - // of the day, when the zone backend lacked transition data. - QTest::newRow("Helsinki-joins-EET") - << QByteArrayLiteral("Europe/Helsinki") - << QString("210506000000Z") << QString("yyMMddHHmmsst") - << QDateTime(QDate(1921, 5, 6), QTime(0, 0), Qt::UTC); + // QTBUG-96861: QAsn1Element::toDateTime() tripped over an assert due to + // the first 20m 11s of 1921-05-01 being skipped, so the parser's + // attempt to construct a local time after scanning yyMM tripped up on + // the start of the day, when the zone backend lacked transition data. + // (Because QDTP tries to use local time until it reads the final zone + // field, constructing a new QDT after reading each field, hence + // transiently wanting 1921-05-01 00:00:00 before reading the dd field.) + QTest::newRow("Helsinki-joins-EET:19") + << "Europe/Helsinki"_ba << u"210506000000Z"_s << u"yyMMddHHmmsst"_s << 1900 + << QDateTime(QDate(1921, 5, 6), QTime(0, 0), UTC); + // Strictly, ASN.1 wants us to parse that with a different baseYear, so + // check that, too, but tweak to match the 1921 transition's mid-point: + QTest::newRow("Helsinki-joins-EET:20") + << "Europe/Helsinki"_ba << u"210501001006Z"_s << u"yyMMddHHmmsst"_s << 1950 + << QDateTime(QDate(2021, 5, 1), QTime(0, 10, 6), UTC); } if (lacksRows) QSKIP("Testcases all use zones unsupported on this platform"); @@ -3056,25 +3453,26 @@ void tst_QDateTime::offsetFromUtc() QCOMPARE(QDateTime().offsetFromUtc(), 0); // Offset constructor - QDateTime dt1(QDate(2013, 1, 1), QTime(1, 0), Qt::OffsetFromUTC, 60 * 60); + QDateTime dt1(QDate(2013, 1, 1), QTime(1, 0), QTimeZone::fromSecondsAheadOfUtc(60 * 60)); QCOMPARE(dt1.offsetFromUtc(), 60 * 60); + QVERIFY(dt1.timeRepresentation().isValid()); #if QT_CONFIG(timezone) QVERIFY(dt1.timeZone().isValid()); #endif - dt1 = QDateTime(QDate(2013, 1, 1), QTime(1, 0), Qt::OffsetFromUTC, -60 * 60); + dt1 = QDateTime(QDate(2013, 1, 1), QTime(1, 0), QTimeZone::fromSecondsAheadOfUtc(-60 * 60)); QCOMPARE(dt1.offsetFromUtc(), -60 * 60); // UTC should be 0 offset - QDateTime dt2(QDate(2013, 1, 1), QTime(0, 0), Qt::UTC); + QDateTime dt2(QDate(2013, 1, 1), QTime(0, 0), UTC); QCOMPARE(dt2.offsetFromUtc(), 0); // LocalTime should vary if (zoneIsCET) { // Time definitely in Standard Time so 1 hour ahead - QDateTime dt3(QDate(2013, 1, 1), QTime(0, 0), Qt::LocalTime); + QDateTime dt3 = QDate(2013, 1, 1).startOfDay(); QCOMPARE(dt3.offsetFromUtc(), 1 * 60 * 60); // Time definitely in Daylight Time so 2 hours ahead - QDateTime dt4(QDate(2013, 6, 1), QTime(0, 0), Qt::LocalTime); + QDateTime dt4 = QDate(2013, 6, 1).startOfDay(); QCOMPARE(dt4.offsetFromUtc(), 2 * 60 * 60); } else { qDebug("Skipped some tests specific to Central European Time " @@ -3090,6 +3488,9 @@ void tst_QDateTime::offsetFromUtc() #endif } +#if QT_DEPRECATED_SINCE(6, 9) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED void tst_QDateTime::setOffsetFromUtc() { /* Basic tests. */ @@ -3165,7 +3566,7 @@ void tst_QDateTime::setOffsetFromUtc() void tst_QDateTime::toOffsetFromUtc() { - QDateTime dt1(QDate(2013, 1, 1), QTime(0, 0), Qt::UTC); + QDateTime dt1(QDate(2013, 1, 1), QTime(0, 0), QTimeZone::UTC); QDateTime dt2 = dt1.toOffsetFromUtc(60 * 60); QCOMPARE(dt2, dt1); @@ -3185,6 +3586,8 @@ void tst_QDateTime::toOffsetFromUtc() QCOMPARE(dt2.date(), QDate(2013, 1, 1)); QCOMPARE(dt2.time(), QTime(0, 0)); } +QT_WARNING_POP +#endif // 6.9 deprecation void tst_QDateTime::zoneAtTime_data() { @@ -3260,28 +3663,46 @@ void tst_QDateTime::zoneAtTime() void tst_QDateTime::timeZoneAbbreviation() { - QDateTime dt1(QDate(2013, 1, 1), QTime(1, 0), Qt::OffsetFromUTC, 60 * 60); + QDateTime dt1(QDate(2013, 1, 1), QTime(1, 0), QTimeZone::fromSecondsAheadOfUtc(60 * 60)); QCOMPARE(dt1.timeZoneAbbreviation(), QString("UTC+01:00")); - QDateTime dt2(QDate(2013, 1, 1), QTime(1, 0), Qt::OffsetFromUTC, -60 * 60); + QDateTime dt2(QDate(2013, 1, 1), QTime(1, 0), QTimeZone::fromSecondsAheadOfUtc(-60 * 60)); QCOMPARE(dt2.timeZoneAbbreviation(), QString("UTC-01:00")); - QDateTime dt3(QDate(2013, 1, 1), QTime(0, 0), Qt::UTC); + QDateTime dt3(QDate(2013, 1, 1), QTime(0, 0), UTC); QCOMPARE(dt3.timeZoneAbbreviation(), QString("UTC")); // LocalTime should vary if (zoneIsCET) { // Time definitely in Standard Time - QDateTime dt4(QDate(2013, 1, 1), QTime(0, 0), Qt::LocalTime); + 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), QTime(0, 0), Qt::LocalTime); + 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)"); } @@ -3374,8 +3795,8 @@ void tst_QDateTime::utcOffsetLessThan() const QDateTime dt1(QDate(2002, 10, 10), QTime(0, 0)); QDateTime dt2(dt1); - dt1.setOffsetFromUtc(-(2 * 60 * 60)); // Minus two hours. - dt2.setOffsetFromUtc(-(3 * 60 * 60)); // Minus three hours. + dt1.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(-(2 * 60 * 60))); // Minus two hours. + dt2.setTimeZone(QTimeZone::fromSecondsAheadOfUtc(-(3 * 60 * 60))); // Minus three hours. QVERIFY(dt1 != dt2); QVERIFY(!(dt1 == dt2)); @@ -3385,14 +3806,14 @@ void tst_QDateTime::utcOffsetLessThan() const void tst_QDateTime::isDaylightTime() const { - QDateTime utc1(QDate(2012, 1, 1), QTime(0, 0), Qt::UTC); + QDateTime utc1(QDate(2012, 1, 1), QTime(0, 0), UTC); QVERIFY(!utc1.isDaylightTime()); - QDateTime utc2(QDate(2012, 6, 1), QTime(0, 0), Qt::UTC); + QDateTime utc2(QDate(2012, 6, 1), QTime(0, 0), UTC); QVERIFY(!utc2.isDaylightTime()); - QDateTime offset1(QDate(2012, 1, 1), QTime(0, 0), Qt::OffsetFromUTC, 1 * 60 * 60); + QDateTime offset1(QDate(2012, 1, 1), QTime(0, 0), QTimeZone::fromSecondsAheadOfUtc(60 * 60)); QVERIFY(!offset1.isDaylightTime()); - QDateTime offset2(QDate(2012, 6, 1), QTime(0, 0), Qt::OffsetFromUTC, 1 * 60 * 60); + QDateTime offset2(QDate(2012, 6, 1), QTime(0, 0), QTimeZone::fromSecondsAheadOfUtc(60 * 60)); QVERIFY(!offset2.isDaylightTime()); if (zoneIsCET) { @@ -3421,8 +3842,8 @@ void tst_QDateTime::daylightTransitions() const const qint64 spring2012 = 1332637200000; const qint64 autumn2012 = 1351386000000; const qint64 msecsOneHour = 3600000; - QCOMPARE(spring2012, QDateTime(QDate(2012, 3, 25), QTime(1, 0), Qt::UTC).toMSecsSinceEpoch()); - QCOMPARE(autumn2012, QDateTime(QDate(2012, 10, 28), QTime(1, 0), Qt::UTC).toMSecsSinceEpoch()); + QCOMPARE(spring2012, QDateTime(QDate(2012, 3, 25), QTime(1, 0), UTC).toMSecsSinceEpoch()); + QCOMPARE(autumn2012, QDateTime(QDate(2012, 10, 28), QTime(1, 0), UTC).toMSecsSinceEpoch()); // Test for correct behviour for StandardTime -> DaylightTime transition, i.e. missing hour @@ -3430,19 +3851,32 @@ void tst_QDateTime::daylightTransitions() const QDateTime before(QDate(2012, 3, 25), QTime(1, 59, 59, 999)); QVERIFY(before.isValid()); + QVERIFY(!before.isDaylightTime()); QCOMPARE(before.date(), QDate(2012, 3, 25)); QCOMPARE(before.time(), QTime(1, 59, 59, 999)); QCOMPARE(before.toMSecsSinceEpoch(), spring2012 - 1); - QDateTime missing(QDate(2012, 3, 25), QTime(2, 0)); - QVERIFY(!missing.isValid()); - QCOMPARE(missing.date(), QDate(2012, 3, 25)); - QCOMPARE(missing.time(), QTime(2, 0)); - // datetimeparser relies on toMSecsSinceEpoch to still work: - QCOMPARE(missing.toMSecsSinceEpoch(), spring2012); + QDateTime entering(QDate(2012, 3, 25), QTime(2, 0), + QDateTime::TransitionResolution::PreferBefore); + QVERIFY(entering.isValid()); + QVERIFY(!entering.isDaylightTime()); + QCOMPARE(entering.date(), QDate(2012, 3, 25)); + QCOMPARE(entering.time(), QTime(1, 0)); + // QDateTimeParser relies on toMSecsSinceEpoch() to still work: + QCOMPARE(entering.toMSecsSinceEpoch(), spring2012 - msecsOneHour); + + QDateTime leaving(QDate(2012, 3, 25), QTime(2, 0), + QDateTime::TransitionResolution::PreferAfter); + QVERIFY(leaving.isValid()); + QVERIFY(leaving.isDaylightTime()); + QCOMPARE(leaving.date(), QDate(2012, 3, 25)); + QCOMPARE(leaving.time(), QTime(3, 0)); + // QDateTimeParser relies on toMSecsSinceEpoch to still work: + QCOMPARE(leaving.toMSecsSinceEpoch(), spring2012); QDateTime after(QDate(2012, 3, 25), QTime(3, 0)); QVERIFY(after.isValid()); + QVERIFY(after.isDaylightTime()); QCOMPARE(after.date(), QDate(2012, 3, 25)); QCOMPARE(after.time(), QTime(3, 0)); QCOMPARE(after.toMSecsSinceEpoch(), spring2012); @@ -3462,19 +3896,18 @@ void tst_QDateTime::daylightTransitions() const QCOMPARE(after.toMSecsSinceEpoch(), spring2012); // Test changing time spec re-validates the date/time - - QDateTime utc(QDate(2012, 3, 25), QTime(2, 0), Qt::UTC); + QDateTime utc(QDate(2012, 3, 25), QTime(2, 0), UTC); QVERIFY(utc.isValid()); QCOMPARE(utc.date(), QDate(2012, 3, 25)); QCOMPARE(utc.time(), QTime(2, 0)); - utc.setTimeSpec(Qt::LocalTime); - QVERIFY(!utc.isValid()); + utc.setTimeZone(QTimeZone::LocalTime); // Resolved to RelativeToBefore. + QVERIFY(utc.isValid()); QCOMPARE(utc.date(), QDate(2012, 3, 25)); - QCOMPARE(utc.time(), QTime(2, 0)); - utc.setTimeSpec(Qt::UTC); + QCOMPARE(utc.time(), QTime(3, 0)); + utc.setTimeZone(UTC); // Preserves the changed time(). QVERIFY(utc.isValid()); QCOMPARE(utc.date(), QDate(2012, 3, 25)); - QCOMPARE(utc.time(), QTime(2, 0)); + QCOMPARE(utc.time(), QTime(3, 0)); // Test date maths, if result falls in missing hour then becomes next // hour (or is always invalid; mktime() may reject gap-times). @@ -3512,19 +3945,17 @@ void tst_QDateTime::daylightTransitions() const #undef CHECK_SPRING_FORWARD // Test for correct behviour for DaylightTime -> StandardTime transition, fall-back - // TODO (QTBUG-79923): Compare to results of direct QDateTime(date, time, fold) - // construction; see Prior/Post commented-out tests. QDateTime autumnMidnight = QDate(2012, 10, 28).startOfDay(); QVERIFY(autumnMidnight.isValid()); - // QCOMPARE(autumnMidnight, QDateTime(QDate(2012, 10, 28), QTime(2, 0), Prior)); QCOMPARE(autumnMidnight.date(), QDate(2012, 10, 28)); QCOMPARE(autumnMidnight.time(), QTime(0, 0)); QCOMPARE(autumnMidnight.toMSecsSinceEpoch(), autumn2012 - 3 * msecsOneHour); QDateTime startFirst = autumnMidnight.addMSecs(2 * msecsOneHour); QVERIFY(startFirst.isValid()); - // QCOMPARE(startFirst, QDateTime(QDate(2012, 10, 28), QTime(2, 0), Prior)); + QCOMPARE(startFirst, QDateTime(QDate(2012, 10, 28), QTime(2, 0), + QDateTime::TransitionResolution::PreferBefore)); QCOMPARE(startFirst.date(), QDate(2012, 10, 28)); QCOMPARE(startFirst.time(), QTime(2, 0)); QCOMPARE(startFirst.toMSecsSinceEpoch(), autumn2012 - msecsOneHour); @@ -3532,7 +3963,9 @@ void tst_QDateTime::daylightTransitions() const // 1 msec before transition is 2:59:59.999 FirstOccurrence QDateTime endFirst = startFirst.addMSecs(msecsOneHour - 1); QVERIFY(endFirst.isValid()); - // QCOMPARE(endFirst, QDateTime(QDate(2012, 10, 28), QTime(2, 59, 59, 999), Prior)); + QCOMPARE(endFirst, + QDateTime(QDate(2012, 10, 28), QTime(2, 59, 59, 999), + QDateTime::TransitionResolution::PreferBefore)); QCOMPARE(endFirst.date(), QDate(2012, 10, 28)); QCOMPARE(endFirst.time(), QTime(2, 59, 59, 999)); QCOMPARE(endFirst.toMSecsSinceEpoch(), autumn2012 - 1); @@ -3540,7 +3973,8 @@ void tst_QDateTime::daylightTransitions() const // At the transition, starting the second pass QDateTime startRepeat = endFirst.addMSecs(1); QVERIFY(startRepeat.isValid()); - // QCOMPARE(startRepeat, QDateTime(QDate(2012, 10, 28), QTime(2, 0), Post)); + QCOMPARE(startRepeat, QDateTime(QDate(2012, 10, 28), QTime(2, 0), + QDateTime::TransitionResolution::PreferAfter)); QCOMPARE(startRepeat.date(), QDate(2012, 10, 28)); QCOMPARE(startRepeat.time(), QTime(2, 0)); QCOMPARE(startRepeat.toMSecsSinceEpoch(), autumn2012); @@ -3548,7 +3982,9 @@ void tst_QDateTime::daylightTransitions() const // 59:59.999 after transition is 2:59:59.999 SecondOccurrence QDateTime endRepeat = endFirst.addMSecs(msecsOneHour); QVERIFY(endRepeat.isValid()); - // QCOMPARE(endRepeat, QDateTime(QDate(2012, 10, 28), QTime(2, 59, 59, 999), Post)); + QCOMPARE(endRepeat, + QDateTime(QDate(2012, 10, 28), QTime(2, 59, 59, 999), + QDateTime::TransitionResolution::PreferAfter)); QCOMPARE(endRepeat.date(), QDate(2012, 10, 28)); QCOMPARE(endRepeat.time(), QTime(2, 59, 59, 999)); QCOMPARE(endRepeat.toMSecsSinceEpoch(), autumn2012 + msecsOneHour - 1); @@ -3804,9 +4240,9 @@ void tst_QDateTime::timeZones() const { #if QT_CONFIG(timezone) QTimeZone invalidTz = QTimeZone("Vulcan/ShiKahr"); - QCOMPARE(invalidTz.isValid(), false); + QVERIFY(!invalidTz.isValid()); QDateTime invalidDateTime = QDateTime(QDate(2000, 1, 1), QTime(0, 0), invalidTz); - QCOMPARE(invalidDateTime.isValid(), false); + QVERIFY(!invalidDateTime.isValid()); QCOMPARE(invalidDateTime.date(), QDate(2000, 1, 1)); QCOMPARE(invalidDateTime.time(), QTime(0, 0)); @@ -3814,39 +4250,39 @@ void tst_QDateTime::timeZones() const QTimeZone nzTzOffset = QTimeZone(12 * 3600); // During Standard Time NZ is +12:00 - QDateTime utcStd(QDate(2012, 6, 1), QTime(0, 0), Qt::UTC); + QDateTime utcStd(QDate(2012, 6, 1), QTime(0, 0), UTC); QDateTime nzStd(QDate(2012, 6, 1), QTime(12, 0), nzTz); QDateTime nzStdOffset(QDate(2012, 6, 1), QTime(12, 0), nzTzOffset); - QCOMPARE(nzStd.isValid(), true); + QVERIFY(nzStd.isValid()); QCOMPARE(nzStd.timeSpec(), Qt::TimeZone); QCOMPARE(nzStd.date(), QDate(2012, 6, 1)); QCOMPARE(nzStd.time(), QTime(12, 0)); QVERIFY(nzStd.timeZone() == nzTz); QCOMPARE(nzStd.timeZone().id(), QByteArray("Pacific/Auckland")); QCOMPARE(nzStd.offsetFromUtc(), 43200); - QCOMPARE(nzStd.isDaylightTime(), false); + QVERIFY(!nzStd.isDaylightTime()); QCOMPARE(nzStd.toMSecsSinceEpoch(), utcStd.toMSecsSinceEpoch()); - QCOMPARE(nzStdOffset.isValid(), true); + QVERIFY(nzStdOffset.isValid()); QCOMPARE(nzStdOffset.timeSpec(), Qt::TimeZone); QCOMPARE(nzStdOffset.date(), QDate(2012, 6, 1)); QCOMPARE(nzStdOffset.time(), QTime(12, 0)); QVERIFY(nzStdOffset.timeZone() == nzTzOffset); - QCOMPARE(nzStdOffset.timeZone().id(), QByteArray("UTC+12")); + QCOMPARE(nzStdOffset.timeZone().id(), QByteArray("UTC+12:00")); QCOMPARE(nzStdOffset.offsetFromUtc(), 43200); - QCOMPARE(nzStdOffset.isDaylightTime(), false); + QVERIFY(!nzStdOffset.isDaylightTime()); QCOMPARE(nzStdOffset.toMSecsSinceEpoch(), utcStd.toMSecsSinceEpoch()); // During Daylight Time NZ is +13:00 - QDateTime utcDst(QDate(2012, 1, 1), QTime(0, 0), Qt::UTC); + QDateTime utcDst(QDate(2012, 1, 1), QTime(0, 0), UTC); QDateTime nzDst(QDate(2012, 1, 1), QTime(13, 0), nzTz); - QCOMPARE(nzDst.isValid(), true); + QVERIFY(nzDst.isValid()); QCOMPARE(nzDst.date(), QDate(2012, 1, 1)); QCOMPARE(nzDst.time(), QTime(13, 0)); QCOMPARE(nzDst.offsetFromUtc(), 46800); - QCOMPARE(nzDst.isDaylightTime(), true); + QVERIFY(nzDst.isDaylightTime()); QCOMPARE(nzDst.toMSecsSinceEpoch(), utcDst.toMSecsSinceEpoch()); QDateTime utc = nzStd.toUTC(); @@ -3866,7 +4302,7 @@ void tst_QDateTime::timeZones() const QCOMPARE(aus.date(), QDate(2012, 6, 1)); QCOMPARE(aus.time(), QTime(10, 0)); - QDateTime dt1(QDate(2012, 6, 1), QTime(0, 0), Qt::UTC); + QDateTime dt1(QDate(2012, 6, 1), QTime(0, 0), UTC); QCOMPARE(dt1.timeSpec(), Qt::UTC); dt1.setTimeZone(nzTz); QCOMPARE(dt1.timeSpec(), Qt::TimeZone); @@ -3878,13 +4314,13 @@ void tst_QDateTime::timeZones() const QCOMPARE(dt2.date(), dt1.date()); QCOMPARE(dt2.time(), dt1.time()); QCOMPARE(dt2.timeSpec(), dt1.timeSpec()); - QCOMPARE(dt2.timeZone(), dt1.timeZone()); + QCOMPARE(dt2.timeRepresentation(), dt1.timeRepresentation()); QDateTime dt3 = QDateTime::fromMSecsSinceEpoch(1338465600000, nzTz); QCOMPARE(dt3.date(), dt1.date()); QCOMPARE(dt3.time(), dt1.time()); QCOMPARE(dt3.timeSpec(), dt1.timeSpec()); - QCOMPARE(dt3.timeZone(), dt1.timeZone()); + QCOMPARE(dt3.timeRepresentation(), dt1.timeRepresentation()); // The start of year 1 should be *describable* in any zone (QTBUG-78051) dt3 = QDateTime(QDate(1, 1, 1), QTime(0, 0), ausTz); @@ -3914,7 +4350,7 @@ void tst_QDateTime::timeZones() const // Standard Time to Daylight Time 2013 on 2013-03-31 is 2:00 local time / 1:00 UTC const qint64 gapMSecs = 1364691600000; - QCOMPARE(gapMSecs, QDateTime(QDate(2013, 3, 31), QTime(1, 0), Qt::UTC).toMSecsSinceEpoch()); + QCOMPARE(gapMSecs, QDateTime(QDate(2013, 3, 31), QTime(1, 0), UTC).toMSecsSinceEpoch()); // Test MSecs to local // - Test 1 msec before tran = 01:59:59.999 @@ -3941,18 +4377,57 @@ void tst_QDateTime::timeZones() const QCOMPARE(atGap.toMSecsSinceEpoch(), gapMSecs); // - Test transition hole, setting 02:00:00 is invalid QDateTime inGap = QDateTime(QDate(2013, 3, 31), QTime(2, 0), cet); - QVERIFY(!inGap.isValid()); + QVERIFY(inGap.isValid()); QCOMPARE(inGap.date(), QDate(2013, 3, 31)); - QCOMPARE(inGap.time(), QTime(2, 0)); - // - Test transition hole, setting 02:59:59.999 is invalid + QCOMPARE(inGap.time(), QTime(3, 0)); + QCOMPARE(inGap.offsetFromUtc(), 7200); + // - Test transition hole, 02:59:59.999 was skipped: inGap = QDateTime(QDate(2013, 3, 31), QTime(2, 59, 59, 999), cet); - QVERIFY(!inGap.isValid()); + QVERIFY(inGap.isValid()); QCOMPARE(inGap.date(), QDate(2013, 3, 31)); - QCOMPARE(inGap.time(), QTime(2, 59, 59, 999)); + QCOMPARE(inGap.time(), QTime(3, 59, 59, 999)); + QCOMPARE(inGap.offsetFromUtc(), 7200); + // Test similar for local time, if it's CET: + if (zoneIsCET) { + inGap = QDateTime(QDate(2013, 3, 31), QTime(2, 30)); + QVERIFY(inGap.isValid()); + QCOMPARE(inGap.date(), QDate(2013, 3, 31)); + QCOMPARE(inGap.offsetFromUtc(), 7200); + QCOMPARE(inGap.time(), QTime(3, 30)); + } + + // Test a gap more than 1'141'707.91-years from 1970, outside ShortData's range, + // The zone version is non-short in any case, but check it anyway. + // However, we can only test this if the underlying OS believes CET continues + // exercising DST indefinitely; Darwin, for example, assumes we'll have all + // kicked the habit by the end of 2100. + constexpr int longYear = 1'143'678; + constexpr qint64 millisInWeek = qint64(7) * 24 * 60 * 60 * 1000; + if (QDateTime(QDate(longYear, 3, 24), QTime(12, 0), cet).msecsTo( + QDateTime(QDate(longYear, 3, 31), QTime(12, 0), cet)) < millisInWeek) { + inGap = QDateTime(QDate(longYear, 3, 27), QTime(2, 30), cet); + QVERIFY(inGap.isValid()); + QCOMPARE(inGap.date(), QDate(longYear, 3, 27)); + QCOMPARE(inGap.time(), QTime(3, 30)); + QCOMPARE(inGap.offsetFromUtc(), 7200); + } else { + qDebug("Skipping far-future check beyond zoned end of DST"); + } + if (zoneIsCET && QDateTime(QDate(longYear, 3, 24), QTime(12, 0)).msecsTo( + QDateTime(QDate(longYear, 3, 31), QTime(12, 0))) < millisInWeek) { + inGap = QDateTime(QDate(longYear, 3, 27), QTime(2, 30)); + QVERIFY(inGap.isValid()); + QCOMPARE(inGap.date(), QDate(longYear, 3, 27)); + QCOMPARE(inGap.offsetFromUtc(), 7200); + QCOMPARE(inGap.time(), QTime(3, 30)); + } else { + qDebug(zoneIsCET ? "Skipping far-future check beyond local end of DST" + : "Skipping CET-specific test"); + } // Standard Time to Daylight Time 2013 on 2013-10-27 is 3:00 local time / 1:00 UTC const qint64 replayMSecs = 1382835600000; - QCOMPARE(replayMSecs, QDateTime(QDate(2013, 10, 27), QTime(1, 0), Qt::UTC).toMSecsSinceEpoch()); + QCOMPARE(replayMSecs, QDateTime(QDate(2013, 10, 27), QTime(1, 0), UTC).toMSecsSinceEpoch()); // Test MSecs to local // - Test 1 hour before tran = 02:00:00 local first occurrence @@ -3974,7 +4449,7 @@ void tst_QDateTime::timeZones() const // - Test 1 hour after tran = 03:00:00 local QDateTime hourAfter = QDateTime::fromMSecsSinceEpoch(replayMSecs + 3600000, cet); QCOMPARE(hourAfter.date(), QDate(2013, 10, 27)); - QCOMPARE(hourAfter.time(), QTime(3, 0, 0)); + QCOMPARE(hourAfter.time(), QTime(3, 0)); // TODO (QTBUG-79923): Compare to results of direct QDateTime(date, time, cet, fold) // construction; see Prior/Post commented-out tests. @@ -4026,14 +4501,14 @@ void tst_QDateTime::systemTimeZoneChange() const // Start out in Brisbane time: TimeZoneRollback useZone(QByteArray("AEST-10:00")); - if (QDateTime(date, early, Qt::LocalTime).offsetFromUtc() != 600 * 60) + if (QDateTime(date, early).offsetFromUtc() != 600 * 60) QSKIP("Test depends on system support for changing zone to AEST-10:00"); #if QT_CONFIG(timezone) QVERIFY(QTimeZone::systemTimeZone().isValid()); #endif - const QDateTime localDate = QDateTime(date, early, Qt::LocalTime); - const QDateTime utcDate = QDateTime(date, early, Qt::UTC); + const QDateTime localDate = QDateTime(date, early); + const QDateTime utcDate = QDateTime(date, early, UTC); const qint64 localMsecs = localDate.toMSecsSinceEpoch(); const qint64 utcMsecs = utcDate.toMSecsSinceEpoch(); #if QT_CONFIG(timezone) @@ -4050,16 +4525,16 @@ void tst_QDateTime::systemTimeZoneChange() const // Change to Indian time useZone.reset(QByteArray("IST-05:30")); - if (QDateTime(date, early, Qt::LocalTime).offsetFromUtc() != 330 * 60) + if (QDateTime(date, early).offsetFromUtc() != 330 * 60) QSKIP("Test depends on system support for changing zone to IST-05:30"); #if QT_CONFIG(timezone) QVERIFY(QTimeZone::systemTimeZone().isValid()); #endif - QCOMPARE(localDate, QDateTime(date, early, Qt::LocalTime)); + QCOMPARE(localDate, QDateTime(date, early)); // Note: localDate.toMSecsSinceEpoch == localMsecs, unchanged, iff localDate is pimpled. - QVERIFY(localMsecs != QDateTime(date, early, Qt::LocalTime).toMSecsSinceEpoch()); - QCOMPARE(utcDate, QDateTime(date, early, Qt::UTC)); + QVERIFY(localMsecs != QDateTime(date, early).toMSecsSinceEpoch()); + QCOMPARE(utcDate, QDateTime(date, early, UTC)); QCOMPARE(utcDate.toMSecsSinceEpoch(), utcMsecs); #if QT_CONFIG(timezone) QCOMPARE(tzDate.toMSecsSinceEpoch(), tzMsecs); @@ -4079,17 +4554,19 @@ void tst_QDateTime::invalid_data() const QTest::newRow("simple") << invalidDate << Qt::LocalTime << true; QTest::newRow("UTC") << invalidDate.toUTC() << Qt::UTC << true; QTest::newRow("offset") - << invalidDate.toOffsetFromUtc(3600) << Qt::OffsetFromUTC << true; + << invalidDate.toTimeZone(QTimeZone::fromSecondsAheadOfUtc(3600)) << Qt::OffsetFromUTC + << true; #if QT_CONFIG(timezone) QTest::newRow("CET") << invalidDate.toTimeZone(QTimeZone("Europe/Oslo")) << Qt::TimeZone << true; // Crash tests, QTBUG-80146: QTest::newRow("nozone+construct") - << QDateTime(QDate(1970, 1, 1), QTime(12, 0), QTimeZone()) << Qt::TimeZone << false; + << QDateTime(QDate(1970, 1, 1), QTime(12, 0), QTimeZone()) + << Qt::TimeZone << false; QTest::newRow("nozone+fromMSecs") << QDateTime::fromMSecsSinceEpoch(42, QTimeZone()) << Qt::TimeZone << false; - QDateTime valid(QDate(1970, 1, 1), QTime(12, 0), Qt::UTC); + QDateTime valid(QDate(1970, 1, 1), QTime(12, 0), UTC); QTest::newRow("tonozone") << valid.toTimeZone(QTimeZone()) << Qt::TimeZone << false; #endif } @@ -4105,38 +4582,36 @@ void tst_QDateTime::invalid() const if (!goodZone) QCOMPARE(when.toMSecsSinceEpoch(), 0); QVERIFY(!when.isDaylightTime()); -#if QT_CONFIG(timezone) - QCOMPARE(when.timeZone().isValid(), goodZone); -#endif + QCOMPARE(when.timeRepresentation().isValid(), goodZone); } void tst_QDateTime::range() const { using Bounds = std::numeric_limits<qint64>; - QCOMPARE(QDateTime::fromMSecsSinceEpoch(Bounds::min() + 1, Qt::UTC).date().year(), + QCOMPARE(QDateTime::fromMSecsSinceEpoch(Bounds::min() + 1, UTC).date().year(), int(QDateTime::YearRange::First)); - QCOMPARE(QDateTime::fromMSecsSinceEpoch(Bounds::max() - 1, Qt::UTC).date().year(), + QCOMPARE(QDateTime::fromMSecsSinceEpoch(Bounds::max() - 1, UTC).date().year(), int(QDateTime::YearRange::Last)); constexpr qint64 millisPerDay = 24 * 3600 * 1000; constexpr qint64 wholeDays = Bounds::max() / millisPerDay; constexpr qint64 millisRemainder = Bounds::max() % millisPerDay; QVERIFY(QDateTime(QDate(1970, 1, 1).addDays(wholeDays), QTime::fromMSecsSinceStartOfDay(millisRemainder), - Qt::UTC).isValid()); + UTC).isValid()); QVERIFY(!QDateTime(QDate(1970, 1, 1).addDays(wholeDays), QTime::fromMSecsSinceStartOfDay(millisRemainder + 1), - Qt::UTC).isValid()); + UTC).isValid()); QVERIFY(QDateTime(QDate(1970, 1, 1).addDays(-wholeDays - 1), QTime::fromMSecsSinceStartOfDay(3600 * 24000 - millisRemainder - 1), - Qt::UTC).isValid()); + UTC).isValid()); QVERIFY(!QDateTime(QDate(1970, 1, 1).addDays(-wholeDays - 1), QTime::fromMSecsSinceStartOfDay(3600 * 24000 - millisRemainder - 2), - Qt::UTC).isValid()); + UTC).isValid()); } void tst_QDateTime::macTypes() { -#ifndef Q_OS_MAC +#ifndef Q_OS_DARWIN QSKIP("This is a Apple-only test"); #else extern void tst_QDateTime_macTypes(); // in qdatetime_mac.mm @@ -4159,22 +4634,22 @@ void tst_QDateTime::stdCompatibilitySysTime_data() QTest::newRow("zero") << StdSysMillis(0s) - << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 0), Qt::UTC); + << QDateTime(QDate(1970, 1, 1), QTime(0, 0), UTC); QTest::newRow("1s") << StdSysMillis(1s) - << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 1), Qt::UTC); + << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 1), UTC); QTest::newRow("1ms") << StdSysMillis(1ms) - << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 0, 1), Qt::UTC); + << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 0, 1), UTC); QTest::newRow("365d") << StdSysMillis(days(365)) - << QDateTime(QDate(1971, 1, 1), QTime(0, 0, 0), Qt::UTC); + << QDateTime(QDate(1971, 1, 1), QTime(0, 0), UTC); QTest::newRow("-1s") << StdSysMillis(-1s) - << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), Qt::UTC); + << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), UTC); QTest::newRow("-1ms") << StdSysMillis(-1ms) - << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59, 999), Qt::UTC); + << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59, 999), UTC); { // The first leap second occurred on 30 June 1972 at 23:59:60. @@ -4183,7 +4658,7 @@ void tst_QDateTime::stdCompatibilitySysTime_data() const sys_days firstLeapSecondDateAsSysDays = firstLeapSecondDate; QTest::newRow("first_leap_second") << StdSysMillis(firstLeapSecondDateAsSysDays) - << QDateTime(QDate(1972, 7, 1), QTime(0, 0, 0), Qt::UTC); + << QDateTime(QDate(1972, 7, 1), QTime(0, 0), UTC); } { @@ -4192,7 +4667,7 @@ void tst_QDateTime::stdCompatibilitySysTime_data() const StdSysMillis dateTime = date + 3h + 10min + 42s; QTest::newRow("2000-01-31 03:10:42") << dateTime - << QDateTime(QDate(2000, 1, 31), QTime(3, 10, 42), Qt::UTC); + << QDateTime(QDate(2000, 1, 31), QTime(3, 10, 42), UTC); } #else QSKIP("This test requires C++20's <chrono>."); @@ -4256,29 +4731,29 @@ void tst_QDateTime::stdCompatibilityLocalTime_data() QTest::newRow("zero") << StdLocalMillis(0s) - << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 0), Qt::LocalTime); + << QDateTime(QDate(1970, 1, 1), QTime(0, 0)); QTest::newRow("1s") << StdLocalMillis(1s) - << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 1), Qt::LocalTime); + << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 1)); QTest::newRow("1ms") << StdLocalMillis(1ms) - << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 0, 1), Qt::LocalTime); + << QDateTime(QDate(1970, 1, 1), QTime(0, 0, 0, 1)); QTest::newRow("365d") << StdLocalMillis(days(365)) - << QDateTime(QDate(1971, 1, 1), QTime(0, 0, 0), Qt::LocalTime); + << QDateTime(QDate(1971, 1, 1), QTime(0, 0)); QTest::newRow("-1s") << StdLocalMillis(-1s) - << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59), Qt::LocalTime); + << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59)); QTest::newRow("-1ms") << StdLocalMillis(-1ms) - << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59, 999), Qt::LocalTime); + << QDateTime(QDate(1969, 12, 31), QTime(23, 59, 59, 999)); { // Random date const local_days date = local_days(2000y/January/31); const StdLocalMillis dateTime = date + 3h + 10min + 42s; QTest::newRow("2000-01-31 03:10:42") << dateTime - << QDateTime(QDate(2000, 1, 31), QTime(3, 10, 42), Qt::LocalTime); + << QDateTime(QDate(2000, 1, 31), QTime(3, 10, 42)); } #else QSKIP("This test requires C++20's <chrono>."); @@ -4328,19 +4803,19 @@ void tst_QDateTime::stdCompatibilityZonedTime_data() StdZonedMillis zs(timeZoneName, local_days(2021y/1/1)); QTest::addRow("localTimeOslo") << zs - << QDateTime(QDate(2021, 1, 1), QTime(0, 0, 0), timeZone); + << QDateTime(QDate(2021, 1, 1), QTime(0, 0), timeZone); } { StdZonedMillis zs(timeZoneName, sys_days(2021y/1/1)); QTest::addRow("sysTimeOslo") << zs - << QDateTime(QDate(2021, 1, 1), QTime(1, 0, 0), timeZone); + << QDateTime(QDate(2021, 1, 1), QTime(1, 0), timeZone); } { StdZonedMillis zs(timeZoneName, sys_days(2021y/7/1)); QTest::addRow("sysTimeOslo summer") << zs - << QDateTime(QDate(2021, 7, 1), QTime(2, 0, 0), timeZone); + << QDateTime(QDate(2021, 7, 1), QTime(2, 0), timeZone); } #else QSKIP("This test requires C++20's <chrono>."); |