Merge lp:~alecu/unity-scope-click/header-apps into lp:unity-scope-click/devel

[Alejandro J. Cura]

Initial version of the branch to show the 6 top apps

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-23 15:00:28 +0000
+++ CMakeLists.txt	2014-07-03 13:14:19 +0000
@@ -75,7 +75,7 @@
 
 # Custom targets for the tests
 add_custom_target (test
-  DEPENDS test-click-scope test-libclickscope
+  DEPENDS test-click-scope test-apps-scope test-libclickscope
 )
 
 add_custom_target (test-disabled
@@ -90,13 +90,13 @@
 
 # Add a custom target for running the tests under valgrind.
 add_custom_target (test-valgrind
-  DEPENDS test-click-scope-valgrind test-libclickscope-valgrind
+  DEPENDS test-click-scope-valgrind test-apps-scope-valgrind test-libclickscope-valgrind
 )
 
 # Add a custom target for running the tests under valgrind with the
 # full leak checks enabled.
 add_custom_target (test-leaks
-  DEPENDS test-click-scope-leaks test-libclickscope-leaks
+  DEPENDS test-click-scope-leaks test-apps-scope-leaks test-libclickscope-leaks
 )
 
 # Also let "make check" and partners work.

=== modified file 'libclickscope/click/CMakeLists.txt'
--- libclickscope/click/CMakeLists.txt	2014-06-23 15:00:28 +0000
+++ libclickscope/click/CMakeLists.txt	2014-07-03 13:14:19 +0000
@@ -2,11 +2,13 @@
 SET (CMAKE_AUTOMOC ON)
 find_package (Qt5Core REQUIRED)
 pkg_check_modules(JSON_CPP REQUIRED jsoncpp)
+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 
 add_definitions(
   -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
   -DGETTEXT_LOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}\"
   -DCLICK_INSTALL_HELPER=\"${CMAKE_INSTALL_PREFIX}/lib/unity-scope-click/install-helper\"
+  ${GSETTINGS_QT_CFLAGS} ${GSETTINGS_QT_OTHER}
 )
 
 add_library(${SCOPE_LIB_NAME} STATIC
@@ -32,6 +34,7 @@
 
 include_directories(
   ${JSON_CPP_INCLUDE_DIRS}
+  ${GSETTINGS_QT_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/libclickscope
 )
 
@@ -41,5 +44,6 @@
   ${UBUNTUONE_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
+  ${GSETTINGS_QT_LIBRARIES}
   -lboost_locale
 )

=== modified file 'libclickscope/click/configuration.cpp'
--- libclickscope/click/configuration.cpp	2014-06-25 21:33:59 +0000
+++ libclickscope/click/configuration.cpp	2014-07-03 13:14:19 +0000
@@ -32,6 +32,10 @@
 
 #include <QDir>
 #include <QProcess>
+#include <QStringList>
+#include <QVariant>
+
+#include <qgsettings.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
@@ -141,4 +145,24 @@
         != FULL_LANG_CODES.end();
 }
 
+const std::vector<std::string> Configuration::get_dconf_strings(const std::string& schema, const std::string& key)
+{
+    QGSettings qgs(schema.c_str());
+    auto locations = qgs.get(QString::fromStdString(key)).toStringList();
+    std::vector<std::string> v;
+    for(const auto& l : locations) {
+        v.push_back(l.toStdString());
+    }
+    return v;
+}
+
+const std::vector<std::string> Configuration::get_core_apps()
+{
+    auto apps = get_dconf_strings(Configuration::COREAPPS_SCHEMA, Configuration::COREAPPS_KEY);
+    if (apps.empty()) {
+        apps = get_default_core_apps();
+    }
+    return apps;
+}
+
 } // namespace click

=== modified file 'libclickscope/click/configuration.h'
--- libclickscope/click/configuration.h	2014-06-25 21:33:59 +0000
+++ libclickscope/click/configuration.h	2014-07-03 13:14:19 +0000
@@ -33,6 +33,8 @@
 #include <string>
 #include <vector>
 
