Merge lp:~dobey/unity-scope-click/nonclick-touch-apps into lp:unity-scope-click

[dobey]

Fix regression from switch to ual, to show X-Ubuntu-Touch=true apps.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:482
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/116/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/834
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/841
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/648
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/648/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/648
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/648/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/648
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/648/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/648
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/648/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/648
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/648/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/648
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/648/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/648
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/648/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/648
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/648/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/648
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/648/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/116/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

Not directly related to this MR, but we should probably just kill the whitelist of allowed applications and show everything installed that is valid. This fix is fine on its own though.

review: Approve

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2016-09-26 21:00:12 +0000
+++ libclickscope/click/interface.cpp	2016-10-04 17:39:01 +0000
@@ -207,10 +207,6 @@
         if (app.name.empty()) {
             app.name = std::string{ualapp->appId().appname.value()} + ".desktop";
             app.url = "application:///" + app.name;
-            if (!is_non_click_app(app.name)) {
-                qDebug() << "Skipping legacy app:" << QString::fromStdString(app.name);
-                continue;
-            }
         } else {
             app.url = "appid://" + app.name + "/" + ualapp->appId().appname.value() + "/current-user-version";
         }
@@ -225,6 +221,15 @@
         // Get the .desktop file info from UAL, since we're not ignoring
         try {
             auto appinfo = ualapp->info();
+
+            // Only skip legacy apps that don't support Ubuntu Lifecycle
+            if (app.version.empty() &&
+                !is_non_click_app(app.name) &&
+                !appinfo->supportsUbuntuLifecycle()) {
+                qDebug() << "Skipping legacy app:" << QString::fromStdString(app.name);
+                continue;
+            }
+
             app.title = appinfo->name();
             app.description = appinfo->description();
             app.icon_url = appinfo->iconPath();

=== modified file 'libclickscope/tests/mock_ual.h'
--- libclickscope/tests/mock_ual.h	2016-09-26 19:05:22 +0000
+++ libclickscope/tests/mock_ual.h	2016-10-04 17:39:01 +0000
@@ -96,6 +96,7 @@
                 DefaultValue<const ual::Application::Info::DefaultDepartment&>::Set(m_defaultDept);
                 DefaultValue<const ual::Application::Info::IconPath&>::Set(m_ssPath);
                 DefaultValue<const ual::Application::Info::Keywords&>::Set(m_keywords);
+                DefaultValue<ual::Application::Info::UbuntuLifecycle>::Set(ual::Application::Info::UbuntuLifecycle::from_raw(false));
             }
 
             const ual::Application::Info::Name& name()

=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2016-09-26 19:05:22 +0000
+++ libclickscope/tests/test_interface.cpp	2016-10-04 17:39:01 +0000
@@ -207,6 +207,37 @@
     EXPECT_EQ("application:///messaging-app.desktop", results.begin()->url);
 }
 
+TEST_F(ClickInterfaceTest, testFindLegacyAppSkipped)
+{
+    FakeClickInterface iface;
+
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{
+                    MockUALApplication::create(ual::AppID::find("skipped-app"),
+                                               std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Skipped", "An app that's skipped", "skipped-app")})
+                        }));
+    auto results = iface.search("");
+    ASSERT_EQ(0, results.size());
+}
+
+TEST_F(ClickInterfaceTest, testFindLegacyAppNotSkipped)
+{
+    FakeClickInterface iface;
+
+    std::shared_ptr<MockUALApplication::MockInfo> mockinfo{new MockUALApplication::MockInfo("Validity", "Valid app", "valid-app")};
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{
+                    MockUALApplication::create(ual::AppID::find("valid-app"),
+                                               mockinfo)
+                        }));
+    EXPECT_CALL(*mockinfo, supportsUbuntuLifecycle()).Times(1).
+        WillOnce(Return(ual::Application::Info::UbuntuLifecycle::from_raw(true)));
+
+    auto results = iface.search("Valid");
+    ASSERT_EQ(1u, results.size());
+    EXPECT_EQ("application:///valid-app.desktop", results.begin()->url);
+}
+
 // test that application with a default department id key in the desktop
 // file is returned when department matches
 TEST_F(ClickInterfaceTest, testFindAppsWithAppWithDefaultDepartmentId)