1
=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
2
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-01-30 15:26:21 +0000
3
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-02-22 00:04:26 +0000
4
@@ -15,7 +15,6 @@
5
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
6
16
16
7
17
import logging
17
import logging
8
18
import time
9
19
from distutils import version
18
from distutils import version
10
20
19
11
21
import autopilot
20
import autopilot
12
@@ -527,7 +526,7 @@
13
527
    def click_element(self, objectName):
526
    def click_element(self, objectName):
14
528
        """Click an element from the list.
527
        """Click an element from the list.
15
529
528
17
530
        It swipes the element into view if it's not fully visible.
529
        It swipes the element into view if it's center is not visible.
18
531
530
19
532
        :parameter objectName: The objectName property of the element to click.
531
        :parameter objectName: The objectName property of the element to click.
20
533
532
21
@@ -537,38 +536,81 @@
22
537
        self.pointing_device.click_object(element)
536
        self.pointing_device.click_object(element)
23
538
537
24
539
    def _swipe_element_into_view(self, objectName):
538
    def _swipe_element_into_view(self, objectName):
29
540
        element = self.select_single(objectName=objectName)
539
        element = self._select_element(objectName)
26
541
        x, y, width, height = self.globalRect
27
542
        start_x = x + (width / 2)
28
543
        start_y = y + (height / 2)
30
544
540
33
545
        while not self._is_element_fully_visible(objectName):
541
        while not self._is_element_clickable(objectName):
32
546
            stop_x = start_x
34
547
            if element.globalRect.y < self.globalRect.y:
542
            if element.globalRect.y < self.globalRect.y:
55
548
                stop_y = start_y + element.implicitHeight
543
                self._show_more_elements_above()
56
549
            else:
544
            else:
57
550
                stop_y = start_y - element.implicitHeight
545
                self._show_more_elements_below()
58
551
546
59
552
            if platform.model() == 'Desktop':
547
    def _select_element(self, object_name):
60
553
                # The drag on the desktop is done two fast, so we are left at
548
        try:
61
554
                # the bottom or at the top of the list, sometimes missing the
549
            return self.select_single(objectName=object_name)
62
555
                # element we are looking for.
550
        except dbus.StateNotFoundError:
63
556
                # TODO: use the slow drag once it's implemented:
551
            # If the list is big, elements will only be created when we scroll
64
557
                # https://bugs.launchpad.net/autopilot/+bug/1257055
552
            # them into view.
65
558
                # --elopio - 2014-01-09
553
            self._scroll_to_top()
66
559
                self.pointing_device.move(start_x, start_y)
554
            while not self.atYEnd:
67
560
                self.pointing_device.press()
555
                self._show_more_elements_below()
68
561
                self.pointing_device.move(stop_x, stop_y)
556
                try:
69
562
                time.sleep(0.3)
557
                    return self.select_single(objectName=object_name)
70
563
                self.pointing_device.release()
558
                except dbus.StateNotFoundError:
71
564
            else:
559
                    pass
72
565
                self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
560
            raise ToolkitEmulatorException(
73
566
561
                'List element with objectName "{}" not found.'.format(
74
567
    def _is_element_fully_visible(self, objectName):
562
                    object_name))
75
563
76
564
    @autopilot_logging.log_action(logger.info)
77
565
    def _scroll_to_top(self):
78
566
        x, y, width, height = self.globalRect
79
567
        while not self.atYBeginning:
80
568
            self._show_more_elements_above()
81
569
82
570
    @autopilot_logging.log_action(logger.info)
83
571
    def _show_more_elements_below(self):
84
572
        if self.atYEnd:
85
573
            raise ToolkitEmulatorException('There are no more elements below.')
86
574
        else:
87
575
            self._show_more_elements('below')
88
576
89
577
    @autopilot_logging.log_action(logger.info)
90
578
    def _show_more_elements_above(self):
91
579
        if self.atYBeginning:
92
580
            raise ToolkitEmulatorException('There are no more elements above.')
93
581
        else:
94
582
            self._show_more_elements('above')
