1
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
2
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2015-02-03 08:34:58 +0000
3
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2015-04-15 13:48:54 +0000
4
@@ -19,6 +19,7 @@
5
19
import autopilot.exceptions
19
import autopilot.exceptions
6
20
from autopilot import logging as autopilot_logging
20
from autopilot import logging as autopilot_logging
7
21
21
8
22
from ubuntuuitoolkit import units
9
22
from ubuntuuitoolkit._custom_proxy_objects import _common
23
from ubuntuuitoolkit._custom_proxy_objects import _common
10
23
24
11
24
25
12
@@ -98,6 +99,14 @@
13
98
99
14
99
class QQuickFlickable(Scrollable):
100
class QQuickFlickable(Scrollable):
15
100
101
16
102
    # Swiping from below can open the toolbar or trigger the bottom edge
17
103
    # gesture. Use this margin to start a swipe that will not be that close to
18
104
    # the bottom edge.
19
105
    margin_to_swipe_from_bottom = units.gu(2)
20
106
    # Swiping from above can open the indicators or resize the window. Use this
21
107
    # margin to start a swipe that will not be that close to the top edge.
22
108
    margin_to_swipe_from_top = units.gu(1)
23
109
24
101
    @autopilot_logging.log_action(logger.info)
110
    @autopilot_logging.log_action(logger.info)
25
102
    def swipe_child_into_view(self, child):
111
    def swipe_child_into_view(self, child):
26
103
        """Make the child visible.
112
        """Make the child visible.
27
@@ -145,24 +154,23 @@
28
145
            containers = self._get_containers()
154
            containers = self._get_containers()
29
146
        start_x = stop_x = self.globalRect.x + (self.globalRect.width // 2)
155
        start_x = stop_x = self.globalRect.x + (self.globalRect.width // 2)
30
147
156
31
157
        top = _get_visible_container_top(containers)
32
158
        bottom = _get_visible_container_bottom(containers)
33
159
34
148
        # Make the drag range be a multiple of the drag "rate" value.
160
        # Make the drag range be a multiple of the drag "rate" value.
35
149
        # Workarounds https://bugs.launchpad.net/mir/+bug/1399690
161
        # Workarounds https://bugs.launchpad.net/mir/+bug/1399690
36
150
        rate = self._slow_drag_rate()
162
        rate = self._slow_drag_rate()
37
151
163
43
152
        # Start and stop just a little under the top and a little over the
164
        # The swipes are not done from right at the top and bottom because
44
153
        # bottom.
165
        # they could trigger edge gestures or resize windows.
40
154
        top = _get_visible_container_top(containers) + rate
41
155
        bottom = _get_visible_container_bottom(containers) - rate
42
156
45
157
        if direction == 'below':
166
        if direction == 'below':
50
158
            # Take into account that swiping from below can open the toolbar or
167
            start_y = bottom - self.margin_to_swipe_from_bottom
47
159
            # trigger the bottom edge gesture.
48
160
            # XXX Do this only if we are close to the bottom edge.
49
161
            start_y = bottom - 20
51
162
            stop_y = start_y + (top - start_y) // rate * rate
168
            stop_y = start_y + (top - start_y) // rate * rate
52
169
53
163
        elif direction == 'above':
170
        elif direction == 'above':
55
164
            start_y = top
171
            start_y = top + self.margin_to_swipe_from_top
56
165
            stop_y = start_y + (bottom - start_y) // rate * rate
172
            stop_y = start_y + (bottom - start_y) // rate * rate
57
173
58
166
        else:
174
        else:
59
167
            raise _common.ToolkitException(
175
            raise _common.ToolkitException(
60
168
                'Invalid direction {}.'.format(direction))
176
                'Invalid direction {}.'.format(direction))
61
169
177
62
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py'
63
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2015-03-03 13:20:06 +0000
64
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2015-04-15 13:48:54 +0000
65
@@ -21,7 +21,11 @@
66
21
21
67
22
import testtools
22
import testtools
68
23
import ubuntuuitoolkit
23
import ubuntuuitoolkit
70
24
from ubuntuuitoolkit import tests
24
from ubuntuuitoolkit import (
71
25
    tests,
72
26
    units,
73
27
)
74
28
from ubuntuuitoolkit._custom_proxy_objects import _flickable
75
25
29
76
26
30
77
27
class FlickableTestCase(testtools.TestCase):
31
class FlickableTestCase(testtools.TestCase):
78
@@ -218,6 +222,45 @@
79
218
        self.flickable.swipe_to_show_more_below()
222
        self.flickable.swipe_to_show_more_below()
80
219
        self.assertFalse(self.flickable.atYBeginning)
223
        self.assertFalse(self.flickable.atYBeginning)
81
220
224
82
225
    def test_swipe_to_show_more_below_with_bottom_margin(self):
83
226
        """Calling swipe to show more below will use the margin in the drag."""
84
227
        qquickflickable = self.main_view.select_single(
85
228
            ubuntuuitoolkit.QQuickFlickable, objectName='flickable')
86
229
        qquickflickable.margin_to_swipe_from_bottom = units.gu(6)
87
230
        containers = qquickflickable._get_containers()
88
231
        bottom = _flickable._get_visible_container_bottom(containers)
89
232
90
233
        with mock.patch.object(
91
234
                qquickflickable.pointing_device, 'drag') as mock_drag:
92
235
            try:
93
236
                qquickflickable.swipe_to_show_more_below()
94
237
            except ubuntuuitoolkit.ToolkitException:
95
238
                # An exception will be raised because the drag was faked.
96
239
                pass
97
240
98
241
        mock_drag.assert_called_with(
99
242
            mock.ANY, bottom - units.gu(6), mock.ANY, mock.ANY, rate=mock.ANY)
100
243
101
244
    def test_swipe_to_show_more_above_with_top_margin(self):
102
245
        """Calling swipe to show more above will use the margin in the drag."""
103
246
        qquickflickable = self.main_view.select_single(
104
247
            ubuntuuitoolkit.QQuickFlickable, objectName='flickable')
105
248
        qquickflickable.margin_to_swipe_from_top = units.gu(6)
106
249
        containers = qquickflickable._get_containers()
107
250
        top = _flickable._get_visible_container_top(containers)
108
251
109
252
        qquickflickable.swipe_to_bottom()
110
253
        with mock.patch.object(
111
254
                qquickflickable.pointing_device, 'drag') as mock_drag:
112
255
            try:
113
256
                qquickflickable.swipe_to_show_more_above()
114
257
            except ubuntuuitoolkit.ToolkitException:
115
258
                # An exception will be raised because the drag was faked.
116
259
                pass
117
260
118
261
        mock_drag.assert_called_with(
119
262
            mock.ANY, top + units.gu(6), mock.ANY, mock.ANY, rate=mock.ANY)
120
263
121
221
    def test_failed_drag_must_raise_exception(self):
264
    def test_failed_drag_must_raise_exception(self):
122
222
        dummy_coordinates = (0, 0, 10, 10)
265
        dummy_coordinates = (0, 0, 10, 10)
123
223
        # Patch the pointing device so it does nothing and the swipe fails.
266
        # Patch the pointing device so it does nothing and the swipe fails.
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2015-02-07	Approve on 2015-04-16
Zsombor Egri		2015-02-07	Approve on 2015-04-16
Brendan Donegan (community)			Approve on 2015-04-16
Leo Arias (community)			Approve on 2015-04-15
Albert Astals Cid (community)		2015-02-07	Abstain on 2015-02-13
Review via email: mp+248986@code.launchpad.net