Merge lp:~larryprice/libertine-scope/libertine-store-link-from-apps into lp:~larryprice/libertine-scope/libertine-store-search

[Larry Price]

Add a category in the Apps scope linking to the Store scope.

Add a category in the Apps scope linking to the Store scope. Note that I don't show the link in the Hidden department. Also, I suppose the image is tentative?

[lp:~larryprice/libertine-scope/libertine-store-link-from-apps]

102. By Larry Price on 2016-08-31

merge

103. By Larry Price on 2016-08-31

merge

[Christopher Townsend (townsend)]

This works well. I'm sure the icon/graphic will change as well as the names for the store, but the only way to get it to change is put this in and make Design fix it:)

One little inline below...

review: Needs Information

[lp:~larryprice/libertine-scope/libertine-store-link-from-apps]

104. By Larry Price on 2016-09-19

remove unnecessary include

[Christopher Townsend (townsend)]

Ok, I approve of this. Let's get it merged into the main branch.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-29 14:32:44 +0000
+++ CMakeLists.txt	2016-09-19 14:03:05 +0000
@@ -36,7 +36,6 @@
 set(APPS_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/libertine-scope/)
 set(APPS_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/unity/scopes/libertine-scope/)
 set(STORE_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/libertine-scope/)
-set(STORE_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/unity/scopes/libertine-scope/)
 set(SCOPE_NAME "libertine-scope")
 set(SCOPE_DISPLAY_NAME "Desktop Apps")
 set(PACKAGE_NAME "libertine-scope.ubuntu")

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-08-26 18:15:41 +0000
+++ data/CMakeLists.txt	2016-09-19 14:03:05 +0000
@@ -1,11 +1,10 @@
-# Put the ini files in the build directory next to the scope
-# .so file so that the test tools can find them.
+# Copy data files into apps scope dir for dev
+file(COPY store.svg blacklist DESTINATION ${CMAKE_BINARY_DIR}/scope/apps/)
 
