From 2bfdc2b540d09b98830557dd13835c6034f5c06c Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Fri, 15 Jun 2012 13:39:28 +0200 Subject: Add test for queued call of method with unregistered parameter type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Verify that this produces a warning containing the relevant typename. Change-Id: I046c02585e410a211e9175600b1027dda83bdd9c Reviewed-by: Jędrzej Nowacki Reviewed-by: Bradley T. Hughes Reviewed-by: Olivier Goffart --- tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'tests') diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp index 8725c934b3..eee3a6258e 100644 --- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp @@ -299,6 +299,8 @@ void tst_QMetaObject::connectSlotsByName() QCOMPARE(obj2.invokeCount2, 1); } +struct MyUnregisteredType { }; + class QtTestObject: public QObject { friend class tst_QMetaObject; @@ -335,6 +337,8 @@ public slots: void moveToThread(QThread *t) { QObject::moveToThread(t); } + void slotWithUnregisteredParameterType(MyUnregisteredType); + signals: void sig0(); QString sig1(QString s1); @@ -402,6 +406,9 @@ void QtTestObject::testSender() slotResult.sprintf("%p", sender()); } +void QtTestObject::slotWithUnregisteredParameterType(MyUnregisteredType) +{ slotResult = "slotWithUnregisteredReturnType"; } + void tst_QMetaObject::invokeMetaMember() { @@ -582,6 +589,14 @@ void tst_QMetaObject::invokeQueuedMetaMember() Q_ARG(quint64, ll2))); qApp->processEvents(QEventLoop::AllEvents); QCOMPARE(obj.slotResult, QString("testLongLong:-1,0")); + + obj.slotResult.clear(); + { + MyUnregisteredType t; + QTest::ignoreMessage(QtWarningMsg, "QMetaMethod::invoke: Unable to handle unregistered datatype 'MyUnregisteredType'"); + QVERIFY(!QMetaObject::invokeMethod(&obj, "slotWithUnregisteredParameterType", Qt::QueuedConnection, Q_ARG(MyUnregisteredType, t))); + QVERIFY(obj.slotResult.isEmpty()); + } } void tst_QMetaObject::invokeBlockingQueuedMetaMember() -- cgit v1.2.3