1 files changed, 15 insertions, 64 deletions

diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
index 2c515d7cf5..18ba133876 100644
--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
@@ -35,12 +35,8 @@
 #include <private/qqmlenginecontrolclient_p.h>
 
 #include <QtTest/qtest.h>
-#include <private/qtestresult_p.h>
 #include <QtCore/qlibraryinfo.h>
 
-#define STR_PORT_FROM "13773"
-#define STR_PORT_TO "13783"
-
 class QQmlEngineBlocker : public QObject
 {
     Q_OBJECT
@@ -65,77 +61,37 @@ void QQmlEngineBlocker::blockEngine(int engineId, const QString &name)
     static_cast<QQmlEngineControlClient *>(parent())->blockEngine(engineId);
 }
 
-class tst_QQmlEngineControl : public QQmlDataTest
+class tst_QQmlEngineControl : public QQmlDebugTest
 {
     Q_OBJECT
 
-public:
-    tst_QQmlEngineControl()
-        : m_process(0)
-        , m_connection(0)
-        , m_client(0)
-    {}
-
 private:
-    QQmlDebugProcess *m_process;
-    QQmlDebugConnection *m_connection;
-    QQmlEngineControlClient *m_client;
+    ConnectResult connect(const QString &testFile, bool restrictServices);
+    QList<QQmlDebugClient *> createClients() override;
 
-    void connect(const QString &testFile, bool restrictServices);
     void engine_data();
+    QPointer<QQmlEngineControlClient> m_client;
 
 private slots:
-    void cleanup();
-
     void startEngine_data();
     void startEngine();
     void stopEngine_data();
     void stopEngine();
 };
 
-void tst_QQmlEngineControl::connect(const QString &testFile, bool restrictServices)
+QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connect(const QString &file,
+                                                            bool restrictServices)
 {
-    const QString executable = QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene";
-    QStringList arguments;
-    arguments << QString::fromLatin1("-qmljsdebugger=port:%1,%2,block%3")
-                 .arg(STR_PORT_FROM).arg(STR_PORT_TO)
-                 .arg(restrictServices ? QStringLiteral(",services:EngineControl") : QString());
-
-    arguments << QQmlDataTest::instance()->testFile(testFile);
-
-    m_process = new QQmlDebugProcess(executable, this);
-    m_process->start(QStringList() << arguments);
-    QVERIFY2(m_process->waitForSessionStart(), "Could not launch application, or did not get 'Waiting for connection'.");
-
-    m_connection = new QQmlDebugConnection();
-    m_client = new QQmlEngineControlClient(m_connection);
-    new QQmlEngineBlocker(m_client);
-    QList<QQmlDebugClient *> others = QQmlDebugTest::createOtherClients(m_connection);
-
-    const int port = m_process->debugPort();
-    m_connection->connectToHost(QLatin1String("127.0.0.1"), port);
-
-    QTRY_COMPARE(m_client->state(), QQmlDebugClient::Enabled);
-    foreach (QQmlDebugClient *other, others)
-        QCOMPARE(other->state(), restrictServices ? QQmlDebugClient::Unavailable :
-                                                    QQmlDebugClient::Enabled);
-    qDeleteAll(others);
+    return QQmlDebugTest::connect(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene",
+                                  restrictServices ? QStringLiteral("EngineControl") : QString(),
+                                  testFile(file), true);
 }
 
-void tst_QQmlEngineControl::cleanup()
+QList<QQmlDebugClient *> tst_QQmlEngineControl::createClients()
 {
-    if (QTest::currentTestFailed()) {
-        qDebug() << "Process State:" << (m_process ? m_process->state() : QLatin1String("null"));
-        qDebug() << "Application Output:" << (m_process ? m_process->output() : QLatin1String("null"));
-        qDebug() << "Connection State:" << QQmlDebugTest::connectionStateString(m_connection);
-        qDebug() << "Client State:" << QQmlDebugTest::clientStateString(m_client);
-    }
-    delete m_process;
-    m_process = 0;
-    delete m_client;
-    m_client = 0;
-    delete m_connection;
-    m_connection = 0;
+    m_client = new QQmlEngineControlClient(m_connection);
+    new QQmlEngineBlocker(m_client);
+    return QList<QQmlDebugClient *>({m_client});
 }
 
 void tst_QQmlEngineControl::engine_data()
@@ -153,10 +109,7 @@ void tst_QQmlEngineControl::startEngine_data()
 void tst_QQmlEngineControl::startEngine()
 {
     QFETCH(bool, restrictMode);
-
-    connect("test.qml", restrictMode);
-    if (QTest::currentTestFailed() || QTestResult::skipCurrentTest())
-        return;
+    QCOMPARE(connect("test.qml", restrictMode), ConnectSuccess);
 
     QTRY_VERIFY(!m_client->blockedEngines().empty());
     m_client->releaseEngine(m_client->blockedEngines().last());
@@ -174,9 +127,7 @@ void tst_QQmlEngineControl::stopEngine()
 {
     QFETCH(bool, restrictMode);
 
-    connect("exit.qml", restrictMode);
-    if (QTest::currentTestFailed() || QTestResult::skipCurrentTest())
-        return;
+    QCOMPARE(connect("exit.qml", restrictMode), ConnectSuccess);
 
     QTRY_VERIFY(!m_client->blockedEngines().empty());
     m_client->releaseEngine(m_client->blockedEngines().last());