Merge lp:~unity-team/unity/unity.fix-870284 into lp:unity

[Mirco Müller]

Using UBus to inform the Dash about the initiation of the scale-plugin (spread), thus it always closes correctly. It comes with alomst working autopilot regression test and UBus-messages for triggering/stopping the scale-plugin (spread).

Unmerged revisions

1984. By Mirco Müller on 2012-03-01

Added correct regression test for bug-fix for LP: #870284 ... although it still fails in the last assertion.

1983. By Thomi Richards on 2012-02-29

DashCOntroller uses variant wrapper. Split spread test into two smaller tests, and now use keybinding from compiz.

1982. By Mirco Müller on 2012-02-28

Further trying to get the autopilot test to work

1981. By Mirco Müller on 2012-02-28

More fixing after re-merge with trunk

1980. By Mirco Müller on 2012-02-28

Re-merged with trunk... solved merge-conflicts... grrrrr... hope nothing breaks

1979. By Mirco Müller on 2012-02-28

Still trying to make the autopilot-test work... this is so much fun

1978. By Mirco Müller on 2012-02-28

Added autopilot-test and extended required infrastructure for catching any regressions regarding LP: #870284

1977. By Mirco Müller on 2012-02-17

Inform the Dash via ubus that the scale-plugin was activated and close itself

=== modified file 'plugins/unityshell/src/DashController.cpp'
--- plugins/unityshell/src/DashController.cpp	2012-02-21 02:46:18 +0000
+++ plugins/unityshell/src/DashController.cpp	2012-03-01 14:54:36 +0000
@@ -20,6 +20,7 @@
 
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
+#include <UnityCore/Variant.h>
 
 #include "DashSettings.h"
 #include "PanelStyle.h"
@@ -42,6 +43,7 @@
   , window_(0)
   , visible_(false)
   , need_show_(false)
+  , spread_active_(false)
   , timeline_id_(0)
   , last_opacity_(0.0f)
   , start_time_(0)
@@ -129,6 +131,10 @@
       HideDash(true);
     }
   });
+  ubus_manager_.RegisterInterest(UBUS_SCALE_INITIATED,
+                                 sigc::mem_fun(this, &Controller::OnScaleInitiated));
+  ubus_manager_.RegisterInterest(UBUS_SCALE_TERMINATED,
+                                 sigc::mem_fun(this, &Controller::OnScaleTerminated));
 }
 
 void Controller::EnsureDash()
@@ -343,6 +349,22 @@
   ShowDash();
 }
 
+void Controller::OnScaleInitiated(GVariant* variant)
+{
+  HideDash(true);
+
+  // needed so the spread is testable via autopilot, also a means to protect
+  // against regressions for 870284
+  spread_active_ = true;
+}
+
+void Controller::OnScaleTerminated(GVariant* variant)
+{
+  // needed so the spread is testable via autopilot, also a means to protect
+  // against regressions for 870284
+  spread_active_ = false;
+}
+
 gboolean Controller::CheckShortcutActivation(const char* key_string)
 {
   EnsureDash();
@@ -369,7 +391,9 @@
 
 void Controller::AddProperties(GVariantBuilder* builder)
 {
-  g_variant_builder_add (builder, "{sv}", "visible", g_variant_new_boolean (visible_) );
+  variant::BuilderWrapper(builder)
+    .add("visible", visible_)
+    .add("spread_active", spread_active_);
 }
 
 

=== modified file 'plugins/unityshell/src/DashController.h'
--- plugins/unityshell/src/DashController.h	2012-02-15 10:54:48 +0000
+++ plugins/unityshell/src/DashController.h	2012-03-01 14:54:36 +0000
@@ -74,6 +74,8 @@
   void OnExternalShowDash(GVariant* variant);
   void OnExternalHideDash(GVariant* variant);
   void OnActivateRequest(GVariant* variant);
+  void OnScaleInitiated(GVariant* variant);
+  void OnScaleTerminated(GVariant* variant);
 
   void ShowDash();
   void HideDash(bool restore_focus = true);
@@ -90,6 +92,7 @@
   nux::BaseWindow* window_;
   bool visible_;
   bool need_show_;
+  bool spread_active_;
 
   guint timeline_id_;
   float last_opacity_;

=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2012-02-22 09:55:54 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2012-03-01 14:54:36 +0000
@@ -20,6 +20,8 @@
 #include <glib.h>
 #include <sstream>
 #include "PluginAdapter.h"
+#include "ubus-server.h"
+#include "UBusMessages.h"
 
 #include <NuxCore/Logger.h>
 
@@ -354,6 +356,10 @@
   argument[0].value().set(m);
 
   m_ScaleActionList.InitiateAll(argument, state);
+
+  ubus_server_send_message(ubus_server_get_default(),
+                           UBUS_SCALE_INITIATED,
+                           nullptr);
 }
 
 void
@@ -361,6 +367,10 @@
 {
   CompOption::Vector argument(0);
   m_ScaleActionList.TerminateAll(argument);
+
+  ubus_server_send_message(ubus_server_get_default(),
+                           UBUS_SCALE_TERMINATED,
+                           nullptr);
 }
 
 bool

=== modified file 'plugins/unityshell/src/UBusMessages.h'
--- plugins/unityshell/src/UBusMessages.h	2012-02-07 07:42:12 +0000
+++ plugins/unityshell/src/UBusMessages.h	2012-03-01 14:54:36 +0000
@@ -84,4 +84,8 @@
 #define UBUS_SWITCHER_SHOWN             "SWITCHER_SHOWN"
 #define UBUS_SWITCHER_SELECTION_CHANGED "SWITCHER_SELECTION_CHANGED"
 
