4 files changed, 114 insertions, 0 deletions
diff --git a/tests/auto/testlib/initmain/initmain.pro b/tests/auto/testlib/initmain/initmain.pro
new file mode 100644
index 0000000000..4c12aba08d
--- /dev/null
+++ b/tests/auto/testlib/initmain/initmain.pro
@@ -0,0 +1,5 @@
+CONFIG += testcase
+SOURCES += tst_initmain.cpp
+QT = core testlib
+
+TARGET = tst_initmain
diff --git a/tests/auto/testlib/initmain/tst_initmain.cpp b/tests/auto/testlib/initmain/tst_initmain.cpp
new file mode 100644
index 0000000000..f08f82c5ec
--- /dev/null
+++ b/tests/auto/testlib/initmain/tst_initmain.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtCore/QCoreApplication>
+#include <QtTest/QtTest>
+
+class tst_InitMain : public QObject
+{
+    Q_OBJECT
+
+public:
+    static void initMain() { m_initMainCalled = true; }
+
+private slots:
+    void testcase();
+
+private:
+    static bool m_initMainCalled;
+};
+
+bool tst_InitMain::m_initMainCalled = false;
+
+void tst_InitMain::testcase()
+{
+    QVERIFY(m_initMainCalled);
+}
+
+QTEST_MAIN(tst_InitMain)
+
+#include "tst_initmain.moc"
diff --git a/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp b/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp
index df241c030e..9555c2a844 100644
--- a/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp
+++ b/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp
@@ -65,6 +65,11 @@ private slots:
     void waitFunctionPointer_signalEmittedLater();
     void waitFunctionPointer_signalEmittedTooLate();
     void waitFunctionPointer_signalEmittedMultipleTimes();
+
+    void spyOnMetaMethod();
+
+    void spyOnMetaMethod_invalid();
+    void spyOnMetaMethod_invalid_data();
 };
 
 class QtTestObject: public QObject
@@ -432,5 +437,52 @@ void tst_QSignalSpy::waitFunctionPointer_signalEmittedMultipleTimes()
     QCOMPARE(spy.count(), 3);
 }
 
+void tst_QSignalSpy::spyOnMetaMethod()
+{
+    QObject obj;
+    auto mo = obj.metaObject();
+
+    auto signalIndex = mo->indexOfSignal("objectNameChanged(QString)");
+    QVERIFY(signalIndex != -1);
+
+    auto signal = mo->method(signalIndex);
+    QVERIFY(signal.isValid());
+    QCOMPARE(signal.methodType(), QMetaMethod::Signal);
+
+    QSignalSpy spy(&obj, signal);
+    QVERIFY(spy.isValid());
+
+    obj.setObjectName("A new object name");
+    QCOMPARE(spy.count(), 1);
+}
+
+Q_DECLARE_METATYPE(QMetaMethod);
+void tst_QSignalSpy::spyOnMetaMethod_invalid()
+{
+    QFETCH(QObject*, object);
+    QFETCH(QMetaMethod, signal);
+
+    QSignalSpy spy(object, signal);
+    QVERIFY(!spy.isValid());
+}
+
+void tst_QSignalSpy::spyOnMetaMethod_invalid_data()
+{
+    QTest::addColumn<QObject*>("object");
+    QTest::addColumn<QMetaMethod>("signal");
+
+    QTest::addRow("Invalid object")
+        << static_cast<QObject*>(nullptr)
+        << QMetaMethod();
+
+    QTest::addRow("Empty signal")
+        << new QObject(this)
+        << QMetaMethod();
+
+    QTest::addRow("Method is not a signal")
+        << new QObject(this)
+        << QObject::staticMetaObject.method(QObject::staticMetaObject.indexOfMethod("deleteLater()"));
+}
+
 QTEST_MAIN(tst_QSignalSpy)
 #include "tst_qsignalspy.moc"
diff --git a/tests/auto/testlib/testlib.pro b/tests/auto/testlib/testlib.pro
index 587c76a189..55f1f9b87b 100644
--- a/tests/auto/testlib/testlib.pro
+++ b/tests/auto/testlib/testlib.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS = \
+   initmain \
    outformat \
    qsignalspy \
    selftests \