1
=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
2
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-12-01 15:52:52 +0000
3
+++ tests/autopilot/unity8/shell/emulators/dash.py	2014-12-05 15:59:15 +0000
4
@@ -90,8 +90,12 @@
5
90
90
6
91
    def _get_scope_loader(self, scope_id):
91
    def _get_scope_loader(self, scope_id):
7
92
        try:
92
        try:
10
93
            return self.dash_content_list.wait_select_single(
93
            aux = self.dash_content_list.get_children_by_type('QQuickItem')[0]
11
94
                'QQuickLoader', scopeId=scope_id)
94
            for l in aux.get_children_by_type('QQuickLoader'):
12
95
                if (l.scopeId == scope_id):
13
96
                    return l;
14
97
            raise emulators.UnityEmulatorException(
15
98
                'No scope found with id {0}'.format(scope_id))
16
95
        except dbus.StateNotFoundError:
99
        except dbus.StateNotFoundError:
17
96
            raise emulators.UnityEmulatorException(
100
            raise emulators.UnityEmulatorException(
18
97
                'No scope found with id {0}'.format(scope_id))
101
                'No scope found with id {0}'.format(scope_id))
19
@@ -125,10 +129,15 @@
20
125
        original_index = self.dash_content_list.currentIndex
129
        original_index = self.dash_content_list.currentIndex
21
126
        dash_content = self.select_single(objectName="dashContent")
130
        dash_content = self.select_single(objectName="dashContent")
22
127
        x, y, width, height = dash_content.globalRect
131
        x, y, width, height = dash_content.globalRect
25
128
        start_x = x + width / 3
132
        # Make the drag range be a multiple of the drag "rate" value.
26
129
        stop_x = x + width / 3 * 2
133
        # Workarounds https://bugs.launchpad.net/mir/+bug/1399690
27
134
        rate = 10
28
135
        divisions = 5
29
136
        jump = ( width / divisions ) // rate * rate
30
137
        start_x = x + jump
31
138
        stop_x = x + jump * (divisions - 1)
32
130
        start_y = stop_y = y + 1
139
        start_y = stop_y = y + 1
34
131
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
140
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate)
35
132
        self.dash_content_list.currentIndex.wait_for(original_index - 1)
141
        self.dash_content_list.currentIndex.wait_for(original_index - 1)
36
133
142
37
134
    @autopilot_logging.log_action(logger.info)
143
    @autopilot_logging.log_action(logger.info)
38
@@ -136,10 +145,15 @@
39
136
        original_index = self.dash_content_list.currentIndex
145
        original_index = self.dash_content_list.currentIndex
40
137
        dash_content = self.select_single(objectName="dashContent")
146
        dash_content = self.select_single(objectName="dashContent")
41
138
        x, y, width, height = dash_content.globalRect
147
        x, y, width, height = dash_content.globalRect
44
139
        start_x = x + width / 3 * 2
148
        # Make the drag range be a multiple of the drag "rate" value.
45
140
        stop_x = x + width / 3
149
        # Workarounds https://bugs.launchpad.net/mir/+bug/1399690
46
150
        rate = 10
47
151
        divisions = 5
48
152
        jump = ( width / divisions ) // rate * rate
49
153
        start_x = x + jump * (divisions - 1)
50
154
        stop_x = x + jump
51
141
        start_y = stop_y = y + 1
155
        start_y = stop_y = y + 1
53
142
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
156
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate)
54
143
        self.dash_content_list.currentIndex.wait_for(original_index + 1)
157
        self.dash_content_list.currentIndex.wait_for(original_index + 1)
55
144
158
56
145
    def enter_search_query(self, query):
159
    def enter_search_query(self, query):
Status:	Merged
Approved by:	Michał Sawicz on 2014-12-15
Approved revision:	1464
Merged at revision:	1512
Proposed branch:	lp:~aacid/unity8/autopilot_drag_more
Merge into:	lp:unity8
Diff against target:	56 lines (+22/-8) 1 file modified tests/autopilot/unity8/shell/emulators/dash.py (+22/-8)
To merge this branch:	bzr merge lp:~aacid/unity8/autopilot_drag_more
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michał Sawicz			Approve on 2014-12-15
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-12-15
Andrea Cimitan (community)		2014-12-02	Needs Fixing on 2014-12-05
Review via email: mp+243367@code.launchpad.net