Merge lp:~mterry/unity-scope-click/allow-legacy into lp:unity-scope-click

[Michael Terry]

WIP

WIP

Unmerged revisions

506. By Michael Terry on 2016-12-02

Merge gmock branch

505. By Michael Terry on 2016-12-01

Remove some now-unneeded code and fix gmock usage

504. By Michael Terry on 2016-12-01

Don't ignore legacy apps

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2016-10-04 17:35:15 +0000
+++ libclickscope/click/interface.cpp	2016-12-02 18:42:36 +0000
@@ -93,28 +93,6 @@
 
 namespace click {
 
-const std::unordered_set<std::string>& nonClickDesktopFiles()
-{
-    static std::unordered_set<std::string> set =
-    {
-        "address-book-app.desktop",
-        "camera-app.desktop",
-        "click-update-manager.desktop",
-        "com.ubuntu.terminal.desktop",
-        "dialer-app.desktop",
-        "friends-app.desktop",
-        "gallery-app.desktop",
-        "mediaplayer-app.desktop",
-        "messaging-app.desktop",
-        "music-app.desktop",
-        "ubuntu-filemanager-app.desktop",
-        "ubuntu-system-settings.desktop",
-        "webbrowser-app.desktop",
-    };
-
-    return set;
-}
-
 static const std::string DESKTOP_FILE_GROUP("Desktop Entry");
 static const std::string DESKTOP_FILE_KEY_NAME("Name");
 static const std::string DESKTOP_FILE_KEY_ICON("Icon");
@@ -221,15 +199,6 @@
         // 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();
@@ -310,16 +279,6 @@
     return sort_apps(result);
 }
 
-/* is_non_click_app()
- *
- * Tests that @filename is one of the special-cased filenames for apps
- * which are not packaged as clicks, but required on Ubuntu Touch.
- */
-bool Interface::is_non_click_app(const std::string& app_id)
-{
-    return click::nonClickDesktopFiles().count(app_id) > 0;
-}
-
 /*
  * is_icon_identifier()
  *

=== modified file 'libclickscope/click/interface.h'
--- libclickscope/click/interface.h	2016-09-02 21:29:13 +0000
+++ libclickscope/click/interface.h	2016-12-02 18:42:36 +0000
@@ -49,9 +49,6 @@
 class KeyFileLocator;
 class DepartmentsDb;
 
-// Hash map of desktop files that are not yet click packages
-const std::unordered_set<std::string>& nonClickDesktopFiles();
-
 struct Manifest
 {
     Manifest() = default;
@@ -92,8 +89,6 @@
             const std::string& current_department = "",
             const std::shared_ptr<click::DepartmentsDb>& depts_db = nullptr);
 
-    static bool is_non_click_app(const std::string& app_id);
-
     static bool is_icon_identifier(const std::string &icon_id);
     static std::string add_theme_scheme(const std::string &filename);
     virtual void get_installed_packages(std::function<void(PackageSet, InterfaceError)> callback);

=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2016-12-02 18:42:36 +0000
+++ libclickscope/tests/test_interface.cpp	2016-12-02 18:42:36 +0000
@@ -118,21 +118,6 @@
     MOCK_CONST_METHOD0(installed_apps, std::list<std::shared_ptr<ual::Application>>());
 };
 
-TEST(ClickInterface, testIsNonClickAppFalse)
-{
-    EXPECT_FALSE(Interface::is_non_click_app("unknown-app.desktop"));
-}
-
-TEST(ClickInterface, testIsNonClickAppNoRegression)
-{
-    // Loop through and check that all filenames are non-click filenames
-    // If this ever breaks, something is very very wrong.
-    for (const auto& element : nonClickDesktopFiles())
-    {
-        EXPECT_TRUE(Interface::is_non_click_app(element));
-    }
-}
-
 TEST(ClickInterface, testFindAppsInDirEmpty)
 {
     FakeClickInterface iface;
@@ -207,37 +192,6 @@
     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(0u, 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)