-# Install the scope images
-install(FILES "apps.png"
+install(FILES apps.png apps.svg
         DESTINATION ${APPS_DATA_DIR})
 
-install(FILES "blacklist"
+install(FILES blacklist store.svg
         DESTINATION ${SCOPE_INSTALL_DIR})
 
 install(FILES com.canonical.libertine.ContainerManager.service

=== added file 'data/store.svg'
--- data/store.svg	1970-01-01 00:00:00 +0000
+++ data/store.svg	2016-09-19 14:03:05 +0000
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="351.27005mm"
+   height="433.59958mm"
+   viewBox="0 0 1244.6577 1536.3765"
+   id="svg3637"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="store.svg">
+  <defs
+     id="defs3639" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#00ffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.24748737"
+     inkscape:cx="-563.75562"
+     inkscape:cy="519.26806"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="1920"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     fit-margin-left="118.5"
+     fit-margin-right="118.5"
+     fit-margin-top="120"
+     fit-margin-bottom="180" />
+  <metadata
+     id="metadata3642">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-388.21849,836.02937)">
+    <g
+       id="g3343"
+       transform="matrix(0.74113597,0,0,0.78153068,321.48718,23.928691)">
+      <path
+         transform="translate(229.97523,-735.66029)"
+         inkscape:connector-curvature="0"
+         id="path3734"
+         d="m 435.93411,771.50865 c 5.13251,-7.46428 23.15091,-32.85714 40.04089,-56.42857 16.88998,-23.57143 36.65936,-51.21428 43.93196,-61.42857 7.2726,-10.21428 21.97523,-30.46508 32.67251,-45.00177 10.69727,-14.53669 27.61176,-38.11043 37.58774,-52.38611 9.97598,-14.27566 24.24529,-34.14652 31.70958,-44.15743 7.46428,-10.01089 13.57143,-19.48897 13.57143,-21.06235 0,-2.71828 -17.5498,-29.26911 -81.37207,-123.10662 -15.49738,-22.78572 -40.3902,-59.42858 -55.31738,-81.42858 -14.92718,-22 -35.00329,-51.57142 -44.61358,-65.71428 -9.6103,-14.14286 -19.70681,-29.25 -22.4367,-33.57143 l -4.96343,-7.85714 65.44846,0 65.44845,0 33.90313,50.17117 c 18.64671,27.59414 35.20443,52.34414 36.79492,55 4.96144,8.28476 14.04967,21.90535 15.61363,23.40026 5.56962,5.32368 80.066,120.17946 80.066,123.44281 0,2.24606 -7.49798,14.28313 -16.66215,26.74904 -31.75367,43.19412 -68.03182,92.82957 -153.20253,209.6104 l -85.57896,117.3406 -20.98687,0 -20.98687,0 9.33184,-13.57143 z"
+         style="fill:#ffffff" />
+      <path
+         transform="translate(229.97523,-735.66029)"
+         inkscape:connector-curvature="0"
+         id="path3736"
+         d="m 831.21335,770.08008 c -5.66053,-8.25 -20.06228,-29.14285 -32.00388,-46.42857 -11.9416,-17.28571 -38.73039,-56.5 -59.53064,-87.14286 -20.80026,-30.64285 -44.68152,-65.72971 -53.06948,-77.97082 -13.98989,-20.41635 -14.92937,-22.77866 -11.36275,-28.57143 2.13845,-3.47317 18.80864,-26.80949 37.04485,-51.85846 18.23622,-25.04895 38.94248,-53.61705 46.01391,-63.48466 7.07143,-9.86761 23.78571,-33.00848 37.14286,-51.42417 13.35714,-18.41568 28.87474,-39.99043 34.48356,-47.9439 5.60881,-7.95346 26.18024,-36.33887 45.71429,-63.07868 19.53404,-26.73982 39.227,-54.06125 43.76215,-60.71429 l 8.24572,-12.09644 22.55911,0 22.55911,0 -8.89011,12.14285 c -12.05808,16.46994 -89.78558,123.80437 -110.17606,152.14286 -16.77918,23.31954 -41.38224,57.29953 -74.11675,102.36479 l -18.32072,25.22193 59.10118,87.6352 c 32.50564,48.19937 70.71004,104.99237 84.89866,126.20665 14.18861,21.21429 26.78352,39 27.98867,39.5238 1.20515,0.52383 2.19119,1.99846 2.19119,3.277 0,1.27855 8.43058,14.6714 18.73463,29.76192 l 18.73462,27.43728 -65.70612,0 -65.70611,0 -10.29189,-15 z"
+         style="fill:#ffffff" />
+    </g>
+  </g>
+</svg>

=== modified file 'debian/libertine-scope.install'
--- debian/libertine-scope.install	2016-08-29 16:20:35 +0000
+++ debian/libertine-scope.install	2016-09-19 14:03:05 +0000
@@ -1,3 +1,4 @@
 usr/lib/*/unity-scopes/*
 usr/share/unity/scopes/libertine-scope/*png
+usr/share/unity/scopes/libertine-scope/*svg
 usr/share/locale/*/LC_MESSAGES/libertine-scope.mo

=== modified file 'scope/apps/config.h.in'
--- scope/apps/config.h.in	2016-07-29 14:32:44 +0000
+++ scope/apps/config.h.in	2016-09-19 14:03:05 +0000
@@ -17,7 +17,9 @@
 #define LIBERTINE_SCOPE_CONFIG_H_
 
 const std::string FULLY_QUALIFIED_APPS_SCOPE = "@FULLY_QUALIFIED_NAME@";
+const std::string STORE_SCOPE_FULL_NAME = "@STORE_PACKAGE_NAME@";
 const std::string ROOT_DEPT_ID = "root_dept";
 const std::string HIDDEN_DEPT_ID = "hidden_dept";
+const std::string DATA_DIR = "@APPS_DATA_DIR@";
 
 #endif // LIBERTINE_SCOPE_CONFIG_H_

=== modified file 'scope/apps/query.cpp'
--- scope/apps/query.cpp	2016-07-29 14:32:44 +0000
+++ scope/apps/query.cpp	2016-09-19 14:03:05 +0000
@@ -31,8 +31,10 @@
 #include <QFile>
 #include <QTextStream>
 
+
 namespace usc = unity::scopes;
 
+
 namespace
 {
 static const auto ROOT_DEPT_TITLE = _("Desktop Apps");
@@ -41,6 +43,8 @@
 static const auto APP_ID_FIELD = "app_id";
 static const auto DEPARTMENT_ID_FIELD = "department_id";
 static const auto EXCLUDED_APPS_FILTER_TITLE = _("Exclude Apps: ");
+static const auto SEARCH_STORE_HINT = _("Search for '%s' in the store");
+static const auto SEARCH_STORE_CATEGORY_TITLE = _("Get more apps from the store");
 
 struct AppInfo
 {
@@ -107,23 +111,45 @@
         }
     }
 )";
+
+
+static const auto CATEGORY_STORE = R"(
+    {
+      "schema-version": 1,
+      "template": {
+        "category-layout": "grid",
+        "overlay": true,
+        "card-background": "color:///#E95420"
+      },
+      "components": {
+        "title": "title",
+        "art": {
+          "aspect-ratio": 0.55,
+          "field": "art"
+        },
+        "overlay-color": "overlay-color"
+      }
+    }
+)";
 } // anonymous namespace
 
 
