1
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py'
2
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2014-04-29 23:03:58 +0000
3
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2014-05-30 07:52:53 +0000
4
@@ -111,3 +111,19 @@
5
111
        raise ToolkitException(
111
        raise ToolkitException(
6
112
            "The element is not contained in a Flickable so it can't be "
112
            "The element is not contained in a Flickable so it can't be "
7
113
            "swiped into view.")
113
            "swiped into view.")
8
114
9
115
    def _get_top_container(self):
10
116
        """Return the top-most container with a globalRect."""
11
117
        root = self.get_root_instance()
12
118
        parent = self.get_parent()
13
119
        top_container = None
14
120
        while parent.id != root.id:
15
121
            if hasattr(parent, 'globalRect'):
16
122
                top_container = parent
17
123
18
124
            parent = parent.get_parent()
19
125
20
126
        if top_container is None:
21
127
            raise ToolkitException('Could not find the top-most container.')
22
128
        else:
23
129
            return top_container
24
114
130
25
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
26
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-05-20 07:31:55 +0000
27
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-05-30 07:52:53 +0000
28
@@ -51,23 +51,6 @@
29
51
        containers = [self._get_top_container(), self]
51
        containers = [self._get_top_container(), self]
30
52
        return containers
52
        return containers
31
53
53
32
54
    def _get_top_container(self):
33
55
        """Return the top-most container with a globalRect."""
34
56
        root = self.get_root_instance()
35
57
        parent = self.get_parent()
36
58
        top_container = None
37
59
        while parent.id != root.id:
38
60
            if hasattr(parent, 'globalRect'):
39
61
                top_container = parent
40
62
41
63
            parent = parent.get_parent()
42
64
43
65
        if top_container is None:
44
66
            raise _common.ToolkitException(
45
67
                "Couldn't find the top-most container.")
46
68
        else:
47
69
            return top_container
48
70
49
71
    def _is_child_visible(self, child, containers):
54
    def _is_child_visible(self, child, containers):
50
72
        """Check if the center of the child is visible.
55
        """Check if the center of the child is visible.
51
73
56
52
74
57
53
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
54
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-05-13 12:43:31 +0000
55
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-05-30 07:52:53 +0000
56
@@ -21,7 +21,6 @@
57
21
21
58
22
from ubuntuuitoolkit._custom_proxy_objects import (
22
from ubuntuuitoolkit._custom_proxy_objects import (
59
23
    _common,
23
    _common,
60
24
    _mainview,
61
25
    _tabbar
24
    _tabbar
62
26
)
25
)
63
27
26
64
@@ -35,13 +34,6 @@
65
35
class Header(_common.UbuntuUIToolkitCustomProxyObjectBase):
34
class Header(_common.UbuntuUIToolkitCustomProxyObjectBase):
66
36
    """Header Autopilot emulator."""
35
    """Header Autopilot emulator."""
67
37
36
68
38
    def __init__(self, *args):
69
39
        super(Header, self).__init__(*args)
70
40
        # XXX we need a better way to keep reference to the main view.
71
41
        # --elopio - 2014-02-26
72
42
        self.main_view = self.get_root_instance().select_single(
73
43
            _mainview.MainView)
74
44
75
45
    def _show_if_not_visible(self):
37
    def _show_if_not_visible(self):
76
46
        if not self._is_visible():
38
        if not self._is_visible():
77
47
            self._show()
39
            self._show()
78
@@ -53,8 +45,9 @@
79
53
        # FIXME This will fail if the header is not linked to a flickable that
45
        # FIXME This will fail if the header is not linked to a flickable that
80
54
        # fills the main view. The header has a flickable property but it
46
        # fills the main view. The header has a flickable property but it
81
55
        # can't be read by autopilot. See bug http://pad.lv/1318829
47
        # can't be read by autopilot. See bug http://pad.lv/1318829
82
48
        top_container = self._get_top_container()
83
56
        start_x = stop_x = (self.globalRect.x + self.globalRect.width) // 2
49
        start_x = stop_x = (self.globalRect.x + self.globalRect.width) // 2
85
57
        start_y = self.main_view.globalRect.y + 5
50
        start_y = top_container.globalRect.y + 5
