Merge lp:~mzanetti/unity8/fix-launcher-losing-apps into lp:unity8

[Michael Zanetti]

[Launcher] fix bug where an item would disappear even though the app is running

When an unpinned item is shown because of a count emblem notification, and
during that time the application is started, the old code wouldn't update
the app's "recent" state and so dropping it when the count emblem is cleared.

 * Are there any related MPs required for this MP to build/function as expected? Please list.

no

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

 * If you changed the UI, has there been a design review?

n/a

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1704
http://jenkins.qa.ubuntu.com/job/unity8-ci/5498/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2034
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/662
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/663
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/663
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1792
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2032
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2032/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19277

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5498/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
Yes, up to what is expected of our autopilot tests nowadays

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2015-02-09 17:17:59 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2015-03-30 17:42:43 +0000
@@ -468,14 +468,14 @@
         return;
     }
 
-    bool found = false;
-    Q_FOREACH(LauncherItem *item, m_list) {
-        if (app->appId() == item->appId()) {
-            found = true;
-            break;
+    int itemIndex = findApplication(app->appId());
+    if (itemIndex != -1) {
+        LauncherItem *item = m_list.at(itemIndex);
+        if (!item->recent()) {
+            item->setRecent(true);
+            m_asAdapter->syncItems(m_list);
+            Q_EMIT dataChanged(index(itemIndex), index(itemIndex), QVector<int>() << RoleRecent);
         }
-    }
-    if (found) {
         // Shall we paint some running/recent app highlight? If yes, do it here.
     } else {
         LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);
 
=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-02-04 15:12:36 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-03-30 17:42:43 +0000
@@ -400,6 +400,63 @@
         QCOMPARE(launcherModel->get(index)->count(), 55);
     }
 
+    void testCountEmblemAddsRemovesItem_data() {
+        QTest::addColumn<bool>("isPinned");
+        QTest::addColumn<bool>("isRunning");
+        QTest::addColumn<bool>("startWhenVisible");
+        QTest::newRow("not pinned, not running") << false << false << false;
+        QTest::newRow("pinned, not running") << true << false << false;
+        QTest::newRow("not pinned, not running, starting from notification") << false << false << true;
+        QTest::newRow("pinned, not running, starting from notification") << true << false << true;
+        QTest::newRow("not pinned, running") << false << true << false;
+        QTest::newRow("pinned, running") << true << true << false;
+    }
+
+    void testCountEmblemAddsRemovesItem() {
+        QFETCH(bool, isPinned);
+        QFETCH(bool, isRunning);
+        QFETCH(bool, startWhenVisible);
+
+        // Make sure item is here as expected after init() and that count is not visible
+        int index = launcherModel->findApplication("abs-icon");
+        QCOMPARE(index == -1, false);
+        QCOMPARE(launcherModel->get(index)->countVisible(), false);
+
+        // Pin if we need to
+        if (isPinned) {
+            launcherModel->pin("abs-icon");
+        }
+        QCOMPARE(launcherModel->get(0)->pinned(), isPinned);
+
+        // Stop it if we need to
+        if (!isRunning) {
+            appManager->stopApplication("abs-icon");
+        }
+        QCOMPARE(launcherModel->findApplication("abs-icon") >= 0, isRunning || isPinned);
+
+
+        // set the count emblem to visible
+        QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "org.freedesktop.DBus.Properties");
+        interface.call("Set", "com.canonical.Unity.Launcher.Item", "count", QVariant::fromValue(QDBusVariant(55)));
+        interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", QVariant::fromValue(QDBusVariant(true)));
+
+        // Make sure item is here and that count is visible
+        index = launcherModel->findApplication("abs-icon");
+        QCOMPARE(index == -1, false);
+        QCOMPARE(launcherModel->get(index)->countVisible(), true);
+
+        if (!isRunning && startWhenVisible) {
+            appManager->addApplication(new MockApp("abs-icon"));
+        }
+
+        // Hide count emblem again
+        interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", QVariant::fromValue(QDBusVariant(false)));
+
+        // Make sure item is shown/hidden as expected
+        index = launcherModel->findApplication("abs-icon");
+        QCOMPARE(index == -1, !isRunning && !isPinned && !startWhenVisible);
+    }
+
     void testRefreshAfterDeletedDesktopFiles_data() {
         QTest::addColumn<bool>("deleted");
         QTest::newRow("have .desktop files") << false;