1
=== modified file 'tests/autopilot/ubuntuuitoolkit/__init__.py'
2
--- tests/autopilot/ubuntuuitoolkit/__init__.py	2014-07-26 00:10:22 +0000
3
+++ tests/autopilot/ubuntuuitoolkit/__init__.py	2014-08-07 18:48:22 +0000
4
@@ -23,7 +23,6 @@
5
23
    'check_autopilot_version',
23
    'check_autopilot_version',
6
24
    'CheckBox',
24
    'CheckBox',
7
25
    'environment',
25
    'environment',
8
26
    'emulators',
9
27
    'fixture_setup',
26
    'fixture_setup',
10
28
    'get_keyboard',
27
    'get_keyboard',
11
29
    'get_pointing_device',
28
    'get_pointing_device',
12
@@ -50,7 +49,6 @@
13
50
49
14
51
from ubuntuuitoolkit import (
50
from ubuntuuitoolkit import (
15
52
    base,
51
    base,
16
53
    emulators,
17
54
    environment,
52
    environment,
18
55
    fixture_setup,
53
    fixture_setup,
19
56
    tests,
54
    tests,
20
57
55
21
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_checkbox.py'
22
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_checkbox.py	2014-04-16 21:13:39 +0000
23
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_checkbox.py	2014-08-07 18:48:22 +0000
24
@@ -25,7 +25,7 @@
25
25
25
26
26
26
27
27
class CheckBox(_common.UbuntuUIToolkitCustomProxyObjectBase):
27
class CheckBox(_common.UbuntuUIToolkitCustomProxyObjectBase):
29
28
    """CheckBox Autopilot emulator."""
28
    """CheckBox Autopilot custom proxy object."""
30
29
29
31
30
    @autopilot_logging.log_action(logger.info)
30
    @autopilot_logging.log_action(logger.info)
32
31
    def check(self, timeout=10):
31
    def check(self, timeout=10):
33
32
32
34
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py'
35
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2014-05-29 16:18:53 +0000
36
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2014-08-07 18:48:22 +0000
37
@@ -32,7 +32,7 @@
38
32
32
39
33
33
40
34
class ToolkitException(Exception):
34
class ToolkitException(Exception):
42
35
    """Exception raised when there is an error with the emulator."""
35
    """Exception raised when there is an error with the custom proxy object."""
43
36
36
44
37
37
45
38
def get_pointing_device():
38
def get_pointing_device():
46
@@ -59,17 +59,17 @@
47
59
    """Check that the Autopilot installed version matches the one required.
59
    """Check that the Autopilot installed version matches the one required.
48
60
60
49
61
    :raise ToolkitException: If the installed Autopilot version does't
61
    :raise ToolkitException: If the installed Autopilot version does't
51
62
        match the required by the emulators.
62
        match the required by the custom proxy objects.
52
63
63
53
64
    """
64
    """
54
65
    installed_version = version.LooseVersion(autopilot.version)
65
    installed_version = version.LooseVersion(autopilot.version)
55
66
    if installed_version < version.LooseVersion('1.4'):
66
    if installed_version < version.LooseVersion('1.4'):
56
67
        raise ToolkitException(
67
        raise ToolkitException(
58
68
            'The emulators need Autopilot 1.4 or higher.')
68
            'The custom proxy objects require Autopilot 1.4 or higher.')
59
69
69
60
70
70
61
71
class UbuntuUIToolkitCustomProxyObjectBase(dbus.CustomEmulatorBase):
71
class UbuntuUIToolkitCustomProxyObjectBase(dbus.CustomEmulatorBase):
63
72
    """A base class for all the Ubuntu UI Toolkit emulators."""
72
    """A base class for all the Ubuntu UI Toolkit custom proxy objects."""
64
73
73
65
74
    def __init__(self, *args):
74
    def __init__(self, *args):
66
75
        check_autopilot_version()
75
        check_autopilot_version()
67
76
76
68
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
69
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-07-31 05:40:01 +0000
70
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-08-07 18:48:22 +0000
71
@@ -32,7 +32,7 @@
72
32
32
73
33
33
74
34
class AppHeader(_common.UbuntuUIToolkitCustomProxyObjectBase):
34
class AppHeader(_common.UbuntuUIToolkitCustomProxyObjectBase):
76
35
    """AppHeader Autopilot emulator."""
35
    """AppHeader Autopilot custom proxy object."""
77
36
36
78
37
    def _show_if_not_visible(self):
37
    def _show_if_not_visible(self):
79
38
        if not self._is_visible():
38
        if not self._is_visible():
80
@@ -124,7 +124,7 @@
81
124
    def switch_to_next_tab(self):
124
    def switch_to_next_tab(self):
82
125
        """Open the next tab.
125
        """Open the next tab.
83
126
126
85
127
        :raise ToolkitEmulatorException: If the main view has no tabs.
127
        :raise ToolkitException: If the main view has no tabs.
86
128
128
87
129
        """
129
        """
88
130
        self._show_if_not_visible()
130
        self._show_if_not_visible()
89
@@ -154,8 +154,8 @@
90
154
        """Open a tab. This only supports the new tabs in the header
154
        """Open a tab. This only supports the new tabs in the header
91
155
155
92
156
        :parameter index: The index of the tab to open.
156
        :parameter index: The index of the tab to open.
95
157
        :raise ToolkitEmulatorException: If the tab index is out of range or
157
        :raise ToolkitException: If the tab index is out
96
158
                useDeprecatedToolbar is set.
158
                of range or useDeprecatedToolbar is set.
97
159
159
98
160
        """
160
        """
99
161
        self._show_if_not_visible()
161
        self._show_if_not_visible()
100
162
162
101
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py'
102
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2014-07-29 08:43:51 +0000
103
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2014-08-07 18:48:22 +0000
104
@@ -36,17 +36,17 @@
105
36
36
106
37
37
107
38
class MainView(_common.UbuntuUIToolkitCustomProxyObjectBase):
38
class MainView(_common.UbuntuUIToolkitCustomProxyObjectBase):
109
39
    """MainView Autopilot emulator."""
39
    """MainView Autopilot custom proxy object."""
110
40
40
111
41
    def get_header(self):
41
    def get_header(self):
113
42
        """Return the AppHeader emulator of the MainView."""
42
        """Return the AppHeader custom proxy object of the MainView."""
114
43
        try:
43
        try:
115
44
            return self.select_single(objectName='MainView_Header')
44
            return self.select_single(objectName='MainView_Header')
116
45
        except dbus.StateNotFoundError:
45
        except dbus.StateNotFoundError:
117
46
            raise _common.ToolkitException('The main view has no header.')
46
            raise _common.ToolkitException('The main view has no header.')
118
47
47
119
48
    def get_toolbar(self):
48
    def get_toolbar(self):
121
49
        """Return the Toolbar emulator of the MainView."""
49
        """Return the Toolbar custom proxy object of the MainView."""
122
50
        return self.select_single(_toolbar.Toolbar)
50
        return self.select_single(_toolbar.Toolbar)
123
51
51
124
52
    @autopilot_logging.log_action(logger.info)
52
    @autopilot_logging.log_action(logger.info)
125
@@ -64,7 +64,7 @@
126
64
        self.get_toolbar().close()
64
        self.get_toolbar().close()
127
65
65
128
66
    def get_tabs(self):
66
    def get_tabs(self):
130
67
        """Return the Tabs emulator of the MainView.
67
        """Return the Tabs custom proxy object of the MainView.
131
68
68
132
69
        :raise ToolkitException: If the main view has no tabs.
69
        :raise ToolkitException: If the main view has no tabs.
133
70
70
134
@@ -93,7 +93,8 @@
135
93
93
136
94
        :parameter index: The index of the tab to open.
94
        :parameter index: The index of the tab to open.
137
95
        :return: The newly opened tab.
95
        :return: The newly opened tab.
139
96
        :raise ToolkitEmulatorException: If the tab index is out of range.
96
        :raise ToolkitException: If the tab index
140
97
                is out of range.
141
97
98
142
98
        """
99
        """
143
99
        if self.useDeprecatedToolbar:
100
        if self.useDeprecatedToolbar:
144
@@ -114,7 +115,7 @@
145
114
                'Current tab index: {0}.'.format(tabs.selectedTabIndex))
115
                'Current tab index: {0}.'.format(tabs.selectedTabIndex))
