From 64306392ce3a7751bfb58e1352b212ad5cba8aec Mon Sep 17 00:00:00 2001 From: Milian Wolff Date: Thu, 20 Apr 2017 12:05:11 +0200 Subject: Gracefully handle early deregistration of objects When an object is deregistered before the signal handler got initializated, we asserted. Now, we check for this case and skip the signal handler removal when it wasn't set up yet. Change-Id: I1edb5fb4f1429e6c69c6c41baabd3d30a4b6fe10 Task-number: QTBUG-60250 Reviewed-by: Kai Dohmen Reviewed-by: Konstantin Tokarev (cherry picked from commit 446978af11ab886d734ca3972dcd73f847df9fbc) --- tests/auto/webchannel/tst_webchannel.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'tests/auto/webchannel/tst_webchannel.cpp') diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp index 2ab820b..95a6160 100644 --- a/tests/auto/webchannel/tst_webchannel.cpp +++ b/tests/auto/webchannel/tst_webchannel.cpp @@ -317,6 +317,21 @@ void TestWebChannel::testDeregisterObjects() emit testObject.sig1(); } +void TestWebChannel::testDeregisterObjectAtStart() +{ + QWebChannel channel; + QVERIFY(channel.registeredObjects().isEmpty()); + + TestObject testObject; + testObject.setObjectName("myTestObject"); + + channel.registerObject(testObject.objectName(), &testObject); + QCOMPARE(channel.registeredObjects().size(), 1); + + channel.deregisterObject(&testObject); + QVERIFY(channel.registeredObjects().isEmpty()); +} + void TestWebChannel::testInfoForObject() { TestObject obj; -- cgit v1.2.1