+#define _CURRENT_USER_VERSION "_current-user-version"
+
 namespace click
 {
 
@@ -54,10 +56,26 @@
     virtual std::string get_accept_languages();
     static bool is_full_lang_code(const std::string& language);
 
+    constexpr static const char* COREAPPS_SCHEMA {""};
+    constexpr static const char* COREAPPS_KEY {""};
+
+    virtual const std::vector<std::string> get_core_apps();
     virtual ~Configuration() {}
 protected:
     virtual std::vector<std::string> list_folder(const std::string &folder, const std::string &pattern);
     virtual std::string architectureFromDpkg();
+    virtual const std::vector<std::string> get_dconf_strings(const std::string& schema, const std::string& key);
+    static const std::vector<std::string>& get_default_core_apps() {
+        static std::vector<std::string> default_apps {
+            "dialer-app.desktop",
+            "messaging-app.desktop",
+            "com.ubuntu.calculator_calculator" _CURRENT_USER_VERSION,
+            "com.ubuntu.clock_clock" _CURRENT_USER_VERSION,
+            "com.ubuntu.camera_camera" _CURRENT_USER_VERSION,
+            "com.ubuntu.calendar_calendar" _CURRENT_USER_VERSION
+        };
+        return default_apps;
+    }
 };
 
 } // namespace click

=== modified file 'libclickscope/tests/test_configuration.cpp'
--- libclickscope/tests/test_configuration.cpp	2014-06-25 21:33:59 +0000
+++ libclickscope/tests/test_configuration.cpp	2014-07-03 13:14:19 +0000
@@ -27,6 +27,8 @@
  * files in the program, then also delete it here.
  */
 
+#include <QStringList>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -42,10 +44,35 @@
 public:
     MOCK_METHOD2(list_folder, std::vector<std::string>(
                      const std::string& folder, const std::string& pattern));
+    MOCK_METHOD2(get_dconf_strings, const std::vector<std::string>(const std::string& schema, const std::string& key));
+    using Configuration::get_default_core_apps;
 };
 
 }
 
+TEST(Configuration, getCoreAppsFound)
+{
+    using namespace ::testing;
+    FakeConfiguration c;
+    EXPECT_CALL(c, get_dconf_strings(Configuration::COREAPPS_SCHEMA,
+                                     Configuration::COREAPPS_KEY))
+            .WillOnce(Return(std::vector<std::string>{"package1", "package2"}));
+    auto found_apps = c.get_core_apps();
+    auto expected_apps = std::vector<std::string>{"package1", "package2"};
+    ASSERT_EQ(found_apps, expected_apps);
+}
+
+TEST(Configuration, getCoreAppsEmpty)
+{
+    using namespace ::testing;
+    FakeConfiguration c;
+    EXPECT_CALL(c, get_dconf_strings(Configuration::COREAPPS_SCHEMA,
+                                     Configuration::COREAPPS_KEY))
+            .WillOnce(Return(std::vector<std::string>{}));
+    auto found_apps = c.get_core_apps();
+    auto expected_apps = c.get_default_core_apps();
+    ASSERT_EQ(found_apps, expected_apps);
+}
 
 TEST(Configuration, getAvailableFrameworksUsesRightFolder)
 {

=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2014-06-30 20:06:33 +0000
+++ scope/clickapps/apps-query.cpp	2014-07-03 13:14:19 +0000
@@ -104,7 +104,22 @@
 
 }
 
