Merge lp:~townsend/unity/fix-lp1286143 into lp:unity

[Christopher Townsend]

Fix corner case depending on where a test window opens, a Dash and Hud Autopilot test failure can occur.

Depending on where a test window opens, it can cause both a Dash and Hud Autopilot test to fail. This is because the mouse may move to where the unmaximized window is opened when clicking to close the Dash/Hud which focuses it. However, the test is checking that the maximized window is focused which causes the test to fail since the unmaximized window is focused.

The tests are:
unity.tests.test_hud.HudBehaviorTests.test_closes_then_focuses_window_on_mouse_down
unity.tests.test_dash.DashRevealTests.test_closes_then_focuses_window_on_mouse_down

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3687
http://jenkins.qa.ubuntu.com/job/unity-ci/740/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/274

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/740/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2014-02-11 21:47:29 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2014-02-28 14:27:31 +0000
@@ -144,13 +144,21 @@
 
         char_win = self.process_manager.start_app("Character Map")
         self.keybinding("window/maximize")
-        self.process_manager.start_app("Calculator")
+        calc_win = self.process_manager.start_app("Calculator")
 
         self.unity.dash.ensure_visible()
 
-        #Click bottom right of the screen
+        # Click bottom right of the screen, but take into account the non-maximized window -
+        # we do not want to click on it as it focuses the wrong window
         w = self.display.get_screen_width() - 1
         h = self.display.get_screen_height() - 1
+
+        # If the mouse is over the non-maximized window, move it away from it.
+        (calc_x, calc_y, calc_w, calc_h) = calc_win.get_windows()[0].geometry
+        if calc_x <= w <= calc_x+calc_w:
+            grab_padding = 15
+            w = w - (calc_w + grab_padding)
+
         self.mouse.move(w,h)
         self.mouse.click()
 
 
=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2014-02-14 16:40:28 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2014-02-28 14:27:31 +0000
@@ -467,13 +467,21 @@
         char_win = self.process_manager.start_app("Character Map")
         self.assertProperty(char_win, is_active=True)
         self.keybinding("window/maximize")
-        self.process_manager.start_app("Calculator")
+        calc_win = self.process_manager.start_app("Calculator")
 
         self.unity.hud.ensure_visible()
 
-        #Click bottom right of the screen
+        # Click bottom right of the screen, but take into account the non-maximized window -
+        # we do not want to click on it as it focuses the wrong window
         w = self.display.get_screen_width() - 1
         h = self.display.get_screen_height() - 1
+
+        # If the mouse is over the non-maximized window, move it away from it.
+        (calc_x, calc_y, calc_w, calc_h) = calc_win.get_windows()[0].geometry
+        if calc_x <= w <= calc_x+calc_w:
+            grab_padding = 15
+            w = w - (calc_w + grab_padding)
+
         self.mouse.move(w,h)
         self.mouse.click()