1 files changed, 63 insertions, 33 deletions

diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
index 8d1a165243..3aa3a5c87e 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
@@ -142,24 +142,36 @@ void tst_QQmlDebuggingEnabler::cleanup()
 
 void tst_QQmlDebuggingEnabler::data()
 {
+    QTest::addColumn<QString>("connector");
     QTest::addColumn<bool>("blockMode");
     QTest::addColumn<QStringList>("services");
 
-    QTest::newRow("noblock,all") << false << QStringList();
-    QTest::newRow("block,all") << true << QStringList();
-    QTest::newRow("noblock,debugger") << false << QQmlDebuggingEnabler::debuggerServices();
-    QTest::newRow("block,debugger") << true << QQmlDebuggingEnabler::debuggerServices();
-    QTest::newRow("noblock,inspector") << false << QQmlDebuggingEnabler::inspectorServices();
-    QTest::newRow("block,inspector") << true << QQmlDebuggingEnabler::inspectorServices();
-    QTest::newRow("noblock,profiler") << false << QQmlDebuggingEnabler::profilerServices();
-    QTest::newRow("block,profiler") << true << QQmlDebuggingEnabler::profilerServices();
-    QTest::newRow("noblock,debugger+inspector")
-            << false << QQmlDebuggingEnabler::debuggerServices() +
-                        QQmlDebuggingEnabler::inspectorServices();
-    QTest::newRow("block,debugger+inspector")
-            << true << QQmlDebuggingEnabler::debuggerServices() +
-                       QQmlDebuggingEnabler::inspectorServices();
-
+    QStringList connectors({
+        QLatin1String("QQmlDebugServer"),
+        QLatin1String("QQmlNativeDebugConnector")
+    });
+
+    QList<bool> blockModes({ true, false });
+
+    QList<QStringList> serviceLists({
+        QStringList(),
+        QQmlDebuggingEnabler::nativeDebuggerServices(),
+        QQmlDebuggingEnabler::debuggerServices(),
+        QQmlDebuggingEnabler::inspectorServices(),
+        QQmlDebuggingEnabler::profilerServices(),
+        QQmlDebuggingEnabler::debuggerServices() + QQmlDebuggingEnabler::inspectorServices()
+    });
+
+    foreach (const QString &connector, connectors) {
+        foreach (bool blockMode, blockModes) {
+            foreach (const QStringList &serviceList, serviceLists) {
+                QString name = connector + QLatin1Char(',')
+                        + QLatin1String(blockMode ? "block" : "noblock") + QLatin1Char(',')
+                        + serviceList.join(QLatin1Char('-'));
+                QTest::newRow(name.toUtf8().constData()) << connector << blockMode << serviceList;
+            }
+        }
+    }
 }
 
 void tst_QQmlDebuggingEnabler::qmlscene_data()
@@ -169,27 +181,36 @@ void tst_QQmlDebuggingEnabler::qmlscene_data()
 
 void tst_QQmlDebuggingEnabler::qmlscene()
 {
+    QFETCH(QString, connector);
     QFETCH(bool, blockMode);
     QFETCH(QStringList, services);
 
-    connection = new QQmlDebugConnection();
-    QList<QQmlDebugClient *> clients = QQmlDebugTest::createOtherClients(connection);
     process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene",
                                    this);
     process->setMaximumBindErrors(1);
     process->start(QStringList()
-                   << QString::fromLatin1("-qmljsdebugger=port:5555,5565%1%2%3")
+                   << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
+                      .arg(connector + (connector == QLatin1String("QQmlDebugServer") ?
+                                            QLatin1String(",port:5555,5565") : QString()))
                       .arg(blockMode ? QLatin1String(",block") : QString())
                       .arg(services.isEmpty() ? QString() : QString::fromLatin1(",services:"))
                       .arg(services.isEmpty() ? QString() : services.join(","))
                    << testFile(QLatin1String("test.qml")));
 
-    QVERIFY(process->waitForSessionStart());
-    connection->connectToHost("127.0.0.1", process->debugPort());
-    QVERIFY(connection->waitForConnected());
-    foreach (QQmlDebugClient *client, clients)
-        QCOMPARE(client->state(), (services.isEmpty() || services.contains(client->name())) ?
-                     QQmlDebugClient::Enabled : QQmlDebugClient::Unavailable);
+    if (connector == QLatin1String("QQmlDebugServer")) {
+        QVERIFY(process->waitForSessionStart());
+        connection = new QQmlDebugConnection();
+        QList<QQmlDebugClient *> clients = QQmlDebugTest::createOtherClients(connection);
+        connection->connectToHost("127.0.0.1", process->debugPort());
+        QVERIFY(connection->waitForConnected());
+        foreach (QQmlDebugClient *client, clients)
+            QCOMPARE(client->state(), (services.isEmpty() || services.contains(client->name())) ?
+                         QQmlDebugClient::Enabled : QQmlDebugClient::Unavailable);
+    }
+
+    QCOMPARE(process->state(), QLatin1String("running"));
+    if (!blockMode)
+        QTRY_VERIFY(process->output().contains(QLatin1String("qml: Component.onCompleted")));
 }
 
 void tst_QQmlDebuggingEnabler::custom_data()
@@ -199,13 +220,12 @@ void tst_QQmlDebuggingEnabler::custom_data()
 
 void tst_QQmlDebuggingEnabler::custom()
 {
+    QFETCH(QString, connector);
     QFETCH(bool, blockMode);
     QFETCH(QStringList, services);
     const int portFrom = 5555;
     const int portTo = 5565;
 
-    connection = new QQmlDebugConnection();
-    QList<QQmlDebugClient *> clients = QQmlDebugTest::createOtherClients(connection);
     process = new QQmlDebugProcess(QCoreApplication::applicationDirPath() +
                                    QLatin1String("/qqmldebuggingenablerserver"), this);
     process->setMaximumBindErrors(portTo - portFrom);
@@ -214,18 +234,28 @@ void tst_QQmlDebuggingEnabler::custom()
     if (blockMode)
         args << QLatin1String("-block");
 
-    args << QString::number(portFrom) << QString::number(portTo);
+    args << QLatin1String("-connector") << connector
+         << QString::number(portFrom) << QString::number(portTo);
+
     if (!services.isEmpty())
         args << QLatin1String("-services") << services;
 
     process->start(args);
 
-    QVERIFY(process->waitForSessionStart());
-    connection->connectToHost("127.0.0.1", process->debugPort());
-    QVERIFY(connection->waitForConnected());
-    foreach (QQmlDebugClient *client, clients)
-        QCOMPARE(client->state(), (services.isEmpty() || services.contains(client->name())) ?
-                     QQmlDebugClient::Enabled : QQmlDebugClient::Unavailable);
+    if (connector == QLatin1String("QQmlDebugServer")) {
+        QVERIFY(process->waitForSessionStart());
+        connection = new QQmlDebugConnection();
+        QList<QQmlDebugClient *> clients = QQmlDebugTest::createOtherClients(connection);
+        connection->connectToHost("127.0.0.1", process->debugPort());
+        QVERIFY(connection->waitForConnected());
+        foreach (QQmlDebugClient *client, clients)
+            QCOMPARE(client->state(), (services.isEmpty() || services.contains(client->name())) ?
+                         QQmlDebugClient::Enabled : QQmlDebugClient::Unavailable);
+    }
+
+    QCOMPARE(process->state(), QLatin1String("running"));
+    if (!blockMode)
+        QTRY_VERIFY(process->output().contains(QLatin1String("QQmlEngine created")));
 }
 
 QTEST_MAIN(tst_QQmlDebuggingEnabler)