-std::string const Query::NO_RESULTS_HINT = _("No applications available. Install new applications with the Libertine Manager.");
-std::string const Query::ALL_RESULTS_FILTERED_HINT = _("All applications hidden. Reset filters or check the Hidden Desktop Apps department.");
+std::string const Query::NO_RESULTS_HINT = _("No applications available in this department.");
+std::string const Query::ALL_RESULTS_FILTERED_HINT = _("All applications filtered. Reset filters or clear department.");
 
 
 Query::
-Query(usc::CannedQuery const&    query,
-      usc::SearchMetadata const& metadata,
-      Libertine::Factory const&  libertine_factory,
+Query(usc::CannedQuery const&     query,
+      usc::SearchMetadata const&  metadata,
+      Libertine::Factory const&   libertine_factory,
       std::shared_ptr<HiddenApps> hidden,
-      std::shared_ptr<Blacklist> blacklist)
+      std::shared_ptr<Blacklist>  blacklist,
+      std::string const&          data_directory)
   : usc::SearchQueryBase(query, metadata)
   , libertine_factory_(libertine_factory)
   , hidden_(hidden)
   , blacklist_(blacklist)
+  , data_directory_(data_directory)
 {
 }
 
@@ -201,6 +227,35 @@
 
 
 void Query::
