Merge lp:~mzanetti/unity8/fix-1599925 into lp:unity8

[Michael Zanetti]

emit the correct role changed signal on count visible changed

* no additional branches required

* Tested on flo.

* waiting on CI still

* no ui change

* no package change

[Michał Sawicz (saviq)]

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2533
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1689/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2236
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1198
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1198
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1198
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2264
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2170
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2170
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2170
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2161
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2161/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2161
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2161/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2161
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2161/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2161
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2161/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2161
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2161/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2161
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2161/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2161
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2161/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2161
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2161/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2161
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2161/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1689/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2016-05-19 16:11:10 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2016-07-07 16:20:56 +0000
@@ -365,7 +365,7 @@
     if (idx >= 0) {
         LauncherItem *item = m_list.at(idx);
         item->setCountVisible(countVisible);
-        QVector<int> changedRoles = {RoleCount};
+        QVector<int> changedRoles = {RoleCountVisible};
         if (countVisible && !item->alerting() && !item->focused()) {
             changedRoles << RoleAlerting;
             item->setAlerting(true);

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-05-19 16:11:10 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-07-07 16:20:56 +0000
@@ -492,6 +492,27 @@
         // Finally check, that the change to "count" implicitly also set the alerting-state to true
         QVERIFY(launcherModel->get(index)->alerting() == true);
 
+        // Check if the launcher emitted the changed signals
+        QCOMPARE(spy.count(), 2);
+
+        QVariantList countEmissionArgs = spy.takeFirst();
+        QCOMPARE(countEmissionArgs.at(0).value<QModelIndex>().row(), index);
+        QCOMPARE(countEmissionArgs.at(1).value<QModelIndex>().row(), index);
+        QVector<int> roles = countEmissionArgs.at(2).value<QVector<int> >();
+        QCOMPARE(roles.first(), (int)LauncherModel::RoleCount);
+
+        QVariantList countVisibleEmissionArgs = spy.takeFirst();
+        QCOMPARE(countVisibleEmissionArgs.at(0).value<QModelIndex>().row(), index);
+        QCOMPARE(countVisibleEmissionArgs.at(1).value<QModelIndex>().row(), index);
+        roles = countVisibleEmissionArgs.at(2).value<QVector<int> >();
+        QVERIFY(roles.contains(LauncherModel::RoleCountVisible));
+        QVERIFY(roles.contains(LauncherModel::RoleAlerting));
+
+        // Check if the values match
+        QCOMPARE(launcherModel->get(index)->countVisible(), true);
+        QCOMPARE(launcherModel->get(index)->count(), 55);
+        QCOMPARE(launcherModel->get(index)->alerting(), true);
+
         // Focus the app, make sure the alert gets cleared
         appManager->focusApplication("abs-icon");
         QVERIFY(launcherModel->get(index)->alerting() == false);

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2016-06-15 14:36:15 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2016-07-07 16:20:56 +0000
@@ -203,6 +203,21 @@
                 onClicked: LauncherModel.setAlerting(LauncherModel.get(parseInt(appIdEntryAlert.displayText)).appId, false)
             }
         }
+
+        Row {
+            spacing: units.gu(1)
+            Button {
+                text: "Toggle count visible"
+                onClicked: {
+                    var item = LauncherModel.get(parseInt(appIdEntryCountVisible.displayText))
+                    LauncherModel.setCountVisible(item.appId, !item.countVisible)
+                }
+            }
+            TextField {
+                id: appIdEntryCountVisible
+                text: "0"
+            }
+        }
     }
 
     SignalSpy {