Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: If2a4f50d03fccc2654b8336d9e40daea85d6adca

1 files changed, 53 insertions, 0 deletions

diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp
index a8a658f..dd2059e 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;
@@ -754,6 +776,37 @@ void TestWebChannel::benchRegisterObjects()
         channel.registerObjects(objects);
     }
 }
+
+void TestWebChannel::benchRemoveTransport()
+{
+    QWebChannel channel;
+    QList<DummyTransport*> dummyTransports;
+    for (int i = 500; i > 0; i--)
+        dummyTransports.append(new DummyTransport(this));
+
+    QList<QSharedPointer<TestObject>> objs;
+    QMetaObjectPublisher *pub = channel.d_func()->publisher;
+
+    foreach (DummyTransport *transport, dummyTransports) {
+        channel.connectTo(transport);
+        channel.d_func()->publisher->initializeClient(transport);
+
+        /* 30 objects per transport */
+        for (int i = 30; i > 0; i--) {
+            QSharedPointer<TestObject> obj = QSharedPointer<TestObject>::create();
+            objs.append(obj);
+            pub->wrapResult(QVariant::fromValue(obj.data()), transport);
+        }
+    }
+
+    QBENCHMARK_ONCE {
+        foreach (DummyTransport *transport, dummyTransports)
+            pub->transportRemoved(transport);
+    }
+
+    qDeleteAll(dummyTransports);
+}
+
 #ifdef WEBCHANNEL_TESTS_CAN_USE_JS_ENGINE
 
 class SubclassedTestObject : public TestObject