1
=== modified file 'autopilot/input/__init__.py'
2
--- autopilot/input/__init__.py	2014-03-25 14:42:25 +0000
3
+++ autopilot/input/__init__.py	2014-08-26 05:24:44 +0000
4
@@ -440,11 +440,11 @@
5
440
        """
440
        """
6
441
        raise NotImplementedError("You cannot use this class directly.")
441
        raise NotImplementedError("You cannot use this class directly.")
7
442
442
9
443
    def tap(self, x, y):
443
    def tap(self, x, y, press_duration=0.1):
10
444
        """Click (or 'tap') at given x,y coordinates."""
444
        """Click (or 'tap') at given x,y coordinates."""
11
445
        raise NotImplementedError("You cannot use this class directly.")
445
        raise NotImplementedError("You cannot use this class directly.")
12
446
446
14
447
    def tap_object(self, object):
447
    def tap_object(self, object, press_duration=0.1):
15
448
        """Tap the center point of a given object.
448
        """Tap the center point of a given object.
16
449
449
17
450
        It does this by looking for several attributes, in order. The first
450
        It does this by looking for several attributes, in order. The first
18
@@ -610,7 +610,7 @@
19
610
            if button != 1:
610
            if button != 1:
20
611
                raise ValueError(
611
                raise ValueError(
21
612
                    "Touch devices do not have button %d" % (button))
612
                    "Touch devices do not have button %d" % (button))
23
613
            self._device.tap(self._x, self._y)
613
            self._device.tap(self._x, self._y, press_duration=press_duration)
24
614
614
25
615
    def move(self, x, y):
615
    def move(self, x, y):
26
616
        """Moves the pointer to the specified coordinates.
616
        """Moves the pointer to the specified coordinates.
27
617
617
28
=== modified file 'autopilot/input/_uinput.py'
29
--- autopilot/input/_uinput.py	2014-07-30 10:18:17 +0000
30
+++ autopilot/input/_uinput.py	2014-08-26 05:24:44 +0000
31
@@ -460,7 +460,7 @@
32
460
    def pressed(self):
460
    def pressed(self):
33
461
        return self._device.pressed
461
        return self._device.pressed
34
462
462
36
463
    def tap(self, x, y):
463
    def tap(self, x, y, press_duration=0.1):
37
464
        """Click (or 'tap') at given x and y coordinates.
464
        """Click (or 'tap') at given x and y coordinates.
38
465
465
39
466
        :raises RuntimeError: if the finger is already pressed.
466
        :raises RuntimeError: if the finger is already pressed.
40
@@ -469,10 +469,10 @@
41
469
        """
469
        """
42
470
        _logger.debug("Tapping at: %d,%d", x, y)
470
        _logger.debug("Tapping at: %d,%d", x, y)
43
471
        self._device.finger_down(x, y)
471
        self._device.finger_down(x, y)
45
472
        sleep(0.1)
472
        sleep(press_duration)
46
473
        self._device.finger_up()
473
        self._device.finger_up()
47
474
474
49
475
    def tap_object(self, object_):
475
    def tap_object(self, object_, press_duration=0.1):
50
476
        """Click (or 'tap') a given object.
476
        """Click (or 'tap') a given object.
51
477
477
52
478
        :raises RuntimeError: if the finger is already pressed.
478
        :raises RuntimeError: if the finger is already pressed.
53
@@ -483,7 +483,7 @@
54
483
        """
483
        """
55
484
        _logger.debug("Tapping object: %r", object)
484
        _logger.debug("Tapping object: %r", object)
56
485
        x, y = get_center_point(object_)
485
        x, y = get_center_point(object_)
58
486
        self.tap(x, y)
486
        self.tap(x, y, press_duration=press_duration)
59
487
487
60
488
    def press(self, x, y):
488
    def press(self, x, y):
61
489
        """Press and hold a given object or at the given coordinates.
489
        """Press and hold a given object or at the given coordinates.
62
490
490
63
=== modified file 'autopilot/tests/unit/test_input.py'
64
--- autopilot/tests/unit/test_input.py	2014-05-20 08:53:21 +0000
65
+++ autopilot/tests/unit/test_input.py	2014-08-26 05:24:44 +0000
66
@@ -652,24 +652,26 @@
67
652
652
68
653
    def get_touch_with_mocked_backend(self):
653
    def get_touch_with_mocked_backend(self):
69
654
        touch = _uinput.Touch(device_class=Mock)
654
        touch = _uinput.Touch(device_class=Mock)
72
655
        touch._device.mock_add_spec(
655
        touch._device.mock_add_spec(_uinput._UInputTouchDevice)
71
656
            _uinput._UInputTouchDevice, spec_set=True)
73
657
        return touch
656
        return touch
74
658
657
76
659
    def test_tap_must_put_finger_down_and_then_up(self):
