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

[Cris Dywan]

Initialize UCApplication with no side effects

https://bileto.ubuntu.com/#/ticket/2478

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime]

2171. By Cris Dywan on 2017-02-09

Forgot to save after the last clean-up of the unit test code

[Tim Peeters (tpeeters)]

lgtm

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1405/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7650/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1405/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1440/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7651/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1440/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1655/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7652/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1655/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/219/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7653/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/219/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/897/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1655
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1440
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1405
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/219
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7654/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7652
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7651
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7650
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7653

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/897/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/220/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7655/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/220/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1406/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7656/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1406/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1441/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7657/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1441/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1656/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7658/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1656/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/898/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1656
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1441
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1406
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/220
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7659/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7658
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7657
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7656
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7655

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/898/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1470/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7785/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1470/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1685/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7786/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1685/rebuild

review: Approve (continuous-integration)

=== modified file 'src/UbuntuToolkit/ucapplication.cpp'
--- src/UbuntuToolkit/ucapplication.cpp	2017-01-12 15:20:31 +0000
+++ src/UbuntuToolkit/ucapplication.cpp	2017-02-09 11:32:17 +0000
@@ -39,8 +39,6 @@
 UCApplication::UCApplication(QObject* parent) : QObject(parent), m_context(0)
                                                                , m_inputMethod(QGuiApplication::inputMethod())
 {
-    // Unset organization by default to skip an extra folder component
-    QCoreApplication::setOrganizationName(QStringLiteral(""));
     // Make sure we receive application name changes from C++ modules
     connect(QCoreApplication::instance(), &QCoreApplication::applicationNameChanged,
             this, &UCApplication::applicationNameChanged);
@@ -70,7 +68,6 @@
        to how Unity uses it to distinguish running applications.
      */
     QCoreApplication::setApplicationName(applicationName);
-    QCoreApplication::setOrganizationName(QCoreApplication::organizationName());
     /*
        Ensure that LocalStorage and WebKit use the same location
        Docs are ambiguous: in practise applicationName is ignored by default

=== modified file 'src/UbuntuToolkit/ucmainwindow.cpp'
--- src/UbuntuToolkit/ucmainwindow.cpp	2017-01-18 17:23:48 +0000
+++ src/UbuntuToolkit/ucmainwindow.cpp	2017-02-09 11:32:17 +0000
@@ -163,11 +163,7 @@
         return;
 
     d->m_applicationName = applicationName;
-
-    if (applicationName != QStringLiteral("")) {
-        UbuntuI18n::instance()->setDomain(applicationName);
-        UCApplication::instance()->setApplicationName(applicationName);
-    }
+    updateApplication(applicationName, d->m_organizationName);
     Q_EMIT applicationNameChanged(applicationName);
 }
 
@@ -192,11 +188,17 @@
         return;
 
     d->m_organizationName = organizationName;
+    updateApplication(d->m_applicationName, organizationName);
+    Q_EMIT organizationNameChanged(organizationName);
+}
 
-    if (organizationName != QStringLiteral("")) {
+void UCMainWindow::updateApplication(QString applicationName, QString organizationName)
+{
+    if (applicationName != QStringLiteral("")) {
+        UbuntuI18n::instance()->setDomain(applicationName);
         QCoreApplication::setOrganizationName(organizationName);
+        UCApplication::instance()->setApplicationName(applicationName);
     }
-    Q_EMIT organizationNameChanged(organizationName);
 }
 
 /*!

=== modified file 'src/UbuntuToolkit/ucmainwindow_p.h'
--- src/UbuntuToolkit/ucmainwindow_p.h	2017-01-16 16:52:57 +0000
+++ src/UbuntuToolkit/ucmainwindow_p.h	2017-02-09 11:32:17 +0000
@@ -76,6 +76,8 @@
 #endif
 
 private:
+    void updateApplication(QString applicationName, QString organizationName);
+
     Q_DECLARE_PRIVATE(UCMainWindow)
 };
 

=== modified file 'tests/unit/mainwindow/VisualRoot.qml'
--- tests/unit/mainwindow/VisualRoot.qml	2017-01-16 14:18:21 +0000
+++ tests/unit/mainwindow/VisualRoot.qml	2017-02-09 11:32:17 +0000
@@ -20,7 +20,6 @@
 
 MainWindow {
     objectName: "visualRoot"
-    applicationName: "org.gnu.wildebeest"
     visualRoot: myRoot
 
     Rectangle {

=== modified file 'tests/unit/mainwindow/tst_mainwindow.cpp'
--- tests/unit/mainwindow/tst_mainwindow.cpp	2017-01-16 17:44:23 +0000
+++ tests/unit/mainwindow/tst_mainwindow.cpp	2017-02-09 11:32:17 +0000
@@ -33,10 +33,7 @@
 #include <QtCore/QCryptographicHash>
 #include <QtCore/QSettings>
 
-#include <QtQuick/QQuickItem>
-#include <QtQuick/QQuickView>
 #include <QtGui/QGuiApplication>
-#include <QtQml/QQmlEngine>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
 
@@ -103,18 +100,22 @@
 
 private Q_SLOTS:
 
-    void initTestCase()
-    {
-    }
-
-    void cleanupTestCase()
-    {
+    void cleanup()
+    {
+        // Delete engine, and thereby also the UCApplication instance
+        QObject* engine(UCApplication::instance()->parent());
+        delete engine;
+        QCoreApplication::setApplicationName(QStringLiteral(""));
+        QCoreApplication::setOrganizationName(QStringLiteral(""));
     }
 
     // Note: tests/unit/mainview13 contains the UCApplication bits
 
     void testCase_AppName()
     {
+        // Sanity check: no name set yet
+        QCOMPARE(QStringLiteral("mainwindow"), QCoreApplication::applicationName());
+
         QString applicationName("org.gnu.wildebeest");
         QQuickWindow *mainWindow(loadTest("AppName.qml"));
         QVERIFY(mainWindow);
@@ -125,6 +126,9 @@
 
     void testCase_OrganizationName()
     {
+        // Sanity check: no organization set yet
+        QCOMPARE(QStringLiteral(""), QCoreApplication::organizationName());
+
         QString applicationName("tv.island.pacific");
         QString organizationName("pacifist");
         QQuickWindow *mainWindow(loadTest("OrganizationName.qml"));
@@ -135,9 +139,28 @@
         QCOMPARE(organizationName, QCoreApplication::organizationName());
     }
 
+    void testCase_NoOrganizationName()
+    {
+        // Sanity check: no organization set yet
+        QCOMPARE(QStringLiteral(""), QCoreApplication::organizationName());
+
+        // Custom values set outside of QML
+        QString applicationName("com.example.random");
+        QString organizationName(QStringLiteral("Example"));
+        QCoreApplication::setApplicationName(applicationName);
+        QCoreApplication::setOrganizationName(organizationName);
+
+        QQuickWindow *mainWindow(loadTest("VisualRoot.qml"));
+        QVERIFY(mainWindow);
+        // MainView shouldn't interfere as applicationName wasn't set in QML
+        QCOMPARE(QStringLiteral(""), mainWindow->property("applicationName").toString());
+        QCOMPARE(applicationName, QCoreApplication::applicationName());
+        QCOMPARE(QStringLiteral(""), mainWindow->property("organizationName").toString());
+        QCOMPARE(organizationName, QCoreApplication::organizationName());
+    }
+
     void testCase_VisualRoot()
     {
-        QString applicationName("tv.island.pacific");
         QQuickWindow *mainWindow(loadTest("VisualRoot.qml"));
         QVERIFY(mainWindow);
         QQuickItem* myLabel(testItem(mainWindow, "myLabel"));