146
115
            if number_of_switches >= number_of_tabs - 1:
116
            if number_of_switches >= number_of_tabs - 1:
147
116
                # This prevents a loop. But if this error is ever raised, it's
117
                # This prevents a loop. But if this error is ever raised, it's
149
117
                # likely there's a bug on the emulator or on the QML Tab.
118
                # likely there's a bug on the helper or on the QML Tab.
150
118
                raise _common.ToolkitException(
119
                raise _common.ToolkitException(
151
119
                    'The tab with index {0} was not selected.'.format(index))
120
                    'The tab with index {0} was not selected.'.format(index))
152
120
            current_tab = self.switch_to_next_tab()
121
            current_tab = self.switch_to_next_tab()
153
@@ -164,7 +165,7 @@
154
164
            'Tab with objectName "{0}" not found.'.format(object_name))
165
            'Tab with objectName "{0}" not found.'.format(object_name))
155
165
166
156
166
    def get_action_selection_popover(self, object_name):
167
    def get_action_selection_popover(self, object_name):
158
167
        """Return an ActionSelectionPopover emulator.
168
        """Return an ActionSelectionPopover custom proxy object.
159
168
169
160
169
        :parameter object_name: The QML objectName property of the popover.
170
        :parameter object_name: The QML objectName property of the popover.
