Merge lp:~3v1n0/unity/wily-ap-fixes into lp:unity

[Marco Trevisan (Treviño)]

Autopilot: modernize some tests, use stronger methods to ensure false positive

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4001
http://jenkins.qa.ubuntu.com/job/unity-ci/1285/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/61
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/61/console

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

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4002
http://jenkins.qa.ubuntu.com/job/unity-ci/1286/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/62
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/62/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/unity/emulators/__init__.py'
--- tests/autopilot/unity/emulators/__init__.py	2013-10-03 02:47:42 +0000
+++ tests/autopilot/unity/emulators/__init__.py	2015-08-19 13:54:35 +0000
@@ -28,6 +28,30 @@
 
     _Backend = DBusAddress.SessionBus(DBUS_SERVICE, DBUS_OBJECT)
 
+    def _repr_string(self, obj_details=""):
+        geostr = ""
+        if hasattr(self, 'globalRect'):
+            geostr = " geo=[{r.x}x{r.y} {r.width}x{r.height}]".format(r=self.globalRect)
+
+        obj_details.strip()
+        obj_details = " "+obj_details if len(obj_details) else ""
+
+        return "<{cls} {addr} id={id}{geo}{details}>".format(cls=self.__class__.__name__,
+                                                             addr=hex(id(self)),
+                                                             id=self.id,
+                                                             geo=geostr,
+                                                             details=obj_details)
+
+    def __repr__(self):
+        with self.no_automatic_refreshing():
+            return self._repr_string()
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.id == other.id
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
 
 def ensure_unity_is_running(timeout=300):
     """Poll the unity debug interface, and return when it's ready for use.

=== modified file 'tests/autopilot/unity/emulators/dash.py'
--- tests/autopilot/unity/emulators/dash.py	2015-04-10 16:22:23 +0000
+++ tests/autopilot/unity/emulators/dash.py	2015-08-19 13:54:35 +0000
@@ -158,7 +158,7 @@
 
     @property
     def geometry(self):
-        return (self.view.x, self.view.y, self.view.width, self.view.height)
+        return self.view.globalRect
 
 
 class DashView(UnityIntrospectionObject):
@@ -225,10 +225,12 @@
 class ScopeView(UnityIntrospectionObject):
     """A Scope View."""
 
-    def get_groups(self):
+    def get_categories(self, only_visible=False):
         """Get a list of all groups within this scopeview. May return an empty list."""
-        groups = self.get_children_by_type(PlacesGroup)
-        return groups
+        if only_visible:
+            return self.get_children_by_type(PlacesGroup, is_visible=True)
+
+        return self.get_children_by_type(PlacesGroup)
 
     def get_focused_category(self):
         """Return a PlacesGroup instance for the category whose header has keyboard focus.
@@ -236,30 +238,22 @@
         Returns None if no category headers have keyboard focus.
 
         """
-        categories = self.get_children_by_type(PlacesGroup)
-        matches = [m for m in categories if m.header_has_keyfocus]
-        if matches:
-            return matches[0]
-        return None
+        matches = self.get_children_by_type(PlacesGroup, header_has_keyfocus=True)
+        return matches[0] if matches else None
 
     def get_category_by_name(self, category_name):
         """Return a PlacesGroup instance with the given name, or None."""
-        categories = self.get_children_by_type(PlacesGroup)
-        matches = [m for m in categories if m.name == category_name]
-        if matches:
-            return matches[0]
-        return None
+        matches = self.get_children_by_type(PlacesGroup, name=category_name)
+        return matches[0] if matches else None
 
     def get_num_visible_categories(self):
         """Get the number of visible categories in this scope."""
-        return len([c for c in self.get_children_by_type(PlacesGroup) if c.is_visible])
+        return len(self.get_categories(only_visible=True))
 
     def get_filterbar(self):
         """Get the filter bar for the current scope, or None if it doesn't have one."""
         bars = self.get_children_by_type(FilterBar)
-        if bars:
-            return bars[0]
-        return None
+        return bars[0] if bars else None
 
 
 class PlacesGroup(UnityIntrospectionObject):
@@ -279,26 +273,16 @@
     """A single result in the dash."""
 
     def activate(self, double_click=True):
-        tx = self.x + (self.width / 2)
-        ty = self.y + (self.height / 2)
         m = Mouse.create()
-        m.move(tx, ty)
-        m.click(1)
+        m.click_object(self, button=1)
         if double_click:
-            m.click(1)
+            m.click_object(self, button=1)
 
     def preview(self, button=1):
-        tx = self.x + (self.width / 2)
-        ty = self.y + (self.height / 2)
-        m = Mouse.create()
-        m.move(tx, ty)
-        m.click(button)
+        Mouse.create().click_object(self, button)
 
     def preview_key(self):
-        tx = self.x + (self.width / 2)
-        ty = self.y + (self.height / 2)
-        m = Mouse.create()
-        m.move(tx, ty)
+        Mouse.create().move_to_object(self)
 
         k = Keyboard.create()
         k.press_and_release('Menu')
@@ -313,11 +297,8 @@
 
     def get_focused_filter(self):
         """Returns the id of the focused filter widget."""
-        filters = self.get_children_by_type(FilterExpanderLabel)
-        for filter_label in filters:
-            if filter_label.expander_has_focus:
-                return filter_label
-        return None
+        filters = self.get_children_by_type(FilterExpanderLabel, expander_has_focus=True)
+        return filters[0] if filters else None
 
     @property
     def expanded(self):
@@ -366,21 +347,13 @@
     def ensure_expanded(self):
         """Expand the filter expander label, if it's not already"""
         if not self.expanded:
