Merge lp:~mhr3/unity/fix-966417 into lp:unity

[Michal Hruby]

Make sure applications can be started from the HomeLens as soon as we get results from apps lens

All the lenses are currently waiting for results before one can execute an item - this is to prevent issues where you quickly type for example "gedit" in the dash and since the results might not be available at the time when you press enter (but they will a couple of milliseconds later) we could launch incorrect item if we didn't wait.
Unfortunately this is a huge problem particularly in the home lens which aggregates results from multiple lenses, so even though you see gedit being in the result set, unity won't launch it, because it's waiting for the files lens to finish searching.

To circumvent the issue and still maintain some determinism, the home lens is now waiting for results from the apps lens before launching an item. (if we just waited for results from any lens, what could happen is that sometimes gedit would launch gedit while other times gedit would launch firefox with a tweet from someone mentioning gedit - a possible result from gwibber lens)

Added AP test for the issue.

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

Please remove the following imports, as you don't need them:

67 +from subprocess import call
70 +from autopilot.emulators.bamf import Bamf

You don't need this:

80 + self.dash = Dash()

...as it's done already in the AutopilotTestCase. This means you also don't need to import the Dash.

You also don't need this:

93 + kb = Keyboard()

use self.keyboard instead - this means you don't need the Keyboard import.

Finally, I have two really small requests:

 1) Please change the author name in the copyright header :)
 2) Docstrings for tests should avoid words like 'should', in favour of stronger words like 'must'. How about something like: """Hitting enter must run an application even though the search has not finished yet."""

Apart from the issues above, nice test - thanks!
Cheers,

review: Needs Fixing

[Michal Hruby (mhr3)]

And... fixed

[Gord Allott (gordallott)]

review: Approve

=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2012-03-29 18:06:53 +0000
+++ plugins/unityshell/src/DashView.cpp	2012-04-02 07:59:18 +0000
@@ -457,6 +457,14 @@
   lens->activated.connect(sigc::mem_fun(this, &DashView::OnUriActivatedReply));
   lens->search_finished.connect(sigc::mem_fun(this, &DashView::OnSearchFinished));
   // global search done is handled by the home lens, no need to connect to it
+  // BUT, we will special case global search finished coming from 
+  // the applications lens, because we want to be able to launch applications
+  // immediately without waiting for the search finished signal which will
+  // be delayed by all the lenses we're searching
+  if (id == "applications.lens")
+  {
+    lens->global_search_finished.connect(sigc::mem_fun(this, &DashView::OnAppsGlobalSearchFinished));
+  }
 }
 
 void DashView::OnLensBarActivated(std::string const& id)
@@ -531,6 +539,22 @@
     OnSearchFinished(hints);
 }
 
+void DashView::OnAppsGlobalSearchFinished(Lens::Hints const& hints)
+{
+  if (active_lens_view_ == home_view_)
+  {
+    /* HACKITY HACK! We're resetting the state of search_in_progress when
+     * doing searches in the home lens and we get results from apps lens.
+     * This way typing a search query and pressing enter immediately will
+     * wait for the apps lens results and will run correct application.
+     * See lp:966417 and lp:856206 for more info about why we do this.
+     */
+    search_in_progress_ = false;
+    if (activate_on_finish_)
+      this->OnEntryActivated();
+  }
+}
+
 void DashView::OnUriActivated(std::string const& uri)
 {
   last_activated_uri_ = uri;

=== modified file 'plugins/unityshell/src/DashView.h'
--- plugins/unityshell/src/DashView.h	2012-03-21 14:18:06 +0000
+++ plugins/unityshell/src/DashView.h	2012-04-02 07:59:18 +0000
@@ -90,6 +90,7 @@
   void OnLensBarActivated(std::string const& id);
   void OnSearchFinished(Lens::Hints const& hints);
   void OnGlobalSearchFinished(Lens::Hints const& hints);
+  void OnAppsGlobalSearchFinished(Lens::Hints const& hints);
   void OnUriActivated(std::string const& uri);
   void OnUriActivatedReply(std::string const& uri, HandledType type, Lens::Hints const&);
   bool DoFallbackActivation(std::string const& uri);

=== added file 'tests/autopilot/autopilot/tests/test_home_lens.py'
--- tests/autopilot/autopilot/tests/test_home_lens.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/autopilot/tests/test_home_lens.py	2012-04-02 07:59:18 +0000
@@ -0,0 +1,39 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2012 Canonical
+# Author: Michal Hruby
+#
+# 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.
+
+from time import sleep
+
+from autopilot.emulators.unity.dash import Dash
+from autopilot.tests import AutopilotTestCase
+
+
+class HomeLensSearchTests(AutopilotTestCase):
+    """Test the command lense search bahavior."""
+
+    def setUp(self):
+        super(HomeLensSearchTests, self).setUp()
+
+    def tearDown(self):
+        self.dash.ensure_hidden()
+        super(HomeLensSearchTests, self).tearDown()
+
+    def test_quick_run_app(self):
+        """Hitting enter runs an application even though a search might not have fully finished yet."""
+        if self.app_is_running("Text Editor"):
+            self.close_all_app("Text Editor")
+            sleep(1)
+
+        kb = self.keyboard
+        self.dash.ensure_visible()
+        kb.type("g")
+        sleep(1)
+        kb.type("edit", 0.1)
+        kb.press_and_release("Enter", 0.1)
+        self.addCleanup(self.close_all_app,  "Text Editor")
+        app_found = self.bamf.wait_until_application_is_running("gedit.desktop", 5)
+        self.assertTrue(app_found)