From a2236c7675144ea971e98d2f9bead38ae05659d1 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 14 Feb 2022 17:59:19 +0100 Subject: [PATCH] Tidy up tst_QTimeZone::specificTransition() It can now use startOfDay()/endOfDay() for the end-points of its search range; and it should check transit is not empty before dereferencing transits.at(0). Change-Id: Ib1568f4d8d6ce301d601071bb58185be906c631a Reviewed-by: Thiago Macieira --- .../auto/corelib/time/qtimezone/tst_qtimezone.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp index 998838e1ff..13ccd4dfb2 100644 --- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp @@ -574,14 +574,15 @@ void tst_QTimeZone::specificTransition() if (!timeZone.isValid()) QSKIP("Missing time-zone data"); QTimeZone::OffsetDataList transits = - timeZone.transitions(QDateTime(start, QTime(0, 0), timeZone), - QDateTime(stop, QTime(23, 59), timeZone)); + timeZone.transitions(start.startOfDay(timeZone), stop.endOfDay(timeZone)); QCOMPARE(transits.length(), count); - const QTimeZone::OffsetData &transition = transits.at(0); - QCOMPARE(transition.offsetFromUtc, offset); - QCOMPARE(transition.standardTimeOffset, stdoff); - QCOMPARE(transition.daylightTimeOffset, dstoff); - QCOMPARE(transition.atUtc, atUtc); + if (count) { + const QTimeZone::OffsetData &transition = transits.at(0); + QCOMPARE(transition.offsetFromUtc, offset); + QCOMPARE(transition.standardTimeOffset, stdoff); + QCOMPARE(transition.daylightTimeOffset, dstoff); + QCOMPARE(transition.atUtc, atUtc); + } } void tst_QTimeZone::transitionEachZone_data()