AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add test for queued call of method with unregistered parameter type

Browse Source 
Verify that this produces a warning containing the relevant typename.

Change-Id: I046c02585e410a211e9175600b1027dda83bdd9c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Kent Hansen 2012-06-15 13:39:28 +02:00 committed by Qt by Nokia
parent 42545eaea0
commit 2bfdc2b540
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
View File

@ -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()