Merge lp:~stolowski/unity-scope-click/use-local-departments into lp:unity-scope-click/devel

[Paweł Stołowski]

Make use of departments db if available to provide departments for installed apps.

Make use of departments db if available to provide departments for installed apps.

[lp:~stolowski/unity-scope-click/use-local-departments]

322. By Paweł Stołowski on 2014-07-15

Merged partent branch.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:322
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/199/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/173
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/173/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/173

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/199/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

On a first look, this branch seems to be lacking a bit more tests.
I'll take a better look tomorrow, to see if I'm missing something.

review: Abstain

[Paweł Stołowski (stolowski)]

Ok, I'm adding a test; this requires some extra work as it's touching stuff we haven't mocked before, but I should have something soon.

[lp:~stolowski/unity-scope-click/use-local-departments]

323. By Paweł Stołowski on 2014-07-16

Added test for departments.

324. By Paweł Stołowski on 2014-07-16

Added one more test case.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/180
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/180/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/180

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/206/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Branch looks mostly fine. One small comment, that we can fix in a following branch:

The big test function in:
TEST(Query, Departments)

Does not follow the naming convention for tests, and should perhaps be split into two test functions sharing a common class, like:

TEST_F(DepartmentsTest, testRootDepartment)
TEST_F(DepartmentsTest, testLeafDepartment)

review: Approve

[Alejandro J. Cura (alecu)]

Here's a branch to split the test as suggested above: https://code.launchpad.net/~alecu/unity-scope-click/split-department-test/+merge/227126

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-06-16 15:38:49 +0000
+++ libclickscope/click/interface.cpp	2014-07-16 13:16:39 +0000
@@ -228,13 +228,15 @@
  *
  * Find all of the installed apps matching @search_query in a timeout.
  */
