Merge lp:~azzar1/unity/lp-1152733 into lp:unity

[Andrea Azzarone]

Export the event timestamp on dash icon click.

== Problem ==
Nautilus windows don't get the the focus when opened via the dash.

== Fix ==
Export the event timestamp on dash icon click. Please keep in mind that the diff is not so small but I just moved code for the most.

== Test ==
Unit test added. Just tests ApplicationStarter*::Launch is getting called.

[Brandon Schaefer (brandontschaefer)]

Awesome, confirmed working here. Tests pass. LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/486/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/486/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/486/console

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Approved!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'UnityCore/FilesystemLenses.h'
--- UnityCore/FilesystemLenses.h	2012-03-29 04:40:53 +0000
+++ UnityCore/FilesystemLenses.h	2013-03-12 22:36:20 +0000
@@ -82,10 +82,10 @@
 
   ~FilesystemLenses();
 
-  LensList GetLenses() const;
-  Lens::Ptr GetLens(std::string const& lens_id) const;
-  Lens::Ptr GetLensAtIndex(std::size_t index) const;
-  Lens::Ptr GetLensForShortcut(std::string const& lens_shortcut) const;
+  LensList GetLenses() const override;
+  Lens::Ptr GetLens(std::string const& lens_id) const override;
+  Lens::Ptr GetLensAtIndex(std::size_t index) const override;
+  Lens::Ptr GetLensForShortcut(std::string const& lens_shortcut) const override;
 
   sigc::signal<void> lenses_loaded;
 
 
=== modified file 'UnityCore/HomeLens.cpp'
--- UnityCore/HomeLens.cpp	2012-11-14 08:57:56 +0000
+++ UnityCore/HomeLens.cpp	2013-03-12 22:36:20 +0000
@@ -1116,14 +1116,14 @@
   delete pimpl;
 }
 
-void HomeLens::AddLenses(Lenses& lenses)
+void HomeLens::AddLenses(Lenses::Ptr const& lenses)
 {
-  for (auto lens : lenses.GetLenses())
+  for (auto lens : lenses->GetLenses())
   {
     pimpl->OnLensAdded(lens);
   }
 
-  lenses.lens_added.connect(sigc::mem_fun(pimpl, &HomeLens::Impl::OnLensAdded));
+  lenses->lens_added.connect(sigc::mem_fun(pimpl, &HomeLens::Impl::OnLensAdded));
 }
 
 Lenses::LensList HomeLens::GetLenses() const
@@ -1158,6 +1158,11 @@
   return Lens::Ptr();
 }
 
+Lens::Ptr HomeLens::GetLensForShortcut(std::string const& lens_shortcut) const
+{
+  return Lens::Ptr();
+}
+
 void HomeLens::GlobalSearch(std::string const& search_string, SearchFinishedCallback const& cb)
 {
   LOG_WARN(logger) << "Global search not enabled for HomeLens class."
 
=== modified file 'UnityCore/HomeLens.h'
--- UnityCore/HomeLens.h	2012-11-12 11:07:23 +0000
+++ UnityCore/HomeLens.h	2013-03-12 22:36:20 +0000
@@ -63,11 +63,12 @@
            MergeMode merge_mode = MergeMode::OWNER_LENS);
   virtual ~HomeLens();
 
-  void AddLenses(Lenses& lenses);
+  void AddLenses(Lenses::Ptr const& lenses);
 
-  Lenses::LensList GetLenses() const;
-  Lens::Ptr GetLens(std::string const& lens_id) const;
-  Lens::Ptr GetLensAtIndex(std::size_t index) const;
+  Lenses::LensList GetLenses() const override;
+  Lens::Ptr GetLens(std::string const& lens_id) const override;
+  Lens::Ptr GetLensAtIndex(std::size_t index) const override;
+  Lens::Ptr GetLensForShortcut(std::string const& lens_shortcut) const override;
 
   void GlobalSearch(std::string const& search_string, SearchFinishedCallback const& cb);
   void Search(std::string const& search_string, SearchFinishedCallback const& cb);
 
=== modified file 'UnityCore/Lenses.h'
--- UnityCore/Lenses.h	2011-07-27 17:35:31 +0000
+++ UnityCore/Lenses.h	2013-03-12 22:36:20 +0000
@@ -20,6 +20,7 @@
 #ifndef UNITY_LENSES_H
 #define UNITY_LENSES_H
 
+#include <memory>
 #include <sigc++/trackable.h>
 #include <sigc++/signal.h>
 