+// Signal used to securely tell the Dash "Scale" has been triggered
+#define UBUS_SCALE_INITIATED "SCALE_INITIATED"
+#define UBUS_SCALE_TERMINATED "SCALE_TERMINATED"
+ 
 #endif // UBUS_MESSAGES_H

=== modified file 'tests/autopilot/autopilot/keybindings.py'
--- tests/autopilot/autopilot/keybindings.py	2012-02-29 04:43:19 +0000
+++ tests/autopilot/autopilot/keybindings.py	2012-03-01 14:54:36 +0000
@@ -80,8 +80,14 @@
     "workspace/move_right": ("wall", "right_key"),
     "workspace/move_up": ("wall", "up_key"),
     "workspace/move_down": ("wall", "down_key"),
+<<<<<<< TREE
     # Window management
     "window/minimize": ("core", "minimize_window_key"),
+=======
+    # Window spread:
+    "spread/initiate": ("scale", "initiate_all_key"),
+    "spread/cancel": "Escape",
+>>>>>>> MERGE-SOURCE
 }
 
 

=== modified file 'tests/autopilot/autopilot/tests/__init__.py'
--- tests/autopilot/autopilot/tests/__init__.py	2012-02-29 23:22:25 +0000
+++ tests/autopilot/autopilot/tests/__init__.py	2012-03-01 14:54:36 +0000
@@ -16,11 +16,18 @@
 from autopilot.emulators.bamf import Bamf
 from autopilot.emulators.unity.switcher import Switcher
 from autopilot.emulators.unity.workspace import WorkspaceManager
+<<<<<<< TREE
 from autopilot.keybindings import KeybindingsHelper
 
 logger = logging.getLogger(__name__)
 
 class LoggedTestCase(TestWithScenarios, TestCase):
+=======
+from autopilot.keybindings import KeybindingsHelper
+
+
+class LoggedTestCase(TestWithScenarios, TestCase, KeybindingsHelper):
+>>>>>>> MERGE-SOURCE
     """Initialize the logging for the test case."""
 
     def setUp(self):

=== modified file 'tests/autopilot/autopilot/tests/test_dash.py'
--- tests/autopilot/autopilot/tests/test_dash.py	2012-02-27 03:56:46 +0000
+++ tests/autopilot/autopilot/tests/test_dash.py	2012-03-01 14:54:36 +0000
@@ -269,7 +269,7 @@
 
 
 class DashClipboardTests(AutopilotTestCase):
-    """Test the Unity clipboard""" 
+    """Test the Unity clipboard"""
     run_test_with = GlibRunner
 
     def setUp(self):
@@ -279,7 +279,7 @@
     def tearDown(self):
         super(DashClipboardTests, self).tearDown()
         self.dash.ensure_hidden()
-         
+
     def test_ctrl_a(self):
         """ This test if ctrl+a selects all text """
         self.dash.ensure_hidden()
@@ -291,7 +291,7 @@
 
         kb.press_and_release("Ctrl+a")
         kb.press_and_release("Delete")
-        
+
         searchbar = self.dash.get_searchbar()
         self.assertEqual(searchbar.search_string, u'')
 
@@ -344,7 +344,7 @@
         kb.press_and_release("Ctrl+c")
         kb.press_and_release("Ctrl+v")
         kb.press_and_release("Ctrl+v")
-        
+
         searchbar = self.dash.get_searchbar()
         self.assertEqual(searchbar.search_string, u'CopyPasteCopyPaste')
 
@@ -361,7 +361,7 @@
         kb.press_and_release("Ctrl+x")
         kb.press_and_release("Ctrl+v")
         kb.press_and_release("Ctrl+v")
-        
+
         searchbar = self.dash.get_searchbar()
         self.assertEqual(searchbar.search_string, u'CutPasteCutPaste')
 
@@ -395,3 +395,46 @@
         searchbar = self.dash.get_searchbar()
         self.assertEqual("hello world", searchbar.search_string)
 
+    def test_spread(self):
+        """Test that the spread is shown correctly."""
+        self.dash.ensure_hidden()
+        self.start_app("Calculator")
+        self.start_app("Character Map")
+
+        self.keybinding("spread/initiate")
+        sleep(1)
+        self.dash.controller.refresh_state()
+        self.assertTrue(self.dash.controller.spread_active)
+        self.keybinding("spread/cancel")
+
+    def test_dash_terminates_spread(self):
+        """A window-spread must be terminated as soon as the dash is opened."""
+        self.keybinding("spread/initiate")
+        sleep(1)
+        self.dash.controller.refresh_state()
+        self.assertTrue(self.dash.controller.spread_active)
+        self.dash.ensure_visible()
+
+        self.assertTrue(self.dash.get_is_visible())
+        self.assertFalse(self.spread.get_is_active())
+        self.keybinding("spread/cancel")
+		sleep(1)
+        self.dash.ensure_hidden()
+
+	def test_dash_regression_870284(self):
+		"""A test verifying that the is bug-fix for LP:870284 not regressed"""
+        mouse = Mouse()
+		self.assertFalse(self.dash.controller.spread_active)
+		self.dash.ensure_hidden()
+		sleep(1)
+        self.start_app("Calculator")
+        self.start_app("Character Map")
+        self.dash.ensure_visible()
+		sleep(1)
+        # make sure the mouse is over Dash, a position of 100/100 ensures this
+        mouse.move(100, 100, True)
+		sleep(1)
+        self.keybinding("spread/initiate")
+		sleep(1)
+        self.assertFalse(self.dash.get_is_visible())
+		self.assertTrue(self.dash.controller.spread_active)

=== modified file 'tests/autopilot/setup.py' (properties changed: -x to +x)