-void click::Query::push_local_results(scopes::SearchReplyProxy const &replyProxy,
+void click::apps::ResultPusher::push_result(scopes::Category::SCPtr& cat, const click::Application& a)
+{
+    scopes::CategorisedResult res(cat);
+    res.set_title(a.title);
+    res.set_art(a.icon_url);
+    res.set_uri(a.url);
+    res[click::apps::Query::ResultKeys::NAME] = a.name;
+    res[click::apps::Query::ResultKeys::DESCRIPTION] = a.description;
+    res[click::apps::Query::ResultKeys::MAIN_SCREENSHOT] = a.main_screenshot;
+    res[click::apps::Query::ResultKeys::INSTALLED] = true;
+    res[click::apps::Query::ResultKeys::VERSION] = a.version;
+    replyProxy->push(res);
+}
+
+
+void click::apps::ResultPusher::push_local_results(
                                       std::vector<click::Application> const &apps,
                                       std::string &categoryTemplate)
 {
@@ -113,42 +128,32 @@
 
     for(const auto & a: apps)
     {
-        scopes::CategorisedResult res(cat);
-        res.set_title(a.title);
-        res.set_art(a.icon_url);
-        res.set_uri(a.url);
-        res[click::Query::ResultKeys::NAME] = a.name;
-        res[click::Query::ResultKeys::DESCRIPTION] = a.description;
-        res[click::Query::ResultKeys::MAIN_SCREENSHOT] = a.main_screenshot;
-        res[click::Query::ResultKeys::INSTALLED] = true;
-        res[click::Query::ResultKeys::VERSION] = a.version;
-        replyProxy->push(res);
+        push_result(cat, a);
     }
 }
 
-struct click::Query::Private
+struct click::apps::Query::Private
 {
-    Private(click::Index& index, const scopes::SearchMetadata& metadata)
-        : index(index),
-          meta(metadata)
+    Private(const scopes::SearchMetadata& metadata)
+        : meta(metadata)
     {
     }
-    click::Index& index;
     scopes::SearchMetadata meta;
+    click::Configuration configuration;
 };
 
-click::Query::Query(unity::scopes::CannedQuery const& query, click::Index& index, scopes::SearchMetadata const& metadata)
+click::apps::Query::Query(unity::scopes::CannedQuery const& query, scopes::SearchMetadata const& metadata)
     : unity::scopes::SearchQueryBase(query, metadata),
-      impl(new Private(index, metadata))
+      impl(new Private(metadata))
 {
 }
 
-void click::Query::cancelled()
+void click::apps::Query::cancelled()
 {
     qDebug() << "cancelling search of" << QString::fromStdString(query().query_string());
 }
 
-click::Query::~Query()
+click::apps::Query::~Query()
 {
     qDebug() << "destroying search";
 }
@@ -165,7 +170,7 @@
 
 }
 
-void click::Query::add_fake_store_app(scopes::SearchReplyProxy const& searchReply)
+void click::apps::Query::add_fake_store_app(scopes::SearchReplyProxy const& searchReply)
 {
     static const std::string title = _("Ubuntu Store");
     static const std::string cat_title = _("Get more apps from the store");
@@ -185,27 +190,41 @@
         res.set_title(title);
         res.set_art(STORE_DATA_DIR "/store-scope-icon.svg");
         res.set_uri(store_scope.to_uri());
-        res[click::Query::ResultKeys::NAME] = title;
-        res[click::Query::ResultKeys::DESCRIPTION] = "";
-        res[click::Query::ResultKeys::MAIN_SCREENSHOT] = "";
-        res[click::Query::ResultKeys::INSTALLED] = true;
-        res[click::Query::ResultKeys::VERSION] = "";
+        res[click::apps::Query::ResultKeys::NAME] = title;
+        res[click::apps::Query::ResultKeys::DESCRIPTION] = "";
+        res[click::apps::Query::ResultKeys::MAIN_SCREENSHOT] = "";
+        res[click::apps::Query::ResultKeys::INSTALLED] = true;
+        res[click::apps::Query::ResultKeys::VERSION] = "";
         searchReply->push(res);
     }
 }
 
