1
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py'
2
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py	2014-08-03 03:06:54 +0000
3
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py	2014-08-13 15:48:10 +0000
4
@@ -68,11 +68,10 @@
5
68
68
6
69
        containers = self._get_containers()
69
        containers = self._get_containers()
7
70
        while not fail_condition():
70
        while not fail_condition():
8
71
            swipe_method(containers)
9
72
            try:
71
            try:
10
73
                return self.select_single(objectName=object_name)
72
                return self.select_single(objectName=object_name)
11
74
            except dbus.StateNotFoundError:
73
            except dbus.StateNotFoundError:
13
75
                pass
74
                swipe_method(containers)
14
76
        raise _common.ToolkitException(
75
        raise _common.ToolkitException(
15
77
            'List element with objectName "{}" not found.'.format(object_name))
76
            'List element with objectName "{}" not found.'.format(object_name))
16
78
77
17
79
78
18
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py'
19
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2014-04-17 01:06:31 +0000
20
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2014-08-13 15:48:10 +0000
21
@@ -14,6 +14,11 @@
22
14
# You should have received a copy of the GNU Lesser General Public License
14
# You should have received a copy of the GNU Lesser General Public License
23
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/>.
24
16
16
25
17
try:
26
18
    from unittest import mock
27
19
except ImportError:
28
20
    import mock
29
21
30
17
from autopilot.introspection import dbus
22
from autopilot.introspection import dbus
31
18
23
32
19
import ubuntuuitoolkit
24
import ubuntuuitoolkit
33
@@ -100,13 +105,39 @@
34
100
        self.list_view.click_element('testListElement4')
105
        self.list_view.click_element('testListElement4')
35
101
        self.assertEqual(self.label.text, 'testListElement4')
106
        self.assertEqual(self.label.text, 'testListElement4')
36
102
107
38
103
    def test_click_element_not_created_at_start(self):
108
    def test_click_element_not_created_at_start_below(self):
39
104
        objectName = 'testListElement19'
109
        objectName = 'testListElement19'
40
105
        self.assertRaises(
110
        self.assertRaises(
41
106
            dbus.StateNotFoundError,
111
            dbus.StateNotFoundError,
42
107
            self.list_view.select_single,
112
            self.list_view.select_single,
43
108
            objectName=objectName)
113
            objectName=objectName)
44
109
        self.list_view.click_element(objectName)
114
        self.list_view.click_element(objectName)
45
115
        self.assertEqual(self.label.text, 'testListElement19')
46
116
47
117
    def test_click_element_from_first_page_deleted_when_swiping_down(self):
48
118
        """Test that no more swiping is done after finding the element.
49
119
50
120
        This is a regression test for bug http://pad.lv/1342521 that caused
51
121
        us to swipe down after finding an element on the first page of the
52
122
        list. If we were lucky, the element was still cashed so we just ended
53
123
        up doing two extra swipes. If not, then the element will be deleted
54
124
        from the tree and the helper failed.
55
125
56
126
        """
57
127
        # Swipe to the bottom.
58
128
        self.list_view.click_element('testListElement19')
59
129
60
130
        objectName = 'testListElement1'
61
131
        self.assertRaises(
62
132
            dbus.StateNotFoundError,
63
133
            self.list_view.select_single,
64
134
            objectName=objectName)
65
135
        with mock.patch.object(
66
136
                self.list_view,
67
137
                'swipe_to_show_more_below') as mock_swipe_down:
68
138
            self.list_view.click_element(objectName)
69
139
        self.assertFalse(mock_swipe_down.called)
70
140
        self.assertEqual(self.label.text, 'testListElement1')
71
110
141
72
111
    def test_click_unexisting_element(self):
142
    def test_click_unexisting_element(self):
73
112
        error = self.assertRaises(
143
        error = self.assertRaises(
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-08-20
Cris Dywan		2014-07-16	Approve on 2014-07-25
Omer Akram (community)		2014-07-16	Approve on 2014-07-25
Canonical Platform QA Team		2014-07-16	Pending
Review via email: mp+226961@code.launchpad.net