qdeclarativedebugclient \
qdeclarativedebugservice \
qdeclarativedebugjs \
+ qdeclarativeinspector \
qpacketprotocol
contains(QT_CONFIG, private_tests) {
jsonVal.setProperty(SEQ,QJSValue(seq++)); \
jsonVal.setProperty(TYPE,REQUEST);
-class QJSDebugProcess;
class QJSDebugClient;
class tst_QDeclarativeDebugJS : public QObject
// void verifyQMLOptimizerDisabled();
private:
- QJSDebugProcess *process;
+ QDeclarativeDebugProcess *process;
QJSDebugClient *client;
QDeclarativeDebugConnection *connection;
};
-class QJSDebugProcess : public QObject
-{
- Q_OBJECT
-public:
- QJSDebugProcess();
- ~QJSDebugProcess();
-
- void start(const QStringList &arguments);
- bool waitForSessionStart();
-
-private slots:
- void processAppOutput();
-
-private:
- void stop();
-
-private:
- QProcess m_process;
- QTimer m_timer;
- QEventLoop m_eventLoop;
- QMutex m_mutex;
- bool m_started;
-};
-
-QJSDebugProcess::QJSDebugProcess()
- : m_started(false)
-{
- m_process.setProcessChannelMode(QProcess::MergedChannels);
- m_timer.setSingleShot(true);
- m_timer.setInterval(5000);
- connect(&m_process, SIGNAL(readyReadStandardOutput()), this, SLOT(processAppOutput()));
- connect(&m_timer, SIGNAL(timeout()), &m_eventLoop, SLOT(quit()));
-
-// QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-// env.insert("QML_DISABLE_OPTIMIZER", "1"); // Add an environment variable
-// m_process.setProcessEnvironment(env);
-
-}
-
-QJSDebugProcess::~QJSDebugProcess()
-{
- stop();
-}
-
-void QJSDebugProcess::start(const QStringList &arguments)
-{
- m_mutex.lock();
- m_process.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", arguments);
- m_process.waitForStarted();
- m_timer.start();
- m_mutex.unlock();
-}
-
-void QJSDebugProcess::stop()
-{
- if (m_process.state() != QProcess::NotRunning) {
- m_process.terminate();
- m_process.waitForFinished(5000);
- }
-}
-
-bool QJSDebugProcess::waitForSessionStart()
-{
- m_eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
-
- return m_started;
-}
-
-void QJSDebugProcess::processAppOutput()
-{
- m_mutex.lock();
- const QString appOutput = m_process.readAll();
- static QRegExp newline("[\n\r]{1,2}");
- QStringList lines = appOutput.split(newline);
- foreach (const QString &line, lines) {
- if (line.isEmpty())
- continue;
- if (line.startsWith("Qml debugging is enabled")) // ignore
- continue;
- if (line.startsWith("QDeclarativeDebugServer:")) {
- if (line.contains("Waiting for connection ")) {
- m_started = true;
- m_eventLoop.quit();
- continue;
- }
- if (line.contains("Connection established")) {
- continue;
- }
- }
- if (line.startsWith("QDeclarativeDebugServer: Unable to listen on port")) {
- QFAIL("Application cannot open port 3771: Port is blocked?");
- break;
- }
-// qWarning() << line;
- }
- m_mutex.unlock();
-}
-
class QJSDebugClient : public QDeclarativeDebugClient
{
Q_OBJECT
void tst_QDeclarativeDebugJS::init()
{
connection = new QDeclarativeDebugConnection();
- process = new QJSDebugProcess();
+ process = new QDeclarativeDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene");
client = new QJSDebugClient(connection);
process->start(QStringList() << QLatin1String(BLOCKMODE) << TESTDATA(QLatin1String(QMLFILE)));
- QVERIFY(process->waitForSessionStart());
+ if (!process->waitForSessionStart()) {
+ QFAIL(QString("Could not launch app. Application output: \n%1").arg(process->output()).toAscii());
+ }
connection->connectToHost("127.0.0.1", 3771);
QVERIFY(connection->waitForConnected());
--- /dev/null
+TARGET = app
+QT = core gui declarative qtquick1
+
+CONFIG += declarative_debug
+macx:CONFIG -= app_bundle
+
+SOURCES += main.cpp
+
+OTHER_FILES += qtquick1.qml qtquick2.qml
--- /dev/null
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QDebug>
+#include <QtCore/QStringList>
+#include <QtDeclarative/QQuickView>
+#include <QtGui/QGuiApplication>
+#include <QtQuick1/QDeclarativeView>
+
+int main(int argc, char *argv[])
+{
+ QGuiApplication app(argc, argv);
+
+ bool qtquick2 = true;
+ for (int i = 1; i < app.arguments().size(); ++i) {
+ const QString arg = app.arguments().at(i);
+ if (arg == "-qtquick1") {
+ qtquick2 = false;
+ } else if (arg == "-qtquick2") {
+ qtquick2 = true;
+ } else {
+ qWarning() << "Usage: " << app.arguments().at(0) << "[-qtquick1|-qtquick2]";
+ return -1;
+ }
+ }
+
+ if (qtquick2) {
+ QQuickView *view = new QQuickView();
+ view->setSource(QUrl::fromLocalFile("qtquick2.qml"));
+ } else {
+ QDeclarativeView *view = new QDeclarativeView();
+ view->setSource(QUrl::fromLocalFile("qtquick1.qml"));
+ }
+ return app.exec();
+}
--- /dev/null
+import QtQuick 1.0
+
+Item {
+
+}
--- /dev/null
+import QtQuick 2.0
+
+Item {
+
+}
--- /dev/null
+TEMPLATE = subdirs
+
+SUBDIRS += tst_qdeclarativeinspector.pro app
--- /dev/null
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QSignalSpy>
+#include <QTimer>
+#include <QHostAddress>
+#include <QDebug>
+#include <QThread>
+
+#include "../../../../src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorprotocol.h"
+#include "../../../../shared/util.h"
+#include "../shared/debugutil_p.h"
+
+using namespace QmlJSDebugger;
+
+#define PORT 13772
+#define STR_PORT "13772"
+
+class QDeclarativeInspectorClient : public QDeclarativeDebugClient
+{
+ Q_OBJECT
+
+public:
+ QDeclarativeInspectorClient(QDeclarativeDebugConnection *connection)
+ : QDeclarativeDebugClient(QLatin1String("QDeclarativeObserverMode"), connection)
+ , m_showAppOnTop(false)
+ {
+ }
+
+ bool showAppOnTop() const { return m_showAppOnTop; }
+ void setShowAppOnTop(bool showOnTop);
+
+signals:
+ void showAppOnTopChanged();
+
+protected:
+ void messageReceived(const QByteArray &message);
+
+private:
+ bool m_showAppOnTop;
+};
+
+class tst_QDeclarativeInspector : public QObject
+{
+ Q_OBJECT
+
+public:
+ tst_QDeclarativeInspector()
+ : m_process(0)
+ , m_connection(0)
+ , m_client(0)
+ {
+ }
+
+
+private:
+ QDeclarativeDebugProcess *m_process;
+ QDeclarativeDebugConnection *m_connection;
+ QDeclarativeInspectorClient *m_client;
+
+private slots:
+ void initTestCase();
+ void cleanupTestCase();
+ void init();
+ void cleanup();
+
+ void connect();
+ void showAppOnTop();
+};
+
+
+void QDeclarativeInspectorClient::setShowAppOnTop(bool showOnTop)
+{
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << InspectorProtocol::ShowAppOnTop << showOnTop;
+
+ sendMessage(message);
+}
+
+void QDeclarativeInspectorClient::messageReceived(const QByteArray &message)
+{
+ QDataStream ds(message);
+ InspectorProtocol::Message type;
+ ds >> type;
+
+ switch (type) {
+ case InspectorProtocol::ShowAppOnTop:
+ ds >> m_showAppOnTop;
+ emit showAppOnTopChanged();
+ break;
+ default:
+ qDebug() << "Unhandled message " << (int)type;
+ }
+}
+
+void tst_QDeclarativeInspector::initTestCase()
+{
+}
+
+void tst_QDeclarativeInspector::cleanupTestCase()
+{
+}
+
+void tst_QDeclarativeInspector::init()
+{
+ const QString executable = SRCDIR"/app/app";
+ const QString argument = "-qmljsdebugger=port:"STR_PORT",block";
+
+ m_process = new QDeclarativeDebugProcess(executable);
+ m_process->start(QStringList() << argument);
+ if (!m_process->waitForSessionStart()) {
+ QFAIL(QString("Could not launch app '%1'.\nApplication output:\n%2").arg(executable, m_process->output()).toAscii());
+ }
+
+ QDeclarativeDebugConnection *m_connection = new QDeclarativeDebugConnection();
+ m_client = new QDeclarativeInspectorClient(m_connection);
+
+ m_connection->connectToHost(QLatin1String("127.0.0.1"), PORT);
+}
+
+void tst_QDeclarativeInspector::cleanup()
+{
+ delete m_process;
+ delete m_connection;
+ delete m_client;
+}
+
+void tst_QDeclarativeInspector::connect()
+{
+ QTRY_COMPARE(m_client->status(), QDeclarativeDebugClient::Enabled);
+}
+
+void tst_QDeclarativeInspector::showAppOnTop()
+{
+ QTRY_COMPARE(m_client->status(), QDeclarativeDebugClient::Enabled);
+
+ m_client->setShowAppOnTop(true);
+ QVERIFY(QDeclarativeDebugTest::waitForSignal(m_client, SIGNAL(showAppOnTopChanged())));
+ QCOMPARE(m_client->showAppOnTop(), true);
+
+ m_client->setShowAppOnTop(false);
+ QVERIFY(QDeclarativeDebugTest::waitForSignal(m_client, SIGNAL(showAppOnTopChanged())));
+ QCOMPARE(m_client->showAppOnTop(), false);
+}
+
+QTEST_MAIN(tst_QDeclarativeInspector)
+
+#include "tst_qdeclarativeinspector.moc"
--- /dev/null
+CONFIG += testcase
+TARGET = tst_qdeclarativinspector
+macx:CONFIG -= app_bundle
+
+HEADERS += ../shared/debugutil_p.h
+SOURCES += tst_qdeclarativeinspector.cpp \
+ ../shared/debugutil.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+CONFIG += parallel_test declarative_debug
+
+QT += core-private gui-private v8-private declarative-private network testlib
lastMsg = ba;
emit serverMessage(ba);
}
+
+QDeclarativeDebugProcess::QDeclarativeDebugProcess(const QString &executable)
+ : m_executable(executable)
+ , m_started(false)
+{
+ m_process.setProcessChannelMode(QProcess::MergedChannels);
+ m_timer.setSingleShot(true);
+ m_timer.setInterval(5000);
+ connect(&m_process, SIGNAL(readyReadStandardOutput()), this, SLOT(processAppOutput()));
+ connect(&m_timer, SIGNAL(timeout()), &m_eventLoop, SLOT(quit()));
+}
+
+QDeclarativeDebugProcess::~QDeclarativeDebugProcess()
+{
+ stop();
+}
+
+void QDeclarativeDebugProcess::start(const QStringList &arguments)
+{
+ m_mutex.lock();
+ m_process.start(m_executable, arguments);
+ m_process.waitForStarted();
+ m_timer.start();
+ m_mutex.unlock();
+}
+
+void QDeclarativeDebugProcess::stop()
+{
+ if (m_process.state() != QProcess::NotRunning) {
+ m_process.terminate();
+ m_process.waitForFinished(5000);
+ }
+}
+
+bool QDeclarativeDebugProcess::waitForSessionStart()
+{
+ if (m_process.state() != QProcess::Running) {
+ qWarning() << "Could not start up " << m_executable;
+ return false;
+ }
+ m_eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
+
+ return m_started;
+}
+
+QString QDeclarativeDebugProcess::output() const
+{
+ return m_outputBuffer;
+}
+
+void QDeclarativeDebugProcess::processAppOutput()
+{
+ m_mutex.lock();
+ const QString appOutput = m_process.readAll();
+ static QRegExp newline("[\n\r]{1,2}");
+ QStringList lines = appOutput.split(newline);
+ foreach (const QString &line, lines) {
+ if (line.isEmpty())
+ continue;
+ if (line.startsWith("Qml debugging is enabled")) // ignore
+ continue;
+ if (line.startsWith("QDeclarativeDebugServer:")) {
+ if (line.contains("Waiting for connection ")) {
+ m_started = true;
+ m_eventLoop.quit();
+ continue;
+ }
+ if (line.contains("Connection established")) {
+ continue;
+ }
+ }
+ m_outputBuffer.append(appOutput);
+ }
+ m_mutex.unlock();
+}
#include <QTimer>
#include <QThread>
#include <QTest>
+#include <QProcess>
#include <QtDeclarative/qdeclarativeengine.h>
QByteArray lastMsg;
};
+class QDeclarativeDebugProcess : public QObject
+{
+ Q_OBJECT
+public:
+ QDeclarativeDebugProcess(const QString &executable);
+ ~QDeclarativeDebugProcess();
+
+ void start(const QStringList &arguments);
+ bool waitForSessionStart();
+
+ QString output() const;
+private slots:
+ void processAppOutput();
+
+private:
+ void stop();
+
+private:
+ QString m_executable;
+ QProcess m_process;
+ QString m_outputBuffer;
+ QTimer m_timer;
+ QEventLoop m_eventLoop;
+ QMutex m_mutex;
+ bool m_started;
+};
projects / profile / ivi / qtdeclarative.git / commitdiff