Merge lp:~larryprice/libertine-scope/implement-search into lp:libertine-scope

[Larry Price]

Filter app launchers based on a user-input regular expression.

Filter app launchers based on a user-input regular expression.

[Stephen M. Webb (bregma)]

Works!!!

review: Approve

=== modified file 'libertine-scope/query.cpp'
--- libertine-scope/query.cpp	2016-01-19 21:10:09 +0000
+++ libertine-scope/query.cpp	2016-04-15 20:09:21 +0000
@@ -22,6 +22,9 @@
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/SearchReply.h>
+#include <QString>
+#include <QRegExp>
+
 
 namespace usc = unity::scopes;
 
@@ -82,26 +85,28 @@
 void Query::
 run(usc::SearchReplyProxy const& reply)
 {
-  usc::CannedQuery const& query(usc::SearchQueryBase::query());
-  std::string query_string = query.query_string();
-
+  QRegExp re(QString::fromStdString(query().query_string()), Qt::CaseInsensitive);
   Libertine::UPtr libertine = libertine_factory_();
+
   for (auto const& container: libertine->get_container_list())
   {
     auto category = reply->register_category(container->id(),
                                              container->name(),
                                              "Application",
                                              usc::CategoryRenderer(CATEGORY_APPS_DISPLAY));
-
     for (auto const& app: container->app_launchers())
     {
-      if (app.no_display())
+      if (app.no_display() ||
+          !(re.isEmpty() || QString::fromStdString(app.name()).contains(re)))
+      {
         continue;
+      }
 
       usc::CategorisedResult result(category);
       result.set_title(app.name());
       result.set_art(app.icon());
       result.set_uri(app_uri(*container, app));
+
       if (!reply->push(result))
       {
         break;

=== modified file 'po/libertine-scope.pot'
--- po/libertine-scope.pot	2016-02-27 03:54:52 +0000
+++ po/libertine-scope.pot	2016-04-15 20:09:21 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-26 22:50-0500\n"
+"POT-Creation-Date: 2016-04-15 14:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-01-19 00:16:56 +0000
+++ tests/CMakeLists.txt	2016-04-15 20:09:21 +0000
@@ -7,6 +7,7 @@
   fake_container.cpp
   fake_libertine.cpp
   test_scope.cpp
+  test_query.cpp
 )
 
 target_link_libraries(libertine_scope_tests
@@ -19,3 +20,5 @@
 add_test(test_scope
   libertine_scope_tests
 )
+
+add_test(test_query libertine_scope_tests)

=== added file 'tests/test_query.cpp'
--- tests/test_query.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_query.cpp	2016-04-15 20:09:21 +0000
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2016 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 warranty of
+ * MERCHANTABILITY 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/>.
+ */
+
+#include "libertine-scope/query.h"
+#include "tests/fake_libertine.h"
+#include <unity/scopes/SearchMetadata.h>
+#include <unity/scopes/CannedQuery.h>
+#include <unity/scopes/SearchReplyProxyFwd.h>
+#include <unity/scopes/testing/MockSearchReply.h>
+#include <unity/scopes/Category.h>
+#include <vector>
+#include <memory>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+namespace
+{
+const std::string LIBERTINE_OUTPUT_WITH_APPS = R"(
+  {
+    "name": "fake-container",
+    "app_launchers": [{
+      "name": "LibreOffice",
+      "no_display": false,
+      "desktop_file_name": "/link/to/libreoffice.desktop"
+    }, {
+      "name": "Linux",
+      "no_display": true,
+      "desktop_file_name": "/link/to/linux.desktop"
+    }, {
+      "name": "Library",
+      "no_display": false,
+      "desktop_file_name": "/link/to/library.desktop"
+    }]
+  }
+)";
+
+
+class FakeCategory : public unity::scopes::Category
+{
+public:
+    FakeCategory(std::string const& id, std::string const& title,
+                 std::string const& icon, unity::scopes::CategoryRenderer const& renderer) :
+       unity::scopes::Category(id, title, icon, renderer)
+    {
+    }
+
+};
+
+
+MATCHER_P3(ResultPropertiesMatch, title, art, uri, "")
+{
+  return arg.contains("title") && arg.contains("art") && arg.contains("uri") &&
+      arg["title"] == unity::scopes::Variant(title) &&
+      arg["art"] == unity::scopes::Variant(art) &&
+      arg["uri"] == unity::scopes::Variant(uri);
+}
+
+
+class TestQueryFixture : public ::testing::Test
+{
+public:
+  TestQueryFixture()
+    : metadata("en_US", "phone")
+    , canned_query("libertine-scope")
+    , reply()
+    , proxy(&reply, [](unity::scopes::SearchReply*) {})
+    , category(std::make_shared<FakeCategory>("fake", "fake-container", "Application", unity::scopes::CategoryRenderer()))
+  {
+  }
+
+  void expect_registry()
+  {
+    EXPECT_CALL(reply, register_category("fake", "fake-container", "Application", testing::_)).WillOnce(testing::Return(category));
+  }
+
+  void expect_push(std::string title, std::string art, std::string appId, bool success = true)
+  {
+    EXPECT_CALL(reply, push(testing::Matcher<unity::scopes::CategorisedResult const&>(ResultPropertiesMatch(title, art, appId)))).WillOnce(testing::Return(success));
+  }
+
+  unity::scopes::SearchMetadata metadata;
+  unity::scopes::CannedQuery canned_query;
+  testing::NiceMock<unity::scopes::testing::MockSearchReply> reply;
+  unity::scopes::SearchReplyProxy proxy;
+  std::shared_ptr<FakeCategory> category;
+};
+
+
+TEST_F(TestQueryFixture, returnsAllDisplayableAppsWithoutFilters)
+{
+  expect_registry();
+  expect_push("LibreOffice", "", "appid://fake/libreoffice/0.0");
+  expect_push("Library", "", "appid://fake/library/0.0");
+
+  Query query(canned_query, metadata, []() {
+    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
+  });
+  query.run(proxy);
+}
+
+
+TEST_F(TestQueryFixture, returnsRegularExpressionFilteredListOfApps)
+{
+  expect_registry();
+  expect_push("LibreOffice", "", "appid://fake/libreoffice/0.0");
+  canned_query.set_query_string("li.*office");
+
+  Query query(canned_query, metadata, []() {
+    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
+  });
+  query.run(proxy);
+}
+
+
+TEST_F(TestQueryFixture, haltsFurtherPushesAfterFailedPush)
+{
+  expect_registry();
+  expect_push("LibreOffice", "", "appid://fake/libreoffice/0.0", false);
+
+  Query query(canned_query, metadata, []() {
+    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
+  });
+  query.run(proxy);
+}
+
+} // anonymous namespace