161
170
171
162
171
172
163
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_optionselector.py'
164
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_optionselector.py	2014-04-17 01:35:43 +0000
165
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_optionselector.py	2014-08-07 18:48:22 +0000
166
@@ -23,7 +23,7 @@
167
23
23
168
24
24
169
25
class OptionSelector(_common.UbuntuUIToolkitCustomProxyObjectBase):
25
class OptionSelector(_common.UbuntuUIToolkitCustomProxyObjectBase):
171
26
    """OptionSelector Autopilot emulator"""
26
    """OptionSelector Autopilot custom proxy object"""
172
27
27
173
28
    def get_option_count(self):
28
    def get_option_count(self):
174
29
        """Gets the number of items in the option selector"""
29
        """Gets the number of items in the option selector"""
175
30
30
176
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabbar.py'
177
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabbar.py	2014-04-16 21:13:39 +0000
178
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabbar.py	2014-08-07 18:48:22 +0000
179
@@ -25,7 +25,7 @@
180
25
25
181
26
26
182
27
class TabBar(_common.UbuntuUIToolkitCustomProxyObjectBase):
27
class TabBar(_common.UbuntuUIToolkitCustomProxyObjectBase):
184
28
    """TabBar Autopilot emulator."""
28
    """TabBar Autopilot custom proxy object."""
185
29
29
186
30
    @autopilot_logging.log_action(logger.info)
30
    @autopilot_logging.log_action(logger.info)
187
31
    def switch_to_next_tab(self):
31
    def switch_to_next_tab(self):
188
32
32
189
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabs.py'
190
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabs.py	2014-04-16 21:13:39 +0000
191
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabs.py	2014-08-07 18:48:22 +0000
192
@@ -18,7 +18,7 @@
193
18
18
194
19
19
195
20
class Tabs(_common.UbuntuUIToolkitCustomProxyObjectBase):
20
class Tabs(_common.UbuntuUIToolkitCustomProxyObjectBase):
197
21
    """Tabs Autopilot emulator."""
21
    """Tabs Autopilot custom proxy object."""
198
22
22
199
23
    def get_current_tab(self):
23
    def get_current_tab(self):
200
24
        """Return the currently selected tab."""
24
        """Return the currently selected tab."""
201
25
25
202
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py'
203
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2014-07-13 07:19:15 +0000
204
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2014-08-07 18:48:22 +0000
205
@@ -23,7 +23,7 @@
206
23
23
207
24
24
208
25
class TextField(_common.UbuntuUIToolkitCustomProxyObjectBase):
25
class TextField(_common.UbuntuUIToolkitCustomProxyObjectBase):
210
26
    """TextField Autopilot emulator."""
26
    """TextField Autopilot custom proxy object."""
211
27
27
212
28
    def __init__(self, *args):
28
    def __init__(self, *args):
213
29
        super(TextField, self).__init__(*args)
29
        super(TextField, self).__init__(*args)
214
30
30
215
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py'
216
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py	2014-04-16 21:13:39 +0000
217
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py	2014-08-07 18:48:22 +0000
218
@@ -26,7 +26,7 @@
219
26
26
220
27
27
221
28
class Toolbar(_common.UbuntuUIToolkitCustomProxyObjectBase):
28
class Toolbar(_common.UbuntuUIToolkitCustomProxyObjectBase):
223
29
    """Toolbar Autopilot emulator."""
29
    """Toolbar Autopilot custom proxy object."""
224
30
30
225
31
    @autopilot_logging.log_action(logger.info)
31
    @autopilot_logging.log_action(logger.info)
226
32
    def open(self):
32
    def open(self):