-            tx = self.x + self.width / 2
-            ty = self.y + self.height / 2
-            m = Mouse.create()
-            m.move(tx, ty)
-            m.click()
+            Mouse.create().click_object(self)
             self.expanded.wait_for(True)
 
     def ensure_collapsed(self):
         """Collapse the filter expander label, if it's not already"""
         if self.expanded:
-            tx = self.x + self.width / 2
-            ty = self.y + self.height / 2
-            m = Mouse.create()
-            m.move(tx, ty)
-            m.click()
+            Mouse.create().click_object(self)
             self.expanded.wait_for(False)
 
 
@@ -402,21 +375,14 @@
 
     def get_action_by_id(self, action_id):
         """Returns the action given it's action hint."""
-        actions = self.get_children_by_type(ActionButton)
-        for action in actions:
-            if action.action == action_id:
-                return action
-        return None
+        actions = self.get_children_by_type(ActionButton, action=action_id)
+        return actions[0] if actions else None
 
     def execute_action_by_id(self, action_id):
         """Executes an action given by the id."""
         action = self.get_action_by_id(action_id)
         if action:
-            tx = action.x + (action.width / 2)
-            ty = action.y + (action.height / 2)
-            m = Mouse.create()
-            m.move(tx, ty)
-            m.click()
+            Mouse.create().click_object(action)
 
     @property
     def cover_art(self):
@@ -495,12 +461,8 @@
 
     def navigate_left(self, count=1):
         """Navigate preview left"""
-        navigator = self.get_left_navigator()
-
-        tx = navigator.button_x + (navigator.button_width / 2)
-        ty = navigator.button_y + (navigator.button_height / 2)
         m = Mouse.create()
-        m.move(tx, ty)
+        m.move_to_object(self.get_left_navigator().button_geo)
 
         old_preview_initiate_count = self.preview_initiate_count
 
@@ -512,12 +474,8 @@
 
     def navigate_right(self, count=1):
         """Navigate preview right"""
-        navigator = self.get_right_navigator()
-
-        tx = navigator.button_x + (navigator.button_width / 2)
-        ty = navigator.button_y + (navigator.button_height / 2)
         m = Mouse.create()
-        m.move(tx, ty)
+        m.move_to_object(self.get_right_navigator().button_geo)
 
         old_preview_initiate_count = self.preview_initiate_count
 
@@ -607,3 +565,4 @@
 
 class StaticCairoText(UnityIntrospectionObject):
     """Text boxes in the preview"""
+

=== modified file 'tests/autopilot/unity/emulators/hud.py'
--- tests/autopilot/unity/emulators/hud.py	2013-10-03 01:33:53 +0000
+++ tests/autopilot/unity/emulators/hud.py	2015-08-19 13:54:35 +0000
@@ -105,7 +105,7 @@
 
     @property
     def geometry(self):
-        return (self.x, self.y, self.width, self.height)
+        return self.globalRect
 
     @property
     def selected_button(self):
@@ -156,7 +156,7 @@
 
     @property
     def geometry(self):
-        return (self.x, self.y, self.width, self.height)
+        return self.globalRect
 
 
 class HudButton(UnityIntrospectionObject):

=== modified file 'tests/autopilot/unity/emulators/icons.py'
--- tests/autopilot/unity/emulators/icons.py	2013-11-14 01:56:41 +0000
+++ tests/autopilot/unity/emulators/icons.py	2015-08-19 13:54:35 +0000
@@ -58,10 +58,6 @@
 
         return self.xids.contains(xid)
 
-    def __repr__(self):
-        with self.no_automatic_refreshing():
-            return "<%s id=%d>" % (self.__class__.__name__, self.id)
-
 
 class BFBLauncherIcon(SimpleLauncherIcon):
     """Represents the BFB button in the launcher."""
@@ -80,10 +76,7 @@
 
     def __repr__(self):
         with self.no_automatic_refreshing():
-            return "<%s %s id=%d>" % (
-                self.__class__.__name__,
-                self.desktop_id,
-                self.id)
+            return self._repr_string("{0.desktop_id}".format(self))
 
 class TrashLauncherIcon(SimpleLauncherIcon):
     """Represents the trash launcher icon."""
@@ -110,7 +103,7 @@
 
     @property
     def geometry(self):
-        return (self.x, self.y, self.width, self.height)
+        return self.globalRect
 
 
 class LauncherEntry(UnityIntrospectionObject):

=== modified file 'tests/autopilot/unity/emulators/launcher.py'
--- tests/autopilot/unity/emulators/launcher.py	2014-01-23 15:51:46 +0000
+++ tests/autopilot/unity/emulators/launcher.py	2015-08-19 13:54:35 +0000
@@ -118,12 +118,8 @@
     def move_mouse_over_launcher(self):
         """Move the mouse over this launcher."""
         move_mouse_to_screen(self.monitor)
-        (x, y, w, h) = self.geometry
-        target_x = x + w / 2
-        target_y = y + h / 2
-
         logger.debug("Moving mouse to center of launcher.")
-        self._mouse.move(target_x, target_y)
+        self._mouse.move_to_object(self)
 
     def move_mouse_to_icon(self, icon, autoscroll_offset=0):
         """Move the mouse to a specific icon."""
@@ -438,8 +434,8 @@
 
     @property
     def geometry(self):
-        """Returns a tuple of (x,y,w,h) for the current launcher."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the current launcher."""
+        return self.globalRect
 
 
 class LauncherModel(UnityIntrospectionObject):