-void click::Query::run(scopes::SearchReplyProxy const& searchReply)
+std::vector<click::Application> click::apps::ResultPusher::push_top_results(
+        scopes::SearchReplyProxy replyProxy,
+        std::vector<click::Application> apps,
+        std::string& categoryTemplate)
+{
+    Q_UNUSED(replyProxy)
+    Q_UNUSED(categoryTemplate)
+    return apps;
+}
+
+void click::apps::Query::run(scopes::SearchReplyProxy const& searchReply)
 {
     auto querystr = query().query_string();
+    ResultPusher pusher(searchReply, impl->configuration);
     std::string categoryTemplate = CATEGORY_APPS_SEARCH;
+    auto localResults = clickInterfaceInstance().find_installed_apps(
+                querystr);
+
     if (querystr.empty()) {
         categoryTemplate = CATEGORY_APPS_DISPLAY;
+//        localResults = pusher.push_top_results(
+//                    searchReply, localResults,
+//                    categoryTemplate);
     }
-    auto localResults = clickInterfaceInstance().find_installed_apps(
-                querystr);
 
-    push_local_results(
-        searchReply,
+    pusher.push_local_results(
         localResults,
         categoryTemplate);
 

=== modified file 'scope/clickapps/apps-query.h'
--- scope/clickapps/apps-query.h	2014-05-28 14:27:28 +0000
+++ scope/clickapps/apps-query.h	2014-07-03 13:14:19 +0000
@@ -43,8 +43,12 @@
 {
 
 class Application;
+class Configuration;
 class Index;
 
+namespace apps
+{
+
 class Query : public scopes::SearchQueryBase
 {
 public:
@@ -60,7 +64,7 @@
         constexpr static const char* VERSION{"version"};
     };
 
-    Query(unity::scopes::CannedQuery const& query, click::Index& index, scopes::SearchMetadata const& metadata);
+    Query(unity::scopes::CannedQuery const& query, scopes::SearchMetadata const& metadata);
     virtual ~Query();
 
     virtual void cancelled() override;
@@ -69,14 +73,38 @@
 
 protected:
     virtual void add_fake_store_app(scopes::SearchReplyProxy const &replyProxy);
-    virtual void push_local_results(scopes::SearchReplyProxy const &replyProxy,
-                                    std::vector<click::Application> const &apps,
-                                    std::string& categoryTemplate);
-
 private:
     struct Private;
     QSharedPointer<Private> impl;
 };
-}
+
+class ResultPusher
+{
+    const click::Configuration& configuration;
+    const scopes::SearchReplyProxy &replyProxy;
+public:
+    ResultPusher(const scopes::SearchReplyProxy &replyProxy, const click::Configuration& configuration)
+        :  configuration(configuration), replyProxy(replyProxy)
+    {
+
+    }
+
+    virtual ~ResultPusher()
+    {
+
+    }
+
+    virtual void push_local_results(std::vector<click::Application> const &apps,
+                                    std::string& categoryTemplate);
+
+    virtual std::vector<click::Application> push_top_results(
+            scopes::SearchReplyProxy replyProxy,
+            std::vector<click::Application> apps,
+            std::string& categoryTemplate);
+protected:
+    virtual void push_result(scopes::Category::SCPtr& cat, const click::Application& a);
+};
+} // namespace apps
+} // namespace query
 
 #endif // CLICK_QUERY_H

=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2014-06-18 16:23:50 +0000
+++ scope/clickapps/apps-scope.cpp	2014-07-03 13:14:19 +0000
@@ -42,6 +42,7 @@
 #include "apps-scope.h"
 #include "apps-query.h"
 
+using namespace click;
 
 click::Scope::Scope()
 {
@@ -78,7 +79,7 @@
 
 scopes::SearchQueryBase::UPtr click::Scope::search(unity::scopes::CannedQuery const& q, scopes::SearchMetadata const& metadata)
 {
-    return scopes::SearchQueryBase::UPtr(new click::Query(q, *index, metadata));
+    return scopes::SearchQueryBase::UPtr(new click::apps::Query(q, metadata));
 }
 
 

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-06-23 15:00:28 +0000
+++ scope/tests/CMakeLists.txt	2014-07-03 13:14:19 +0000
@@ -1,4 +1,5 @@
 set (CLICKSCOPE_TESTS_TARGET click-scope-tests)
+set (APPS_SCOPE_TESTS_TARGET apps-scope-tests)
 find_package(Threads)
 
 # Qt5 bits
@@ -19,7 +20,12 @@
   test_query.cpp
 )
 
+add_executable (${APPS_SCOPE_TESTS_TARGET}
+  test_apps_query.cpp
+)
+
 qt5_use_modules(${CLICKSCOPE_TESTS_TARGET} Core DBus Network Test)