658
    def test_tap_must_put_finger_down_then_sleep_and_then_put_finger_up(self):
77
660
        expected_calls = [
659
        expected_calls = [
78
661
            call.finger_down(0, 0),
660
            call.finger_down(0, 0),
79
661
            call.sleep(ANY),
80
662
            call.finger_up()
662
            call.finger_up()
81
663
        ]
663
        ]
82
664
664
83
665
        touch = self.get_touch_with_mocked_backend()
665
        touch = self.get_touch_with_mocked_backend()
85
666
        touch.tap(0, 0)
666
        with patch('autopilot.input._uinput.sleep') as mock_sleep:
86
667
            touch._device.attach_mock(mock_sleep, 'sleep')
87
668
            touch.tap(0, 0)
88
667
        self.assertEqual(expected_calls, touch._device.mock_calls)
669
        self.assertEqual(expected_calls, touch._device.mock_calls)
89
668
670
90
669
    def test_tap_object_must_put_finger_down_and_then_up_on_the_center(self):
671
    def test_tap_object_must_put_finger_down_and_then_up_on_the_center(self):
92
670
        object_ = type('Dummy', (object,), {'globalRect': (0, 0, 10, 10)})
672
        object_ = make_fake_object(center=True)
93
671
        expected_calls = [
673
        expected_calls = [
95
672
            call.finger_down(5, 5),
674
            call.finger_down(object_.center_x, object_.center_y),
96
673
            call.finger_up()
675
            call.finger_up()
97
674
        ]
676
        ]
98
675
677
99
@@ -746,6 +748,40 @@
100
746
        touch.drag(0, 0, 0, 0)
748
        touch.drag(0, 0, 0, 0)
101
747
        self.assertEqual(expected_calls, touch._device.mock_calls)
749
        self.assertEqual(expected_calls, touch._device.mock_calls)
102
748
750
103
751
    def test_tap_without_press_duration_must_sleep_default_time(self):
104
752
        touch = self.get_touch_with_mocked_backend()
105
753
106
754
        touch.tap(0, 0)
107
755
108
756
        self.assertEqual(utilities.sleep.total_time_slept(), 0.1)
109
757
110
758
    def test_tap_with_press_duration_must_sleep_specified_time(self):
111
759
        touch = self.get_touch_with_mocked_backend()
112
760
113
761
        touch.tap(0, 0, press_duration=10)
114
762
115
763
        self.assertEqual(utilities.sleep.total_time_slept(), 10)
116
764
117
765
    def test_tap_object_without_duration_must_call_tap_with_default_time(self):
118
766
        object_ = make_fake_object(center=True)
119
767
        touch = self.get_touch_with_mocked_backend()
120
768
121
769
        with patch.object(touch, 'tap') as mock_tap:
122
770
            touch.tap_object(object_)
123
771
124
772
        mock_tap.assert_called_once_with(
125
773
            object_.center_x, object_.center_y, press_duration=0.1)
126
774
127
775
    def test_tap_object_with_duration_must_call_tap_with_specified_time(self):
128
776
        object_ = make_fake_object(center=True)
129
777
        touch = self.get_touch_with_mocked_backend()
130
778
131
779
        with patch.object(touch, 'tap') as mock_tap:
132
780
            touch.tap_object(object_, press_duration=10)
133
781
134
782
        mock_tap.assert_called_once_with(
135
783
            object_.center_x, object_.center_y, press_duration=10)
136
784
137
749
785
138
750
class MultipleUInputTouchBackend(_uinput._UInputTouchDevice):
786
class MultipleUInputTouchBackend(_uinput._UInputTouchDevice):
139
751
787
140
@@ -885,3 +921,17 @@
141
885
921
142
886
        mock_drag.assert_called_once_with(
922
        mock_drag.assert_called_once_with(
143
887
            0, 0, 20, 20, rate=10, time_between_events=0.01)
923
            0, 0, 20, 20, rate=10, time_between_events=0.01)
144
924
145
925
    def test_click_with_default_press_duration(self):
146
926
        pointer = self.get_pointer_with_touch_backend_with_mock_device()
147
927
        with patch.object(pointer._device, 'tap') as mock_tap:
148
928
            pointer.click(1)
149
929
150
930
        mock_tap.assert_called_once_with(0, 0, press_duration=0.1)
151
931
152
932
    def test_press_with_specified_press_duration(self):
153
933
        pointer = self.get_pointer_with_touch_backend_with_mock_device()
154
934
        with patch.object(pointer._device, 'tap') as mock_tap:
155
935
            pointer.click(1, press_duration=10)
156
936
157
937
        mock_tap.assert_called_once_with(0, 0, press_duration=10)
Reviewer	Review Type	Date Requested	Status
Christopher Lee (community)		2014-08-21	Approve on 2014-08-27
PS Jenkins bot	continuous-integration		Approve on 2014-08-26
Review via email: mp+231678@code.launchpad.net