Merge lp:~veebers/autopilot/fix_1205949_gestures into lp:autopilot

[Christopher Lee]

Fix for pinch gesture with test.

Fix for pinch gesture with test.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

Hi Chris,

You still need better documentation in the Touch interface. In particular, you need to mention which exception will be raised, and under which conditions. There's very little point adding docstrings to the implementation, since they never get seen by the user.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

Unmerged revisions

=== modified file 'autopilot/input/__init__.py'
--- autopilot/input/__init__.py	2013-07-23 04:04:43 +0000
+++ autopilot/input/__init__.py	2013-08-12 05:44:56 +0000
@@ -273,7 +273,7 @@
         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).
+        """Moves mouse to location (x,y).
 
         Callers should avoid specifying the *rate* or *time_between_events*
         parameters unless they need a specific rate of movement.
@@ -362,7 +362,7 @@
         raise NotImplementedError("You cannot use this class directly.")
 
     def tap(self, x, y):
-        """Click (or 'tap') at given x and y coordinates."""
+        """Click (or 'tap') at given x,y coordinates."""
         raise NotImplementedError("You cannot use this class directly.")
 
     def tap_object(self, object):
@@ -382,7 +382,20 @@
         raise NotImplementedError("You cannot use this class directly.")
 
     def press(self, x, y):
-        """Press and hold."""
+        """Press and hold at the given x,y coordinates."""
+        raise NotImplementedError("You cannot use this class directly.")
+
+    def move(self, x, y):
+        """Move the pointer coords to (x,y).
+
+        .. note:: The touch 'finger' must be pressed for a call to this
+         method to be successful. (see :py:meth:`press` for further details on
+         touch presses.)
+
+        :raises: **RuntimeError** if called and the touch 'finger' isn't
+         pressed.
+
+        """
         raise NotImplementedError("You cannot use this class directly.")
 
     def release(self):

=== modified file 'autopilot/input/_uinput.py'
--- autopilot/input/_uinput.py	2013-07-24 08:26:10 +0000
+++ autopilot/input/_uinput.py	2013-08-12 05:44:56 +0000
@@ -350,6 +350,16 @@
         logger.debug("Releasing")
         self._finger_up()
 
+    def move(self, x, y):
+        """Moves the pointing "finger" to pos(x,y).
+
+        NOTE: The finger has to be down for this to have any effect.
+
+        """
+        if self._touch_finger is None:
+            raise RuntimeError("Attempting to move without finger being down.")
+        self._finger_move(x, y)
+
     def drag(self, x1, y1, x2, y2):
         """Perform a drag gesture from (x1,y1) to (x2,y2)"""
         logger.debug("Dragging from %d,%d to %d,%d", x1, y1, x2, y2)

=== modified file 'autopilot/tests/functional/test_input_stack.py'
--- autopilot/tests/functional/test_input_stack.py	2013-07-24 08:26:10 +0000
+++ autopilot/tests/functional/test_input_stack.py	2013-08-12 05:44:56 +0000
@@ -23,10 +23,12 @@
 from tempfile import mktemp
 from testtools import TestCase
 from testtools.matchers import IsInstance, Equals, raises
+from textwrap import dedent
 from unittest import SkipTest
 from mock import patch
 
 from autopilot.testcase import AutopilotTestCase, multiply_scenarios
+from autopilot.gestures import pinch
 from autopilot.input import Keyboard, Mouse, Pointer, Touch
 from autopilot.input._common import get_center_point
 from autopilot.matchers import Eventually
@@ -204,6 +206,56 @@
             self.button_status.text, Eventually(Equals("Touch Release")))
 
 
+class TouchGesturesTests(AutopilotTestCase):
+    def _start_qml_script(self, script_contents):
+        """Launch a qml script."""
+        qml_path = mktemp(suffix='.qml')
+        open(qml_path, 'w').write(script_contents)
+        self.addCleanup(os.remove, qml_path)
+
+        return self.launch_test_application(
+            "qmlscene",
+            qml_path,
+            app_type='qt',
+        )
+
+    def test_pinch_gesture(self):
+        """Ensure that the pinch gesture pinches as expected."""
+
+        test_qml = dedent("""\
+            import QtQuick 2.0
+
+            Rectangle {
+                id: colorBox
+                width: 250
+                height: 250
+                color: "#00FF00"
+
+                PinchArea {
+                    anchors.fill: parent
+                    onPinchFinished: {
+                        colorBox.color = "#0000FF"
+                    }
+                }
+            }
+            """)
+
+        # Returned results include the alpha (RGBA)
+        start_green_bg = [0, 255, 0, 255]
+        end_blue_bg = [0, 0, 255, 255]
+
+        app = self._start_qml_script(test_qml)
+        pinch_widget = app.select_single("QQuickRectangle")
+        widget_bg_colour = lambda: pinch_widget.color
+
+        self.assertThat(widget_bg_colour, Eventually(Equals(start_green_bg)))
+
+        x, y = get_center_point(pinch_widget)
+        pinch((x, y), (10, 0), (100, 0))
+
+        self.assertThat(widget_bg_colour, Eventually(Equals(end_blue_bg)))
+
+
 class PointerWrapperTests(AutopilotTestCase):
 
     def test_can_move_touch_wrapper(self):