From 0828014b44de4365de9f3724f5c798025c00010e Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 28 Jan 2022 15:28:14 +0100 Subject: [PATCH] Fix an inaccurate comment and update a test case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The offset fields for tst_QTimeZone::specificTransition() had a comment claiming they are in minutes; they are in fact in seconds, so fix that. At the same time, Moscow hasn't had a time-zone change since 2017, so the end-date for one of the test intervals can be nudged a little closer to the present without harm. Change-Id: I66822cb758f7e00d6added801466a6745be3e31a Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira Reviewed-by: MÃ¥rten Nordheim --- tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp index f68aeced2f..a9d552fd03 100644 --- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp @@ -527,7 +527,7 @@ void tst_QTimeZone::specificTransition_data() QTest::addColumn("stop"); QTest::addColumn("count"); QTest::addColumn("atUtc"); - // In minutes: + // In seconds: QTest::addColumn("offset"); QTest::addColumn("stdoff"); QTest::addColumn("dstoff"); @@ -544,7 +544,7 @@ void tst_QTimeZone::specificTransition_data() { QTest::newRow("Moscow/2014") // From original bug-report << QByteArray("Europe/Moscow") - << QDate(2011, 4, 1) << QDate(2017, 12,31) << 1 + << QDate(2011, 4, 1) << QDate(2021, 12, 31) << 1 << QDateTime(QDate(2014, 10, 26), QTime(2, 0, 0), Qt::OffsetFromUTC, 4 * 3600).toUTC() << 3 * 3600 << 3 * 3600 << 0;