1 files changed, 15 insertions, 30 deletions

diff --git a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp
index 7ca69b6d44..6fc6c6a914 100644
--- a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp
+++ b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp
@@ -42,6 +42,8 @@
 #include "debugutil_p.h"
 #include "qqmldebugtestservice.h"
 
+#include <private/qqmldebugconnector_p.h>
+
 #define PORT 13770
 #define STR_PORT "13770"
 
@@ -51,6 +53,7 @@ class tst_QQmlDebugClient : public QObject
 
 private:
     QQmlDebugConnection *m_conn;
+    QQmlDebugTestService *m_service;
 
 private slots:
     void initTestCase();
@@ -64,26 +67,31 @@ private slots:
 
 void tst_QQmlDebugClient::initTestCase()
 {
+    QQmlDebugConnector::setPluginKey(QLatin1String("QQmlDebugServer"));
+    QTest::ignoreMessage(QtWarningMsg,
+                         "QML debugger: Cannot set plugin key after loading the plugin.");
+
+    m_service = new QQmlDebugTestService("tst_QQmlDebugClient::handshake()");
     const QString waitingMsg = QString("QML Debugger: Waiting for connection on port %1...").arg(PORT);
     QTest::ignoreMessage(QtDebugMsg, waitingMsg.toLatin1().constData());
+    QQmlDebuggingEnabler::startTcpDebugServer(PORT);
+
     new QQmlEngine(this);
 
     m_conn = new QQmlDebugConnection(this);
 
     QQmlDebugTestClient client("tst_QQmlDebugClient::handshake()", m_conn);
-    QQmlDebugTestService service("tst_QQmlDebugClient::handshake()");
+
 
     for (int i = 0; i < 50; ++i) {
         // try for 5 seconds ...
         m_conn->connectToHost("127.0.0.1", PORT);
-        if (m_conn->waitForConnected())
+        if (m_conn->waitForConnected(100))
             break;
-        QTest::qSleep(100);
     }
 
     QVERIFY(m_conn->isConnected());
 
-    QTRY_VERIFY(QQmlDebugService::hasDebuggingClient());
     QTRY_COMPARE(client.state(), QQmlDebugClient::Enabled);
 }
 
@@ -107,14 +115,6 @@ void tst_QQmlDebugClient::state()
     QQmlDebugTestClient client("tst_QQmlDebugClient::state()", m_conn);
     QCOMPARE(client.state(), QQmlDebugClient::Unavailable);
 
-    {
-        QQmlDebugTestService service("tst_QQmlDebugClient::state()", 2);
-        QTRY_COMPARE(client.state(), QQmlDebugClient::Enabled);
-        QCOMPARE(client.serviceVersion(), 2.0f);
-    }
-
-    QTRY_COMPARE(client.state(), QQmlDebugClient::Unavailable);
-
     // duplicate plugin name
     QTest::ignoreMessage(QtWarningMsg, "QQmlDebugClient: Conflicting plugin name \"tst_QQmlDebugClient::state()\"");
     QQmlDebugClient client2("tst_QQmlDebugClient::state()", m_conn);
@@ -126,8 +126,7 @@ void tst_QQmlDebugClient::state()
 
 void tst_QQmlDebugClient::sendMessage()
 {
-    QQmlDebugTestService service("tst_QQmlDebugClient::sendMessage()");
-    QQmlDebugTestClient client("tst_QQmlDebugClient::sendMessage()", m_conn);
+    QQmlDebugTestClient client("tst_QQmlDebugClient::handshake()", m_conn);
 
     QByteArray msg = "hello!";
 
@@ -153,7 +152,6 @@ void tst_QQmlDebugClient::sequentialConnect()
 {
     QQmlDebugConnection connection2;
     QQmlDebugTestClient client2("tst_QQmlDebugClient::handshake()", &connection2);
-    QQmlDebugTestService service("tst_QQmlDebugClient::handshake()");
 
     m_conn->close();
     QVERIFY(!m_conn->isConnected());
@@ -165,23 +163,10 @@ void tst_QQmlDebugClient::sequentialConnect()
     connection2.connectToHost("127.0.0.1", PORT);
     QVERIFY(connection2.waitForConnected());
     QVERIFY(connection2.isConnected());
-    QTRY_VERIFY(client2.state() == QQmlDebugClient::Enabled);
+    QTRY_COMPARE(client2.state(), QQmlDebugClient::Enabled);
 }
 
-int main(int argc, char *argv[])
-{
-    int _argc = argc + 1;
-    char **_argv = new char*[_argc];
-    for (int i = 0; i < argc; ++i)
-        _argv[i] = argv[i];
-    char arg[] = "-qmljsdebugger=port:" STR_PORT;
-    _argv[_argc - 1] = arg;
-
-    QGuiApplication app(_argc, _argv);
-    tst_QQmlDebugClient tc;
-    return QTest::qExec(&tc, _argc, _argv);
-    delete _argv;
-}
+QTEST_MAIN(tst_QQmlDebugClient)
 
 #include "tst_qqmldebugclient.moc"