=== modified file 'tests/autopilot/unity/emulators/panel.py'
--- tests/autopilot/unity/emulators/panel.py	2015-02-18 00:49:47 +0000
+++ tests/autopilot/unity/emulators/panel.py	2015-08-19 13:54:35 +0000
@@ -14,6 +14,7 @@
 
 from autopilot.input import Mouse
 from autopilot.keybindings import KeybindingsHelper
+from autopilot.introspection.types import Rectangle
 
 from unity.emulators import UnityIntrospectionObject
 logger = logging.getLogger(__name__)
@@ -107,30 +108,18 @@
 
     def move_mouse_over_grab_area(self):
         """Move the mouse over the grab area for this panel."""
-        (x, y, w, h) = self.grab_area.geometry
-        target_x = x + w / 2
-        target_y = y + h / 2
-
         logger.debug("Moving mouse to center of grab area.")
-        self._mouse.move(target_x, target_y)
+        self._mouse.move_to_object(self.grab_area)
 
     def move_mouse_over_window_buttons(self):
         """Move the mouse over the center of the window buttons area for this panel."""
-        (x, y, w, h) = self.window_buttons.geometry
-        target_x = x + w / 2
-        target_y = y + h / 2
-
         logger.debug("Moving mouse to center of the window buttons.")
-        self._mouse.move(target_x, target_y)
+        self._mouse.move_to_object(self.window_buttons)
 
     def move_mouse_over_indicators(self):
         """Move the mouse over the center of the indicators area for this panel."""
-        (x, y, w, h) = self.indicators.geometry
-        target_x = x + w / 2
-        target_y = y + h / 2
-
         logger.debug("Moving mouse to center of the indicators area.")
-        self._mouse.move(target_x, target_y)
+        self._mouse.move_to_object(self.indicators)
 
     def get_indicator_entries(self, visible_only=True, include_hidden_menus=False):
         """Returns a list of entries for this panel including both menus and indicators"""
@@ -192,8 +181,8 @@
 
     @property
     def geometry(self):
-        """Returns a tuple of (x,y,w,h) for the current panel."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the current panel."""
+        return self.globalRect
 
 
 class MenuView(UnityIntrospectionObject):
@@ -215,8 +204,8 @@
 
     @property
     def geometry(self):
-        """Returns a tuple of (x,y,w,h) for the current menu view."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the current menu view."""
+        return self.globalRect
 
 
 class WindowButtons(UnityIntrospectionObject):
@@ -256,8 +245,8 @@
 
     @property
     def geometry(self):
-        """Returns a tuple of (x,y,w,h) for the current panel."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the current panel."""
+        return self.globalRect
 
 
 class WindowButton(UnityIntrospectionObject):
@@ -268,20 +257,25 @@
         self._mouse = Mouse.create()
 
     def mouse_move_to(self):
-        target_x = self.x + self.width / 2
-        target_y = self.y + self.height / 2
-        self._mouse.move(target_x, target_y, rate=20, time_between_events=0.005)
+        self._mouse.move_to_object(self)
 
     def mouse_click(self):
-        self.mouse_move_to()
-        sleep(.2)
-        self._mouse.click(press_duration=.1)
+        # Ignore buttons that are placed at 0x0, as they're invisible yet
+        if not self.x and not self.y and not self.visible:
+            return
+
+        self._mouse.click_object(self)
         sleep(.01)
 
     @property
     def geometry(self):
-        """Returns a tuple of (x,y,w,h) for the window button."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the window button."""
+        return self.globalRect
+
+    def __repr__(self):
+        with self.no_automatic_refreshing():
+            details = "type={0.type} state={0.visual_state} sensitive={0.sensitive}".format(self)
+            return self._repr_string(details)
 
 
 class GrabArea(UnityIntrospectionObject):
@@ -289,8 +283,8 @@
 
     @property
     def geometry(self):
-        """Returns a tuple of (x,y,w,h) for the grab area."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the grab area."""
+        return self.globalRect
 
 
 class Indicators(UnityIntrospectionObject):
@@ -314,8 +308,8 @@
 
     @property
     def geometry(self):
-        """Returns a tuple of (x,y,w,h) for the indicators area."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the indicators area."""
+        return self.globalRect
 
 
 class IndicatorEntry(UnityIntrospectionObject):
@@ -326,30 +320,26 @@
         self._mouse = Mouse.create()
 
     def mouse_move_to(self):
-        target_x = self.x + self.width / 2
-        target_y = self.y + self.height / 2
-        self._mouse.move(target_x, target_y, rate=20, time_between_events=0.005)
+        self._mouse.move_to_object(self)
 
     def mouse_click(self, button=1):
-        self.mouse_move_to()
-        sleep(.2)
-        assert(self.visible)
-        self._mouse.click(press_duration=.1)
+        self._mouse.click_object(self, button=button)
         sleep(.01)
 
     @property
     def geometry(self):
-        """Returns a tuple of (x,y,w,h) for the indicator entry."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the indicator entry."""
+        return self.globalRect
 
     @property
     def menu_geometry(self):
-        """Returns a tuple of (x,y,w,h) for the opened menu geometry."""
-        return (self.menu_x, self.menu_y, self.menu_width, self.menu_height)
+        """Returns a Rectangle (x,y,w,h) for the opened menu geometry."""
+        return Rectangle(self.menu_x, self.menu_y, self.menu_width, self.menu_height)
 
     def __repr__(self):
         with self.no_automatic_refreshing():
-            return "<IndicatorEntry 0x%x (%s)>" % (id(self), self.label)
+            details = "label={0.label}".format(self)
+            return self._repr_string(details)
 
 
 class Tray(UnityIntrospectionObject):

