1 files changed, 63 insertions, 12 deletions

diff --git a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
index 2b8ef8358d..59fb747524 100644
--- a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
+++ b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
@@ -1,9 +1,10 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // Copyright (C) 2014 Olivier Goffart <ogoffart@woboq.com>
-// 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 <QTest>
+#include <QtTest/private/qcomparisontesthelper_p.h>
 #include <QTypeRevision>
 
 #include <qobject.h>
@@ -14,6 +15,7 @@ class tst_QMetaMethod : public QObject
     Q_OBJECT
 
 private slots:
+    void compareCompiles();
     void method_data();
     void method();
 
@@ -22,6 +24,7 @@ private slots:
     void comparisonOperators();
 
     void fromSignal();
+    void fromSignalOfNullSignalIsInvalid();
 
     void gadget();
     void revision();
@@ -32,6 +35,9 @@ private slots:
     void parameterTypeName();
 
     void isConst();
+
+    void methodIndexes_data();
+    void methodIndexes();
 };
 
 struct CustomType { };
@@ -162,6 +168,11 @@ QVariant MethodTestObject::qvariantSlotBoolIntUIntLonglongULonglongDoubleLongSho
 }
 void MethodTestObject::voidSlotNoParameterNames(bool, int) {}
 
+void tst_QMetaMethod::compareCompiles()
+{
+    QTestPrivate::testEqualityOperatorsCompile<QMetaMethod>();
+}
+
 void tst_QMetaMethod::method_data()
 {
     QTest::addColumn<QByteArray>("signature");
@@ -643,6 +654,8 @@ void tst_QMetaMethod::method()
     // Bogus indexes
     QCOMPARE(method.parameterType(-1), 0);
     QCOMPARE(method.parameterType(parameterTypes.size()), 0);
+    QT_TEST_EQUALITY_OPS(method, QMetaMethod(), false);
+    QT_TEST_EQUALITY_OPS(QMetaMethod(), QMetaMethod(), true);
 }
 
 void tst_QMetaMethod::invalidMethod()
@@ -655,6 +668,9 @@ void tst_QMetaMethod::invalidMethod()
 
     QMetaMethod method3 = staticMetaObject.method(-1);
     QVERIFY(!method3.isValid());
+    QT_TEST_EQUALITY_OPS(method, method2, true);
+    QT_TEST_EQUALITY_OPS(method2, method3, true);
+    QT_TEST_EQUALITY_OPS(method, method3, true);
 }
 
 void tst_QMetaMethod::comparisonOperators()
@@ -669,16 +685,9 @@ void tst_QMetaMethod::comparisonOperators()
                 QMetaMethod other = x ? mo->constructor(j) : mo->method(j);
                 bool expectedEqual = ((methodMo == other.enclosingMetaObject())
                                       && (i == j));
-                QCOMPARE(method == other, expectedEqual);
-                QCOMPARE(method != other, !expectedEqual);
-                QCOMPARE(other == method, expectedEqual);
-                QCOMPARE(other != method, !expectedEqual);
+                QT_TEST_EQUALITY_OPS(method, other, expectedEqual);
             }
-
-            QVERIFY(method != QMetaMethod());
-            QVERIFY(QMetaMethod() != method);
-            QVERIFY(!(method == QMetaMethod()));
-            QVERIFY(!(QMetaMethod() == method));
+            QT_TEST_EQUALITY_OPS(method, QMetaMethod(), false);
         }
     }
 
@@ -687,8 +696,7 @@ void tst_QMetaMethod::comparisonOperators()
     for (int i = 0; i < qMin(mo->methodCount(), mo->constructorCount()); ++i) {
         QMetaMethod method = mo->method(i);
         QMetaMethod constructor = mo->constructor(i);
-        QVERIFY(method != constructor);
-        QVERIFY(!(method == constructor));
+        QT_TEST_EQUALITY_OPS(method, constructor, false);
     }
 }
 
@@ -716,6 +724,12 @@ void tst_QMetaMethod::fromSignal()
 #undef FROMSIGNAL_HELPER
 }
 
+void tst_QMetaMethod::fromSignalOfNullSignalIsInvalid()
+{
+    constexpr decltype(&QObject::destroyed) ptr = nullptr;
+    QVERIFY(!QMetaMethod::fromSignal(ptr).isValid());
+}
+
 class MyGadget {
     Q_GADGET
 public:
@@ -738,6 +752,7 @@ void tst_QMetaMethod::gadget()
     QMetaMethod getValueMethod = MyGadget::staticMetaObject.method(idx);
     QVERIFY(getValueMethod.isValid());
 
+    QT_TEST_EQUALITY_OPS(setValueMethod, getValueMethod, false);
     {
         MyGadget gadget;
         QString string;
@@ -862,6 +877,42 @@ void tst_QMetaMethod::isConst()
     }
 }
 
+void tst_QMetaMethod::methodIndexes_data()
+{
+    QTest::addColumn<QByteArray>("signature");
+    QTest::addColumn<QMetaMethod::MethodType>("methodType");
+
+    QTest::newRow("constructor1") << QByteArray("MethodTestObject()") << QMetaMethod::Constructor;
+    QTest::newRow("constructor5") << QByteArray("MethodTestObject(CustomUnregisteredType)")
+                                  << QMetaMethod::Constructor;
+    QTest::newRow("method0") << QByteArray("voidInvokable()") << QMetaMethod::Method;
+    QTest::newRow("method6") << QByteArray("boolInvokable()") << QMetaMethod::Method;
+}
+
+void tst_QMetaMethod::methodIndexes()
+{
+    QFETCH(QByteArray, signature);
+    QFETCH(QMetaMethod::MethodType, methodType);
+
+    const bool isConstructor = methodType == QMetaMethod::Constructor;
+
+    // roundtrip: index = QMetaObject::indexOfConstructor/Method()
+    //            <-> method = QMetaObject::constructor/method()
+    //            <-> indexThatShouldBeEqualToAboveIndex = QMetaMethod::methodIndex()
+
+    const QMetaObject *mo = &MethodTestObject::staticMetaObject;
+    const int index =
+            isConstructor ? mo->indexOfConstructor(signature) : mo->indexOfMethod(signature);
+    QVERIFY(index != -1);
+
+    QMetaMethod methodFromMetaObject =
+            mo->method(index); // should work on all methods (constructors, signals, ...)
+    const int absoluteMethodIndex =
+            methodFromMetaObject
+                    .methodIndex(); // should work on all methods (constructors, signals, ...)
+
+    QCOMPARE(absoluteMethodIndex, index);
+}
 
 QTEST_MAIN(tst_QMetaMethod)
 #include "tst_qmetamethod.moc"