TestLib: provide helper functions to test relational operators

The patch provides two sets of functions:
* functions to perform compile-time check for all cv-ref combinations
* functions that actually verify the comparison results for all
  cv-ref combinations.

For now it does not test operator<=>(), even if compiled with C++20,
because Qt types do not yet implement it.

The patch uses the new helper functions to improve testing of date and
time classes, because they already provide a full set of relational
operators.

Change-Id: I8bd869c489543719ea856d6609cac53cbd4dc122
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

2 files changed, 39 insertions, 158 deletions

diff --git a/tests/auto/corelib/time/qtime/CMakeLists.txt b/tests/auto/corelib/time/qtime/CMakeLists.txt
index 9aff56bf41..6fe2968107 100644
--- a/tests/auto/corelib/time/qtime/CMakeLists.txt
+++ b/tests/auto/corelib/time/qtime/CMakeLists.txt
@@ -19,4 +19,5 @@ qt_internal_add_test(tst_qtime
         QT_NO_KEYWORDS
     LIBRARIES
         Qt::CorePrivate
+        Qt::TestPrivate
 )
diff --git a/tests/auto/corelib/time/qtime/tst_qtime.cpp b/tests/auto/corelib/time/qtime/tst_qtime.cpp
index 74631229d1..d9d3698ef6 100644
--- a/tests/auto/corelib/time/qtime/tst_qtime.cpp
+++ b/tests/auto/corelib/time/qtime/tst_qtime.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <private/qglobal_p.h>
+#include <private/qcomparisontesthelper_p.h>
 #include <QTest>
 #include "qdatetime.h"
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -27,12 +28,11 @@ private Q_SLOTS:
     void addMSecs();
     void addSecs_data();
     void addSecs();
+    void orderingCompiles();
     void operator_eq_eq_data();
     void operator_eq_eq();
-    void operator_lt();
-    void operator_gt();
-    void operator_lt_eq();
-    void operator_gt_eq();
+    void ordering_data();
+    void ordering();
 #if QT_CONFIG(datestring)
 # if QT_CONFIG(datetimeparser)
     void fromStringFormat_data();
@@ -320,6 +320,11 @@ void tst_QTime::msecsTo()
     QCOMPARE( t1.msecsTo( t2 ), delta );
 }
 
+void tst_QTime::orderingCompiles()
+{
+    QTestPrivate::testAllComparisonOperatorsCompile<QTime>();
+}
+
 void tst_QTime::operator_eq_eq_data()
 {
     QTest::addColumn<QTime>("t1");
@@ -345,169 +350,44 @@ void tst_QTime::operator_eq_eq()
     QFETCH(QTime, t2);
     QFETCH(bool, expectEqual);
 
-    bool equal = t1 == t2;
-    QCOMPARE(equal, expectEqual);
-    bool notEqual = t1 != t2;
-    QCOMPARE(notEqual, !expectEqual);
+    QTestPrivate::testEqualityOperators(t1, t2, expectEqual);
+    if (QTest::currentTestFailed())
+        return;
 
-    if (equal)
+    if (expectEqual)
         QVERIFY(qHash(t1) == qHash(t2));
 }
 
