Merge lp:~bregma/libertine-scope/release-20160426 into lp:libertine-scope/release

[Stephen M. Webb]

libertine-scope 1.1 release, for landing in vivid+overlay and release in OTA-11.

  [ Chris Townsend ]
  * Use the "unconfined" apparmor template to allow the scope to access user
    data (lp: #1558738).

  [ Larry Price ]
  * Redesigned preview pane with reasonably-sized image, title, and description.
  * Filtered app launchers based on a user-input regular expression.
  * Added a setting for listing app launcher names which should be excluded
    from the scope view.

  [ Stephen M. Webb ]
  * Added internationalization support.

[lp:~bregma/libertine-scope/release-20160426]

30. By Stephen M. Webb on 2016-04-26

synched with development trunk

31. By Stephen M. Webb on 2016-04-26

marking for 1.1 release

[Christopher Townsend (townsend)]

Looks sane to me.

review: Approve

[lp:~bregma/libertine-scope/release-20160426]

32. By Stephen M. Webb on 2016-04-26

Fixed failing unit tests on Vivid.

33. By Larry Price on 2016-05-05

Integrate the ubuntu-app-launch C++ API.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2016-05-05 15:35:57 +0000
@@ -0,0 +1,2 @@
+po/POTFILES.in
+po/Makefile.in.in

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-03 20:26:02 +0000
+++ CMakeLists.txt	2016-05-05 15:35:57 +0000
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(libertine-scope
-        VERSION 1.0
+        VERSION 1.1
         LANGUAGES CXX)
 
 # We require at least g++ 4.9, to avoid ABI breakage with earlier versions.
@@ -30,12 +30,16 @@
 find_package(Qt5Gui REQUIRED)
 
 pkg_check_modules(SCOPE libunity-scopes>=0.6.0 REQUIRED)
+pkg_check_modules(UAL ubuntu-app-launch-2>=0.5.0 REQUIRED)
+pkg_check_modules(LIBERTINE libertine REQUIRED)
 
 # Add our dependencies to the include paths
 include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libertine-scope
   ${SCOPE_INCLUDE_DIRS}
+  ${UAL_INCLUDE_DIRS}
+  ${LIBERTINE_INCLUDE_DIRS}
 )
 
 # Important project paths

=== modified file 'data/libertine-scope-settings.ini.in'
--- data/libertine-scope-settings.ini.in	2015-12-29 21:50:58 +0000
+++ data/libertine-scope-settings.ini.in	2016-05-05 15:35:57 +0000
@@ -1,3 +1,8 @@
+[blacklist]
+type = string
+_displayName = Excluded Apps
+defaultValue = Panel Manager;OpenJDK Java 7 Policy Tool;OpenJDK Java 8 Policy Tool;
+
 # Below are some example settings. You can access your scope's
 # settings by calling settings() from the Query::run() method.
 # E.g. auto location = settings().at("location").get_string();
@@ -17,4 +22,3 @@
 #type = boolean
 #defaultValue = true
 #_displayName = Show Forecast