+add_store_link(usc::SearchReplyProxy const& reply) const
+{
+  const auto querystr = query().query_string();
+  auto cat_title = SEARCH_STORE_CATEGORY_TITLE;
+
+  if (!querystr.empty())
+  {
+    char tmp[512];
+    if (snprintf(tmp, sizeof(tmp), SEARCH_STORE_HINT, querystr.c_str()) > 0)
+    {
+        cat_title = tmp;
+    }
+  }
+
+  usc::CategoryRenderer rdr(CATEGORY_STORE);
+  auto cat = reply->register_category("hint", cat_title, "", rdr);
+
+  const unity::scopes::CannedQuery store_scope(STORE_SCOPE_FULL_NAME, querystr, "");
+
+  usc::CategorisedResult res(cat);
+  res.set_title(_("Install X Apps"));
+  res.set_art(data_directory_ + "/store.svg");
+  res.set_uri(store_scope.to_uri());
+  res["overlay-color"] = "transparent";
+  reply->push(res);
+}
+
+
+void Query::
 run(usc::SearchReplyProxy const& reply)
 {
   if (!hidden_->empty())
@@ -219,7 +274,8 @@
 
   QRegExp search_query(QString::fromStdString(query().query_string()), Qt::CaseInsensitive);
   bool has_no_apps = true,
-       all_filtered = true;
+       all_filtered = true,
+       is_hidden_dept = query().department_id() == HIDDEN_DEPT_ID;
 
   for (auto const& container: libertine->get_container_list())
   {
@@ -230,44 +286,40 @@
 
     for (auto const& app: container->app_launchers())
     {
+      auto app_info = parse_app_info(app.uri());
+
+      // ignore blacklisted apps
+      if (blacklist_->app_is_blacklisted(app_info.app_id, container->id()))
+      {
+        continue;
+      }
+
+      // ignore hidden apps unless in hidden dept
+      if ((!is_hidden_dept && hidden_->app_is_hidden(app_info.key)) ||
+          (is_hidden_dept && !hidden_->app_is_hidden(app_info.key)))
+      {
+        continue;
+      }
+
       has_no_apps = false;
+
       if (!(search_query.isEmpty() || QString::fromStdString(app.name()).contains(search_query)))
       {
         continue;
       }
 
-      auto app_info = parse_app_info(app.uri());
-
-      if (blacklist_->app_is_blacklisted(app_info.app_id, container->id()))
-      {
-        continue;
-      }
-
       if (excludes_by_filter.contains(app_info.key))
       {
         continue;
       }
 
-      // ignore hidden apps in root department
-      if (query().department_id().empty() || query().department_id() == ROOT_DEPT_ID)
-      {
-        if (hidden_->app_is_hidden(app_info.key))
-        {
-          continue;
-        }
-      }
-      else if (!hidden_->app_is_hidden(app_info.key))
-      {
-        continue;
-      }
-
       usc::CategorisedResult result(category);
       result.set_title(app.name());
       result.set_art(app.icon());
       result.set_uri(app.uri());
       result[DESCRIPTION_FIELD] = app.description();
       result[APP_ID_FIELD] = app_info.key.toStdString();
-      result[DEPARTMENT_ID_FIELD] = (query().department_id().empty() || query().department_id() == ROOT_DEPT_ID) ? ROOT_DEPT_ID : HIDDEN_DEPT_ID;
+      result[DEPARTMENT_ID_FIELD] = is_hidden_dept ? HIDDEN_DEPT_ID : ROOT_DEPT_ID;
 
       if (!reply->push(result))
       {
@@ -278,12 +330,19 @@
     }
   }
 
-  if (has_no_apps)
+  if (is_hidden_dept)
   {
-    show_hint(reply, NO_RESULTS_HINT);
+      if (has_no_apps)
+      {
+        show_hint(reply, NO_RESULTS_HINT);
+      }
+      else if (all_filtered)
+      {
+        show_hint(reply, ALL_RESULTS_FILTERED_HINT);
+      }
   }
-  else if (all_filtered)
+  else
   {
-    show_hint(reply, ALL_RESULTS_FILTERED_HINT);
+    add_store_link(reply);
   }
 }

=== modified file 'scope/apps/query.h'
--- scope/apps/query.h	2016-07-28 14:04:27 +0000
+++ scope/apps/query.h	2016-09-19 14:03:05 +0000
@@ -35,7 +35,8 @@
         unity::scopes::SearchMetadata const& metadata,
         Libertine::Factory const&            libertine_factory,
         std::shared_ptr<HiddenApps>          hidden_apps,
-        std::shared_ptr<Blacklist>           blacklist);
+        std::shared_ptr<Blacklist>           blacklist,
+        std::string const&                   data_directory);
 
   ~Query() = default;
 
@@ -53,10 +54,12 @@
   QStringList make_filters(unity::scopes::SearchReplyProxy const& reply, Libertine::UPtr libertine) const;
   void show_hint(unity::scopes::SearchReplyProxy const& reply, std::string const& reason) const;
   void parse_blacklist(const std::string& data_dir);
+  void add_store_link(unity::scopes::SearchReplyProxy const& reply) const;
 
   Libertine::Factory libertine_factory_;
   std::shared_ptr<HiddenApps> hidden_;
   std::shared_ptr<Blacklist> blacklist_;
+  const std::string data_directory_;
 };
 
 #endif // LIBERTINE_SCOPE_QUERY_H_

=== modified file 'scope/apps/scope.cpp'
--- scope/apps/scope.cpp	2016-07-29 13:21:34 +0000
+++ scope/apps/scope.cpp	2016-09-19 14:03:05 +0000
@@ -71,7 +71,8 @@
                                               metadata,
                                               libertine_factory_,
                                               std::make_shared<HiddenApps>(cache_directory()),