86
58
        stop_y = start_y + self.globalRect.height
51
        stop_y = start_y + self.globalRect.height
87
59
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
52
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
88
60
        self.y.wait_for(0)
53
        self.y.wait_for(0)
89
61
54
90
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/CustomMainView.qml'
91
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/CustomMainView.qml	1970-01-01 00:00:00 +0000
92
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/CustomMainView.qml	2014-05-30 07:52:53 +0000
93
@@ -0,0 +1,23 @@
94
1
/*
95
2
 * Copyright 2014 Canonical Ltd.
96
3
 *
97
4
 * This program is free software; you can redistribute it and/or modify
98
5
 * it under the terms of the GNU Lesser General Public License as published by
99
6
 * the Free Software Foundation; version 3.
100
7
 *
101
8
 * This program is distributed in the hope that it will be useful,
102
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
103
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
104
11
 * GNU Lesser General Public License for more details.
105
12
 *
106
13
 * You should have received a copy of the GNU Lesser General Public License
107
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
108
15
 */
109
16
110
17
import QtQuick 2.0
111
18
import Ubuntu.Components 0.1
112
19
113
20
MainView {
114
21
    objectName: "overview"
115
22
    property string test
116
23
}
117
0
24
118
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.HeaderInCustomMainViewTestCase.qml'
119
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.HeaderInCustomMainViewTestCase.qml	1970-01-01 00:00:00 +0000
120
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.HeaderInCustomMainViewTestCase.qml	2014-05-30 07:52:53 +0000
121
@@ -0,0 +1,24 @@
122
1
/*
123
2
 * Copyright 2014 Canonical Ltd.
124
3
 *
125
4
 * This program is free software; you can redistribute it and/or modify
126
5
 * it under the terms of the GNU Lesser General Public License as published by
127
6
 * the Free Software Foundation; version 3.
128
7
 *
129
8
 * This program is distributed in the hope that it will be useful,
130
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
131
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
132
11
 * GNU Lesser General Public License for more details.
133
12
 *
134
13
 * You should have received a copy of the GNU Lesser General Public License
135
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
136
15
 */
137
16
138
17
import QtQuick 2.0
139
18
import Ubuntu.Components 1.1
140
19
141
20
CustomMainView {
142
21
143
22
    objectName: 'mainView'
144
23
145
24
}
146
0
25
147
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py'
148
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-05-20 08:56:28 +0000
149
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-05-30 07:52:53 +0000
150
@@ -14,6 +14,8 @@
151
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
152
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/>.
153
16
16
154
17
import os
155
18
156
17
import ubuntuuitoolkit
19
import ubuntuuitoolkit
157
18
from ubuntuuitoolkit import tests
20
from ubuntuuitoolkit import tests
158
19
21
159
@@ -157,3 +159,28 @@
160
157
159
161
158
        # only three actions are visible
160
        # only three actions are visible
162
159
        self.assertEqual(overflow_button.visible, False)
161
        self.assertEqual(overflow_button.visible, False)
163
162
164
163
165
164
class CustomMainView(ubuntuuitoolkit.MainView):
166
165
    """Autopilot helper for a custom main view."""
167
166
168
167
169
168
class HeaderInCustomMainViewTestCase(tests.QMLFileAppTestCase):
170
169
171
170
    path = os.path.abspath(__file__)
172
171
    dir_path = os.path.dirname(path)
173
172
    test_qml_file_path = os.path.join(
174
173
        dir_path, 'test_header.HeaderInCustomMainViewTestCase.qml')
175
174
176
175
    @property
177
176
    def main_view(self):
178
177
        return self.app.select_single(CustomMainView)
179
178
180
179
    def test_get_header_from_custom_main_view(self):
181
180
        """Test that we can get the header from a custom main view.
182
181
183
182
        This prevents a regression of http://pad.lv/1324556.
184
183
185
184
        """
186
185
        header = self.main_view.get_header()
187
186
        self.assertIsInstance(header, ubuntuuitoolkit.Header)
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-05-30	Approve on 2014-06-03
Ubuntu SDK team		2014-05-30	Pending
Review via email: mp+221492@code.launchpad.net