95
583
96
584
    def _show_more_elements(self, direction):
97
585
        x, y, width, height = self.globalRect
98
586
        start_x = stop_x = x + (width / 2)
99
587
        # Start and stop just a little under the top of the list.
100
588
        top = y + 5
101
589
        bottom = y + height - 5
102
590
        if direction == 'below':
103
591
            start_y = bottom
104
592
            stop_y = top
105
593
        elif direction == 'above':
106
594
            start_y = top
107
595
            stop_y = bottom
108
596
        else:
109
597
            raise ToolkitEmulatorException(
110
598
                'Invalid direction {}.'.format(direction))
111
599
        self._slow_drag(start_x, stop_x, start_y, stop_y)
112
600
        self.dragging.wait_for(False)
113
601
        self.moving.wait_for(False)
114
602
115
603
    def _slow_drag(self, start_x, stop_x, start_y, stop_y):
116
604
        # If we drag too fast, we end up scrolling more than what we
117
605
        # should, sometimes missing the  element we are looking for.
118
606
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate=5)
119
607
120
608
    def _is_element_clickable(self, objectName):
121
609
        """Return True if the center of the element is visible."""
122
568
        element = self.select_single(objectName=objectName)
610
        element = self.select_single(objectName=objectName)
126
569
        return (element.globalRect.y >= self.globalRect.y and
611
        element_center = element.globalRect.y + element.globalRect.height / 2
127
570
                element.globalRect.y + element.globalRect.height <=
612
        return (element_center >= self.globalRect.y and
128
571
                self.globalRect.y + self.globalRect.height)
613
                element_center <= self.globalRect.y + self.globalRect.height)
129
572
614
130
573
615
131
574
class Empty(UbuntuUIToolkitEmulatorBase):
616
class Empty(UbuntuUIToolkitEmulatorBase):
132
575
617
133
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
134
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-01-13 15:23:25 +0000
135
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-02-22 00:04:26 +0000
136
@@ -574,47 +574,6 @@
137
574
                text: "No element clicked."
574
                text: "No element clicked."
138
575
            }
575
            }
139
576
576
140
577
            ListModel {
141
578
                id: testModel
142
579
143
580
                ListElement {
144
581
                    objectName: "testListElement1"
145
582
                    label: "test list element 1"
146
583
                }
147
584
                ListElement {
148
585
                    objectName: "testListElement2"
149
586
                    label: "test list element 2"
150
587
                }
151
588
                ListElement {
152
589
                    objectName: "testListElement3"
153
590
                    label: "test list element 3"
154
591
                }
155
592
                ListElement {
156
593
                    objectName: "testListElement4"
157
594
                    label: "test list element 4"
158
595
                }
159
596
                ListElement {
160
597
                    objectName: "testListElement5"
161
598
                    label: "test list element 5"
162
599
                }
163
600
                ListElement {
164
601
                    objectName: "testListElement6"
165
602
                    label: "test list element 6"
166
603
                }
167
604
                ListElement {
168
605
                    objectName: "testListElement7"
169
606
                    label: "test list element 7"
170
607
                }
171
608
                ListElement {
172
609
                    objectName: "testListElement8"
173
610
                    label: "test list element 8"
174
611
                }
175
612
                ListElement {
176
613
                    objectName: "testListElement9"
177
614
                    label: "test list element 9"
178
615
                }
179
616
            }
180
617
181
618
            ListView {
577
            ListView {
182
619
                id: testListView
578
                id: testListView
183
620
                objectName: "testListView"
579
                objectName: "testListView"
184
@@ -622,13 +581,13 @@
185
622
                anchors.right: parent.right
581
                anchors.right: parent.right
186
623
                height: column.height - clickedLabel.paintedHeight
582
                height: column.height - clickedLabel.paintedHeight
187
624
                clip: true
583
                clip: true
189
625
                model: testModel
584
                model: 20
190
626
585
191
627
                delegate: ListItem.Standard {
586
                delegate: ListItem.Standard {
196
628
                    text: model.label
587
                        objectName: "testListElement%1".arg(index)
197
629
                    objectName: model.objectName
588
                        text: "test list element %1".arg(index)
198
630
                    onClicked: clickedLabel.text = model.objectName
589
                        onClicked: clickedLabel.text = objectName
199
631
                    height: units.gu(5)
590
                        height: units.gu(5)
200
632
                }
591
                }
201
633
            }
592
            }
