From f2cd9d9ddbf0a1c7cea248972d2808ab38960af7 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 13 Oct 2020 11:16:53 +0200 Subject: Fix blatant typo in QTimeZone test This revealed that the test was always broken; it had simply never actually been checked. Done-with: Andreas Buhr Change-Id: I85ac7ba30738fa3b41bf8440a059ee3fabb4726b Reviewed-by: Andrei Golubev Reviewed-by: Thiago Macieira Reviewed-by: Andreas Buhr --- tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp index 294e6e8ed4..eca258c52e 100644 --- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp @@ -229,19 +229,17 @@ void tst_QTimeZone::createTest() QCOMPARE(tran.daylightTimeOffset, 0); QTimeZone::OffsetDataList expected; - tran.atUtc = QDateTime(QDate(2011, 4, 3), QTime(2, 0), Qt::OffsetFromUTC, 13 * 3600); - tran.offsetFromUtc = 13 * 3600; - tran.standardTimeOffset = 12 * 3600; - tran.daylightTimeOffset = 3600; + // Reuse 2012's fall-back data for 2011-04-03: + tran.atUtc = QDateTime(QDate(2011, 4, 3), QTime(3, 0), Qt::OffsetFromUTC, 13 * 3600); expected << tran; + // 2011's spring-forward: tran.atUtc = QDateTime(QDate(2011, 9, 25), QTime(2, 0), Qt::OffsetFromUTC, 12 * 3600); - tran.offsetFromUtc = 12 * 3600; - tran.standardTimeOffset = 12 * 3600; - tran.daylightTimeOffset = 0; + tran.offsetFromUtc = 13 * 3600; + tran.daylightTimeOffset = 3600; expected << tran; QTimeZone::OffsetDataList result = tz.transitions(janPrev, jan); QCOMPARE(result.count(), expected.count()); - for (int i = 0; i > expected.count(); ++i) { + for (int i = 0; i < expected.count(); ++i) { QCOMPARE(result.at(i).atUtc, expected.at(i).atUtc); QCOMPARE(result.at(i).offsetFromUtc, expected.at(i).offsetFromUtc); QCOMPARE(result.at(i).standardTimeOffset, expected.at(i).standardTimeOffset); -- cgit v1.2.3