=== modified file 'tests/autopilot/unity/emulators/quicklist.py'
--- tests/autopilot/unity/emulators/quicklist.py	2013-05-10 05:16:07 +0000
+++ tests/autopilot/unity/emulators/quicklist.py	2015-08-19 13:54:35 +0000
@@ -66,8 +66,8 @@
 
     @property
     def geometry(self):
-        """Returns a tuple of (x,y,w,h) for the quicklist."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the quicklist."""
+        return self.globalRect
 
 
 class QuicklistMenuItem(UnityIntrospectionObject):
@@ -79,20 +79,17 @@
 
     @property
     def geometry(self):
-        """Returns a tuple of (x,y,w,h) for the quicklist item."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the quicklist item."""
+        return self.globalRect
 
     def mouse_move_to(self):
         assert(self.visible)
         logger.debug("Moving mouse over quicklist item %r", self)
-        target_x = self.x + self.width / 2
-        target_y = self.y + self.height / 2
-        self._mouse.move(target_x, target_y, rate=20, time_between_events=0.005)
+        self._mouse.move_to_object(self)
 
     def mouse_click(self, button=1):
         logger.debug("Clicking on quicklist item %r", self)
-        self.mouse_move_to()
-        self._mouse.click()
+        self._mouse.click_object(self)
 
 
 class QuicklistMenuItemLabel(QuicklistMenuItem):

=== modified file 'tests/autopilot/unity/emulators/screen.py'
--- tests/autopilot/unity/emulators/screen.py	2014-02-20 21:37:37 +0000
+++ tests/autopilot/unity/emulators/screen.py	2015-08-19 13:54:35 +0000
@@ -13,6 +13,7 @@
 from unity.emulators import UnityIntrospectionObject
 from testtools.matchers import GreaterThan
 
+from autopilot.introspection.types import Rectangle
 from unity.emulators.dash import SearchBar
 
 logger = logging.getLogger(__name__)
@@ -54,15 +55,15 @@
 
     @property
     def geometry(self):
-        """Returns a tuple of (x,y,w,h) for the current window."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the current window."""
+        return self.globalRect
 
     @property
     def scale_close_geometry(self):
-        """Returns a tuple of (x,y,w,h) for the scale close button."""
+        """Returns a Rectangle (x,y,w,h) for the scale close button."""
         self.scaled_close_width.wait_for(GreaterThan(0))
         self.scaled_close_height.wait_for(GreaterThan(0))
-        return (self.scaled_close_x, self.scaled_close_y, self.scaled_close_width, self.scaled_close_height)
+        return Rectangle(self.scaled_close_x, self.scaled_close_y, self.scaled_close_width, self.scaled_close_height)
 
 
 class SpreadFilter(UnityIntrospectionObject):

=== modified file 'tests/autopilot/unity/emulators/window_manager.py'
--- tests/autopilot/unity/emulators/window_manager.py	2013-10-02 23:33:55 +0000
+++ tests/autopilot/unity/emulators/window_manager.py	2015-08-19 13:54:35 +0000
@@ -10,6 +10,7 @@
 from __future__ import absolute_import
 
 import logging
+from autopilot.introspection.types import Rectangle
 from autopilot.keybindings import KeybindingsHelper
 
 from unity.emulators import UnityIntrospectionObject
@@ -22,8 +23,8 @@
 
     @property
     def screen_geometry(self):
-        """Returns a tuple of (x,y,w,h) for the screen."""
-        return (self.x, self.y, self.width, self.height)
+        """Returns a Rectangle (x,y,w,h) for the screen."""
+        return self.globalRect
 
     def initiate_spread(self):
         self.keybinding("spread/start")

=== modified file 'tests/autopilot/unity/tests/launcher/test_icon_behavior.py'
--- tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2015-03-25 14:59:04 +0000
+++ tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2015-08-19 13:54:35 +0000
@@ -384,7 +384,7 @@
             self.drag_type)
         moved_icon = self.unity.launcher.model.\
                      get_launcher_icons_for_monitor(self.launcher_monitor)[1]
-        self.assertThat(moved_icon.id, Equals(calc_icon.id))
+        self.assertThat(moved_icon, Equals(calc_icon))
 
     def test_can_drag_icon_below_window_switcher(self):
         """Application icons must be dragable to below the workspace switcher icon."""

=== modified file 'tests/autopilot/unity/tests/launcher/test_visual.py'
--- tests/autopilot/unity/tests/launcher/test_visual.py	2013-12-11 19:12:58 +0000
+++ tests/autopilot/unity/tests/launcher/test_visual.py	2015-08-19 13:54:35 +0000
@@ -71,14 +71,12 @@
 
     def test_mouse_over_with_dash_open_desaturates_icons(self):
         """Moving mouse over launcher with dash open must saturate icons."""
-        launcher_instance = self.get_launcher()
         self.unity.dash.ensure_visible()
         current_monitor = self.unity.dash.monitor
 
         self.addCleanup(self.unity.dash.ensure_hidden)
         sleep(.5)
-        x,y,w,h = launcher_instance.geometry
-        self.mouse.move(x + w/2, y + h/2)
+        self.mouse.move_to_object(self.get_launcher())
         sleep(.5)
         for icon in self.unity.launcher.model.get_launcher_icons():
             self.assertFalse(icon.monitors_desaturated[current_monitor])

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2015-02-19 19:23:39 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2015-08-19 13:54:35 +0000
@@ -400,10 +400,11 @@
 
         # Test that tab cycles through the categories.
         # + 1 is the filter bar
