Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/engineLauncher into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Add a launcher with a switch for the QQMLEngine

This launcher has an -engine switch that affects the internal component tree, as can be seen in 'autopilot vis' and affects running test cases in autopilot.

See lp:~elopio/ubuntu-ui-toolkit/improve_unity_container launch_application/ get_alternate_launch_command

[Tim Peeters (tpeeters)]

110 + QString filename(args.at(1));
111 + args.removeAt(0);

should that be removeAt(1)?

[Tim Peeters (tpeeters)]

good, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1041
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/227/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/699
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/436
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/436/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/235
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/235/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/227/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1043
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/702
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/439
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/439/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/237
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/237/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/228/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1044
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/244/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/76
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/614
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/614/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/348
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/348/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/244/rebuild

review: Approve (continuous-integration)

[Leo Arias (elopio)]

review: Approve (tried with my unity test)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/137/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/486
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/81
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/81
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/988
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1041
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1041/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7852
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/430
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/624
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/624/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1045
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/302/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/494
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/134
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/991
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1052
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1052/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7861
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/632
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/632/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/302/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/ubuntu-ui-toolkit-autopilot.install'
--- debian/ubuntu-ui-toolkit-autopilot.install	2014-02-21 23:39:43 +0000
+++ debian/ubuntu-ui-toolkit-autopilot.install	2014-05-28 13:36:57 +0000
@@ -1,2 +1,3 @@
 usr/lib/python3
+usr/lib/ubuntu-ui-toolkit/launcher
 usr/lib/python2.7

=== added directory 'tests/launcher'
=== added file 'tests/launcher/launcher.cpp'
--- tests/launcher/launcher.cpp	1970-01-01 00:00:00 +0000
+++ tests/launcher/launcher.cpp	2014-05-28 13:36:57 +0000
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * QML launcher with the ability to setup the QQuickView/ QQmlEngine differently
+ *
+ * Rationale: Different variants of qmlscene exist as well as C++ and Go apps
+ * This is to write Autopilot test cases that exhibit specific behavior
+ */
+
+#include <iostream>
+#include <QtCore/qdebug.h>
+#include <QtQuick/QQuickView>
+#include <QtGui/QGuiApplication>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlContext>
+#include <QtCore/QFileInfo>
+#include <QLibrary>
+#include <QOpenGLContext>
+#include <QtGui/private/qopenglcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
+
+int usage()
+{
+    QString self(QGuiApplication::instance()->arguments().at(0));
+    std::cout << "Usage\n  "
+        << qPrintable(self)
+        << " -testability -frameless -engine"
+        << " --desktop_file_path=DESKTOP_FILE"
+        << " -I MODULE_PATH FILENAME\n";
+    return 1;
+}
+
+int main(int argc, const char *argv[])
+{
+    // QPlatformIntegration::ThreadedOpenGL
+    setenv("QML_FORCE_THREADED_RENDERER", "1", 1);
+    // QPlatformIntegration::BufferQueueingOpenGL
+    setenv("QML_FIXED_ANIMATION_STEP", "1", 1);
+    // Oxide and QWebEngine need a shared context
+    QScopedPointer<QOpenGLContext> shareContext;
+    shareContext.reset(new QOpenGLContext);
+    QSGContext::setSharedOpenGLContext(shareContext.data());
+
+    QGuiApplication::setApplicationName("UITK Launcher");
+    QGuiApplication application(argc, (char**)argv);
+    QStringList args (application.arguments());
+
+    int _testability(args.indexOf("-testability"));
+    args.removeAt(_testability);
+    int _frameless(args.indexOf("-frameless"));
+    args.removeAt(_frameless);
+    int _engine(args.indexOf("-engine"));
+    args.removeAt(_engine);
+
+    Q_FOREACH(QString arg, args) {
+        if (arg.startsWith("--desktop_file_hint")) {
+            // This will not be used - it only needs to be ignored
+            int _desktop_file_hint(args.indexOf(arg));
+            args.removeAt(_desktop_file_hint);
+        }
+    }
+
+    // Testability is only supported out of the box by QApplication not QGuiApplication
+    if (_testability > -1 || getenv("QT_LOAD_TESTABILITY")) {
+        QLibrary testLib(QLatin1String("qttestability"));
+        if (testLib.load()) {
+            typedef void (*TasInitialize)(void);
+            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
+            if (initFunction) {
+                initFunction();
+            } else {
+                qCritical("Library qttestability resolve failed!");
+                return 1;
+            }
+        } else {
+            qCritical("Library qttestability load failed!");
+            return 1;
+        }
+    }
+
+    QQmlEngine* engine;
+    // The default constructor affects the components tree (autopilot vis)
+    QQuickView* view;
+    if (_engine > -1) {
+        view = new QQuickView();
+        engine = view->engine();
+    } else {
+        engine = new QQmlEngine();
+        view = new QQuickView(engine, NULL);
+    }
+
+    int _import(args.indexOf("-I"));
+    args.removeAt(_import);
+    if (_import > -1) {
+        if (args.count() > _import) {
+            QString importPath(args.at(_import));
+            args.removeAt(_import);
+            engine->addImportPath(importPath);
+        }
+    }
+
+    view->setResizeMode(QQuickView::SizeRootObjectToView);
+    view->setTitle("UI Toolkit QQuickView");
+    if (_frameless > -1) {
+        view->setFlags(Qt::FramelessWindowHint);
+    }
+
+    // The remaining unnamed argument must be a filename
+    if (args.count() == 1) {
+        qCritical() << "Missing filename";
+        return usage();
+    }
+    QString filename(args.at(1));
+    // The first argument is the launcher itself
+    args.removeAt(0);
+
+    QUrl source(QUrl::fromLocalFile(filename));
+    view->setSource(source);
+    if (view->errors().count() > 0) {
+        return usage();
+    }
+    view->show();
+
+    if (args.count() > 1) {
+        qCritical() << "Invalid arguments passed" << args;
+        return usage();
+    }
+
+    return application.exec();
+}
+

=== added file 'tests/launcher/launcher.pro'
--- tests/launcher/launcher.pro	1970-01-01 00:00:00 +0000
+++ tests/launcher/launcher.pro	2014-05-28 13:36:57 +0000
@@ -0,0 +1,11 @@
+TEMPLATE = app
+QT += qml quick
+# For setSharedOpenGLContext
+QT += core-private gui-private quick-private
+CONFIG += no_keywords
+SOURCES += \
+    launcher.cpp
+launcher.path = /usr/lib/ubuntu-ui-toolkit
+launcher.files = launcher
+INSTALLS += launcher
+

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2014-02-21 23:39:43 +0000
+++ tests/tests.pro	2014-05-28 13:36:57 +0000
@@ -7,4 +7,6 @@
 autopilot2_module.path = /usr/lib/python2.7/dist-packages/ubuntuuitoolkit
 autopilot2_module.files = autopilot/ubuntuuitoolkit/*
 
+SUBDIRS += launcher
+
 INSTALLS += autopilot_module autopilot2_module