diff options
Diffstat (limited to 'tests/auto/webchannel')
-rw-r--r-- | tests/auto/webchannel/tst_webchannel.cpp | 44 | ||||
-rw-r--r-- | tests/auto/webchannel/tst_webchannel.h | 2 |
2 files changed, 23 insertions, 23 deletions
diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp index 0fe742f..a2c62cf 100644 --- a/tests/auto/webchannel/tst_webchannel.cpp +++ b/tests/auto/webchannel/tst_webchannel.cpp @@ -629,6 +629,28 @@ void TestWebChannel::testWrapRegisteredObject() QCOMPARE(obj.objectName(), returnedId); } +void TestWebChannel::testRemoveUnusedTransports() +{ + QWebChannel channel; + DummyTransport *dummyTransport = new DummyTransport(this); + TestObject obj; + + channel.connectTo(dummyTransport); + channel.d_func()->publisher->initializeClient(dummyTransport); + + QMetaObjectPublisher *pub = channel.d_func()->publisher; + pub->wrapResult(QVariant::fromValue(&obj), dummyTransport); + + QCOMPARE(pub->wrappedObjects.size(), 1); + QCOMPARE(pub->registeredObjectIds.size(), 1); + + channel.disconnectFrom(dummyTransport); + delete dummyTransport; + + QCOMPARE(pub->wrappedObjects.size(), 0); + QCOMPARE(pub->registeredObjectIds.size(), 0); +} + void TestWebChannel::testPassWrappedObjectBack() { QWebChannel channel; @@ -659,28 +681,6 @@ void TestWebChannel::testPassWrappedObjectBack() QCOMPARE(registeredObj.mReturnedObject, &returnedObjProperty); } -void TestWebChannel::testRemoveUnusedTransports() -{ - QWebChannel channel; - DummyTransport *dummyTransport = new DummyTransport(this); - TestObject obj; - - channel.connectTo(dummyTransport); - channel.d_func()->publisher->initializeClient(dummyTransport); - - QMetaObjectPublisher *pub = channel.d_func()->publisher; - pub->wrapResult(QVariant::fromValue(&obj), dummyTransport); - - QCOMPARE(pub->wrappedObjects.size(), 1); - QCOMPARE(pub->registeredObjectIds.size(), 1); - - channel.disconnectFrom(dummyTransport); - delete dummyTransport; - - QCOMPARE(pub->wrappedObjects.size(), 0); - QCOMPARE(pub->registeredObjectIds.size(), 0); -} - void TestWebChannel::testInfiniteRecursion() { QWebChannel channel; diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h index a587499..11786b4 100644 --- a/tests/auto/webchannel/tst_webchannel.h +++ b/tests/auto/webchannel/tst_webchannel.h @@ -278,8 +278,8 @@ private slots: void testSetPropertyConversion(); void testDisconnect(); void testWrapRegisteredObject(); - void testPassWrappedObjectBack(); void testRemoveUnusedTransports(); + void testPassWrappedObjectBack(); void testInfiniteRecursion(); void benchClassInfo(); |