-        for i in range(scope.get_num_visible_categories()):
+        for category in scope.get_categories(only_visible=True):
             self.keyboard.press_and_release('Tab')
-            category = scope.get_focused_category()
-            self.assertIsNot(category, None)
+            selected = scope.get_focused_category()
+            expected = category if category.expand_label_is_visible else None
+            self.assertEqual(selected, expected)
 
     def test_tab_with_filter_bar(self):
         """ This test makes sure that Tab works well with the filter bara."""
@@ -544,10 +545,7 @@
 
         self.unity.dash.ensure_visible()
 
-        self.mouse.move(self.unity.dash.searchbar.x + self.unity.dash.searchbar.width / 2,
-                       self.unity.dash.searchbar.y + self.unity.dash.searchbar.height / 2)
-
-        self.mouse.click(button=2)
+        self.mouse.click_object(self.unity.dash.searchbar, button=2)
 
         self.assertThat(self.unity.dash.search_string, Eventually(Equals('ThirdButtonPaste')))
 
@@ -691,7 +689,7 @@
 
         self.unity.dash.ensure_visible()
 
-        self.assertThat(self.unity.dash.geometry[0], Eventually(Equals(launcher.geometry[0] + launcher.geometry[2] - 1)))
+        self.assertThat(self.unity.dash.view.x, Eventually(Equals(launcher.geometry.x + launcher.geometry.width - 1)))
 
 
     def test_see_more_result_alignment(self):
@@ -701,11 +699,9 @@
         self.unity.dash.reveal_application_scope()
 
         scope = self.unity.dash.get_current_scope()
-        self.assertThat(lambda: len(scope.get_groups()), Eventually(GreaterThan(0), timeout=20))
-
-        groups = scope.get_groups()
-
-        for group in groups:
+        self.assertThat(lambda: len(scope.get_categories()), Eventually(GreaterThan(0), timeout=20))
+
+        for group in scope.get_categories():
             if (group.is_visible and group.expand_label_is_visible):
                 expand_label_y = group.expand_label_y + group.expand_label_baseline
                 name_label_y = group.name_label_y + group.name_label_baseline
