From f4b19f8bbaf5887988d74d5784cf899819333e4c Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 3 Nov 2021 16:42:51 +0100 Subject: Give symbolic names to some constants used in time-zone tests Where std::numeric_limits<...>::min() is used used as invalid value for an API return, save it as a named constant so that the comparisons are against an informative name, rather than leaving the reader to guess the significance of the min-value. Change-Id: Ia99c75e21856f65cb4494120d05eed36f5fc2d50 Reviewed-by: Thiago Macieira --- .../auto/corelib/time/qtimezone/tst_qtimezone.cpp | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp index 479c2771d7..73f251ae82 100644 --- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp @@ -300,24 +300,25 @@ void tst_QTimeZone::nullTest() QCOMPARE(nullTz1.isDaylightTime(jun), false); QTimeZone::OffsetData data = nullTz1.offsetData(jan); + constexpr auto invalidOffset = std::numeric_limits::min(); QCOMPARE(data.atUtc, QDateTime()); - QCOMPARE(data.offsetFromUtc, std::numeric_limits::min()); - QCOMPARE(data.standardTimeOffset, std::numeric_limits::min()); - QCOMPARE(data.daylightTimeOffset, std::numeric_limits::min()); + QCOMPARE(data.offsetFromUtc, invalidOffset); + QCOMPARE(data.standardTimeOffset, invalidOffset); + QCOMPARE(data.daylightTimeOffset, invalidOffset); QCOMPARE(nullTz1.hasTransitions(), false); data = nullTz1.nextTransition(jan); QCOMPARE(data.atUtc, QDateTime()); - QCOMPARE(data.offsetFromUtc, std::numeric_limits::min()); - QCOMPARE(data.standardTimeOffset, std::numeric_limits::min()); - QCOMPARE(data.daylightTimeOffset, std::numeric_limits::min()); + QCOMPARE(data.offsetFromUtc, invalidOffset); + QCOMPARE(data.standardTimeOffset, invalidOffset); + QCOMPARE(data.daylightTimeOffset, invalidOffset); data = nullTz1.previousTransition(jan); QCOMPARE(data.atUtc, QDateTime()); - QCOMPARE(data.offsetFromUtc, std::numeric_limits::min()); - QCOMPARE(data.standardTimeOffset, std::numeric_limits::min()); - QCOMPARE(data.daylightTimeOffset, std::numeric_limits::min()); + QCOMPARE(data.offsetFromUtc, invalidOffset); + QCOMPARE(data.standardTimeOffset, invalidOffset); + QCOMPARE(data.daylightTimeOffset, invalidOffset); } void tst_QTimeZone::systemZone() @@ -1232,11 +1233,13 @@ void tst_QTimeZone::tzTest() } else { QCOMPARE(dat.standardTimeOffset, 3600); + constexpr qint64 invalidTime = std::numeric_limits::min(); + constexpr int invalidOffset = std::numeric_limits::min(); // Test previous to low value is invalid dat = tzp.previousTransition(-9999999999999); - QCOMPARE(dat.atMSecsSinceEpoch, std::numeric_limits::min()); - QCOMPARE(dat.standardTimeOffset, std::numeric_limits::min()); - QCOMPARE(dat.daylightTimeOffset, std::numeric_limits::min()); + QCOMPARE(dat.atMSecsSinceEpoch, invalidTime); + QCOMPARE(dat.standardTimeOffset, invalidOffset); + QCOMPARE(dat.daylightTimeOffset, invalidOffset); } dat = tzp.nextTransition(-9999999999999); -- cgit v1.2.3