+qt5_use_modules(${APPS_SCOPE_TESTS_TARGET} Core DBus Network Test)
 
 target_link_libraries(${CLICKSCOPE_TESTS_TARGET}
   ${STORE_LIB_UNVERSIONED}
@@ -37,6 +43,22 @@
   ${CMAKE_THREAD_LIBS_INIT}
 )
 
+target_link_libraries(${APPS_SCOPE_TESTS_TARGET}
+  ${APPS_LIB_UNVERSIONED}
+  ${SCOPE_LIB_NAME}
+
+  ${UNITY_SCOPES_LDFLAGS}
+  ${UBUNTUONE_LDFLAGS}
+  ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
+  ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
+  ${JSON_CPP_LDFLAGS}
+
+  gmock
+  gmock_main
+
+  ${CMAKE_THREAD_LIBS_INIT}
+)
+
 add_custom_target (test-click-scope
   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${CLICKSCOPE_TESTS_TARGET}
   DEPENDS ${CLICKSCOPE_TESTS_TARGET}
@@ -56,6 +78,28 @@
   DEPENDS ${CLICKSCOPE_TESTS_TARGET}
 )
 
+# ---
+
+add_custom_target (test-apps-scope
+  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${APPS_SCOPE_TESTS_TARGET}
+  DEPENDS ${APPS_SCOPE_TESTS_TARGET}
+)
+
+add_custom_target(test-apps-scope-valgrind
+  COMMAND valgrind --tool=memcheck ${CMAKE_CURRENT_BINARY_DIR}/${APPS_SCOPE_TESTS_TARGET}
+  DEPENDS ${APPS_SCOPE_TESTS_TARGET}
+)
+
+add_custom_target(test-apps-scope-leaks
+  COMMAND valgrind --tool=memcheck --track-origins=yes --num-callers=40 --leak-resolution=high --leak-check=full ${CMAKE_CURRENT_BINARY_DIR}/${APPS_SCOPE_TESTS_TARGET}
+  DEPENDS ${APPS_SCOPE_TESTS_TARGET}
+)
+add_custom_target (test-apps-scope-disabled
+  COMMAND GTEST_ALSO_RUN_DISABLED_TESTS=1 ${CMAKE_CURRENT_BINARY_DIR}/${APPS_SCOPE_TESTS_TARGET}
+  DEPENDS ${APPS_SCOPE_TESTS_TARGET}
+)
+
+
 add_subdirectory(integration)
 add_subdirectory(download_manager_tool)
 add_subdirectory(click_interface_tool)

=== added file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	1970-01-01 00:00:00 +0000
+++ scope/tests/test_apps_query.cpp	2014-07-03 13:14:19 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include <string>
+#include <memory>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <clickapps/apps-query.h>
+
+#include <unity/scopes/SearchReply.h>
+#include <unity/scopes/testing/MockSearchReply.h>
+
+#include "test_helpers.h"
+
+using namespace click::test::helpers;
+
+class ResultPusherTest : public ::testing::Test
+{
+protected:
+    click::Configuration fake_configuration;
+    click::apps::ResultPusher pusher;
+    scopes::SearchReplyProxy reply;
+public:
+    ResultPusherTest() : pusher(reply, fake_configuration)
+    {
+        reply.reset(new scopes::testing::MockSearchReply());
+    }
+};
+
+TEST_F(ResultPusherTest, testPushLocalResults)
+{
+    std::string categoryTemplate;
+    std::vector<click::Application> apps{};
+    auto apps2 = pusher.push_top_results(reply, apps, categoryTemplate);
+}
+
+TEST_F(ResultPusherTest, testPushOneResult)
+{
+
+//    pusher.push_one_result();
+}