@@ -725,10 +721,7 @@
         the rectangle outside of the icon.
         """
         app_icon = self.scopebar.get_icon_by_name(u'applications.scope')
-
-        self.mouse.move(app_icon.x + (app_icon.width / 2),
-                        app_icon.y + (app_icon.height / 2))
-        self.mouse.click()
+        self.mouse.click_object(app_icon)
 
         self.assertThat(self.scopebar.active_scope, Eventually(Equals('applications.scope')))
 
@@ -1119,10 +1112,7 @@
         cover_art = self.get_current_preview().cover_art[0]
 
         # click the cover-art (this will set focus)
-        tx = cover_art.x + (cover_art.width / 2)
-        ty = cover_art.y + (cover_art.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click()
+        self.mouse.click_object(cover_art)
 
         self.keyboard.press_and_release("Escape")
 
@@ -1138,13 +1128,21 @@
 class PreviewClickCancelTests(DashTestCase):
     """Tests that the preview closes when left, middle, and right clicking in the preview"""
 
+    scenarios = [('Left button', {'clicked_button': 1}),
+                 ('Middle button', {'clicked_button': 2}),
+                 ('Right button', {'clicked_button': 3})]
+
     def setUp(self):
         super(PreviewClickCancelTests, self).setUp()
         gettext.install("unity-scope-applications")
-        scope = self.unity.dash.reveal_application_scope()
+        scope = self.unity.dash.reveal_application_scope(clear_search=False)
         self.addCleanup(self.unity.dash.ensure_hidden)
         # Only testing an application preview for this test.
-        self.keyboard.type("Software Updater")
+
+        search_string = "Software Updater"
+        if self.unity.dash.search_string != search_string:
+            self.unity.dash.clear_search()
+            self.keyboard.type(search_string)
 
         # wait for "Installed" category
         category = self.wait_for_category(scope, _("Installed"))
@@ -1159,183 +1157,43 @@
 
         self.preview_container = self.unity.dash.view.get_preview_container()
 
-    def test_left_click_on_preview_icon_cancel_preview(self):
-        """Left click on preview icon must close preview."""
-        icon = self.get_current_preview().icon[0]
-        self.assertThat(icon, NotEquals(None))
-
-        tx = icon.x + icon.width
-        ty = icon.y + (icon.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=1)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_middle_click_on_preview_icon_cancel_preview(self):
-        """Middle click on preview icon must close preview."""
-        icon = self.get_current_preview().icon[0]
-        self.assertThat(icon, NotEquals(None))
-
-        tx = icon.x + icon.width
-        ty = icon.y + (icon.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=2)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_right_click_on_preview_icon_cancel_preview(self):
-        """Right click on preview icon must close preview."""
-        icon = self.get_current_preview().icon[0]
-        self.assertThat(icon, NotEquals(None))
-
-        tx = icon.x + icon.width
-        ty = icon.y + (icon.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=3)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_left_click_on_preview_image_cancel_preview(self):
-        """Left click on preview image must cancel the preview."""
-        cover_art = self.get_current_preview().cover_art[0]
-        self.assertThat(cover_art, NotEquals(None))
-
-        tx = cover_art.x + (cover_art.width / 2)
-        ty = cover_art.y + (cover_art.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=1)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_middle_click_on_preview_image_cancel_preview(self):
-        """Middle click on preview image must cancel the preview."""
-        cover_art = self.get_current_preview().cover_art[0]
-        self.assertThat(cover_art, NotEquals(None))
-
-        tx = cover_art.x + (cover_art.width / 2)
-        ty = cover_art.y + (cover_art.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=2)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_right_click_on_preview_image_cancel_preview(self):
-        """Right click on preview image must cancel the preview."""
-        cover_art = self.get_current_preview().cover_art[0]
-        self.assertThat(cover_art, NotEquals(None))
-
-        tx = cover_art.x + (cover_art.width / 2)
-        ty = cover_art.y + (cover_art.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=3)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_left_click_on_preview_text_cancel_preview(self):
-        """Left click on some preview text must cancel the preview."""
-        text = self.get_current_preview().text_boxes[0]
-        self.assertThat(text, NotEquals(None))
-
-        tx = text.x + (text.width / 2)
-        ty = text.y + (text.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=1)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_middle_click_on_preview_text_cancel_preview(self):
-        """Middle click on some preview text must cancel the preview."""
-        text = self.get_current_preview().text_boxes[0]
-        self.assertThat(text, NotEquals(None))
-
-        tx = text.x + (text.width / 2)
-        ty = text.y + (text.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=2)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_right_click_on_preview_text_cancel_preview(self):
-        """Right click on some preview text must cancel the preview."""
-        text = self.get_current_preview().text_boxes[0]
-        self.assertThat(text, NotEquals(None))
-
-        tx = text.x + (text.width / 2)
-        ty = text.y + (text.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=3)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_left_click_on_preview_ratings_widget_cancel_preview(self):
-        """Left click on the ratings widget must cancel the preview."""
-        ratings_widget = self.get_current_preview().ratings_widget[0]
-        self.assertThat(ratings_widget, NotEquals(None))
-
-        tx = ratings_widget.x + (ratings_widget.width / 2)
-        ty = ratings_widget.y + (ratings_widget.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=1)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_middle_click_on_preview_ratings_widget_cancel_preview(self):
-        """Middle click on the ratings widget must cancel the preview."""
-        ratings_widget = self.get_current_preview().ratings_widget[0]
-        self.assertThat(ratings_widget, NotEquals(None))
-
-        tx = ratings_widget.x + (ratings_widget.width / 2)
-        ty = ratings_widget.y + (ratings_widget.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=2)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_right_click_on_preview_ratings_widget_cancel_preview(self):
-        """Right click on the ratings widget must cancel the preview."""
-        ratings_widget = self.get_current_preview().ratings_widget[0]
-        self.assertThat(ratings_widget, NotEquals(None))
-
-        tx = ratings_widget.x + (ratings_widget.width / 2)
-        ty = ratings_widget.y + (ratings_widget.height / 2)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=3)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_left_click_on_preview_info_hint_cancel_preview(self):
-        """Left click on the info hint must cancel the preview."""
-        info_hint = self.get_current_preview().info_hint_widget[0]
-        self.assertThat(info_hint, NotEquals(None))
-
-        tx = info_hint.x + (info_hint.width / 2)
-        ty = info_hint.y + (info_hint.height / 8)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=1)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_middle_click_on_preview_info_hint_cancel_preview(self):
-        """Middle click on the info hint must cancel the preview."""
-        info_hint = self.get_current_preview().info_hint_widget[0]
-        self.assertThat(info_hint, NotEquals(None))
-
-        tx = info_hint.x + (info_hint.width / 2)
-        ty = info_hint.y + (info_hint.height / 8)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=2)
-
-        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
-
-    def test_right_click_on_preview_info_hint_cancel_preview(self):
-        """Right click on the info hint must cancel the preview."""
-        info_hint = self.get_current_preview().info_hint_widget[0]
-        self.assertThat(info_hint, NotEquals(None))
-
-        tx = info_hint.x + (info_hint.width / 2)
-        ty = info_hint.y + (info_hint.height / 8)
-        self.mouse.move(tx, ty)
-        self.mouse.click(button=3)
+    def test_click_on_preview_icon_cancel_preview(self):
+        """Clicking with any button on preview icon must close preview."""
+        icon = self.get_current_preview().icon[0]
+        self.assertThat(icon, NotEquals(None))
+
+        self.mouse.click_object(icon, button=self.clicked_button)
+        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_click_on_preview_image_cancel_preview(self):
+        """Clicking with any button on preview image must cancel the preview."""
+        cover_art = self.get_current_preview().cover_art[0]
+        self.assertThat(cover_art, NotEquals(None))
+
+        self.mouse.click_object(cover_art, button=self.clicked_button)
+        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_click_on_preview_text_cancel_preview(self):
+        """Clicking with any button on some preview text must cancel the preview."""
+        text = self.get_current_preview().text_boxes[0]
+        self.assertThat(text, NotEquals(None))
+        self.mouse.click_object(text, button=self.clicked_button)
+
+        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_click_on_preview_ratings_widget_cancel_preview(self):
+        """Clicking with any button on the ratings widget must cancel the preview."""
+        ratings_widget = self.get_current_preview().ratings_widget[0]
+        self.assertThat(ratings_widget, NotEquals(None))
+        self.mouse.click_object(ratings_widget, button=self.clicked_button)
+
+        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_click_on_preview_info_hint_cancel_preview(self):
+        """Clicking with any button on the info hint must cancel the preview."""
+        info_hint = self.get_current_preview().info_hint_widget[0]
+        self.assertThat(info_hint, NotEquals(None))
+        self.mouse.click_object(info_hint, button=self.clicked_button)
 
         self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
 
@@ -1401,3 +1259,4 @@
         self.addCleanup(self.unity.dash.ensure_hidden)
 
         self.assertThat(self.unity.dash.visible, Eventually(Equals(True)))
+

=== modified file 'tests/autopilot/unity/tests/test_panel.py'
--- tests/autopilot/unity/tests/test_panel.py	2015-02-19 14:41:09 +0000
+++ tests/autopilot/unity/tests/test_panel.py	2015-08-19 13:54:35 +0000
@@ -78,8 +78,7 @@
             self.keybinding("window/restore")
             self.addCleanup(self.keybinding, "window/maximize")
 
-        sleep(.25)
-        self.assertProperty(win, is_maximized=maximized)
+        self.assertThat(lambda: win.is_maximized, Eventually(Equals(maximized)))
 
     def open_new_application_window(self, app_name, maximized=False, move_to_monitor=True):
         """Opens a new instance of the requested application, ensuring that only