-                                              std::make_shared<Blacklist>(scope_directory())));
+                                              std::make_shared<Blacklist>(scope_directory()),
+                                              scope_directory()));
 }
 
 

=== modified file 'tests/scope/apps/test_query.cpp'
--- tests/scope/apps/test_query.cpp	2016-07-29 14:45:01 +0000
+++ tests/scope/apps/test_query.cpp	2016-09-19 14:03:05 +0000
@@ -25,8 +25,8 @@
 #include <unity/scopes/Category.h>
 #include <vector>
 #include <memory>
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <QUrl>
 
 namespace
 {
@@ -95,6 +95,15 @@
 }
 
 
+MATCHER_P4(HintPropertiesMatch, title, art, uri, overlay, "")
+{
+  return arg.contains("title") && arg["title"] == unity::scopes::Variant(title) &&
+      arg.contains("art") && arg["art"] == unity::scopes::Variant(art) &&
+      arg.contains("uri") && arg["uri"] == unity::scopes::Variant(uri) &&
+      arg.contains("overlay-color") && arg["overlay-color"] == unity::scopes::Variant(overlay);
+}
+
+
 class TestQueryFixture : public ::testing::Test
 {
 public:
@@ -106,6 +115,7 @@
     , category(std::make_shared<FakeCategory>("fake-container", "fake-container", "Application", unity::scopes::CategoryRenderer()))
     , hidden(new testing::NiceMock<MockHiddenApps>())
     , blacklist(new testing::NiceMock<MockBlacklist>())
+    , data_dir("/some/fake/path")
   {
   }
 
@@ -124,6 +134,26 @@
     EXPECT_CALL(reply, register_category("fake-container", "fake-container", "Application", testing::_)).WillOnce(testing::Return(category));
   }
 
+  void expect_hint_registry(QString const& query = "")
+  {
+    if (query.isEmpty())
+    {
+      EXPECT_CALL(reply, register_category("hint", "Get more apps from the store", "", testing::_)).WillOnce(testing::Return(category));
+    }
+    else
+    {
+      EXPECT_CALL(reply, register_category("hint", QString("Search for '%1' in the store").arg(query).toStdString(), "", testing::_))
+          .WillOnce(testing::Return(category));
+    }
+
+    auto full_scope = QString("scope://%1?q=%2")
+        .arg(QString::fromStdString(STORE_SCOPE_FULL_NAME))
+        .arg(QString(QUrl::toPercentEncoding(query, QByteArray{}, QByteArray{"."})))
+        .toStdString();
+    EXPECT_CALL(reply, push(testing::Matcher<unity::scopes::CategorisedResult const&>(HintPropertiesMatch("Install X Apps", data_dir+"/store.svg", full_scope, "transparent"))))
+        .WillOnce(testing::Return(true));
+  }
+
   void expect_push(std::string title, std::string art, std::string description, std::string appId, bool success = true)
   {
     EXPECT_CALL(reply, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultPropertiesMatch(title, art, description, appId)))).WillOnce(testing::Return(success));
@@ -151,6 +181,7 @@
   std::shared_ptr<FakeCategory> category;
   std::shared_ptr<MockHiddenApps> hidden;
   std::shared_ptr<MockBlacklist> blacklist;
+  std::string data_dir;
 };
 
 
@@ -160,10 +191,11 @@
   expect_push_libreoffice();
   expect_push_linux();
   expect_push_library();
+  expect_hint_registry();
 
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  }, hidden, blacklist);
+  }, hidden, blacklist, data_dir);
   query.run(proxy);
 }
 
@@ -172,11 +204,12 @@
 {
   expect_registry();
   expect_push_libreoffice();
+  expect_hint_registry("li.*office");
   canned_query.set_query_string("li.*office");
 
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  }, hidden, blacklist);
+  }, hidden, blacklist, data_dir);
   query.run(proxy);
 }
 
@@ -188,7 +221,7 @@
 
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  }, hidden, blacklist);
+  }, hidden, blacklist, data_dir);
   query.run(proxy);
 }
 
@@ -198,13 +231,14 @@
   expect_registry();
   expect_push_linux();
   expect_push_library();
