Merge lp:~thomir-deactivatedaccount/autopilot/1.3-fix-path-attr-hiding into lp:autopilot

[Thomi Richards]

Fix bug.

Fix bug where we were overwriting an attribute named 'path' in some proxy objects with a variable that should have been made private.

Unmerged revisions

=== modified file 'autopilot/input/__init__.py'
--- autopilot/input/__init__.py	2013-09-04 03:44:07 +0000
+++ autopilot/input/__init__.py	2013-09-13 16:28:42 +0000
@@ -337,7 +337,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.
@@ -426,7 +426,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):
@@ -446,7 +446,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-09-13 16:28:42 +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/introspection/dbus.py'
--- autopilot/introspection/dbus.py	2013-08-09 01:29:23 +0000
+++ autopilot/introspection/dbus.py	2013-09-13 16:28:42 +0000
@@ -128,7 +128,7 @@
         self.__state = {}
         self.__refresh_on_attribute = True
         self._set_properties(state_dict)
-        self.path = path
+        self._path = path
 
     def _set_properties(self, state_dict):
         """Creates and set attributes of *self* based on contents of
@@ -509,10 +509,10 @@
     def get_class_query_string(self):
         """Get the XPath query string required to refresh this class's
         state."""
-        if not self.path.startswith('/'):
-            return "//" + self.path + "[id=%d]" % self.id
+        if not self._path.startswith('/'):
+            return "//" + self._path + "[id=%d]" % self.id
         else:
-            return self.path + "[id=%d]" % self.id
+            return self._path + "[id=%d]" % self.id
 
     @classmethod
     def make_introspection_object(cls, dbus_tuple):

=== modified file 'autopilot/tests/functional/test_input_stack.py'
--- autopilot/tests/functional/test_input_stack.py	2013-09-04 03:44:07 +0000
+++ autopilot/tests/functional/test_input_stack.py	2013-09-13 16:28:42 +0000
@@ -29,6 +29,7 @@
 
 from autopilot import platform
 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
@@ -333,6 +334,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):

=== modified file 'autopilot/tests/unit/test_introspection_features.py'
--- autopilot/tests/unit/test_introspection_features.py	2013-08-08 20:33:14 +0000
+++ autopilot/tests/unit/test_introspection_features.py	2013-09-13 16:28:42 +0000
@@ -25,6 +25,7 @@
 
 from autopilot.introspection.dbus import (
     CustomEmulatorBase,
+    DBusIntrospectionObject,
     _is_valid_server_side_filter_param,
 )
 
@@ -80,3 +81,14 @@
             _is_valid_server_side_filter_param(self.key, self.value),
             Equals(self.result)
         )
+
+
+class DBusIntrospectionObjectTests(TestCase):
+
+    def test_can_access_path_attribute(self):
+        fake_object = DBusIntrospectionObject(
+            dict(id=123, path='/some/path'),
+            '/'
+        )
+        with fake_object.no_automatic_refreshing():
+            self.assertThat(fake_object.path, Equals('/some/path'))