Add QQmlApplicationEngine

This helper class exposes QML application functionality that QML-only
applications want to have, but QML-using applications may not.

Change-Id: If91c3f55ffa2a4aecdd9d6cc62f6ad09fd35b0dd
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>

11 files changed, 277 insertions, 1 deletions

diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index ede7689a0c..584533c65b 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -24,7 +24,8 @@ PUBLICTESTS += \
     qqmltranslation \
     qqmlxmlhttprequest \
     qtqmlmodules \
-    qquickfolderlistmodel
+    qquickfolderlistmodel \
+    qqmlapplicationengine
 
 PRIVATETESTS += \
     animation \
diff --git a/tests/auto/qml/qqmlapplicationengine/data/TestItem.qml b/tests/auto/qml/qqmlapplicationengine/data/TestItem.qml
new file mode 100644
index 0000000000..e879577e10
--- /dev/null
+++ b/tests/auto/qml/qqmlapplicationengine/data/TestItem.qml
@@ -0,0 +1,4 @@
+import QtQml 2.0
+
+QtObject {
+}
diff --git a/tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml b/tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml
new file mode 100644
index 0000000000..2a1b4fbf57
--- /dev/null
+++ b/tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml
@@ -0,0 +1,14 @@
+import QtQml 2.0
+
+QtObject {
+    property string originalName
+    property string originalVersion
+    property string currentName: Qt.application.name
+    property string currentVersion: Qt.application.version
+    Component.onCompleted: {
+        originalName = Qt.application.name
+        originalVersion = Qt.application.version
+        Qt.application.name = "Test B"
+        Qt.application.version = "0.0B"
+    }
+}
diff --git a/tests/auto/qml/qqmlapplicationengine/data/basicTest.qml b/tests/auto/qml/qqmlapplicationengine/data/basicTest.qml
new file mode 100644
index 0000000000..837835f6df
--- /dev/null
+++ b/tests/auto/qml/qqmlapplicationengine/data/basicTest.qml
@@ -0,0 +1,5 @@
+import QtQml 2.0
+
+QtObject {
+    property bool success: true
+}
diff --git a/tests/auto/qml/qqmlapplicationengine/qqmlapplicationengine.pro b/tests/auto/qml/qqmlapplicationengine/qqmlapplicationengine.pro
new file mode 100644
index 0000000000..4a2dde7c47
--- /dev/null
+++ b/tests/auto/qml/qqmlapplicationengine/qqmlapplicationengine.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS = tst_qqmlapplicationengine.pro \
+          testapp
diff --git a/tests/auto/qml/qqmlapplicationengine/testapp/main.cpp b/tests/auto/qml/qqmlapplicationengine/testapp/main.cpp
new file mode 100644
index 0000000000..fe64bb35ad
--- /dev/null
+++ b/tests/auto/qml/qqmlapplicationengine/testapp/main.cpp
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Research In Motion.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia 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.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QCoreApplication>
+#include <QQmlApplicationEngine>
+
+int main (int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+    QQmlApplicationEngine e(QUrl("qrc:///main.qml"));
+    return app.exec();
+}
diff --git a/tests/auto/qml/qqmlapplicationengine/testapp/main.qml b/tests/auto/qml/qqmlapplicationengine/testapp/main.qml
new file mode 100644
index 0000000000..c75485a7f7
--- /dev/null
+++ b/tests/auto/qml/qqmlapplicationengine/testapp/main.qml
@@ -0,0 +1,11 @@
+import QtQml 2.0
+
+QtObject {
+    id: root
+    property Timer t: Timer { interval: 1; running: true; onTriggered: Qt.quit(); }
+    property Connections c: Connections {
+        target: Qt.application
+        onAboutToQuit: console.log("End");
+    }
+    Component.onCompleted: console.log("Start: " + Qt.application.arguments[1]);
+}
diff --git a/tests/auto/qml/qqmlapplicationengine/testapp/main.qrc b/tests/auto/qml/qqmlapplicationengine/testapp/main.qrc
new file mode 100644
index 0000000000..5f6483ac33
--- /dev/null
+++ b/tests/auto/qml/qqmlapplicationengine/testapp/main.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>main.qml</file>
+    </qresource>
+</RCC>
diff --git a/tests/auto/qml/qqmlapplicationengine/testapp/testapp.pro b/tests/auto/qml/qqmlapplicationengine/testapp/testapp.pro
new file mode 100644
index 0000000000..34d2718178
--- /dev/null
+++ b/tests/auto/qml/qqmlapplicationengine/testapp/testapp.pro
@@ -0,0 +1,11 @@
+TEMPLATE = app
+TARGET = testapp
+DESTDIR = ./
+CONFIG -= app_bundle
+CONFIG += console
+
+QT += qml
+
+# Input
+SOURCES += main.cpp
+RESOURCES += main.qrc
diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
new file mode 100644
index 0000000000..1c11fcbc73
--- /dev/null
+++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
@@ -0,0 +1,162 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Research In Motion.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia 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.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../shared/util.h"
+#include <QQmlApplicationEngine>
+#include <QSignalSpy>
+#include <QProcess>
+#include <QDebug>
+
+class tst_qqmlapplicationengine : public QQmlDataTest
+{
+    Q_OBJECT
+public:
+    tst_qqmlapplicationengine() {}
+
+
+private slots:
+    void initTestCase();
+    void basicLoading();
+    void application();
+    void applicationProperties();
+private:
+    QString buildDir;
+    QString srcDir;
+};
+
+void tst_qqmlapplicationengine::initTestCase()
+{
+    buildDir = QDir::currentPath();
+    QQmlDataTest::initTestCase(); //Changes current path to src dir
+    srcDir = QDir::currentPath();
+}
+
+void tst_qqmlapplicationengine::basicLoading()
+{
+    int size = 0;
+
+    QQmlApplicationEngine *test = new QQmlApplicationEngine(testFileUrl("basicTest.qml"));
+    QCOMPARE(test->rootObjects().size(), ++size);
+    QVERIFY(test->rootObjects()[size -1]);
+    QVERIFY(test->rootObjects()[size -1]->property("success").toBool());
+
+    QSignalSpy objectCreated(test, SIGNAL(objectCreated(QObject*,const QUrl&)));
+    test->load(testFileUrl("basicTest.qml"));
+    QCOMPARE(objectCreated.count(), size);//one less than rootObjects().size() because we missed the first one
+    QCOMPARE(test->rootObjects().size(), ++size);
+    QVERIFY(test->rootObjects()[size -1]);
+    QVERIFY(test->rootObjects()[size -1]->property("success").toBool());
+
+    QByteArray testQml("import QtQml 2.0; QtObject{property bool success: true; property TestItem t: TestItem{}}");
+    test->loadData(testQml, testFileUrl("dynamicTest.qml"));
+    QCOMPARE(objectCreated.count(), size);
+    QCOMPARE(test->rootObjects().size(), ++size);
+    QVERIFY(test->rootObjects()[size -1]);
+    QVERIFY(test->rootObjects()[size -1]->property("success").toBool());
+
+    delete test;
+}
+
+void tst_qqmlapplicationengine::application()
+{
+    /* This test batches together some tests about running an external application
+       written with QQmlApplicationEngine. The application tests the following functionality
+       which is easier to do by watching a separate process:
+       -Loads relative paths from the working directory
+       -quits when quit is called
+       -emits aboutToQuit after quit is called
+       -has access to application command line arguments
+
+       Note that checking the output means that on builds with extra debugging, this might fail with a false positive.
+       Also the testapp is automatically built and installed in shadow builds, so it does NOT use testData
+   */
+    QDir::setCurrent(buildDir);
+    QProcess *testProcess = new QProcess(this);
+    QTest::ignoreMessage(QtWarningMsg, "Don't know how to handle 'QProcess::ExitStatus', use qRegisterMetaType to register it.");
+    QSignalSpy processFinished(testProcess, SIGNAL(finished(int,QProcess::ExitStatus)));
+    QStringList args;
+    args << QLatin1String("testData");
+    testProcess->start(QLatin1String("testapp/testapp"), args);
+    QTRY_VERIFY(processFinished.count());//Application should immediately exit
+    QCOMPARE(processFinished[0][0].toInt(), 0);
+    QByteArray test_stdout = testProcess->readAllStandardOutput();
+    QByteArray test_stderr = testProcess->readAllStandardError();
+    QByteArray test_stderr_target("Start: testData\nEnd\n");
+#ifdef Q_OS_WIN
+    test_stderr_target.replace('\n', QByteArray("\r\n"));
+#endif
+    QCOMPARE(test_stdout, QByteArray(""));
+    QCOMPARE(test_stderr, test_stderr_target);
+    delete testProcess;
+    QDir::setCurrent(srcDir);
+}
+
+void tst_qqmlapplicationengine::applicationProperties()
+{
+    QCoreApplication* coreApp = QCoreApplication::instance();
+    QString originalName = coreApp->applicationName();
+    QString originalVersion = coreApp->applicationVersion();
+    QString firstName = QLatin1String("Test A");
+    QString firstVersion = QLatin1String("0.0A");
+    QString secondName = QLatin1String("Test B");
+    QString secondVersion = QLatin1String("0.0B");
+
+    coreApp->setApplicationName(firstName);
+    coreApp->setApplicationVersion(firstVersion);
+
+    QQmlApplicationEngine *test = new QQmlApplicationEngine(testFileUrl("applicationTest.qml"));
+    QObject* root = test->rootObjects().at(0);
+    QVERIFY(root);
+    QCOMPARE(root->property("originalName").toString(), firstName);
+    QCOMPARE(root->property("originalVersion").toString(), firstVersion);
+    QCOMPARE(root->property("currentName").toString(), secondName);
+    QCOMPARE(root->property("currentVersion").toString(), secondVersion);
+    QCOMPARE(coreApp->applicationName(), secondName);
+    QCOMPARE(coreApp->applicationVersion(), secondVersion);
+
+    coreApp->setApplicationName(originalName);
+    coreApp->setApplicationVersion(originalVersion);
+    delete test;
+}
+
+QTEST_MAIN(tst_qqmlapplicationengine)
+
+#include "tst_qqmlapplicationengine.moc"
diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.pro b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.pro
new file mode 100644
index 0000000000..18c38a80b6
--- /dev/null
+++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.pro
@@ -0,0 +1,10 @@
+CONFIG += testcase
+TARGET = tst_qqmlapplicationengine
+macx:CONFIG -= app_bundle
+
+
+SOURCES += tst_qqmlapplicationengine.cpp
+TESTDATA += data/*
+
+include (../../shared/util.pri)
+QT += core-private gui-private qml-private network testlib