1 files changed, 39 insertions, 9 deletions

diff --git a/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp b/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp
index 652a62f640..7a2b12b2eb 100644
--- a/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp
+++ b/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp
@@ -1,25 +1,29 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#include <QtCore/QDateTime>
 #include <QtCore/QString>
-#include <QtCore/QTime>
 #include <QtCore/QElapsedTimer>
 #include <QTest>
+#include <QtTest/private/qcomparisontesthelper_p.h>
 #include <QTimer>
 
 static const int minResolution = 100; // the minimum resolution for the tests
 
+QT_BEGIN_NAMESPACE
 QDebug operator<<(QDebug s, const QElapsedTimer &t)
 {
     s.nospace() << "(" << t.msecsSinceReference() << ")";
     return s.space();
 }
+QT_END_NAMESPACE
 
 class tst_QElapsedTimer : public QObject
 {
     Q_OBJECT
 
 private Q_SLOTS:
+    void compareCompiles();
     void statics();
     void validity();
     void basics();
@@ -27,13 +31,32 @@ private Q_SLOTS:
     void msecsTo();
 };
 
+void tst_QElapsedTimer::compareCompiles()
+{
+    QTestPrivate::testAllComparisonOperatorsCompile<QElapsedTimer>();
+}
+
 void tst_QElapsedTimer::statics()
 {
-    qDebug() << "Clock type is" << QElapsedTimer::clockType();
-    qDebug() << "Said clock is" << (QElapsedTimer::isMonotonic() ? "monotonic" : "not monotonic");
+    // these have been required since Qt 6.6
+    QCOMPARE(QElapsedTimer::clockType(), QElapsedTimer::MonotonicClock);
+    QVERIFY(QElapsedTimer::isMonotonic());
+
     QElapsedTimer t;
     t.start();
-    qDebug() << "Current time is" << t.msecsSinceReference();
+    qint64 system_now = QDateTime::currentMSecsSinceEpoch();
+
+    auto setprecision = +[](QTextStream &s) -> QTextStream & {
+        s.setRealNumberNotation(QTextStream::FixedNotation);
+        s.setRealNumberPrecision(3);
+        return s;
+    };
+    qDebug() << setprecision
+             << "Current monotonic time is" << (t.msecsSinceReference() / 1000.)
+             << "s and current system time is" << (system_now / 1000.) << 's';
+    if (qAbs(system_now - t.msecsSinceReference()) < 5 * minResolution)
+        qWarning() << "The monotonic clock is awfully close to the system clock"
+                      " (it may not be monotonic at all!)";
 }
 
 void tst_QElapsedTimer::validity()
@@ -61,6 +84,7 @@ void tst_QElapsedTimer::basics()
     QVERIFY(!(t1 < t1));
     QCOMPARE(t1.msecsTo(t1), qint64(0));
     QCOMPARE(t1.secsTo(t1), qint64(0));
+    QT_TEST_ALL_COMPARISON_OPS(t1, t1, Qt::strong_ordering::equal);
 
     quint64 value1 = t1.msecsSinceReference();
     qDebug() << "value1:" << value1 << "t1:" << t1;
@@ -125,10 +149,16 @@ void tst_QElapsedTimer::msecsTo()
     QTest::qSleep(minResolution);
     QElapsedTimer t2;
     t2.start();
-
-    QVERIFY(t1 != t2);
-    QVERIFY(!(t1 == t2));
-    QVERIFY(t1 < t2);
+    QTest::qSleep(minResolution);
+    QElapsedTimer t3;
+    t3.start();
+
+    QT_TEST_EQUALITY_OPS(t1, t2, false);
+    QT_TEST_EQUALITY_OPS(QElapsedTimer(), QElapsedTimer(), true);
+    QT_TEST_EQUALITY_OPS(QElapsedTimer(), t2, false);
+    QT_TEST_ALL_COMPARISON_OPS(t1, t2, Qt::strong_ordering::less);
+    QT_TEST_ALL_COMPARISON_OPS(t3, t2, Qt::strong_ordering::greater);
+    QT_TEST_ALL_COMPARISON_OPS(t3, QElapsedTimer(), Qt::strong_ordering::greater);
 
     auto diff = t1.msecsTo(t2);
     QVERIFY2(diff > 0, QString("difference t1 and t2 is %1").arg(diff).toLatin1());