-void tst_QTime::operator_lt()
-{
-    QTime t1(0,0,0,0);
-    QTime t2(0,0,0,0);
-    QVERIFY( !(t1 < t2) );
-
-    t1 = QTime(12,34,56,20);
-    t2 = QTime(12,34,56,30);
-    QVERIFY( t1 < t2 );
-
-    t1 = QTime(13,34,46,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( t1 < t2 );
-
-    t1 = QTime(13,24,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( t1 < t2 );
-
-    t1 = QTime(12,34,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( t1 < t2 );
-
-    t1 = QTime(14,34,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( !(t1 < t2) );
-
-    t1 = QTime(13,44,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( !(t1 < t2) );
-
-    t1 = QTime(13,34,56,20);
-    t2 = QTime(13,34,46,20);
-    QVERIFY( !(t1 < t2) );
-
-    t1 = QTime(13,44,56,30);
-    t2 = QTime(13,44,56,20);
-    QVERIFY( !(t1 < t2) );
-}
-
-void tst_QTime::operator_gt()
-{
-    QTime t1(0,0,0,0);
-    QTime t2(0,0,0,0);
-    QVERIFY( !(t1 > t2) );
-
-    t1 = QTime(12,34,56,20);
-    t2 = QTime(12,34,56,30);
-    QVERIFY( !(t1 > t2) );
-
-    t1 = QTime(13,34,46,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( !(t1 > t2) );
-
-    t1 = QTime(13,24,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( !(t1 > t2) );
-
-    t1 = QTime(12,34,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( !(t1 > t2) );
-
-    t1 = QTime(14,34,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( t1 > t2 );
-
-    t1 = QTime(13,44,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( t1 > t2 );
-
-    t1 = QTime(13,34,56,20);
-    t2 = QTime(13,34,46,20);
-    QVERIFY( t1 > t2 );
-
-    t1 = QTime(13,44,56,30);
-    t2 = QTime(13,44,56,20);
-    QVERIFY( t1 > t2 );
-}
-
-void tst_QTime::operator_lt_eq()
+void tst_QTime::ordering_data()
 {
-    QTime t1(0,0,0,0);
-    QTime t2(0,0,0,0);
-    QVERIFY( t1 <= t2 );
-
-    t1 = QTime(12,34,56,20);
-    t2 = QTime(12,34,56,30);
-    QVERIFY( t1 <= t2 );
-
-    t1 = QTime(13,34,46,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( t1 <= t2 );
-
-    t1 = QTime(13,24,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( t1 <= t2 );
-
-    t1 = QTime(12,34,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( t1 <= t2 );
-
-    t1 = QTime(14,34,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( !(t1 <= t2) );
-
-    t1 = QTime(13,44,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( !(t1 <= t2) );
-
-    t1 = QTime(13,34,56,20);
-    t2 = QTime(13,34,46,20);
-    QVERIFY( !(t1 <= t2) );
-
-    t1 = QTime(13,44,56,30);
-    t2 = QTime(13,44,56,20);
-    QVERIFY( !(t1 <= t2) );
+    QTest::addColumn<QTime>("left");
+    QTest::addColumn<QTime>("right");
+    QTest::addColumn<QStrongOrdering>("expectedOrdering");
+
+    auto generateRow = [](QTime t1, QTime t2, QStrongOrdering ordering) {
+        const QByteArray t1Str = t1.toString("hh:mm:ss.zz").toLatin1();
+        const QByteArray t2Str = t2.toString("hh:mm:ss.zz").toLatin1();
+        QTest::addRow("%s_vs_%s", t1Str.constData(), t2Str.constData()) << t1 << t2 << ordering;
+    };
+
+    generateRow(QTime(0, 0), QTime(0, 0), QStrongOrdering::Equivalent);
+    generateRow(QTime(12, 34, 56, 20), QTime(12, 34, 56, 30), QStrongOrdering::Less);
+    generateRow(QTime(13, 34, 46, 20), QTime(13, 34, 56, 20), QStrongOrdering::Less);
+    generateRow(QTime(13, 24, 56, 20), QTime(13, 34, 56, 20), QStrongOrdering::Less);
+    generateRow(QTime(12, 34, 56, 20), QTime(13, 34, 56, 20), QStrongOrdering::Less);
+    generateRow(QTime(14, 34, 56, 20), QTime(13, 34, 56, 20), QStrongOrdering::Greater);
+    generateRow(QTime(13, 44, 56, 20), QTime(13, 34, 56, 20), QStrongOrdering::Greater);
+    generateRow(QTime(13, 34, 56, 20), QTime(13, 34, 46, 20), QStrongOrdering::Greater);
+    generateRow(QTime(13, 34, 56, 30), QTime(13, 34, 56, 20), QStrongOrdering::Greater);
 }
 
-void tst_QTime::operator_gt_eq()
+void tst_QTime::ordering()
 {
-    QTime t1(0,0,0,0);
-    QTime t2(0,0,0,0);
-    QVERIFY( t1 >= t2 );
-
-    t1 = QTime(12,34,56,20);
-    t2 = QTime(12,34,56,30);
-    QVERIFY( !(t1 >= t2) );
-
-    t1 = QTime(13,34,46,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( !(t1 >= t2) );
-
-    t1 = QTime(13,24,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( !(t1 >= t2) );
-
-    t1 = QTime(12,34,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( !(t1 >= t2) );
-
-    t1 = QTime(14,34,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( t1 >= t2 );
-
-    t1 = QTime(13,44,56,20);
-    t2 = QTime(13,34,56,20);
-    QVERIFY( t1 >= t2 );
-
-    t1 = QTime(13,34,56,20);
-    t2 = QTime(13,34,46,20);
-    QVERIFY( t1 >= t2 );
+    QFETCH(QTime, left);
+    QFETCH(QTime, right);
+    QFETCH(QStrongOrdering, expectedOrdering);
 
-    t1 = QTime(13,44,56,30);
-    t2 = QTime(13,44,56,20);
-    QVERIFY( t1 >= t2 );
+    QTestPrivate::testAllComparisonOperators(left, right, expectedOrdering);
 }
 
 #if QT_CONFIG(datestring)