+  expect_hint_registry();
 
   EXPECT_CALL(*blacklist, app_is_blacklisted(QString("libreoffice"), "fake-container"))
       .WillRepeatedly(testing::Return(true));
 
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  }, hidden, blacklist);
+  }, hidden, blacklist, data_dir);
   query.run(proxy);
 }
 
@@ -214,6 +248,7 @@
   expect_registry();
   expect_push_linux();
   expect_push_libreoffice();
+  expect_hint_registry();
 
   EXPECT_CALL(*hidden, app_is_hidden(QString("fake-container/library")))
               .WillRepeatedly(testing::Return(true));
@@ -222,7 +257,7 @@
 
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  }, hidden, blacklist);
+  }, hidden, blacklist, data_dir);
   query.run(proxy);
 }
 
@@ -241,37 +276,50 @@
 
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  }, hidden, blacklist);
+  }, hidden, blacklist, data_dir);
   query.run(proxy);
 }
 
 
-TEST_F(TestQueryFixture, showsHintWhenAllAppsFiltered)
+TEST_F(TestQueryFixture, showsHintInHiddenDepartmentWhenAllAppsFiltered)
 {
   expect_registry();
 
   EXPECT_CALL(reply, register_category("hint", "", "", testing::_)).WillOnce(testing::Return(category));
   EXPECT_CALL(reply, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch(Query::ALL_RESULTS_FILTERED_HINT)))).WillOnce(testing::Return(true));
 
-  EXPECT_CALL(*hidden, app_is_hidden(testing::_)).WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(*hidden, app_is_hidden(QString("fake-container/library")))
+              .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(*hidden, empty())
+      .WillOnce(testing::Return(false));
+
+  canned_query.set_department_id(HIDDEN_DEPT_ID);
+  canned_query.set_query_string("li.*office");
 
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
-  }, hidden, blacklist);
+  }, hidden, blacklist, data_dir);
   query.run(proxy);
 }
 
 
-TEST_F(TestQueryFixture, showsHintWhenNoAppsInContainer)
+TEST_F(TestQueryFixture, showsHintInHiddenDepartmentWhenNoApps)
 {
   expect_registry();
 
   EXPECT_CALL(reply, register_category("hint", "", "", testing::_)).WillOnce(testing::Return(category));
   EXPECT_CALL(reply, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultTitleMatch(Query::NO_RESULTS_HINT)))).WillOnce(testing::Return(true));
 
+  EXPECT_CALL(*hidden, app_is_hidden(QString("fake-container/library")))
+              .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(*hidden, empty())
+      .WillOnce(testing::Return(false));
+
+  canned_query.set_department_id(HIDDEN_DEPT_ID);
+
   Query query(canned_query, metadata, []() {
     return FakeLibertine::make_fake("");
-  }, hidden, blacklist);
-  query.run(proxy);
-}
+  }, hidden, blacklist, data_dir);
+   query.run(proxy);
+ }
 } // anonymous namespace

=== modified file 'tests/scope/apps/test_scope.cpp'
--- tests/scope/apps/test_scope.cpp	2016-07-18 13:53:20 +0000
+++ tests/scope/apps/test_scope.cpp	2016-09-19 14:03:05 +0000
@@ -47,9 +47,9 @@
 
   NiceMock<MockSearchReply> reply;
   EXPECT_CALL(reply, register_category(_, _, _, _))
-    .Times(1)
-    .WillOnce(Return(unity::scopes::Category::SCPtr(new unity::scopes::testing::Category("x", "y", "z", renderer))));
-  EXPECT_CALL(reply, push(Matcher<CategorisedResult const&>(_))).Times(2).WillRepeatedly(Return(true));
+    .Times(2)
+    .WillRepeatedly(Return(unity::scopes::Category::SCPtr(new unity::scopes::testing::Category("x", "y", "z", renderer))));
+  EXPECT_CALL(reply, push(Matcher<CategorisedResult const&>(_))).Times(3).WillRepeatedly(Return(true));
 
   SearchReplyProxy search_reply_proxy(&reply, [](unity::scopes::SearchReply*) {});
   search_query->run(search_reply_proxy);