Merge lp:~chris.gagnon/autopilot/click_object into lp:autopilot

[Chris Gagnon]

add click_object to mouse

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:207
http://jenkins.qa.ubuntu.com/job/autopilot-ci/83/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/11

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/83/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/autopilot-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/12

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/84/rebuild

review: Approve (continuous-integration)

[lp:~chris.gagnon/autopilot/click_object]

207. By Chris Gagnon on 2013-05-14

add click object

208. By Chris Gagnon on 2013-05-21

move click_object to base class

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

=== modified file 'autopilot/input/__init__.py'
--- autopilot/input/__init__.py	2013-05-21 03:22:47 +0000
+++ autopilot/input/__init__.py	2013-05-21 21:33:25 +0000
@@ -238,6 +238,24 @@
         """Click mouse at current location."""
         raise NotImplementedError("You cannot use this class directly.")
 
+    def click_object(self, object_proxy, button=1, press_duration=0.10):
+        """Click the center point of a given object.
+
+        It does this by looking for several attributes, in order. The first
+        attribute found will be used. The attributes used are (in order):
+
+         * globalRect (x,y,w,h)
+         * center_x, center_y
+         * x, y, w, h
+
+        :raises: **ValueError** if none of these attributes are found, or if an
+         attribute is of an incorrect type.
+
+         """
+        self.move_to_object(object_proxy)
+        self.click(button, press_duration)
+
+
     def move(self, x, y, animate=True, rate=10, time_between_events=0.01):
         """Moves mouse to location (x, y).
 
@@ -473,6 +491,27 @@
             self._x = x
             self._y = y
 
+    def click_object(self, object_proxy, button=1, press_duration=0.10):
+        """
+        Attempts to move the pointer to 'object_proxy's centre point.
+        and click a button
+
+        It does this by looking for several attributes, in order. The first
+        attribute found will be used. The attributes used are (in order):
+
+         * globalRect (x,y,w,h)
+         * center_x, center_y
+         * x, y, w, h
+
+        If the wrapped device is a mouse, the button specification is used. If
+        it is a touch device, passing anything other than 1 will raise a ValueError
+        exception.
+
+        """
+
+        self.move_to_object(object_proxy)
+        self.click(button, press_duration)
+
     def move_to_object(self, object_proxy):
         """Attempts to move the pointer to 'object_proxy's centre point.
 

=== modified file 'autopilot/tests/functional/test_input_stack.py'
--- autopilot/tests/functional/test_input_stack.py	2013-05-21 04:38:09 +0000
+++ autopilot/tests/functional/test_input_stack.py	2013-05-21 21:33:25 +0000
@@ -88,8 +88,7 @@
         text_edit = app_proxy.select_single('QTextEdit')
 
         # make sure the text edit has keyboard focus:
-        self.mouse.move_to_object(text_edit)
-        self.mouse.click()
+        self.mouse.click_object(text_edit)
 
         # create keyboard and type the text.
         keyboard = Keyboard.create(self.backend)