1 files changed, 18 insertions, 20 deletions

diff --git a/tests/auto/qml/tst_bench.qml b/tests/auto/qml/tst_bench.qml
index 056dda9..833720e 100644
--- a/tests/auto/qml/tst_bench.qml
+++ b/tests/auto/qml/tst_bench.qml
@@ -40,13 +40,24 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import QtTest 1.0
 
 import QtWebChannel 1.0
+import "qrc:///qwebchannel/qwebchannel.js" as Client
 
-WebChannelTest {
+TestCase {
     name: "Bench"
     id: test
 
+    Client {
+        id: client
+    }
+
+    WebChannel {
+        id: webChannel
+        transports: [client.serverTransport]
+    }
+
     Component {
         id: component
         QtObject {
@@ -96,28 +107,15 @@ WebChannelTest {
         webChannel.registerObjects(objects);
     }
 
-    function benchmark_init_baseline()
-    {
-        loadUrl("bench_init.html");
-    }
-
-    function benchmark_init_webview()
+    function cleanup()
     {
-        useWebViewTransport = true;
-        loadUrl("bench_init.html");
-        // init
-        awaitMessage();
-        // idle
-        awaitMessage();
+        client.cleanup();
     }
 
-    function benchmark_init_websocket()
+    function benchmark_init()
     {
-        useWebViewTransport = false;
-        loadUrl("bench_init.html");
-        // init
-        awaitMessage();
-        // idle
-        awaitMessage();
+        var channel = client.createChannel(function() {});
+        client.awaitInit();
+        client.awaitIdle();
     }
 }