From 5a1fbef109a7356ade550615c7fee879bb753c7d Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 1 Dec 2022 18:34:41 +0100 Subject: [PATCH] tst_QDateTime: Modernize some comparisons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use QCOMPARE(a, b) in place of QVERIFY(a == b), similar with QCOMPARE_LT() and QCOMPARE_LE(); and use a scope-guard to emit a message on failure instead of incurring the cost of building a string for the message, even when the passing test doesn't need it. Change-Id: I3884bc40e89a4b1ba881968b99faab27d4b1abc9 Reviewed-by: Mårten Nordheim Reviewed-by: Ivan Solovev --- .../corelib/time/qdatetime/tst_qdatetime.cpp | 92 ++++++++++--------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp index 5455e2996c..5d15029f32 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -1781,30 +1781,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()); + 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()); + }); - QVERIFY2(lowerBound < upperBound, qPrintable(details)); + 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(); - 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); + QCOMPARE(dt1.timeSpec(), Qt::LocalTime); + QCOMPARE(dt2.timeSpec(), Qt::LocalTime); + QCOMPARE(dt3.timeSpec(), Qt::UTC); } void tst_QDateTime::currentDateTimeUtc() @@ -1827,30 +1829,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()); + 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()); + }); - QVERIFY2(lowerBound < upperBound, qPrintable(details)); + 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(); - 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); + QCOMPARE(dt1.timeSpec(), Qt::UTC); + QCOMPARE(dt2.timeSpec(), Qt::LocalTime); + QCOMPARE(dt3.timeSpec(), Qt::UTC); } void tst_QDateTime::currentDateTimeUtc2()