-std::vector<click::Application> Interface::find_installed_apps(const std::string& search_query)
+std::vector<click::Application> Interface::find_installed_apps(const std::string& search_query,
+            const std::unordered_set<std::string>& packages_in_department,
+            bool department_filter)
 {
     std::vector<Application> result;
 
     bool include_desktop_results = show_desktop_apps();
 
-    auto enumerator = [&result, this, search_query, include_desktop_results]
+    auto enumerator = [&result, this, search_query, packages_in_department, department_filter, include_desktop_results]
             (const unity::util::IniParser& keyFile, const std::string& filename)
     {
         if (keyFile.has_group(DESKTOP_FILE_GROUP) == false) {
@@ -250,6 +252,21 @@
             || Interface::is_non_click_app(QString::fromStdString(filename))) {
             auto app = load_app_from_desktop(keyFile, filename);
 
+            // check if apps is present in current department
+            if (department_filter)
+            {
+                if (!app.name.empty()) // app from click package
+                {
+                    if (packages_in_department.find(app.name) == packages_in_department.end())
+                        return;
+                }
+                else // non-click app, match on desktop file name
+                {
+                    if (packages_in_department.find(filename) == packages_in_department.end())
+                        return;
+                }
+            }
+
             if (search_query.empty()) {
                 result.push_back(app);
             } else {
 
=== modified file 'libclickscope/click/interface.h'
--- libclickscope/click/interface.h	2014-07-16 13:16:39 +0000
+++ libclickscope/click/interface.h	2014-07-16 13:16:39 +0000
@@ -91,7 +91,9 @@
     virtual Application load_app_from_desktop(const unity::util::IniParser& keyFile,
                                               const std::string& filename);
     static std::vector<Application> sort_apps(const std::vector<Application>& apps);
-    virtual std::vector<Application> find_installed_apps(const std::string& search_query);
+    virtual std::vector<Application> find_installed_apps(const std::string& search_query,
+            const std::unordered_set<std::string>& packages_in_department = std::unordered_set<std::string>(),
+            bool department_filter = false);
 
     static bool is_non_click_app(const QString& filename);
 
 
=== modified file 'scope/clickapps/CMakeLists.txt'
--- scope/clickapps/CMakeLists.txt	2014-06-04 14:45:48 +0000
+++ scope/clickapps/CMakeLists.txt	2014-07-16 13:16:39 +0000
@@ -1,6 +1,7 @@
 SET (CMAKE_INCLUDE_CURRENT_DIR ON)
 SET (CMAKE_AUTOMOC ON)
 find_package (Qt5Core REQUIRED)
+find_package (Qt5Sql REQUIRED)
 pkg_check_modules(JSON_CPP REQUIRED jsoncpp)
 
 add_definitions(
@@ -20,7 +21,7 @@
   ${JSON_CPP_INCLUDE_DIRS}
 )
 
-qt5_use_modules (${APPS_LIB_UNVERSIONED} Network)
+qt5_use_modules (${APPS_LIB_UNVERSIONED} Network Sql)
 
 target_link_libraries (${APPS_LIB_UNVERSIONED}
   ${SCOPE_LIB_NAME}
 
=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2014-07-14 12:44:48 +0000
+++ scope/clickapps/apps-query.cpp	2014-07-16 13:16:39 +0000
@@ -28,7 +28,7 @@
  */
 
 #include <click/application.h>
-#include <click/interface.h>
+#include <click/departments-db.h>
 
 #include <click/key_file_locator.h>
 
@@ -37,6 +37,7 @@
 #include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/SearchReply.h>
 #include <unity/scopes/SearchMetadata.h>
+#include <unity/scopes/Department.h>
 
 #include <vector>
 
@@ -199,17 +200,21 @@
 
 struct click::apps::Query::Private
 {
-    Private(const scopes::SearchMetadata& metadata)
-        : meta(metadata)
+    Private(std::shared_ptr<click::DepartmentsDb> depts_db, const scopes::SearchMetadata& metadata)
+        : depts_db(depts_db),
+          meta(metadata)
     {
     }
+
+    std::shared_ptr<click::DepartmentsDb> depts_db;
     scopes::SearchMetadata meta;
     click::Configuration configuration;
 };
 
-click::apps::Query::Query(unity::scopes::CannedQuery const& query, scopes::SearchMetadata const& metadata)
+click::apps::Query::Query(unity::scopes::CannedQuery const& query, std::shared_ptr<DepartmentsDb> depts_db,
+        scopes::SearchMetadata const& metadata)
     : unity::scopes::SearchQueryBase(query, metadata),
-      impl(new Private(metadata))
+      impl(new Private(depts_db, metadata))
 {
 }
 
@@ -223,9 +228,7 @@
     qDebug() << "destroying search";
 }
 
-namespace
-{
-click::Interface& clickInterfaceInstance()
+click::Interface& click::apps::Query::clickInterfaceInstance()
 {
     static QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
     static click::Interface iface(keyFileLocator);
@@ -233,8 +236,6 @@
     return iface;
 }
 
-}
-
 void click::apps::Query::add_fake_store_app(scopes::SearchReplyProxy const& searchReply)
 {
     static const std::string title = _("Ubuntu Store");
@@ -267,15 +268,89 @@
     searchReply->push(res);
 }
 
+void click::apps::Query::push_local_departments(scopes::SearchReplyProxy const& replyProxy)
+{
+    auto const current_dep_id = query().department_id();
+    const std::list<std::string> locales = { search_metadata().locale(), "en_US", "" };
+
+    unity::scopes::Department::SPtr root;
+
+    try
+    {
+        static const std::string all_dept_name = _("All departments");
+
+        // create node for current department
+        auto name = current_dep_id == "" ? all_dept_name : impl->depts_db->get_department_name(current_dep_id, locales);
+        unity::scopes::Department::SPtr current = unity::scopes::Department::create(current_dep_id, query(), name);
+
+        // attach subdepartments to it
+        for (auto const& subdep: impl->depts_db->get_children_departments(current_dep_id))
+        {
+            name = impl->depts_db->get_department_name(subdep.id, locales);
+            unity::scopes::Department::SPtr dep = unity::scopes::Department::create(subdep.id, query(), name);
+            dep->set_has_subdepartments(subdep.has_children);
+            current->add_subdepartment(dep);
+        }
+
+        // if current is not the top, then gets its parent
+        if (current_dep_id != "")
+        {
+            auto const parent_dep_id = impl->depts_db->get_parent_department_id(current_dep_id);
+            root = unity::scopes::Department::create(parent_dep_id, query(), parent_dep_id == "" ? all_dept_name :
+                    impl->depts_db->get_department_name(parent_dep_id, locales));
+            root->add_subdepartment(current);
+        }
+        else
+        {
+            root = current;
+        }
+
+        replyProxy->register_departments(root);
+    }
+    catch (const std::exception& e)
+    {
+        qWarning() << "Failed to push departments: " << QString::fromStdString(e.what());
+    }
+}
+
 void click::apps::Query::run(scopes::SearchReplyProxy const& searchReply)
 {
     const std::string categoryTemplate = CATEGORY_APPS_DISPLAY;
-    auto querystr = query().query_string();
-
-    ResultPusher pusher(searchReply, querystr.empty() ? impl->configuration.get_core_apps() : std::vector<std::string>());
-    auto localResults = clickInterfaceInstance().find_installed_apps(querystr);
+    auto const current_dept = query().department_id();
+    auto const querystr = query().query_string();
+
+    //
+    // get the set of packages that belong to current deparment;
+    // only apply department filtering if not in root of all departments.
+    bool apply_department_filter = (querystr.empty() && !current_dept.empty());
+    std::unordered_set<std::string> pkgs_in_department;
+    if (impl->depts_db && apply_department_filter)
+    {
+        try
+        {
+            pkgs_in_department = impl->depts_db->get_packages_for_department(current_dept);
+        }
+        catch (const std::exception& e)
+        {
+            qWarning() << "Failed to get packages of department" << QString::fromStdString(current_dept);
+            apply_department_filter = false; // disable so that we are not loosing any apps if something goes wrong
+        }
+    }
+
+    const bool show_top_apps = querystr.empty() && current_dept.empty();
+    ResultPusher pusher(searchReply, show_top_apps ? impl->configuration.get_core_apps() : std::vector<std::string>());
+    auto const localResults = clickInterfaceInstance().find_installed_apps(
+                querystr, pkgs_in_department, apply_department_filter);
 
     if (querystr.empty()) {
+        if (impl->depts_db)
+        {
+            push_local_departments(searchReply);
+        }
+    }
+
+    if (show_top_apps)
+    {
         pusher.push_top_results(localResults, categoryTemplate);
     }
 
 
=== modified file 'scope/clickapps/apps-query.h'
--- scope/clickapps/apps-query.h	2014-07-11 16:49:05 +0000
+++ scope/clickapps/apps-query.h	2014-07-16 13:16:39 +0000
@@ -38,14 +38,14 @@
 #include <QSharedPointer>
 #include <set>
 #include <unordered_set>
-
+#include <click/interface.h>
 
 namespace click
 {
 
 class Application;
 class Configuration;
-class Index;
+class DepartmentsDb;
 
 namespace apps
 {
@@ -65,7 +65,7 @@
         constexpr static const char* VERSION{"version"};
     };
 
-    Query(unity::scopes::CannedQuery const& query, scopes::SearchMetadata const& metadata);
+    Query(unity::scopes::CannedQuery const& query, std::shared_ptr<DepartmentsDb> depts_db, scopes::SearchMetadata const& metadata);
     virtual ~Query();
 
     virtual void cancelled() override;
@@ -73,6 +73,12 @@
     virtual void run(scopes::SearchReplyProxy const& reply) override;
 
     virtual void add_fake_store_app(scopes::SearchReplyProxy const &replyProxy);
+
+    virtual void push_local_departments(scopes::SearchReplyProxy const& replyProxy);
+
+protected:
+    virtual click::Interface& clickInterfaceInstance();
+
 private:
     struct Private;
     QSharedPointer<Private> impl;
 
=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2014-07-16 13:16:39 +0000
+++ scope/clickapps/apps-scope.cpp	2014-07-16 13:16:39 +0000
@@ -31,6 +31,7 @@
 #include <click/preview.h>
 #include <click/interface.h>
 #include <click/scope_activation.h>
+#include <click/departments-db.h>
 
 #include <QSharedPointer>
 
@@ -49,6 +50,14 @@
     nam.reset(new click::network::AccessManager());
     client.reset(new click::web::Client(nam));
     index.reset(new click::Index(client));
+    try
+    {
+        depts_db = click::DepartmentsDb::create_db();
+    }
+    catch (const std::runtime_error& e)
+    {
+        std::cerr << "Failed to get cache directory" << std::endl;
+    }
 }
 
 click::Scope::~Scope()
@@ -79,14 +88,14 @@
 
 scopes::SearchQueryBase::UPtr click::Scope::search(unity::scopes::CannedQuery const& q, scopes::SearchMetadata const& metadata)
 {
-    return scopes::SearchQueryBase::UPtr(new click::apps::Query(q, metadata));
+    return scopes::SearchQueryBase::UPtr(new click::apps::Query(q, depts_db, metadata));
 }
 
 
 unity::scopes::PreviewQueryBase::UPtr click::Scope::preview(const unity::scopes::Result& result,
         const unity::scopes::ActionMetadata& metadata) {
     qDebug() << "Scope::preview() called.";
-    return scopes::PreviewQueryBase::UPtr{new click::Preview(result, metadata, client, nam, nullptr)};
+    return scopes::PreviewQueryBase::UPtr{new click::Preview(result, metadata, client, nam, depts_db)};
 }
 
 
 
=== modified file 'scope/clickapps/apps-scope.h'
--- scope/clickapps/apps-scope.h	2014-06-18 14:42:47 +0000
+++ scope/clickapps/apps-scope.h	2014-07-16 13:16:39 +0000
@@ -43,6 +43,9 @@
 
 namespace click
 {
+
+class DepartmentsDb;
+
 class Scope : public scopes::ScopeBase
 {
 public:
@@ -64,6 +67,7 @@
     QSharedPointer<click::network::AccessManager> nam;
     QSharedPointer<click::web::Client> client;
     QSharedPointer<click::Index> index;
+    std::shared_ptr<click::DepartmentsDb> depts_db;
 
     std::string installApplication(unity::scopes::Result const& result);
 };
 
=== modified file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	2014-07-14 12:44:48 +0000
+++ scope/tests/test_apps_query.cpp	2014-07-16 13:16:39 +0000
@@ -34,6 +34,7 @@
 #include <gmock/gmock.h>
 
 #include <clickapps/apps-query.h>
+#include <click/departments-db.h>
 
 #include <unity/scopes/SearchReply.h>
 #include <unity/scopes/SearchMetadata.h>
@@ -56,6 +57,32 @@
     }
 };
 
+class MockClickInterface : public click::Interface
+{
+public:
+    MockClickInterface() = default;
+    MOCK_METHOD3(find_installed_apps, std::vector<click::Application>(const std::string&, const std::unordered_set<std::string>&, bool));
+};
+
+class MockAppsQuery : public click::apps::Query
+{
+private:
+    std::shared_ptr<MockClickInterface> click_iface;
+
+public:
+    MockAppsQuery(unity::scopes::CannedQuery const& query, std::shared_ptr<click::DepartmentsDb> depts_db, scopes::SearchMetadata const& metadata,
+            const std::shared_ptr<MockClickInterface>& click_iface)
+        : click::apps::Query(query, depts_db, metadata),
+          click_iface(click_iface)
+    {
+    }
+
+    click::Interface& clickInterfaceInstance() override
+    {
+        return *click_iface;
+    }
+};
+
 MATCHER_P(HasApplicationTitle, n, "") { return arg["title"].get_string() == n; }
 
 TEST_F(ResultPusherTest, testPushTopAndLocalResults)
@@ -99,8 +126,8 @@
     const unity::scopes::CannedQuery query("foo.scope", "FooBar", "");
     const unity::scopes::CannedQuery query2("foo.scope", "Metallica", "");
 
-    click::apps::Query q(query, metadata);
-    click::apps::Query q2(query2, metadata);
+    click::apps::Query q(query, nullptr, metadata);
+    click::apps::Query q2(query2, nullptr, metadata);
 
     scopes::testing::MockSearchReply mock_reply;
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
@@ -124,3 +151,92 @@
     q2.add_fake_store_app(reply2);
 }
 
+// this matcher expects a list of department ids in depts:
+// first on the list is the root, followed by children ids.
+// the arg of the matcher is unity::scopes::Department ptr.
+MATCHER_P(MatchesDepartments, depts, "") {
+    auto it = depts.begin();
+    if (arg->id() != *it)
+        return false;
+    auto const subdeps = arg->subdepartments();
+    if (subdeps.size() != depts.size() - 1)
+        return false;
+    for (auto const& sub: subdeps)
+    {
+        if (sub->id() != *(++it))
+            return false;
+    }
+    return true;
+}
+
+TEST(Query, Departments)
+{
+    const std::vector<click::Application> installed_apps = {{"app1", "App1", 0.0f, "icon", "url", "descr", "scrshot"}};
+    const scopes::SearchMetadata metadata("en_EN", "phone");
+    auto clickif = std::make_shared<MockClickInterface>();
+
+    const scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+    auto depts_db = std::make_shared<MockDepartmentsDb>(":memory:");
+
+    const std::list<std::string> expected_locales {"en_EN", "en_US", ""};
+
+    // query for root of the departments tree
+    {
+        const unity::scopes::CannedQuery query("foo.scope", "", "");
+
+        MockAppsQuery q(query, depts_db, metadata, clickif);
+
+        scopes::testing::MockSearchReply mock_reply;
+        scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+
+        std::list<std::string> expected_departments({{"", "games", "video"}});
+
+        EXPECT_CALL(*clickif, find_installed_apps(_, _, _)).WillOnce(Return(installed_apps));
+        EXPECT_CALL(mock_reply, register_category("predefined", _, _, _)).WillOnce(Return(ptrCat));
+        EXPECT_CALL(mock_reply, register_category("local", _, _, _)).WillOnce(Return(ptrCat));
+        EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
+        EXPECT_CALL(mock_reply, register_departments(MatchesDepartments(expected_departments)));
+
+        EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(2).WillRepeatedly(Return(true));
+
+        EXPECT_CALL(*depts_db, get_department_name("games", expected_locales)).WillOnce(Return("Games"));
+        EXPECT_CALL(*depts_db, get_department_name("video", expected_locales)).WillOnce(Return("Video"));
+        EXPECT_CALL(*depts_db, get_children_departments("")).WillOnce(Return(
+                    std::list<click::DepartmentsDb::DepartmentInfo>({
+                        {"games", false},
+                        {"video", true}
+                    }))
+                );
+
+        q.run(reply);
+    }
+
+    // query for a leaf department
+    {
+        const unity::scopes::CannedQuery query("foo.scope", "", "games");
+
+        MockAppsQuery q(query, depts_db, metadata, clickif);
+
+        scopes::testing::MockSearchReply mock_reply;
+        scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+
+        std::list<std::string> expected_departments({"", "games"});
+
+        EXPECT_CALL(*clickif, find_installed_apps(_, _, _)).WillOnce(Return(installed_apps));
+        EXPECT_CALL(mock_reply, register_category("local", _, _, _)).WillOnce(Return(ptrCat));
+        EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
+        EXPECT_CALL(mock_reply, register_departments(MatchesDepartments(expected_departments)));
+
+        EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(2).WillRepeatedly(Return(true));
+
+        EXPECT_CALL(*depts_db, get_parent_department_id("games")).WillOnce(Return(""));
+        EXPECT_CALL(*depts_db, get_department_name("games", expected_locales)).WillOnce(Return("Games"));
+        EXPECT_CALL(*depts_db, get_children_departments("games")).WillOnce(Return(
+                    std::list<click::DepartmentsDb::DepartmentInfo>({})
+                ));
+
+        q.run(reply);
+    }
+}
+
 
=== modified file 'scope/tests/test_helpers.h'
--- scope/tests/test_helpers.h	2014-07-03 14:58:53 +0000
+++ scope/tests/test_helpers.h	2014-07-16 13:16:39 +0000
@@ -53,6 +53,23 @@
                       std::function<void(click::Packages, click::Packages)>));
 };
 