=== added file 'scope/tests/test_helpers.h'
--- scope/tests/test_helpers.h	1970-01-01 00:00:00 +0000
+++ scope/tests/test_helpers.h	2014-07-03 13:14:19 +0000
@@ -0,0 +1,68 @@
+#ifndef TEST_HELPERS_H
+#define TEST_HELPERS_H
+
+#include <click/department-lookup.h>
+#include <click/highlights.h>
+#include "click/index.h"
+#include <click/interface.h>
+#include <click/package.h>
+
+namespace click
+{
+namespace test
+{
+namespace helpers
+{
+static const std::string FAKE_QUERY {"FAKE_QUERY"};
+static const std::string FAKE_CATEGORY_TEMPLATE {"{}"};
+
+
+class MockIndex : public click::Index {
+    click::Packages packages;
+    click::DepartmentList departments;
+    click::DepartmentList bootstrap_departments;
+    click::HighlightList bootstrap_highlights;
+public:
+    MockIndex(click::Packages packages = click::Packages(),
+            click::DepartmentList departments = click::DepartmentList(),
+            click::DepartmentList boot_departments = click::DepartmentList())
+        : Index(QSharedPointer<click::web::Client>()),
+          packages(packages),
+          departments(departments),
+          bootstrap_departments(boot_departments)
+    {
+
+    }
+
+    click::web::Cancellable search(const std::string &query, std::function<void (click::Packages)> callback) override
+    {
+        do_search(query, callback);
+        callback(packages);
+        return click::web::Cancellable();
+    }
+
+    click::web::Cancellable bootstrap(std::function<void(const click::DepartmentList&, const click::HighlightList&, Error, int)> callback) override
+    {
+        callback(bootstrap_departments, bootstrap_highlights, click::Index::Error::NoError, 0);
+        return click::web::Cancellable();
+    }
+
+    MOCK_METHOD2(do_search, void(const std::string&, std::function<void(click::Packages)>));
+};
+
+
+class FakeCategory : public scopes::Category
+{
+public:
+    FakeCategory(std::string const& id, std::string const& title,
+                 std::string const& icon, scopes::CategoryRenderer const& renderer) :
+       scopes::Category(id, title, icon, renderer)
+    {
+    }
+
+};
+} // namespace helpers
+} // namespace test
+} // namespace click
+
+#endif // TEST_HELPERS_H

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-06-24 17:18:53 +0000
+++ scope/tests/test_query.cpp	2014-07-03 13:14:19 +0000
@@ -35,8 +35,8 @@
 
 #include "click/qtbridge.h"
 #include "clickstore/store-query.h"
-#include "click/index.h"
 #include "click/application.h"
+#include "test_helpers.h"
 
 #include <tests/mock_network_access_manager.h>
 
@@ -49,9 +49,11 @@
 
 using namespace ::testing;
 using namespace click;
+using namespace click::test::helpers;
 
 namespace
 {
+<<<<<<< TREE
 static const std::string FAKE_QUERY {"FAKE_QUERY"};
 static const std::string FAKE_CATEGORY_TEMPLATE {"{}"};
 
@@ -94,6 +96,8 @@
                       std::function<void(click::Packages, click::Packages)>));
 };
 
+=======
+>>>>>>> MERGE-SOURCE
 class MockQueryBase : public click::Query {
 public:
     MockQueryBase(const unity::scopes::CannedQuery& query, click::Index& index,
@@ -140,7 +144,7 @@
 public:
     MockQueryRun(const unity::scopes::CannedQuery& query, click::Index& index,
                  click::DepartmentLookup& depts,
-                 click::HighlightList& highlights, 
+                 click::HighlightList& highlights,
                  scopes::SearchMetadata const& metadata) : MockQueryBase(query, index, depts, highlights, metadata)
     {
 
@@ -154,17 +158,6 @@
                                           std::string& categoryTemplate));
     MOCK_METHOD0(get_installed_packages, PackageSet());
 };
-
-class FakeCategory : public scopes::Category
-{
-public:
-    FakeCategory(std::string const& id, std::string const& title,
-                 std::string const& icon, scopes::CategoryRenderer const& renderer) :
-       scopes::Category(id, title, icon, renderer)
-    {
-    }
-
-};
 } // namespace
 
 TEST(QueryTest, testAddAvailableAppsCallsClickIndex)