1 files changed, 23 insertions, 24 deletions
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index c8fc001..9ebbbaf 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -52,21 +52,19 @@
 #include <private/qdeclarativedebugclient_p.h>
 #include <private/qdeclarativedebugservice_p.h>
 
+#include "../../../shared/util.h"
 #include "../shared/debugutil_p.h"
 
+
 class tst_QDeclarativeDebugService : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QDeclarativeDebugService(QDeclarativeDebugTestData *data)
-    {
-        m_conn = data->conn;
-    }
-
+private:
     QDeclarativeDebugConnection *m_conn;
 
 private slots:
+    void initTestCase();
+
     void name();
     void isEnabled();
     void enabledChanged();
@@ -76,6 +74,22 @@ private slots:
     void objectToString();
 };
 
+void tst_QDeclarativeDebugService::initTestCase()
+{
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3769...");
+    qputenv("QML_DEBUG_SERVER_PORT", "3769");
+    new QDeclarativeEngine(this);
+
+    m_conn = new QDeclarativeDebugConnection(this);
+    m_conn->connectToHost("127.0.0.1", 3769);
+
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established");
+    bool ok = m_conn->waitForConnected();
+    Q_ASSERT(ok);
+
+    QTRY_VERIFY(QDeclarativeDebugService::hasDebuggingClient());
+}
+
 void tst_QDeclarativeDebugService::name()
 {
     QString name = "tst_QDeclarativeDebugService::name()";
@@ -140,7 +154,7 @@ void tst_QDeclarativeDebugService::idForObject()
     int idB = QDeclarativeDebugService::idForObject(objB);
     QVERIFY(idB != idA);
     QCOMPARE(QDeclarativeDebugService::objectForId(idB), objB);
- 
+
     delete objA;
     delete objB;
 }
@@ -170,21 +184,6 @@ void tst_QDeclarativeDebugService::objectToString()
     delete obj;
 }
 
-
-class tst_QDeclarativeDebugService_Factory : public QDeclarativeTestFactory
-{
-public:
-    QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QDeclarativeDebugService(data); }
-};
-
-// This does not use QTEST_MAIN because the test has to be created and run
-// in a separate thread.
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    tst_QDeclarativeDebugService_Factory factory;
-    return QDeclarativeDebugTest::runTests(&factory);
-}
+QTEST_MAIN(tst_QDeclarativeDebugService)
 
 #include "tst_qdeclarativedebugservice.moc"