+class MockDepartmentsDb : public click::DepartmentsDb
+{
+public:
+    MockDepartmentsDb(const std::string& name)
+        : click::DepartmentsDb(name)
+    {
+    }
+
+    MOCK_METHOD2(get_department_name, std::string(const std::string&, const std::list<std::string>&));
+    MOCK_METHOD2(get_packages_for_department, std::unordered_set<std::string>(const std::string&, bool));
+    MOCK_METHOD1(get_parent_department_id, std::string(const std::string&));
+    MOCK_METHOD1(get_children_departments, std::list<click::DepartmentsDb::DepartmentInfo>(const std::string&));
+
+    MOCK_METHOD2(store_package_mapping, void(const std::string&, const std::string&));
+    MOCK_METHOD2(store_department_mapping, void(const std::string&, const std::string&));
+    MOCK_METHOD3(store_department_name, void(const std::string&, const std::string&, const std::string&));
+};
 
 class FakeCategory : public scopes::Category
 {
 
=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-07-16 13:16:39 +0000
+++ scope/tests/test_query.cpp	2014-07-16 13:16:39 +0000
@@ -55,19 +55,6 @@
 namespace
 {
 
-class MockDepartmentsDb : public click::DepartmentsDb
-{
-public:
-    MockDepartmentsDb(const std::string& name)
-        : click::DepartmentsDb(name)
-    {
-    }
-
-    MOCK_METHOD2(store_package_mapping, void(const std::string&, const std::string&));
-    MOCK_METHOD2(store_department_mapping, void(const std::string&, const std::string&));
-    MOCK_METHOD3(store_department_name, void(const std::string&, const std::string&, const std::string&));
-};
-
 class MockQueryBase : public click::Query {
 public:
     MockQueryBase(const unity::scopes::CannedQuery& query, click::Index& index,
@@ -296,7 +283,7 @@
             std::make_shared<click::Department>("1-2", "Department three", "http://three.com", false)
             });
     DepartmentList init_departments({dept1});
-    auto depts_db = std::make_shared<MockDepartmentsDb>("query-tests.db");
+    auto depts_db = std::make_shared<MockDepartmentsDb>(":memory:");
 
     EXPECT_CALL(*depts_db, store_department_name(_, _, _)).Times(3);
     EXPECT_CALL(*depts_db, store_department_mapping(_, _)).Times(2);