-

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-05 13:58:17 +0000
+++ debian/changelog	2016-05-05 15:35:57 +0000
@@ -1,3 +1,20 @@
+libertine-scope (1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Chris Townsend ]
+  * Use the "unconfined" apparmor template to allow the scope to access user
+    data (lp: #1558738).
+
+  [ Larry Price ]
+  * Redesigned preview pane with reasonably-sized image, title, and description.
+  * Filtered app launchers based on a user-input regular expression.
+  * Added a setting for listing app launcher names which should be excluded
+    from the scope view.
+
+  [ Stephen M. Webb ]
+  * Added internationalization support.
+
+ -- Stephen M. Webb <[e-mail]>  Tue, 26 Apr 2016 11:31:09 -0400
+
 libertine-scope (1.0-0ubuntu1) xenial; urgency=low
 
   * Initial release (lp: #1541417).

=== modified file 'debian/control'
--- debian/control	2016-02-05 13:58:24 +0000
+++ debian/control	2016-05-05 15:35:57 +0000
@@ -11,6 +11,8 @@
                intltool,
                libunity-scopes-dev (>= 0.6.0),
                liburl-dispatcher1-dev,
+               libubuntu-app-launch2-dev,
+               liblibertine-dev,
                pkg-config,
                qtbase5-dev
 Standards-Version: 3.9.6

=== modified file 'libertine-scope.apparmor'
--- libertine-scope.apparmor	2015-12-29 21:50:58 +0000
+++ libertine-scope.apparmor	2016-05-05 15:35:57 +0000
@@ -1,5 +1,5 @@
 {
-    "template": "ubuntu-scope-network",
+    "template": "unconfined",
     "policy_groups": [],
     "policy_version": 1.3
 }

=== modified file 'libertine-scope/CMakeLists.txt'
--- libertine-scope/CMakeLists.txt	2016-02-03 15:42:16 +0000
+++ libertine-scope/CMakeLists.txt	2016-05-05 15:35:57 +0000
@@ -17,6 +17,8 @@
 
 target_link_libraries(scope
   ${SCOPE_LDFLAGS}
+  ${UAL_LDFLAGS}
+  ${LIBERTINE_LDFLAGS}
   Qt5::Core
   Qt5::Gui
   ${URL_DISPATCHER_LIBRARIES}

=== modified file 'libertine-scope/applauncher.cpp'
--- libertine-scope/applauncher.cpp	2016-02-03 15:42:16 +0000
+++ libertine-scope/applauncher.cpp	2016-05-05 15:35:57 +0000
@@ -13,80 +13,40 @@
  * 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/applauncher.h"
-
-#include <QtCore/QByteArray>
-#include <QtCore/QJsonArray>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QFileInfo>
-#include <QtGui/QImage>
+#include <ubuntu-app-launch/registry.h>
 
 
 AppLauncher::
-AppLauncher(std::string const& json_string)
+AppLauncher(const std::string& app_id, const std::string& container_id)
 {
-  auto doc = QJsonDocument::fromJson(QByteArray::fromStdString(json_string));
-  auto obj = doc.object();
-
-  name_ = obj["name"].toString().toStdString();
-
-  no_display_ = obj["no_display"].toBool();
-
-  QJsonValue icons = obj["icons"];
-  if (icons.isArray())
-  {
-    int width = 0;
-    for (auto const& icon: icons.toArray())
-    {
-      QString icon_file_name = icon.toString();
-      if (icon_file_name.endsWith(".svg", Qt::CaseInsensitive))
-      {
-        icon_ = "file://" + icon_file_name.toStdString();
-        break;
-      }
-
-      QImage image = QImage(icon_file_name);
-      if (image.width() > width)
-      {
-        icon_ = "file://" + icon_file_name.toStdString();
-        width = image.width();
-      }
-    }
-  }
-
-  desktop_file_ = obj["desktop_file_name"].toString().toStdString();
+  auto appId = ubuntu::app_launch::AppID::parse(app_id);
+  auto app = ubuntu::app_launch::Application::create(appId, ubuntu::app_launch::Registry::getDefault());
+  name_ = app->info()->name().value();
+  icon_ = app->info()->iconPath().value();
+  description_ = app->info()->description().value();
+  uri_ = "appid://" + container_id + "/" + appId.appname.value() + "/0.0";
 }
 
 
 AppLauncher::
+AppLauncher() { /* empty */ }
+
+
+AppLauncher::
 ~AppLauncher()
 {
 }
 
 
 std::string AppLauncher::
-id() const
-{
-  QFileInfo fi(QString::fromStdString(desktop_file_));
-  return fi.baseName().toStdString();
-}
-
-
-std::string AppLauncher::
 name() const
 {
   return name_;
 }
 
 
-bool AppLauncher::
-no_display() const
-{
-  return no_display_;
-}
-
-
 std::string AppLauncher::
 icon() const
 {
@@ -95,8 +55,15 @@
 
 
 std::string AppLauncher::
-desktop_file() const
-{
-  return desktop_file_;
+description() const
+{
+  return description_;
+}
+
+
+std::string AppLauncher::
+uri() const
+{
+  return uri_;
 }
 

=== modified file 'libertine-scope/applauncher.h'
--- libertine-scope/applauncher.h	2016-01-04 18:30:15 +0000
+++ libertine-scope/applauncher.h	2016-05-05 15:35:57 +0000
@@ -30,31 +30,31 @@
    * Constructs an AppLaunchder object from a JSON string.
    */
   explicit
-  AppLauncher(std::string const& json_string);
+  AppLauncher(const std::string& app_id, const std::string& container_name);
 
   virtual
   ~AppLauncher();
 
   virtual std::string
-  id() const;
-
-  virtual std::string
   name() const;
 
-  virtual bool
-  no_display() const;
-
   virtual std::string
   icon() const;
 
   virtual std::string
-  desktop_file() const;
-
-private:
+  description() const;
+
+  virtual std::string
+  uri() const;
+
+protected:
+  explicit
+  AppLauncher();
+
   std::string     name_;
-  bool            no_display_;
   std::string     icon_;
-  std::string     desktop_file_;
+  std::string     uri_;
+  std::string     description_;
 };
 
 #endif /* LIBERTINE_SCOPE_APPLAUNCHER_H */

=== modified file 'libertine-scope/container.cpp'
--- libertine-scope/container.cpp	2016-01-19 21:10:09 +0000
+++ libertine-scope/container.cpp	2016-05-05 15:35:57 +0000
@@ -13,13 +13,14 @@
  * 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/container.h"
 
 
 Container::
-Container(std::string const& container_id)
+Container(std::string const& container_id, std::string const& container_name)
 : id_(container_id)
-, name_(container_id)
+, name_(container_name)
 { }
 
 

=== modified file 'libertine-scope/container.h'
--- libertine-scope/container.h	2016-01-19 21:10:09 +0000
+++ libertine-scope/container.h	2016-05-05 15:35:57 +0000
@@ -43,7 +43,7 @@
    * launcher .desktop files and their icons.
    */
   explicit
-  Container(std::string const& container_id);
+  Container(std::string const& container_id, std::string const& container_name);
 
   virtual
   ~Container() = 0;

=== modified file 'libertine-scope/libertine.cpp'
--- libertine-scope/libertine.cpp	2016-01-19 21:10:09 +0000
+++ libertine-scope/libertine.cpp	2016-05-05 15:35:57 +0000
@@ -13,56 +13,41 @@
  * 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/libertine.h"
-
 #include "libertine-scope/container.h"
-#include <QtCore/QJsonArray>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QJsonValue>
-#include <QtCore/QProcess>
-#include <QtCore/QString>
-
+#include <liblibertine/libertine.h>
+#include <glib.h>
 
 namespace
 {
 
 /**
- * A real Libertine Container created by using the Libertine tools.
+ * A real Libertine Container created by querying liblibertine.
  */
 class LibertineContainer
 : public Container
 {
 public:
-  LibertineContainer(std::string const& container_id)
-  : Container(container_id)
+  LibertineContainer(std::string const& container_id, std::string const& container_name)
+  : Container(container_id, container_name)
   {
-    QProcess libertine_container_manager;
-    libertine_container_manager.start("libertine-container-manager",
-                                      QStringList() <<  "list-apps"
-                                                    << "--id"
-                                                    << QString::fromStdString(id_)
-                                                    << "--json");
-    if (libertine_container_manager.waitForFinished())
+    auto apps = libertine_list_apps_for_container(container_id.c_str());
+    for (auto i = 0; apps[i] != nullptr; ++i)
     {
-      QJsonDocument json = QJsonDocument::fromJson(libertine_container_manager.readAllStandardOutput());
-      QJsonObject object = json.object();
-      QJsonValue name = object["name"];
-      if (name != QJsonValue::Undefined)
-      {
-        name_ = name.toString().toStdString();
-
-        QJsonValue v = object["app_launchers"];
-        if (v != QJsonValue::Undefined)
-        {
-          for (auto const& app: v.toArray())
-          {
-            auto json = QJsonDocument(app.toObject()).toJson().toStdString();
-            app_launcher_list_.emplace_back(AppLauncher(json));
-          }
-        }
+      try
+      {
+        app_launcher_list_.emplace_back(AppLauncher(apps[i], container_id));
+      }
+      catch(std::runtime_error)
+      {
+        /*
+         * U-A-L will throw if an application cannot be displayed
+         * for any reason. Ignore and continue.
+         */
       }
     }
+    g_strfreev(apps);
   }
 
   ~LibertineContainer()
@@ -75,17 +60,14 @@
 public:
   LibertineCli()
   {
-    QProcess libertine_container_manager;
-    libertine_container_manager.start("libertine-container-manager",
-                                      QStringList() <<  "list");
-    if (libertine_container_manager.waitForFinished())
+    auto container_ids = libertine_list_containers();
+    for (auto i = 0; container_ids[i] != nullptr; ++i)
     {
-      QString container_id_list(libertine_container_manager.readAllStandardOutput());
-      for (auto const& id: container_id_list.split("\n", QString::SkipEmptyParts))
-      {
-        container_list_.emplace_back(new LibertineContainer(id.toStdString()));
-      }
+      auto name = libertine_container_name(container_ids[i]);
+      container_list_.emplace_back(new LibertineContainer(container_ids[i], name));
+      g_free(name);
     }
+    g_strfreev(container_ids);
   }
 
   Libertine::ContainerList const&

=== modified file 'libertine-scope/preview.cpp'
--- libertine-scope/preview.cpp	2016-01-19 21:10:09 +0000
+++ libertine-scope/preview.cpp	2016-05-05 15:35:57 +0000
@@ -13,16 +13,19 @@
  * 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/preview.h"
-
 #include <unity/scopes/PreviewReply.h>
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/VariantBuilder.h>
+#include <unity/scopes/ActionMetadata.h>
+#include <unity/scopes/Result.h>
 
+namespace usc = unity::scopes;
 
 Preview::
-Preview(unity::scopes::Result const&         result,
-        unity::scopes::ActionMetadata const& metadata)
+Preview(usc::Result const&         result,
+        usc::ActionMetadata const& metadata)
 : PreviewQueryBase(result, metadata)
 {
 }
@@ -41,22 +44,24 @@
 
 
 void Preview::
-run(unity::scopes::PreviewReplyProxy const& reply)
+run(usc::PreviewReplyProxy const& reply)
 {
-  reply->push("description", unity::scopes::Variant("A Description"));
-
-  unity::scopes::PreviewWidget image_widget("myimage", "image");
-  image_widget.add_attribute_mapping("source", "art");
-
-  unity::scopes::PreviewWidget buttons("buttons", "actions");
-  unity::scopes::VariantBuilder vb;
+  usc::PreviewWidget header("hdr", "header");
+  header.add_attribute_mapping("title", "title");
+  header.add_attribute_mapping("mascot", "art");
+  header.add_attribute_value("fallback", usc::Variant("image://theme/placeholder-app-icon"));
+
+  usc::PreviewWidget buttons("buttons", "actions");
+  usc::VariantBuilder vb;
   vb.add_tuple({
-    {"id",    unity::scopes::Variant("open")},
-    {"label", unity::scopes::Variant("Open")},
+    {"id",    usc::Variant("open")},
+    {"label", usc::Variant("Open")},
   });
   buttons.add_attribute_value("actions", vb.end());
 
-  unity::scopes::PreviewWidgetList widgets{ image_widget, buttons };
+  usc::PreviewWidget desc("desc", "text");
+  desc.add_attribute_mapping("text", "description");
+
+  usc::PreviewWidgetList widgets{ header, desc, buttons };
   reply->push(widgets);
 }
-

=== modified file 'libertine-scope/query.cpp'
--- libertine-scope/query.cpp	2016-01-19 21:10:09 +0000
+++ libertine-scope/query.cpp	2016-05-05 15:35:57 +0000
@@ -13,15 +13,17 @@
  * 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 "libertine-scope/applauncher.h"
 #include "libertine-scope/container.h"
-#include "libertine-scope/libertine.h"
 #include <unity/scopes/CategorisedResult.h>
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/SearchReply.h>
+#include <QString>
+#include <QStringList>
+#include <QRegExp>
+
 
 namespace usc = unity::scopes;
 
@@ -44,22 +46,13 @@
             "title" : "title",
             "art" : {
                 "field": "art",
-                "fill-mode": "fit"
+                "fill-mode": "fit",
+                "fallback": "image://theme/placeholder-app-icon"
             }
         }
     }
 )";
 
-
-/**
- * Generates a ubuntu-application-launcher URI for a contained desktop file.
- */
-static std::string
-app_uri(Container const& container, AppLauncher const& app)
-{
-  return "appid://" + container.id() + "/" + app.id() + "/0.0";
-}
-
 } // anonymous namespace
 
 
@@ -79,29 +72,53 @@
 }
 
 
+unity::scopes::VariantMap
+Query::settings() const
+{
+  return SearchQueryBase::settings();
+}
+
+
+QStringList
+Query::blacklist() const
+{
+  QStringList blacklistedApps;
+  auto blacklist = settings()["blacklist"];
+  if (!blacklist.is_null()) {
+    blacklistedApps = QString::fromStdString(blacklist.get_string())
+        .remove("\"")
+        .split(";", QString::SkipEmptyParts);
+  }
+  return blacklistedApps;
+}
+
+
 void Query::
 run(usc::SearchReplyProxy const& reply)
 {
-  usc::CannedQuery const& query(usc::SearchQueryBase::query());
-  std::string query_string = query.query_string();
-
+  auto blacklistedApps = blacklist();
+  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 (!(re.isEmpty() || QString::fromStdString(app.name()).contains(re))
+          || blacklistedApps.contains(QString::fromStdString(app.name())))
+      {
         continue;
+      }
 
       usc::CategorisedResult result(category);
       result.set_title(app.name());
       result.set_art(app.icon());
-      result.set_uri(app_uri(*container, app));
+      result.set_uri(app.uri());
+      result["description"] = app.description();
       if (!reply->push(result))
       {
         break;

=== modified file 'libertine-scope/query.h'
--- libertine-scope/query.h	2016-01-19 21:10:09 +0000
+++ libertine-scope/query.h	2016-05-05 15:35:57 +0000
@@ -20,6 +20,8 @@
 #include <unity/scopes/ReplyProxyFwd.h>
 #include <unity/scopes/SearchQueryBase.h>
 
+class QStringList;
+
 
 /**
  * Engine to run a specific scope query.
@@ -40,7 +42,12 @@
     void
     run(unity::scopes::SearchReplyProxy const& reply) override;
 
+    // Overriding base class method to add ability to test
+    virtual unity::scopes::VariantMap settings() const;
+
 private:
+    QStringList blacklist() const;
+
     Libertine::Factory libertine_factory_;
 };
 

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2015-12-29 21:50:58 +0000
+++ po/CMakeLists.txt	2016-05-05 15:35:57 +0000
@@ -1,5 +1,7 @@
 intltool_update_potfile(
   ALL
+  KEYWORDS "_" "_:1,2" "N_" "N_:1,2"
+  POTFILES_TEMPLATE POTFILES.in.in
   GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
 )
 
@@ -8,3 +10,12 @@
   GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
 )
 
+file(GLOB_RECURSE ALL_POFILES "*.po")
+
+add_custom_target(potfiles
+  ALL
+  SOURCES
+    POTFILES.in.in
+    ${GETTEXT_PACKAGE}.pot
+    ${ALL_POFILES}
+)

=== removed file 'po/Makefile.in.in'
--- po/Makefile.in.in	2015-12-29 21:50:58 +0000
+++ po/Makefile.in.in	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-XGETTEXT_KEYWORDS=--c++ --keyword=_ --keyword=N_ --keyword=_:1,2

=== removed file 'po/POTFILES.in'
--- po/POTFILES.in	2016-01-19 21:10:09 +0000
+++ po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-libertine-scope/query.cpp
-libertine-scope/container.cpp
-libertine-scope/applauncher.cpp
-libertine-scope/libertine.cpp
-libertine-scope/preview.cpp
-libertine-scope/scope.cpp
-tests/fake_container.cpp
-tests/fake_libertine.cpp
-tests/test_scope.cpp
-libertine-scope/preview.h
-libertine-scope/libertine.h
-libertine-scope/scope.h
-libertine-scope/applauncher.h
-libertine-scope/query.h
-libertine-scope/container.h
-libertine-scope/localization.h
-tests/fake_container_json.h
-tests/TypedScopeFixture.h
-tests/fake_libertine.h
-tests/scopefixture.h
-tests/fake_container.h

=== added file 'po/POTFILES.in.in'
--- po/POTFILES.in.in	1970-01-01 00:00:00 +0000
+++ po/POTFILES.in.in	2016-05-05 15:35:57 +0000
@@ -0,0 +1,2 @@
+[type: gettext/ini] data/libertine-scope.ini.in
+@GENERATED_POTFILES@

=== added file 'po/libertine-scope.pot'
--- po/libertine-scope.pot	1970-01-01 00:00:00 +0000
+++ po/libertine-scope.pot	2016-05-05 15:35:57 +0000
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-27 14:37-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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/libertine-scope.ini.in.h:1
+msgid "Legacy Applications Scope"
+msgstr ""
+
+#: ../data/libertine-scope.ini.in.h:2
+msgid "Deb-packaged X11-based legacy applications."
+msgstr ""

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-01-19 00:16:56 +0000
+++ tests/CMakeLists.txt	2016-05-05 15:35:57 +0000
@@ -6,7 +6,11 @@
 add_executable(libertine_scope_tests
   fake_container.cpp
   fake_libertine.cpp
+
+  # tests
   test_scope.cpp
+  test_preview.cpp
+  test_query.cpp
 )
 
 target_link_libraries(libertine_scope_tests
@@ -16,6 +20,7 @@
   gmock_main
 )
 
-add_test(test_scope
-  libertine_scope_tests
-)
+add_test(test_scope libertine_scope_tests)
+add_test(test_preview libertine_scope_tests)
+add_test(test_query libertine_scope_tests)
+

=== modified file 'tests/fake_container.cpp'
--- tests/fake_container.cpp	2016-01-19 00:16:56 +0000
+++ tests/fake_container.cpp	2016-05-05 15:35:57 +0000
@@ -24,9 +24,28 @@
 #include <QtCore/QString>
 
 
+class TestAppLauncher : public AppLauncher
+{
+public:
+  TestAppLauncher(const std::string& json)
+    :AppLauncher()
+  {
+    auto doc = QJsonDocument::fromJson(QByteArray::fromStdString(json));
+    auto obj = doc.object();
+    name_ = obj["name"].toString().toStdString();
+    if (obj["icons"].isArray())
+    {
+      icon_ = obj["icons"].toArray()[0].toString().toStdString();
+    }
+    description_ = obj["description"].toString().toStdString();
+    uri_ = obj["uri"].toString().toStdString();
+  }
+};
+
+
 FakeContainer::
 FakeContainer(std::string const& json_string)
-: Container("fake")
+: Container("fakeId", "fakeName")
 {
   QJsonDocument json = QJsonDocument::fromJson(QByteArray::fromStdString(json_string), nullptr);
   QJsonObject object = json.object();
@@ -41,7 +60,7 @@
       for (auto const& app: v.toArray())
       {
         auto json = QJsonDocument(app.toObject()).toJson().toStdString();
-        app_launcher_list_.emplace_back(AppLauncher(json));
+        app_launcher_list_.emplace_back(TestAppLauncher(json));
       }
     }
   }

=== modified file 'tests/fake_container.h'
--- tests/fake_container.h	2016-01-19 21:10:09 +0000
+++ tests/fake_container.h	2016-05-05 15:35:57 +0000
@@ -28,7 +28,7 @@
 {
 public:
   explicit
-  FakeContainer(std::string const& json);
+  FakeContainer(std::string const& container_id);
 
   ~FakeContainer();
 };

=== modified file 'tests/fake_container_json.h'
--- tests/fake_container_json.h	2016-01-19 00:16:56 +0000
+++ tests/fake_container_json.h	2016-05-05 15:35:57 +0000
@@ -30,7 +30,9 @@
             ],
             "mime_types": [],
             "name": "Panel Manager",
-            "no_display": false
+            "no_display": false,
+            "description": "some description",
+            "uri": "some/uri"
         },
         {
             "desktop_file_name": "/home/someuser/.cache/libertine-container/fake1/rootfs/usr/share/applications/sakura.desktop",
@@ -40,7 +42,9 @@
             ],
             "mime_types": [],
             "name": "Sakura",
-            "no_display": false
+            "no_display": false,
+            "description": "some other description",
+            "uri": "some/other/uri"
         }
     ]
 }

=== added file 'tests/test_preview.cpp'
--- tests/test_preview.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_preview.cpp	2016-05-05 15:35:57 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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/preview.h"
+#include <unity/scopes/Variant.h>
+#include <gtest/gtest.h>
+#include <unity/scopes/ActionMetadata.h>
+#include <unity/scopes/testing/Result.h>
+#include <unity/scopes/testing/MockPreviewReply.h>
+#include <unity/scopes/PreviewWidget.h>
+#include <memory>
+#include <QDir>
+
+
+TEST(TestPreview, pushesWidgetsWithAppInformation)
+{
+  unity::scopes::testing::Result result;
+  unity::scopes::ActionMetadata metadata("en_US", "phone");
+
+  std::unique_ptr<unity::scopes::PreviewWidgetList> list(new unity::scopes::PreviewWidgetList());
+	testing::NiceMock<unity::scopes::testing::MockPreviewReply> reply;
+  EXPECT_CALL(reply, push(testing::_)).WillOnce(testing::SaveArg<0>(list.get()));
+  unity::scopes::PreviewReplyProxy proxy(&reply, [](unity::scopes::PreviewReply*) {});
+
+	Preview preview(result, metadata);
+	preview.run(proxy);
+
+  ASSERT_NE(nullptr, list);
+  ASSERT_EQ(3, list->size());
+
+  auto header = list->front();
+  EXPECT_EQ("hdr", header.id());
+  EXPECT_EQ("header", header.widget_type());
+  EXPECT_EQ("title", header.attribute_mappings()["title"]);
+  EXPECT_EQ("art", header.attribute_mappings()["mascot"]);
+
+  list->pop_front();
+  auto desc = list->front();
+  EXPECT_EQ("desc", desc.id());
+
+  list->pop_front();
+  auto buttons = list->front();
+  EXPECT_EQ("buttons", buttons.id());
+  EXPECT_EQ("actions", buttons.widget_type());
+
+  auto buttons_actions = buttons.attribute_values()["actions"].get_array();
+  ASSERT_EQ(1, buttons_actions.size());
+  EXPECT_EQ("open", buttons_actions[0].get_dict()["id"].get_string());
+  EXPECT_EQ("Open", buttons_actions[0].get_dict()["label"].get_string());
+}

=== added file 'tests/test_query.cpp'
--- tests/test_query.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_query.cpp	2016-05-05 15:35:57 +0000
@@ -0,0 +1,210 @@
+/*
+ * 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,
+      "uri": "appid://fake/libreoffice/0.0",
+      "icons": ["file:///lo.png"],
+      "description": "libreoffice!"
+    }, {
+      "name": "Linux",
+      "no_display": true,
+      "uri": "appid://fake/linux/0.0",
+      "icons": ["file:///nix.png"],
+      "description": "linux!"
+    }, {
+      "name": "Library",
+      "no_display": false,
+      "uri": "appid://fake/library/0.0",
+      "icons": ["file:///lib.png"],
+      "description": "library!"
+    }]
+  }
+)";
+
+
+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_P4(ResultPropertiesMatch, title, art, description, uri, "")
+{
+  return arg.contains("title") && arg.contains("art") && arg.contains("description") && arg.contains("uri") &&
+      arg["title"] == unity::scopes::Variant(title) &&
+      arg["art"] == unity::scopes::Variant(art) &&
+      arg["description"] == unity::scopes::Variant(description) &&
+      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>("fakeId", "fake-container", "Application", unity::scopes::CategoryRenderer()))
+  {
+  }
+
+  void expect_registry()
+  {
+    EXPECT_CALL(reply, register_category("fakeId", "fake-container", "Application", testing::_)).WillOnce(testing::Return(category));
+  }
+
+  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));
+  }
+
+  void expect_push_libreoffice(bool success = true)
+  {
+    expect_push("LibreOffice", "file:///lo.png", "libreoffice!", "appid://fake/libreoffice/0.0", success);
+  }
+
+  void expect_push_library(bool success = true)
+  {
+    expect_push("Library", "file:///lib.png", "library!", "appid://fake/library/0.0", success);
+  }
+
+  void expect_push_linux(bool success = true)
+  {
+    expect_push("Linux", "file:///nix.png", "linux!", "appid://fake/linux/0.0", 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();
+  expect_push_linux();
+  expect_push_library();
+
+  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();
+  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(false);
+
+  Query query(canned_query, metadata, []() {
+    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
+  });
+  query.run(proxy);
+}
+
+
+// Query class with faked out Settings
+class QueryWithFakeSettings : public Query
+{
+public:
+  QueryWithFakeSettings(unity::scopes::CannedQuery const& query,
+        unity::scopes::SearchMetadata const&  metadata,
+        Libertine::Factory const&   libertine_factory)
+  : Query(query, metadata, libertine_factory)
+    , settings_()
+  {
+  }
+
+  unity::scopes::VariantMap settings() const override
+  {
+    return settings_;
+  }
+
+  unity::scopes::VariantMap settings_;
+};
+
+
+TEST_F(TestQueryFixture, ignoresAnyBlacklistedApps)
+{
+  expect_registry();
+  expect_push_library();
+
+  QueryWithFakeSettings query(canned_query, metadata, []() {
+    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
+  });
+  query.settings_["blacklist"] = "LibreOffice;Linux";
+  query.run(proxy);
+}
+
+
+TEST_F(TestQueryFixture, stripsQuotationMarksFromBlacklist)
+{
+  expect_registry();
+  expect_push_linux();
+  expect_push_library();
+
+  QueryWithFakeSettings query(canned_query, metadata, []() {
+    return FakeLibertine::make_fake(LIBERTINE_OUTPUT_WITH_APPS);
+  });
+  query.settings_["blacklist"] = "\"LibreOffice\"";
+  query.run(proxy);
+}
+
+} // anonymous namespace

=== modified file 'tests/test_scope.cpp'
--- tests/test_scope.cpp	2016-01-19 00:16:56 +0000
+++ tests/test_scope.cpp	2016-05-05 15:35:57 +0000
@@ -54,4 +54,3 @@
   SearchReplyProxy search_reply_proxy(&reply, [](unity::scopes::SearchReply*) {});
   search_query->run(search_reply_proxy);
 }
-