202
634
        }
593
        }
203
@@ -648,32 +607,45 @@
204
648
        self.assertIsInstance(self.list_view, emulators.QQuickListView)
607
        self.assertIsInstance(self.list_view, emulators.QQuickListView)
205
649
608
206
650
    def test_click_element(self):
609
    def test_click_element(self):
209
651
        self.list_view.click_element('testListElement1')
610
        self.list_view.click_element('testListElement0')
210
652
        self.assertEqual(self.label.text, 'testListElement1')
611
        self.assertEqual(self.label.text, 'testListElement0')
211
653
612
212
654
    def test_click_element_outside_view_below(self):
613
    def test_click_element_outside_view_below(self):
213
655
        # Click the first element out of view to make sure we are not scrolling
614
        # Click the first element out of view to make sure we are not scrolling
214
656
        # to the bottom at once.
615
        # to the bottom at once.
215
657
        self.assertFalse(
616
        self.assertFalse(
217
658
            self.list_view._is_element_fully_visible('testListElement5'))
617
            self.list_view._is_element_clickable('testListElement5'))
218
659
618
219
660
        self.list_view.click_element('testListElement5')
619
        self.list_view.click_element('testListElement5')
220
661
        self.assertEqual(self.label.text, 'testListElement5')
620
        self.assertEqual(self.label.text, 'testListElement5')
221
662
621
222
663
    def test_click_element_outside_view_above(self):
622
    def test_click_element_outside_view_above(self):
223
664
        # First we need to scroll to the 8th element in order for the 9th to be
224
665
        # created.
225
666
        self.list_view.click_element('testListElement8')
226
667
        self.list_view.click_element('testListElement9')
623
        self.list_view.click_element('testListElement9')
227
668
624
228
669
        # Click the first element out of view to make sure we are not scrolling
625
        # Click the first element out of view to make sure we are not scrolling
229
670
        # to the top at once.
626
        # to the top at once.
230
671
        self.assertFalse(
627
        self.assertFalse(
232
672
            self.list_view._is_element_fully_visible('testListElement4'))
628
            self.list_view._is_element_clickable('testListElement4'))
233
673
629
234
674
        self.list_view.click_element('testListElement4')
630
        self.list_view.click_element('testListElement4')
235
675
        self.assertEqual(self.label.text, 'testListElement4')
631
        self.assertEqual(self.label.text, 'testListElement4')
236
676
632
237
633
    def test_click_element_not_created_at_start(self):
238
634
        objectName = 'testListElement19'
239
635
        self.assertRaises(
240
636
            dbus.StateNotFoundError,
241
637
            self.list_view.select_single,
242
638
            objectName=objectName)
243
639
        self.list_view.click_element(objectName)
244
640
245
641
    def test_click_unexisting_element(self):
246
642
        error = self.assertRaises(
247
643
            emulators.ToolkitEmulatorException,
248
644
            self.list_view.click_element,
249
645
            'unexisting')
250
646
        self.assertEqual(
251
647
            str(error), 'List element with objectName "unexisting" not found.')
252
648
253
677
649
254
678
class SwipeToDeleteTestCase(tests.QMLStringAppTestCase):
650
class SwipeToDeleteTestCase(tests.QMLStringAppTestCase):
255
679
651
Reviewer	Review Type	Date Requested	Status
Florian Boucault (community)			Approve on 2014-02-25
Cris Dywan		2014-01-17	Approve on 2014-02-24
PS Jenkins bot	continuous-integration		Approve on 2014-02-22
Javier Collado		2014-01-17	Pending
Richard Huddie		2014-01-17	Pending
Víctor R. Ruiz		2014-01-17	Pending
Review via email: mp+202129@code.launchpad.net