@@ -33,6 +34,7 @@
 class Lenses : public sigc::trackable, boost::noncopyable
 {
 public:
+  typedef std::shared_ptr<Lenses> Ptr;
   typedef std::vector<Lens::Ptr> LensList;
 
   /**
@@ -45,6 +47,7 @@
   virtual LensList GetLenses() const = 0;
   virtual Lens::Ptr GetLens(std::string const& lens_id) const = 0;
   virtual Lens::Ptr GetLensAtIndex(std::size_t index) const = 0;
+  virtual Lens::Ptr GetLensForShortcut(std::string const& lens_shortcut) const = 0;
 
   nux::ROProperty<std::size_t> count;
 
 
=== added file 'dash/ApplicationStarter.h'
--- dash/ApplicationStarter.h	1970-01-01 00:00:00 +0000
+++ dash/ApplicationStarter.h	2013-03-12 22:36:20 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2013 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/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#ifndef UNITY_SHARED_APPLICATION_STARTER_H
+#define UNITY_SHARED_APPLICATION_STARTER_H
+
+#include <boost/noncopyable.hpp>
+#include <memory>
+#include <string>
+
+#include <X11/X.h>
+
+namespace unity {
+
+class ApplicationStarter : boost::noncopyable
+{
+public:
+  typedef std::shared_ptr<ApplicationStarter> Ptr;
+
+  virtual bool Launch(std::string const& application_name, Time timestamp) = 0;
+};
+
+}
+
+#endif
 
=== added file 'dash/ApplicationStarterImp.cpp'
--- dash/ApplicationStarterImp.cpp	1970-01-01 00:00:00 +0000
+++ dash/ApplicationStarterImp.cpp	2013-03-12 22:36:20 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2013 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/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#include "ApplicationStarterImp.h"
+
+#include <gdk/gdk.h>
+#include <gio/gdesktopappinfo.h>
+
+#include <NuxCore/Logger.h>
+#include <UnityCore/GLibWrapper.h>
+
+namespace unity {
+
+DECLARE_LOGGER(logger, "unity.applicationstarterimp");
+
+bool ApplicationStarterImp::Launch(std::string const& application_name, Time timestamp)
+{
+  std::string id = application_name;
+
+  LOG_DEBUG(logger) << "Launching " << id;
+
+  GdkDisplay* display = gdk_display_get_default();
+  glib::Object<GdkAppLaunchContext> app_launch_context(gdk_display_get_app_launch_context(display));
+
+  if (timestamp >= 0)
+    gdk_app_launch_context_set_timestamp(app_launch_context, timestamp);
+
+  while (true)
+  {
+    glib::Object<GDesktopAppInfo> info(g_desktop_app_info_new(id.c_str()));
+
+    if (info)
+    {
+      glib::Error error;
+      g_app_info_launch(glib::object_cast<GAppInfo>(info), nullptr, 
+                        glib::object_cast<GAppLaunchContext>(app_launch_context), &error);
+
+      if (error)
+        LOG_WARNING(logger) << "Unable to launch " << id << ":" << error;
+      else
+        return true;
+
+      break;
+    }
+
+    // Try to replace the next - with a / and do the lookup again.
+    auto pos = id.find_first_of('-');
+    if (pos != std::string::npos)
+      id.replace(pos, 1, "/");
+    else
+      break;
+  }
+
+  return false;
+}
+
+}
 
=== added file 'dash/ApplicationStarterImp.h'
--- dash/ApplicationStarterImp.h	1970-01-01 00:00:00 +0000
+++ dash/ApplicationStarterImp.h	2013-03-12 22:36:20 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 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/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#ifndef UNITY_SHARED_APPLICATION_STARTER_IMP_H
+#define UNITY_SHARED_APPLICATION_STARTER_IMP_H
+
+#include "ApplicationStarter.h"
+
+namespace unity {
+
+class ApplicationStarterImp : public ApplicationStarter 
+{
+public:
+  bool Launch(std::string const& application_name, Time timestamp) override;
+};
+
+}
+
+#endif
 
=== modified file 'dash/CMakeLists.txt'
--- dash/CMakeLists.txt	2013-01-28 23:57:38 +0000
+++ dash/CMakeLists.txt	2013-03-12 22:36:20 +0000
@@ -19,6 +19,7 @@
 # Headers & Sources
 #
 set (DASH_SOURCES
+     ApplicationStarterImp.cpp
      CoverflowResultView.cpp
      DashController.cpp
      DashView.cpp
 
=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2013-03-06 13:13:37 +0000
+++ dash/DashController.cpp	2013-03-12 22:36:20 +0000
@@ -23,6 +23,7 @@
 #include <Nux/HLayout.h>
 #include <UnityCore/GLibWrapper.h>
 
+#include "ApplicationStarterImp.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UBusMessages.h"
@@ -139,7 +140,7 @@
 
 void Controller::SetupDashView()
 {
-  view_ = new DashView();
+  view_ = new DashView(std::make_shared<FilesystemLenses>(), std::make_shared<ApplicationStarterImp>());
   AddChild(view_);
 
   nux::HLayout* layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-02-26 12:57:59 +0000
+++ dash/DashView.cpp	2013-03-12 22:36:20 +0000
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-#include <gio/gdesktopappinfo.h>
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
@@ -110,13 +109,16 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(DashView);
 
-DashView::DashView()
+DashView::DashView(Lenses::Ptr const& lenses, ApplicationStarter::Ptr const& application_starter)
   : nux::View(NUX_TRACKER_LOCATION)
+  , lenses_(lenses)
   , home_lens_(new HomeLens(_("Home"), _("Home screen"), _("Search your computer and online sources")))
+  , application_starter_(application_starter)
   , preview_container_(nullptr)
   , preview_displaying_(false)
   , preview_navigation_mode_(previews::Navigation::NONE)
   , last_activated_uri_("")
+  , last_activated_timestamp_(0)
   , search_in_progress_(false)
   , activate_on_finish_(false)
   , visible_(false)
@@ -137,11 +139,14 @@
   SetupViews();
   SetupUBusConnections();
 
-  lenses_.lens_added.connect(sigc::mem_fun(this, &DashView::OnLensAdded));
+  lenses_->lens_added.connect(sigc::mem_fun(this, &DashView::OnLensAdded));
   mouse_down.connect(sigc::mem_fun(this, &DashView::OnMouseButtonDown));
   preview_state_machine_.PreviewActivated.connect(sigc::mem_fun(this, &DashView::BuildPreview));
   Relayout();
 
+  for (auto lens : lenses_->GetLenses())
+    lenses_->lens_added.emit(lens);
+
   home_lens_->AddLenses(lenses_);
   lens_bar_->Activate("home.lens");
 
@@ -195,7 +200,8 @@
     int row_height = 0;
     int results_to_the_left = 0;
     int results_to_the_right = 0;
-    g_variant_get(data, "(iiiiii)", &column_x, &row_y, &column_width, &row_height, &results_to_the_left, &results_to_the_right);
+    g_variant_get(data, "(iiiiiii)", &last_activated_timestamp_, &column_x, &row_y, &column_width, &row_height, &results_to_the_left, &results_to_the_right);
+
     preview_state_machine_.SetSplitPosition(SplitPosition::CONTENT_AREA, row_y);
     preview_state_machine_.left_results = results_to_the_left;
     preview_state_machine_.right_results = results_to_the_right;
@@ -470,7 +476,7 @@
 
     if (active_lens_view_->lens()->id() == "home.lens")
     {
-      for (auto lens : lenses_.GetLenses())
+      for (auto lens : lenses_->GetLenses())
       {
         lens->view_type = ViewType::HOME_VIEW;
         LOG_DEBUG(logger) << "Setting ViewType " << ViewType::HOME_VIEW
@@ -508,7 +514,7 @@
   visible_ = false;
   renderer_.AboutToHide();
 
-  for (auto lens : lenses_.GetLenses())
+  for (auto lens : lenses_->GetLenses())
   {
     lens->view_type = ViewType::HIDDEN;
     LOG_DEBUG(logger) << "Setting ViewType " << ViewType::HIDDEN
@@ -1152,9 +1158,9 @@
 
 void DashView::UpdateLensFilter(std::string lens_id, std::string filter_name, std::string value)
 {
-  if (lenses_.GetLens(lens_id))
+  if (lenses_->GetLens(lens_id))
   {
-    Lens::Ptr lens = lenses_.GetLens(lens_id);
+    Lens::Ptr lens = lenses_->GetLens(lens_id);
 
     Filters::Ptr filters = lens->filters;
 
@@ -1219,7 +1225,6 @@
 
 void DashView::OnLensAdded(Lens::Ptr& lens)
 {
-  std::string id = lens->id;
   lens_bar_->AddLens(lens);
 
   nux::ObjectPtr<LensView> view(new LensView(lens, search_bar_->show_filters()));
@@ -1366,70 +1371,20 @@
 
   if (g_str_has_prefix(uri.c_str(), "application://"))
   {
-    std::string appname = uri.substr(14);
-    return LaunchApp(appname);
+    std::string const& appname = uri.substr(14);
+    return application_starter_->Launch(appname, last_activated_timestamp_);
   }
   else if (g_str_has_prefix(uri.c_str(), "unity-runner://"))
   {
-    std::string appname = uri.substr(15);
-    return LaunchApp(appname);
+    std::string const& appname = uri.substr(15);
+    return application_starter_->Launch(appname, last_activated_timestamp_);
   }
   else
-    return gtk_show_uri(NULL, uri.c_str(), CurrentTime, NULL);
+    return gtk_show_uri(NULL, uri.c_str(), last_activated_timestamp_, NULL);
 
   return false;
 }
 
-bool DashView::LaunchApp(std::string const& appname)
-{
-  GDesktopAppInfo* info;
-  bool ret = false;
-  char *id = g_strdup(appname.c_str());
-  int i = 0;
-
-  LOG_DEBUG(logger) << "Launching " << appname;
-
-  while (id != NULL)
-  {
-    info = g_desktop_app_info_new(id);
-    if (info != NULL)
-    {
-      GError* error = NULL;
-
-      g_app_info_launch(G_APP_INFO(info), NULL, NULL, &error);
-      if (error)
-      {
-        g_warning("Unable to launch %s: %s", id,  error->message);
-        g_error_free(error);
-      }
-      else
-        ret = true;
-      g_object_unref(info);
-      break;
-    }
-
-    /* Try to replace the next - with a / and do the lookup again.
-     * If we set id=NULL we'll exit the outer loop */
-    for (i = 0; ; i++)
-    {
-      if (id[i] == '-')
-      {
-        id[i] = '/';
-        break;
-      }
-      else if (id[i] == '\0')
-      {
-        g_free(id);
-        id = NULL;
-        break;
-      }
-    }
-  }
-
-  g_free(id);
-  return ret;
-}
-
 void DashView::DisableBlur()
 {
   renderer_.DisableBlur();
@@ -1452,7 +1407,7 @@
 
 std::string const DashView::GetIdForShortcutActivation(std::string const& shortcut) const
 {
-  Lens::Ptr lens = lenses_.GetLensForShortcut(shortcut);
+  Lens::Ptr lens = lenses_->GetLensForShortcut(shortcut);
   if (lens)
     return lens->id;
   return "";
@@ -1462,7 +1417,7 @@
 {
   std::vector<char> result;
 
-  for (Lens::Ptr lens: lenses_.GetLenses())
+  for (Lens::Ptr lens: lenses_->GetLenses())
   {
     std::string shortcut = lens->shortcut;
     if(shortcut.size() > 0)
 
=== modified file 'dash/DashView.h'
--- dash/DashView.h	2013-01-28 23:57:38 +0000
+++ dash/DashView.h	2013-03-12 22:36:20 +0000
@@ -28,6 +28,7 @@
 #include <UnityCore/HomeLens.h>
 #include <UnityCore/GLibSource.h>
 
+#include "ApplicationStarter.h"
 #include "LensBar.h"
 #include "LensView.h"
 #include "previews/PreviewContainer.h"
@@ -58,7 +59,7 @@
   typedef std::map<std::string, nux::ObjectPtr<LensView>> LensViews;
 
 public:
-  DashView();
+   DashView(Lenses::Ptr const& lenses, ApplicationStarter::Ptr const& application_starter);
   ~DashView();
 
   void AboutToShow();
@@ -131,10 +132,12 @@
   nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
 
   UBusManager ubus_manager_;
-  FilesystemLenses lenses_;
+  Lenses::Ptr lenses_;
   HomeLens::Ptr home_lens_;
   LensViews lens_views_;
 
+  ApplicationStarter::Ptr application_starter_;
+
   // View related
   PreviewStateMachine preview_state_machine_;
   previews::PreviewContainer::Ptr preview_container_;
@@ -159,7 +162,7 @@
   OverlayRenderer renderer_;
 
   std::string last_activated_uri_;
-  // we're passing this back to g_* functions, so we'll keep the g* type
+  Time last_activated_timestamp_;
   bool search_in_progress_;
   bool activate_on_finish_;
 
 
=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2013-01-09 13:33:36 +0000
+++ dash/ResultViewGrid.cpp	2013-03-12 22:36:20 +0000
@@ -208,7 +208,8 @@
   }
 
   active_index_ = index;
-  glib::Variant data(g_variant_new("(iiiiii)", column_x, row_y, column_width, row_height, left_results, right_results));
+  auto timestamp = nux::GetWindowThread()->GetGraphicsDisplay().GetCurrentEvent().x11_timestamp;
+  glib::Variant data(g_variant_new("(iiiiiii)", timestamp, column_x, row_y, column_width, row_height, left_results, right_results));
   UriActivated.emit(uri, type, data);
 }
 
 
=== modified file 'dash/StandaloneDash.cpp'
--- dash/StandaloneDash.cpp	2012-11-29 10:19:01 +0000
+++ dash/StandaloneDash.cpp	2013-03-12 22:36:20 +0000
@@ -28,6 +28,7 @@
 #include <NuxCore/AnimationController.h>
 #include <NuxCore/Logger.h>
 
+#include "ApplicationStarterImp.h"
 #include "unity-shared/BGHash.h"
 #include "unity-shared/FontSettings.h"
 #include "DashView.h"
@@ -64,7 +65,8 @@
 {
   layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
-  DashView* view = new DashView();
+  DashView* view = new DashView(std::make_shared<unity::dash::FilesystemLenses>(), 
+                                std::make_shared<unity::ApplicationStarterImp>());
   view->DisableBlur();
   view->SetMinMaxSize(WIDTH, HEIGHT);
   layout->AddView (view, 1, nux::MINOR_POSITION_CENTER);
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-03-08 12:46:41 +0000
+++ tests/CMakeLists.txt	2013-03-12 22:36:20 +0000
@@ -202,6 +202,7 @@
                  test_application_launcher_icon.cpp
                  test_bamf_application.cpp
                  test_bfb_launcher_icon.cpp
+                 test_dash_view.cpp
                  test_dashview_impl.cpp
                  test_dash_controller.cpp
                  test_desktop_launcher_icon.cpp
 
=== added file 'tests/mock-lenses.h'
--- tests/mock-lenses.h	1970-01-01 00:00:00 +0000
+++ tests/mock-lenses.h	2013-03-12 22:36:20 +0000
@@ -0,0 +1,271 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright (C) 2013 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/>.
+*
+*/
+
+#ifndef UNITY_TESTS_MOCK_LENSES_H
+#define UNITY_TESTS_MOCK_LENSES_H
+
+#include <dee.h>
+
+#include <UnityCore/GLibWrapper.h>
+#include <UnityCore/GLibSource.h>
+#include <UnityCore/Lens.h>
+#include <UnityCore/Lenses.h>
+
+namespace testmocks {
+
+/*
+ * FORWARDS
+ */
+
+class MockTestLens;
+
+/*
+ * Mock Lens instance that does not use DBus. The default search does like this:
+ * For input "bar" output:
+ *
+ * i = 0
+ * for letter in "bar":
+ *   put result row [ "uri+$letter+$lens_id", "icon+$letter+$lens_id", i % 3, "mime+$letter+$lens_id", ...]
+ *   i++
+ *
+ * The mock lens has 3 categories:
+ *
+ *  0) "cat0+$lens_id"
+ *  1) "cat1+$lens_id"
+ *  2) "Shared cat"
+ */
+class MockTestLens : public unity::dash::Lens
+{
+public:
+  typedef std::shared_ptr<MockTestLens> Ptr;
+
+  MockTestLens(std::string const& id, std::string const& name, std::string const& description, std::string const& search_hint)
+    : Lens(id, "", "", name, "lens-icon.png",
+           description, search_hint, true, "",
+           unity::dash::ModelType::LOCAL)
+    , num_results_(-1)
+    , provides_personal_results_(true)
+  {
+    search_in_global(true);
+    connected.SetGetterFunction(sigc::mem_fun(this, &MockTestLens::force_connected));
+    provides_personal_content.SetGetterFunction(sigc::mem_fun(this, &MockTestLens::get_provides_personal_results));
+
+    DeeModel* cats = categories()->model();
+    DeeModel* results = global_results()->model();
+    DeeModel* flters = filters()->model();
+
+    // Set model schemas
+    dee_model_set_schema(cats, "s", "s", "s", "a{sv}", NULL);
+    dee_model_set_schema(results, "s", "s", "u", "s", "s", "s", "s", NULL);
+    dee_model_set_schema(flters, "s", "s", "s", "s", "a{sv}", "b", "b", "b", NULL);
+
+    // Populate categories model
+    std::ostringstream cat0, cat1;
+    cat0 << "cat0+" << id;
+    cat1 << "cat1+" << id;
+    GVariantBuilder b;
+    g_variant_builder_init(&b, G_VARIANT_TYPE_VARDICT);
+    GVariant *asv = g_variant_builder_end(&b);
+
+    dee_model_append(cats, cat0.str().c_str(), "icon.png", "tile-vertical", asv);
+    dee_model_append(cats, cat1.str().c_str(), "icon.png", "tile-vertical", asv);
+    dee_model_append(cats, "Shared cat", "icon.png", "tile-vertical", asv);
+  }
+
+  virtual ~MockTestLens() {}
+
+  bool force_connected()
+  {
+    return true;
+  }
+
+  bool get_provides_personal_results()
+  {
+    return provides_personal_results_;
+  }
+
+  virtual void DoGlobalSearch(std::string const& search_string)
+  {
+    DeeModel* model = global_results()->model();
+    GVariant** row_buf = g_new(GVariant*, 8);
+
+    row_buf[1] = g_variant_new_string("");
+    row_buf[3] = g_variant_new_string("");
+    row_buf[5] = g_variant_new_string("");
+    row_buf[6] = g_variant_new_string("");
+    row_buf[7] = NULL;
+
+    unsigned int i;
+    unsigned int results_count = search_string.size();
+    if (num_results_ >= 0) results_count = static_cast<unsigned>(num_results_);
+    for (i = 0; i < results_count; i++)
+    {
+      std::ostringstream uri;
+      char res_id(i >= search_string.size() ? '-' : search_string.at(i));
+      uri << "uri+" << res_id << "+" << id();
+      row_buf[0] = g_variant_new_string(uri.str().c_str());
+      row_buf[2] = g_variant_new_uint32(i % 3);
+      unity::glib::String name(g_strdup_printf("%s - %d",
+            results_base_name_.empty() ?
+                search_string.c_str() : results_base_name_.c_str(),
+            i));
+      row_buf[4] = g_variant_new_string(name);
+
+      dee_model_append_row(model, row_buf);
+    }
+
+    g_free(row_buf);
+  }
+
+  void GlobalSearch(std::string const& search_string,
+                    SearchFinishedCallback const& cb)
+  {
+    /* Dispatch search async, because that's what it'd normally do */
+    source_manager_.Add(new unity::glib::Idle([this, search_string, cb] ()
+    {
+      DoGlobalSearch(search_string);
+      cb(Lens::Hints(), unity::glib::Error());
+      return false;
+    }));
+  }
+
+  void Search(std::string const& search_string, SearchFinishedCallback const& cb)
+  {
+    /* Dispatch search async, because that's what it'd normally do */
+    source_manager_.Add(new unity::glib::Idle([search_string, cb] ()
+    {
+      cb(Lens::Hints(), unity::glib::Error());
+      return false;
+    }));
+  }
+
+  void Activate(std::string const& uri)
+  {
+
+  }
+
+  void Preview(std::string const& uri)
+  {
+
+  }
+
+  void SetResultsBaseName(std::string const& name)
+  {
+    results_base_name_ = name;
+  }
+
+  void SetNumResults(int count)
+  {
+    num_results_ = count;
+  }
+
+  void SetProvidesPersonalResults(bool value)
+  {
+    provides_personal_results_ = value;
+  }
+
+private:
+  std::string results_base_name_;
+  int num_results_;
+  bool provides_personal_results_;
+  unity::glib::SourceManager source_manager_;
+};
+
+/*
+ * Mock Lenses class
+ */
+class MockTestLenses : public unity::dash::Lenses
+{
+public:
+  typedef std::shared_ptr<MockTestLenses> Ptr;
+
+  MockTestLenses()
+  {
+    count.SetGetterFunction(sigc::mem_fun(&list_, &unity::dash::Lenses::LensList::size));
+  }
+
+  virtual ~MockTestLenses() {}
+
+  unity::dash::Lenses::LensList GetLenses() const
+  {
+    return list_;
+  }
+
+  unity::dash::Lens::Ptr GetLens(std::string const& lens_id) const
+  {
+    for (auto lens : list_)
+    {
+      if (lens->id() == lens_id)
+        return lens;
+    }
+    return unity::dash::Lens::Ptr();
+  }
+
+  unity::dash::Lens::Ptr GetLensAtIndex(std::size_t index) const
+  {
+    return list_.at(index);
+  }
+
+  unity::dash::Lens::Ptr GetLensForShortcut(std::string const& lens_shortcut) const override
+  {
+    return unity::dash::Lens::Ptr();
+  }
+
+
+protected:
+  unity::dash::Lenses::LensList list_;
+};
+
+class TwoMockTestLenses : public MockTestLenses
+{
+public:
+  TwoMockTestLenses()
+  : lens_1_(new MockTestLens("first.lens", "First Lens", "The very first lens", "First search hint"))
+  , lens_2_(new MockTestLens("second.lens", "Second Lens", "The second lens", "Second search hint"))
+  {
+    list_.push_back(lens_1_);
+    list_.push_back(lens_2_);
+  }
+
+private:
+  unity::dash::Lens::Ptr lens_1_;
+  unity::dash::Lens::Ptr lens_2_;
+};
+
+class ThreeMockTestLenses : public MockTestLenses
+{
+public:
+  ThreeMockTestLenses()
+  : lens_1_(new MockTestLens("first.lens", "First Lens", "The very first lens", "First search hint"))
+  , lens_2_(new MockTestLens("second.lens", "Second Lens", "The second lens", "Second search hint"))
+  , lens_3_(new MockTestLens("applications.lens", "Applications", "The applications lens", "Search applications"))
+  {
+    list_.push_back(lens_1_);
+    list_.push_back(lens_2_);
+    list_.push_back(lens_3_);
+  }
+
+private:
+  unity::dash::Lens::Ptr lens_1_;
+  unity::dash::Lens::Ptr lens_2_;
+  unity::dash::Lens::Ptr lens_3_;
+};
+
+}
+
+#endif
 
=== added file 'tests/test_dash_view.cpp'
--- tests/test_dash_view.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_dash_view.cpp	2013-03-12 22:36:20 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2013 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/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#include <gmock/gmock.h>
+
+#include <UnityCore/Lenses.h>
+
+#include "ApplicationStarter.h"
+#include "DashView.h"
+#include "unity-shared/DashStyle.h"
+#include "unity-shared/PanelStyle.h"
+#include "unity-shared/UnitySettings.h"
+
+#include "mock-lenses.h"
+
+using namespace unity::dash;
+using namespace testing;
+
+namespace  {
+
+struct MockApplicationStarter : public unity::ApplicationStarter {
+  typedef std::shared_ptr<MockApplicationStarter> Ptr;
+  MOCK_METHOD2(Launch, bool(std::string const&, Time));
+};
+
+
+struct TestDashView : public testing::Test {
+  TestDashView()
+    : lenses_(std::make_shared<testmocks::ThreeMockTestLenses>())
+    , application_starter_(std::make_shared<MockApplicationStarter>())
+    , dash_view_(new DashView(lenses_, application_starter_))
+  {}
+
+  unity::Settings unity_settings_;
+  Style dash_style;
+  unity::panel::Style panel_style;
+  Lenses::Ptr lenses_;
+  MockApplicationStarter::Ptr application_starter_;
+  nux::ObjectPtr<DashView> dash_view_;
+};
+
+
+TEST_F(TestDashView, LensActivatedSignal)
+{
+  EXPECT_CALL(*application_starter_, Launch("uri", _)).Times(1);
+  lenses_->GetLensAtIndex(0)->activated.emit("0xaabbcc:application://uri", NOT_HANDLED, Lens::Hints());
+
+  EXPECT_CALL(*application_starter_, Launch("uri", _)).Times(1);
+  lenses_->GetLensAtIndex(0)->activated.emit("0xaabbcc:unity-runner://uri", NOT_HANDLED, Lens::Hints());
+}
+
+}
 
=== modified file 'tests/test_home_lens.cpp'
--- tests/test_home_lens.cpp	2012-11-14 08:57:56 +0000
+++ tests/test_home_lens.cpp	2013-03-12 22:36:20 +0000
@@ -1,7 +1,5 @@
 #include <gtest/gtest.h>
 #include <glib-object.h>
-#include <dee.h>
-#include <string>
 #include <iostream>
 #include <stdexcept>
 #include <map>
@@ -9,254 +7,21 @@
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
 
-#include <UnityCore/GLibWrapper.h>
-#include <UnityCore/GLibSource.h>
+
 #include <UnityCore/Variant.h>
 #include <UnityCore/HomeLens.h>
-#include <UnityCore/Lens.h>
-#include <UnityCore/Lenses.h>
 
 #include "test_utils.h"
+#include "mock-lenses.h"
 
 using namespace std;
 using namespace unity;
 using namespace unity::dash;
+using namespace testmocks;
 
 namespace
 {
 
-/*
- * FORWARDS
- */
-
-class StaticTestLens;
-
-/*
- * Mock Lens instance that does not use DBus. The default search does like this:
- * For input "bar" output:
- *
- * i = 0
- * for letter in "bar":
- *   put result row [ "uri+$letter+$lens_id", "icon+$letter+$lens_id", i % 3, "mime+$letter+$lens_id", ...]
- *   i++
- *
- * The mock lens has 3 categories:
- *
- *  0) "cat0+$lens_id"
- *  1) "cat1+$lens_id"
- *  2) "Shared cat"
- */
-class StaticTestLens : public Lens
-{
-public:
-  typedef std::shared_ptr<StaticTestLens> Ptr;
-
-  StaticTestLens(string const& id, string const& name, string const& description, string const& search_hint)
-    : Lens(id, "", "", name, "lens-icon.png",
-           description, search_hint, true, "",
-           ModelType::LOCAL)
-    , num_results_(-1)
-    , provides_personal_results_(true)
-  {
-    search_in_global(true);
-    connected.SetGetterFunction(sigc::mem_fun(this, &StaticTestLens::force_connected));
-    provides_personal_content.SetGetterFunction(sigc::mem_fun(this, &StaticTestLens::get_provides_personal_results));
-
-    DeeModel* cats = categories()->model();
-    DeeModel* results = global_results()->model();
-    DeeModel* flters = filters()->model();
-
-    // Set model schemas
-    dee_model_set_schema(cats, "s", "s", "s", "a{sv}", NULL);
-    dee_model_set_schema(results, "s", "s", "u", "s", "s", "s", "s", NULL);
-    dee_model_set_schema(flters, "s", "s", "s", "s", "a{sv}", "b", "b", "b", NULL);
-
-    // Populate categories model
-    ostringstream cat0, cat1;
-    cat0 << "cat0+" << id;
-    cat1 << "cat1+" << id;
-    GVariantBuilder b;
-    g_variant_builder_init(&b, G_VARIANT_TYPE_VARDICT);
-    GVariant *asv = g_variant_builder_end(&b);
-
-    dee_model_append(cats, cat0.str().c_str(), "icon.png", "tile-vertical", asv);
-    dee_model_append(cats, cat1.str().c_str(), "icon.png", "tile-vertical", asv);
-    dee_model_append(cats, "Shared cat", "icon.png", "tile-vertical", asv);
-  }
-
-  virtual ~StaticTestLens() {}
-
-  bool force_connected()
-  {
-    return true;
-  }
-
-  bool get_provides_personal_results()
-  {
-    return provides_personal_results_;
-  }
-
-  virtual void DoGlobalSearch(string const& search_string)
-  {
-    DeeModel* model = global_results()->model();
-    GVariant** row_buf = g_new(GVariant*, 8);
-
-    row_buf[1] = g_variant_new_string("");
-    row_buf[3] = g_variant_new_string("");
-    row_buf[5] = g_variant_new_string("");
-    row_buf[6] = g_variant_new_string("");
-    row_buf[7] = NULL;
-
-    unsigned int i;
-    unsigned int results_count = search_string.size();
-    if (num_results_ >= 0) results_count = static_cast<unsigned>(num_results_);
-    for (i = 0; i < results_count; i++)
-    {
-      ostringstream uri;
-      char res_id(i >= search_string.size() ? '-' : search_string.at(i));
-      uri << "uri+" << res_id << "+" << id();
-      row_buf[0] = g_variant_new_string(uri.str().c_str());
-      row_buf[2] = g_variant_new_uint32(i % 3);
-      glib::String name(g_strdup_printf("%s - %d",
-            results_base_name_.empty() ?
-                search_string.c_str() : results_base_name_.c_str(),
-            i));
-      row_buf[4] = g_variant_new_string(name);
-
-      dee_model_append_row(model, row_buf);
-    }
-
-    g_free(row_buf);
-  }
-
-  void GlobalSearch(string const& search_string,
-                    SearchFinishedCallback const& cb)
-  {
-    /* Dispatch search async, because that's what it'd normally do */
-    source_manager_.Add(new glib::Idle([this, search_string, cb] ()
-    {
-      DoGlobalSearch(search_string);
-      cb(Lens::Hints(), glib::Error());
-      return false;
-    }));
-  }
-
-  void Search(string const& search_string, SearchFinishedCallback const& cb)
-  {
-    /* Dispatch search async, because that's what it'd normally do */
-    source_manager_.Add(new glib::Idle([search_string, cb] ()
-    {
-      cb(Lens::Hints(), glib::Error());
-      return false;
-    }));
-  }
-
-  void Activate(string const& uri)
-  {
-
-  }
-
-  void Preview(string const& uri)
-  {
-
-  }
-
-  void SetResultsBaseName(string const& name)
-  {
-    results_base_name_ = name;
-  }
-
-  void SetNumResults(int count)
-  {
-    num_results_ = count;
-  }
-
-  void SetProvidesPersonalResults(bool value)
-  {
-    provides_personal_results_ = value;
-  }
-
-private:
-  string results_base_name_;
-  int num_results_;
-  bool provides_personal_results_;
-  glib::SourceManager source_manager_;
-};
-
-/*
- * Mock Lenses class
- */
-class StaticTestLenses : public Lenses
-{
-public:
-  typedef std::shared_ptr<StaticTestLenses> Ptr;
-
-  StaticTestLenses()
-  {
-    count.SetGetterFunction(sigc::mem_fun(&list_, &Lenses::LensList::size));
-  }
-
-  virtual ~StaticTestLenses() {}
-
-  Lenses::LensList GetLenses() const
-  {
-    return list_;
-  }
-
-  Lens::Ptr GetLens(std::string const& lens_id) const
-  {
-    for (auto lens : list_)
-    {
-      if (lens->id() == lens_id)
-        return lens;
-    }
-    return Lens::Ptr();
-  }
-
-  Lens::Ptr GetLensAtIndex(std::size_t index) const
-  {
-    return list_.at(index);
-  }
-
-protected:
-  Lenses::LensList list_;
-};
-
-class TwoStaticTestLenses : public StaticTestLenses
-{
-public:
-  TwoStaticTestLenses()
-  : lens_1_(new StaticTestLens("first.lens", "First Lens", "The very first lens", "First search hint"))
-  , lens_2_(new StaticTestLens("second.lens", "Second Lens", "The second lens", "Second search hint"))
-  {
-    list_.push_back(lens_1_);
-    list_.push_back(lens_2_);
-  }
-
-private:
-  Lens::Ptr lens_1_;
-  Lens::Ptr lens_2_;
-};
-
-class ThreeStaticTestLenses : public StaticTestLenses
-{
-public:
-  ThreeStaticTestLenses()
-  : lens_1_(new StaticTestLens("first.lens", "First Lens", "The very first lens", "First search hint"))
-  , lens_2_(new StaticTestLens("second.lens", "Second Lens", "The second lens", "Second search hint"))
-  , lens_3_(new StaticTestLens("applications.lens", "Applications", "The applications lens", "Search applications"))
-  {
-    list_.push_back(lens_1_);
-    list_.push_back(lens_2_);
-    list_.push_back(lens_3_);
-  }
-
-private:
-  Lens::Ptr lens_1_;
-  Lens::Ptr lens_2_;
-  Lens::Ptr lens_3_;
-};
-
 TEST(TestHomeLens, TestConstruction)
 {
   HomeLens home_lens_("name", "description", "searchhint");
@@ -286,7 +51,7 @@
 TEST(TestHomeLens, TestTwoStaticLenses)
 {
   HomeLens home_lens_("name", "description", "searchhint");
-  TwoStaticTestLenses lenses_;
+  std::shared_ptr<Lenses> lenses_ = std::make_shared<TwoMockTestLenses>();
 
   home_lens_.AddLenses(lenses_);
 
@@ -312,7 +77,7 @@
 {
   HomeLens home_lens_("name", "description", "searchhint",
                       HomeLens::MergeMode::DISPLAY_NAME);
-  TwoStaticTestLenses lenses_;
+  std::shared_ptr<Lenses> lenses_ = std::make_shared<TwoMockTestLenses>();
   DeeModel* cats = home_lens_.categories()->model();
   DeeModelIter* iter;
   unsigned int cat0_first = 0,
@@ -347,7 +112,7 @@
 {
   HomeLens home_lens_("name", "description", "searchhint",
                       HomeLens::MergeMode::OWNER_LENS);
-  TwoStaticTestLenses lenses_;
+  std::shared_ptr<Lenses> lenses_ = std::make_shared<TwoMockTestLenses>();
   DeeModel* cats = home_lens_.categories()->model();
   DeeModelIter* iter;
   const unsigned int NAME_COLUMN = 0;
@@ -371,7 +136,7 @@
 TEST(TestHomeLens, TestIgnoreFilters)
 {
   HomeLens home_lens_("name", "description", "searchhint");
-  TwoStaticTestLenses lenses_;
+  std::shared_ptr<Lenses> lenses_ = std::make_shared<TwoMockTestLenses>();
   DeeModel* filters = home_lens_.filters()->model();
 
   EXPECT_EQ(dee_model_get_n_rows(filters), 0);
@@ -381,7 +146,7 @@
 {
   HomeLens home_lens_("name", "description", "searchhint",
                       HomeLens::MergeMode::DISPLAY_NAME);
-  TwoStaticTestLenses lenses_;
+  std::shared_ptr<Lenses> lenses_ = std::make_shared<TwoMockTestLenses>();
   DeeModel* results = home_lens_.results()->model();
   DeeModel* cats = home_lens_.categories()->model();
   DeeModel* filters = home_lens_.filters()->model();
@@ -440,7 +205,7 @@
 {
   HomeLens home_lens_("name", "description", "searchhint",
                       HomeLens::MergeMode::OWNER_LENS);
-  ThreeStaticTestLenses lenses_;
+  std::shared_ptr<Lenses> lenses_ = std::make_shared<ThreeMockTestLenses>();
   DeeModel* results = home_lens_.results()->model();
   DeeModel* cats = home_lens_.categories()->model();
   DeeModel* filters = home_lens_.filters()->model();
@@ -491,14 +256,14 @@
 {
   HomeLens home_lens_("name", "description", "searchhint",
                       HomeLens::MergeMode::OWNER_LENS);
-  ThreeStaticTestLenses lenses_;
+  std::shared_ptr<Lenses> lenses_ = std::make_shared<ThreeMockTestLenses>();
   // the lens is added as third, so must have cat == 2
   unsigned int apps_lens_cat = 2;
 
   home_lens_.AddLenses(lenses_);
-  Lens::Ptr apps_lens = lenses_.GetLens("applications.lens");
+  Lens::Ptr apps_lens = lenses_->GetLens("applications.lens");
 
-  auto static_lens = dynamic_pointer_cast<StaticTestLens>(apps_lens);
+  auto static_lens = dynamic_pointer_cast<MockTestLens>(apps_lens);
   static_lens->SetNumResults(1);
 
   bool order_changed = false;
@@ -535,14 +300,14 @@
 {
   HomeLens home_lens_("name", "description", "searchhint",
                       HomeLens::MergeMode::OWNER_LENS);
-  ThreeStaticTestLenses lenses_;
+  std::shared_ptr<Lenses> lenses_ = std::make_shared<ThreeMockTestLenses>();
   // the lens is added as third, so must have cat == 2
   unsigned int apps_lens_cat = 2;
 
   home_lens_.AddLenses(lenses_);
-  Lens::Ptr apps_lens = lenses_.GetLens("applications.lens");
+  Lens::Ptr apps_lens = lenses_->GetLens("applications.lens");
 
-  auto static_lens = dynamic_pointer_cast<StaticTestLens>(apps_lens);
+  auto static_lens = dynamic_pointer_cast<MockTestLens>(apps_lens);
   static_lens->SetResultsBaseName("noapes");
   static_lens->SetNumResults(1);
 
@@ -579,7 +344,7 @@
 {
   HomeLens home_lens_("name", "description", "searchhint",
                       HomeLens::MergeMode::OWNER_LENS);
-  ThreeStaticTestLenses lenses_;
+  std::shared_ptr<Lenses> lenses_ = std::make_shared<ThreeMockTestLenses>();
   unsigned int lens1_cat = 0;
   unsigned int lens2_cat = 1;
   // the lens is added as third, so must have cat == 2
@@ -587,14 +352,14 @@
 
   home_lens_.AddLenses(lenses_);
 
-  Lens::Ptr lens = lenses_.GetLensAtIndex(2);
-  auto static_lens = dynamic_pointer_cast<StaticTestLens>(lens);
+  Lens::Ptr lens = lenses_->GetLensAtIndex(2);
+  auto static_lens = dynamic_pointer_cast<MockTestLens>(lens);
   static_lens->SetResultsBaseName("noapes"); // no exact match in apps lens
   static_lens->SetNumResults(2);
 
-  static_lens = dynamic_pointer_cast<StaticTestLens>(lenses_.GetLensAtIndex(0));
+  static_lens = dynamic_pointer_cast<MockTestLens>(lenses_->GetLensAtIndex(0));
   static_lens->SetNumResults(1);
-  static_lens = dynamic_pointer_cast<StaticTestLens>(lenses_.GetLensAtIndex(1));
+  static_lens = dynamic_pointer_cast<MockTestLens>(lenses_->GetLensAtIndex(1));
   static_lens->SetNumResults(3);
 
   bool order_changed = false;
@@ -638,7 +403,7 @@
 {
   HomeLens home_lens_("name", "description", "searchhint",
                       HomeLens::MergeMode::OWNER_LENS);
-  ThreeStaticTestLenses lenses_;
+  std::shared_ptr<Lenses> lenses_ = std::make_shared<ThreeMockTestLenses>();
   unsigned int lens1_cat = 0;
   unsigned int lens2_cat = 1;
   // the lens is added as third, so must have cat == 2
@@ -652,14 +417,14 @@
    * lens3 -> 2 results (apps.lens)
    */
 
-  Lens::Ptr lens = lenses_.GetLensAtIndex(2);
-  auto static_lens = dynamic_pointer_cast<StaticTestLens>(lens);
+  Lens::Ptr lens = lenses_->GetLensAtIndex(2);
+  auto static_lens = dynamic_pointer_cast<MockTestLens>(lens);
   static_lens->SetResultsBaseName("noapes"); // no exact match in apps lens
   static_lens->SetNumResults(2);
 
-  static_lens = dynamic_pointer_cast<StaticTestLens>(lenses_.GetLensAtIndex(0));
+  static_lens = dynamic_pointer_cast<MockTestLens>(lenses_->GetLensAtIndex(0));
   static_lens->SetNumResults(1);
-  static_lens = dynamic_pointer_cast<StaticTestLens>(lenses_.GetLensAtIndex(1));
+  static_lens = dynamic_pointer_cast<MockTestLens>(lenses_->GetLensAtIndex(1));
   static_lens->SetNumResults(3);
   static_lens->SetProvidesPersonalResults(false);
 
@@ -698,7 +463,7 @@
 {
   HomeLens home_lens_("name", "description", "searchhint",
                       HomeLens::MergeMode::OWNER_LENS);
-  ThreeStaticTestLenses lenses_;
+  std::shared_ptr<Lenses> lenses_ = std::make_shared<ThreeMockTestLenses>();
   unsigned int lens1_cat = 0;
   unsigned int lens2_cat = 1;
   // the lens is added as third, so must have cat == 2
@@ -712,13 +477,13 @@
    * lens3 -> 0 results (apps.lens)
    */
 
-  Lens::Ptr lens = lenses_.GetLensAtIndex(2);
-  auto static_lens = dynamic_pointer_cast<StaticTestLens>(lens);
+  Lens::Ptr lens = lenses_->GetLensAtIndex(2);
+  auto static_lens = dynamic_pointer_cast<MockTestLens>(lens);
   static_lens->SetNumResults(0);
 
-  static_lens = dynamic_pointer_cast<StaticTestLens>(lenses_.GetLensAtIndex(0));
+  static_lens = dynamic_pointer_cast<MockTestLens>(lenses_->GetLensAtIndex(0));
   static_lens->SetNumResults(1);
-  static_lens = dynamic_pointer_cast<StaticTestLens>(lenses_.GetLensAtIndex(1));
+  static_lens = dynamic_pointer_cast<MockTestLens>(lenses_->GetLensAtIndex(1));
   static_lens->SetNumResults(3);
   static_lens->SetProvidesPersonalResults(false);