From 31abe4e2cd65f1fdf9acec29effd85e6b1af73c3 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Fri, 4 May 2012 15:13:11 +0200 Subject: [PATCH] QQmlInspector: Use qmlscene in auto tests Change-Id: I2f265409439183861c0d6d164247348db6097cb3 Reviewed-by: Kai Koehne --- tests/auto/qml/debugger/qqmlinspector/app/app.pro | 10 --- tests/auto/qml/debugger/qqmlinspector/app/main.cpp | 71 ---------------------- .../qqmlinspector/{app => data}/qtquick2.qml | 0 .../qml/debugger/qqmlinspector/qqmlinspector.pro | 16 ++++- .../debugger/qqmlinspector/tst_qqmlinspector.cpp | 23 ++----- .../debugger/qqmlinspector/tst_qqmlinspector.pro | 12 ---- 6 files changed, 19 insertions(+), 113 deletions(-) delete mode 100644 tests/auto/qml/debugger/qqmlinspector/app/app.pro delete mode 100644 tests/auto/qml/debugger/qqmlinspector/app/main.cpp rename tests/auto/qml/debugger/qqmlinspector/{app => data}/qtquick2.qml (100%) delete mode 100644 tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.pro diff --git a/tests/auto/qml/debugger/qqmlinspector/app/app.pro b/tests/auto/qml/debugger/qqmlinspector/app/app.pro deleted file mode 100644 index 26831bc..0000000 --- a/tests/auto/qml/debugger/qqmlinspector/app/app.pro +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = app -DESTDIR = $$OUT_PWD -QT += qml quick - -CONFIG += qml_debug -macx:CONFIG -= app_bundle - -SOURCES += main.cpp - -OTHER_FILES += qtquick1.qml qtquick2.qml diff --git a/tests/auto/qml/debugger/qqmlinspector/app/main.cpp b/tests/auto/qml/debugger/qqmlinspector/app/main.cpp deleted file mode 100644 index a7ef09c..0000000 --- a/tests/auto/qml/debugger/qqmlinspector/app/main.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** 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 -#include -#include -#include - -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("app/qtquick2.qml")); - } else { - qWarning("No suitable QtQuick1 implementation is available!"); - } - return app.exec(); -} diff --git a/tests/auto/qml/debugger/qqmlinspector/app/qtquick2.qml b/tests/auto/qml/debugger/qqmlinspector/data/qtquick2.qml similarity index 100% rename from tests/auto/qml/debugger/qqmlinspector/app/qtquick2.qml rename to tests/auto/qml/debugger/qqmlinspector/data/qtquick2.qml diff --git a/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro b/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro index 5544f76..0ad6b6c 100644 --- a/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro +++ b/tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro @@ -1,3 +1,15 @@ -TEMPLATE = subdirs +CONFIG += testcase +TARGET = tst_qqmlinspector -SUBDIRS += tst_qqmlinspector.pro app +QT += qml testlib +macx:CONFIG -= app_bundle + +SOURCES += tst_qqmlinspector.cpp + +INCLUDEPATH += ../shared +include(../../../shared/util.pri) +include(../shared/debugutil.pri) + +TESTDATA = data/* + +CONFIG += parallel_test diff --git a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp index a105ff8..611dc2b 100644 --- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp +++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp @@ -44,8 +44,10 @@ #include #include #include +#include #include "../shared/debugutil_p.h" +#include "../../../shared/util.h" #define PORT 3772 #define STR_PORT "3772" @@ -79,7 +81,7 @@ public: bool m_requestResult; }; -class tst_QQmlInspector : public QObject +class tst_QQmlInspector : public QQmlDataTest { Q_OBJECT @@ -98,8 +100,6 @@ private: QQmlInspectorClient *m_client; private slots: - void initTestCase(); - void cleanupTestCase(); void init(); void cleanup(); @@ -135,25 +135,12 @@ void QQmlInspectorClient::messageReceived(const QByteArray &message) emit responseReceived(); } -void tst_QQmlInspector::initTestCase() -{ -} - -void tst_QQmlInspector::cleanupTestCase() -{ -} - void tst_QQmlInspector::init() { -#if defined(Q_OS_WIN) - const QString executable = "app\\app.exe"; -#else - const QString executable = "app/app"; -#endif const QString argument = "-qmljsdebugger=port:"STR_PORT",block"; - m_process = new QQmlDebugProcess(executable); - m_process->start(QStringList() << argument); + m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene"); + m_process->start(QStringList() << argument << testFile("qtquick2.qml")); QVERIFY2(m_process->waitForSessionStart(), "Could not launch application, or did not get 'Waiting for connection'."); diff --git a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.pro b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.pro deleted file mode 100644 index f6973ba..0000000 --- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.pro +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG += testcase -TARGET = tst_qqmlinspector -macx:CONFIG -= app_bundle - -SOURCES += tst_qqmlinspector.cpp - -INCLUDEPATH += ../shared -include(../shared/debugutil.pri) - -CONFIG += parallel_test - -QT += qml testlib -- 2.7.4