227
33
33
228
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py'
229
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2014-07-31 07:18:29 +0000
230
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2014-08-07 18:48:22 +0000
231
@@ -66,7 +66,7 @@
232
66
66
233
67
67
234
68
class ActionSelectionPopover(_common.UbuntuUIToolkitCustomProxyObjectBase):
68
class ActionSelectionPopover(_common.UbuntuUIToolkitCustomProxyObjectBase):
236
69
    """ActionSelectionPopover Autopilot emulator."""
69
    """ActionSelectionPopover Autopilot custom proxy object."""
237
70
70
238
71
    def click_button_by_text(self, text):
71
    def click_button_by_text(self, text):
239
72
        """Click a button on the popover.
72
        """Click a button on the popover.
240
@@ -102,7 +102,7 @@
241
102
102
242
103
103
243
104
class ComposerSheet(_common.UbuntuUIToolkitCustomProxyObjectBase):
104
class ComposerSheet(_common.UbuntuUIToolkitCustomProxyObjectBase):
245
105
    """ComposerSheet Autopilot emulator."""
105
    """ComposerSheet Autopilot custom proxy object."""
246
106
106
247
107
    def __init__(self, *args):
107
    def __init__(self, *args):
248
108
        super(ComposerSheet, self).__init__(*args)
108
        super(ComposerSheet, self).__init__(*args)
249
109
109
250
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
251
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-07-22 07:44:40 +0000
252
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-08-07 18:48:22 +0000
253
@@ -23,7 +23,8 @@
254
23
from autopilot.matchers import Eventually
23
from autopilot.matchers import Eventually
255
24
from testtools.matchers import Is, Not, Equals
24
from testtools.matchers import Is, Not, Equals
256
25
25
258
26
from ubuntuuitoolkit import base, emulators, fixture_setup
26
import ubuntuuitoolkit
259
27
from ubuntuuitoolkit import base, fixture_setup
260
27
28
261
28
29
262
29
_DESKTOP_FILE_CONTENTS = ("""[Desktop Entry]
30
_DESKTOP_FILE_CONTENTS = ("""[Desktop Entry]
263
@@ -91,7 +92,7 @@
264
91
        application_name, _ = os.path.splitext(desktop_file_name)
92
        application_name, _ = os.path.splitext(desktop_file_name)
265
92
        self.app = self.launch_upstart_application(
93
        self.app = self.launch_upstart_application(
266
93
            application_name,
94
            application_name,
268
94
            emulator_base=emulators.UbuntuUIToolkitEmulatorBase)
95
            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
269
95
96
270
96
97
271
97
class QMLStringAppTestCase(UbuntuUIToolkitWithFakeAppRunningTestCase):
98
class QMLStringAppTestCase(UbuntuUIToolkitWithFakeAppRunningTestCase):
272
@@ -106,7 +107,7 @@
273
106
107
274
107
    @property
108
    @property
275
108
    def main_view(self):
109
    def main_view(self):
277
109
        return self.app.select_single(emulators.MainView)
110
        return self.app.select_single(ubuntuuitoolkit.MainView)
278
110
111
279
111
112
280
112
class FlickDirection:
113
class FlickDirection:
281
@@ -133,7 +134,7 @@
282
133
            "-I" + _get_module_include_path(),
134
            "-I" + _get_module_include_path(),
283
134
            self.test_qml_file_path,
135
            self.test_qml_file_path,
284
135
            '--desktop_file_hint={0}'.format(desktop_file_path),
136
            '--desktop_file_hint={0}'.format(desktop_file_path),
286
136
            emulator_base=emulators.UbuntuUIToolkitEmulatorBase,
137
            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase,
287
137
            app_type='qt')
138
            app_type='qt')
288
138
139
289
139
        self.assertThat(
140
        self.assertThat(
290
@@ -149,7 +150,7 @@
291
149
150
292
150
    @property
151
    @property
293
151
    def main_view(self):
152
    def main_view(self):
295
152
        return self.app.select_single(emulators.MainView)
153
        return self.app.select_single(ubuntuuitoolkit.MainView)
296
153
154
297
154
    def getOrientationHelper(self):
155
    def getOrientationHelper(self):
298
155
        orientationHelper = self.main_view.select_many(
156
        orientationHelper = self.main_view.select_many(
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-07-16	Approve on 2014-08-20
Leo Arias (community)		2014-07-16	Approve on 2014-08-07
Tim Peeters		2014-07-16	Pending
Review via email: mp+227093@code.launchpad.net