@@ -93,8 +92,8 @@
         app = app_win.application
 
         app_win.set_focus()
-        self.assertTrue(app.is_active)
-        self.assertTrue(app_win.is_focused)
+        self.assertThat(lambda: app.is_active, Eventually(Equals(True)))
+        self.assertThat(lambda: app_win.is_focused, Eventually(Equals(True)))
         self.assertThat(app.desktop_file, Equals(app_win.application.desktop_file))
 
         if move_to_monitor:
@@ -431,7 +430,6 @@
         self.addCleanup(self.unity.hud.ensure_hidden)
 
         self.panel.window_buttons.maximize.mouse_click()
-
         self.assertThat(self.unity.hud.visible, Eventually(Equals(True)))
 
     def test_hud_maximize_button_does_not_change_dash_form_factor(self):
@@ -986,7 +984,7 @@
 
     def open_app_and_get_menu_entry(self):
         """Open the test app and wait for the menu entry to appear."""
-        self.open_new_application_window("Remmina" if self.lim else "Calculator",
+        self.open_new_application_window("Text Editor" if self.lim else "Calculator",
                                          maximized=self.lim)
 
         refresh_fn = lambda: len(self.panel.menus.get_entries())
@@ -1043,7 +1041,8 @@
         self.assertThat(menu_entry.active, Eventually(Equals(True)))
 
         self.open_new_application_window("Text Editor")
-        self.assertThat(self.unity.panels.get_active_indicator, Eventually(Equals(None)))
+        get_active_indicator_fn = lambda: self.unity.panels.get_active_indicator()
+        self.assertThat(get_active_indicator_fn, Eventually(Equals(None)))
 
     def test_indicator_opens_when_dash_is_open(self):
         """When the dash is open and a click is on an indicator the dash
@@ -1068,8 +1067,9 @@
         This method will wait until the active indicator has been set.
 
         """
-        self.assertThat(self.panel.get_active_indicator, Eventually(NotEquals(None)))
-        return self.panel.get_active_indicator()
+        get_active_indicator_fn = lambda: self.panel.get_active_indicator()
+        self.assertThat(get_active_indicator_fn, Eventually(NotEquals(None)))
+        return get_active_indicator_fn()
 
     def test_panel_first_menu_show_works(self):
         """Pressing the open-menus keybinding must open the first indicator."""
@@ -1185,9 +1185,7 @@
         self.assertProperty(text_win, is_focused=False)
         self.assertProperty(calc_win, is_focused=True)
 
-        self.move_mouse_over_grab_area()
-        self.mouse.click()
-
+        self.mouse.click_object(self.panel.grab_area, button=1)
         self.assertProperty(text_win, is_focused=True)
 
     def test_lower_the_maximized_window_works(self):
@@ -1198,8 +1196,7 @@
         self.assertProperty(text_win, is_focused=True)
         self.assertProperty(calc_win, is_focused=False)
 
-        self.move_mouse_over_grab_area()
-        self.mouse.click(2)
+        self.mouse.click_object(self.panel.grab_area, button=2)
 
         self.assertProperty(calc_win, is_focused=True)
 
@@ -1209,8 +1206,7 @@
         self.addCleanup(self.unity.hud.ensure_hidden)
 
         self.keyboard.type("Hello")
-        self.move_mouse_over_grab_area()
-        self.mouse.click()
+        self.mouse.click_object(self.panel.grab_area)
         self.keyboard.type("World")
 
         self.assertThat(self.unity.hud.search_string, Eventually(Equals("HelloWorld")))

=== modified file 'tests/autopilot/unity/tests/test_quicklist.py'
--- tests/autopilot/unity/tests/test_quicklist.py	2015-03-25 14:59:04 +0000
+++ tests/autopilot/unity/tests/test_quicklist.py	2015-08-19 13:54:35 +0000
@@ -269,7 +269,7 @@
     def assertCorrectItemSelected(self, item):
         """Ensure the item considers itself selected and that quicklist agrees."""
         self.assertThat(item.selected, Eventually(Equals(True)))
-        self.assertThat(self.quicklist.selected_item.id, Equals(item.id))
+        self.assertThat(self.quicklist.selected_item, Equals(item))
 
     def test_keynav_selects_first_item_when_unselected(self):
         """Home key MUST select the first selectable item in a quicklist."""
@@ -402,11 +402,11 @@
 
         # Moving the mouse horizontally doesn't change the selection
         self.mouse.move(mouse_item.x + mouse_item.width - 10, mouse_item.y + mouse_item.height / 2)
-        self.assertThat(self.quicklist.selected_item.id, Equals(key_item.id))
+        self.assertThat(self.quicklist.selected_item, Equals(key_item))
 
         # Moving the mouse outside doesn't change the selection
         self.mouse.move(mouse_item.x + mouse_item.width + 50, mouse_item.y + mouse_item.height / 2)
-        self.assertThat(self.quicklist.selected_item.id, Equals(key_item.id))
+        self.assertThat(self.quicklist.selected_item, Equals(key_item))
 
         # Moving the mouse to another entry, changes the selection
         mouse_item = self.quicklist.selectable_items[-2]

=== modified file 'tests/autopilot/unity/tests/test_spread.py'
--- tests/autopilot/unity/tests/test_spread.py	2015-03-24 22:35:27 +0000
+++ tests/autopilot/unity/tests/test_spread.py	2015-08-19 13:54:35 +0000
@@ -114,11 +114,7 @@
         target_xid = not_focused.x_id
         [target_win] = [w for w in self.unity.screen.scaled_windows if w.xid == target_xid]
 
-        (x, y, w, h) = target_win.geometry
-        self.mouse.move(x + w / 2, y + h / 2)
-        sleep(.5)
-        self.mouse.click()
-
+        self.mouse.click_object(target_win, button=1)
         self.assertThat(lambda: not_focused.is_focused, Eventually(Equals(True)))
 
     def test_scaled_window_closes_on_middle_click(self):
@@ -129,10 +125,8 @@
         target_xid = win.x_id
         [target_win] = [w for w in self.unity.screen.scaled_windows if w.xid == target_xid]
 
-        (x, y, w, h) = target_win.geometry
-        self.mouse.move(x + w / 2, y + h / 2)
-        sleep(.5)
-        self.mouse.click(button=2)
+        sleep(1)
+        self.mouse.click_object(target_win, button=2)
 
         self.assertWindowIsScaledEquals(target_xid, False)
         self.assertWindowIsClosed(target_xid)
@@ -146,13 +140,8 @@
         [target_win] = [w for w in self.unity.screen.scaled_windows if w.xid == target_xid]
 
         # Make sure mouse is over the test window
-        (x1, y1, w1, h1) = target_win.geometry
-        self.mouse.move(x1 + w1 / 2, y1 + h1 / 2)
-
-        (x, y, w, h) = target_win.scale_close_geometry
-        self.mouse.move(x + w / 2, y + h / 2)
-        sleep(.5)
-        self.mouse.click()
+        self.mouse.move_to_object(target_win)
+        self.mouse.click_object(target_win.scale_close_geometry)
 
         self.assertWindowIsScaledEquals(target_xid, False)
         self.assertWindowIsClosed(target_xid)

=== modified file 'tests/autopilot/unity/tests/test_switcher.py'
--- tests/autopilot/unity/tests/test_switcher.py	2014-01-29 20:33:47 +0000
+++ tests/autopilot/unity/tests/test_switcher.py	2015-08-19 13:54:35 +0000
@@ -629,6 +629,7 @@
     def setUp(self):
         super(SwitcherDetailsMouseTests, self).setUp()
         self.set_timeout_setting(False)
+        self.mouse.move(0, 0, animate=False)
 
     def test_mouse_highlights_switcher_icons(self):
         """ Tests that the mouse can hightlight all the switcher icons. """
@@ -653,7 +654,7 @@
         index = 0;
         for cords in icon_cords:
             self.mouse.move(cords[0], cords[1])
-            self.assertThat(index, Equals(self.unity.switcher.selection_index))
+            self.assertThat(self.unity.switcher.selection_index, Eventually(Equals(index)))
             index += 1
 
     def test_mouse_clicks_activate_icon(self):
@@ -691,7 +692,7 @@
 
         mouse_index = self.unity.switcher.selection_index - 1
 
-        self.unity.switcher.view.move_over_icon(mouse_index);
+        self.unity.switcher.view.move_over_icon(mouse_index)
         # Assert we are over the icon we want to hover over.
         self.assertThat(self.unity.switcher.view.last_icon_selected, Eventually(Equals(mouse_index)))
 
@@ -724,11 +725,9 @@
         self.unity.switcher.initiate(SwitcherMode.DETAIL)
         self.addCleanup(self.unity.switcher.terminate)
 
-        index = 0;
-        for icon in self.unity.switcher.view.detail_icons:
+        for index in range(len(self.unity.switcher.view.detail_icons)):
           self.unity.switcher.view.move_over_detail_icon(index)
-          self.assertThat(index, Equals(self.unity.switcher.detail_selection_index))
-          index += 1
+          self.assertThat(self.unity.switcher.detail_selection_index, Eventually(Equals(index)))
 
     def test_mouse_click_will_activate_detail_icon(self):
         """

=== modified file 'unity-shared/WindowButtons.cpp'
--- unity-shared/WindowButtons.cpp	2015-06-03 12:10:00 +0000
+++ unity-shared/WindowButtons.cpp	2015-08-19 13:54:35 +0000
@@ -234,14 +234,14 @@
   }
 
   introspection.add(GetAbsoluteGeometry())
-                                  .add("type", type_name)
-                                  .add("visible", IsVisible() && Parent()->opacity() != 0.0f)
-                                  .add("sensitive", Parent()->GetInputEventSensitivity())
-                                  .add("enabled", enabled())
-                                  .add("visual_state", state_name)
-                                  .add("opacity", Parent()->opacity())
-                                  .add("focused", Parent()->focused())
-                                  .add("overlay_mode", overlay_mode());
+               .add("type", type_name)
+               .add("visible", IsVisible() && Parent()->opacity() != 0.0f)
+               .add("sensitive", Parent()->GetInputEventSensitivity())
+               .add("enabled", enabled())
+               .add("visual_state", state_name)
+               .add("opacity", Parent()->opacity())
+               .add("focused", Parent()->focused())
+               .add("overlay_mode", overlay_mode());
 }
 } // Internal Namespace