1
=== modified file 'ubuntu_system_tests/helpers/indicators/cpo.py'
2
--- ubuntu_system_tests/helpers/indicators/cpo.py	2016-12-02 12:16:41 +0000
3
+++ ubuntu_system_tests/helpers/indicators/cpo.py	2017-03-30 19:25:29 +0000
4
@@ -20,7 +20,7 @@
5
20
from ubuntu_system_tests.helpers.ubuntuuitools.cpo.qquicklistview import QQuickListView  # NOQA
20
from ubuntu_system_tests.helpers.ubuntuuitools.cpo.qquicklistview import QQuickListView  # NOQA
6
21
from ubuntu_system_tests.helpers.ubuntuuitools.cpo.common import CustomProxyObjectBase  # NOQA
21
from ubuntu_system_tests.helpers.ubuntuuitools.cpo.common import CustomProxyObjectBase  # NOQA
7
22
22
9
23
INDICATOR_PAGE_PATH = b'IndicatorPage'
23
INDICATOR_PAGE_PATH = b'PanelMenuPage'
10
24
24
11
25
25
12
26
class IndicatorPage(CustomProxyObjectBase):
26
class IndicatorPage(CustomProxyObjectBase):
13
27
27
14
=== modified file 'ubuntu_system_tests/helpers/indicators/datetime.py'
15
--- ubuntu_system_tests/helpers/indicators/datetime.py	2016-12-19 18:50:17 +0000
16
+++ ubuntu_system_tests/helpers/indicators/datetime.py	2017-03-30 19:25:29 +0000
17
@@ -27,6 +27,7 @@
18
27
    """Autopilot helper for the date time indicator page."""
27
    """Autopilot helper for the date time indicator page."""
19
28
28
20
29
    name = 'indicator-datetime'
29
    name = 'indicator-datetime'
21
30
    title = 'Time & Date'
22
30
31
23
31
    @classmethod
32
    @classmethod
24
32
    def validate_dbus_object(cls, path, state):
33
    def validate_dbus_object(cls, path, state):
25
33
34
26
=== modified file 'ubuntu_system_tests/helpers/indicators/indicators.py'
27
--- ubuntu_system_tests/helpers/indicators/indicators.py	2016-12-19 18:50:17 +0000
28
+++ ubuntu_system_tests/helpers/indicators/indicators.py	2017-03-30 19:25:29 +0000
29
@@ -16,9 +16,8 @@
30
16
# You should have received a copy of the GNU General Public License
16
# You should have received a copy of the GNU General Public License
31
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
32
18
18
33
19
from autopilot.exceptions import StateNotFoundError
34
19
from ubuntu_system_tests.helpers import context
20
from ubuntu_system_tests.helpers import context
35
20
from autopilot import input
36
21
37
22
from ubuntu_system_tests.helpers.input_manager import input_manager
21
from ubuntu_system_tests.helpers.input_manager import input_manager
38
23
22
39
24
TRANSFER_INDICATOR = 'indicator-transfer'
23
TRANSFER_INDICATOR = 'indicator-transfer'
40
@@ -27,16 +26,30 @@
41
27
class IndicatorsFactory:
26
class IndicatorsFactory:
42
28
27
43
29
    @staticmethod
28
    @staticmethod
50
30
    def get_indicators_page(indicator_name):
29
    def get_indicators_page(name):
51
31
        widget = context.shared.unity.main_window._get_indicator_panel_item(
30
        date_time_indicator = context.shared.unity.main_window.select_single(
52
32
            indicator_name)
31
            objectName='indicator-datetime-panelItem')
53
33
        start_x, start_y = input.get_center_point(widget)
32
        x, y, w, h = date_time_indicator.get_properties()['globalRect']
54
34
        end_x = start_x
33
49
35
        end_y = context.shared.unity.main_window.height
55
36
        input_manager.pointer.drag(
34
        input_manager.pointer.drag(
59
37
            start_x, start_y, end_x, end_y)
35
            x + w / 2, y + h / 2, x + w / 2,
60
38
        context.shared.unity.main_window.wait_select_single(
36
            context.shared.unity.main_window.get_properties()['height'] / 2)
61
39
            'IndicatorsMenu', fullyOpened=True)
37
62
38
        indicators_list = context.shared.unity.main_window.wait_select_single(
63
39
            objectName='indicatorsContentListView', visible=True, enabled=True)
64
40
65
41
        while not indicators_list.get_properties()['atXBeginning']:
66
42
            input_manager.keyboard.press_and_release('LEFT')
67
43
68
44
        while not indicators_list.get_properties()['atXEnd']:
69
45
            try:
70
46
                indicators_list.select_single(
71
47
                    objectName='{}-page'.format(name),
72
48
                    visible=True,
73
49
                    enabled=True)
74
50
                break
75
51
            except StateNotFoundError:
76
52
                input_manager.keyboard.press_and_release('RIGHT')
77
40
53
78
41
        return context.shared.unity.main_window.select_single(
54
        return context.shared.unity.main_window.select_single(
80
42
            'IndicatorPage', visible=True)
55
            'PanelMenuPage', visible=True)
81
43
56
82
=== modified file 'ubuntu_system_tests/helpers/indicators/network/cpo.py'
83
--- ubuntu_system_tests/helpers/indicators/network/cpo.py	2017-01-16 12:41:26 +0000
84
+++ ubuntu_system_tests/helpers/indicators/network/cpo.py	2017-03-30 19:25:29 +0000
85
@@ -16,7 +16,7 @@
86
16
# You should have received a copy of the GNU General Public License
16
# You should have received a copy of the GNU General Public License
87
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
88
18
#
18
#
90
19
19
from ubuntu_system_tests.helpers import platform
91
20
from ubuntu_system_tests.helpers.indicators.cpo import (
20
from ubuntu_system_tests.helpers.indicators.cpo import (
92
21
    IndicatorPage, INDICATOR_PAGE_PATH)
21
    IndicatorPage, INDICATOR_PAGE_PATH)
93
22
from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
22
from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
94
@@ -86,18 +86,24 @@
95
86
        if self.is_wifi_enabled():
86
        if self.is_wifi_enabled():
96
87
            self._get_wifi_switch().toggle()
87
            self._get_wifi_switch().toggle()
97
88
88
99
89
    def _get_cellular_settings_menu_item(self):
89
    def _get_ethernet_settings_menu_item(self):
100
90
        """Return the menu item which opens cellular settings."""
90
        """Return the menu item which opens cellular settings."""
101
91
        return self.select_single(
91
        return self.select_single(
108
92
            objectName='indicator.cellular.settings', visible=True)
92
            objectName='indicator.ethernet.settings', visible=True)
109
93
93
110
94
    def is_cellular_settings_visible(self):
94
    def is_ethernet_settings_visible(self):
111
95
        return self._get_cellular_settings_menu_item().visible
95
        return self._get_ethernet_settings_menu_item().visible
112
96
96
113
97
    def open_cellular_settings(self):
97
    def open_network_settings(self):
114
98
        if platform.get_device_name() is 'desktop':
115
99
            self.open_ethernet_settings()
116
100
        else:
117
101
            self.open_wifi_settings()
118
102
119
103
    def open_ethernet_settings(self):
120
98
        """Tap the cellular settings list item to open settings."""
104
        """Tap the cellular settings list item to open settings."""
121
99
        input_manager.pointer.click_object(
105
        input_manager.pointer.click_object(
123
100
            self._get_cellular_settings_menu_item())
106
            self._get_ethernet_settings_menu_item())
124
101
107
125
102
    def _get_wifi_settings_menu_item(self):
108
    def _get_wifi_settings_menu_item(self):
126
103
        """Return the menu item which opens WiFi settings."""
109
        """Return the menu item which opens WiFi settings."""
127
104
110
128
=== modified file 'ubuntu_system_tests/helpers/music/__init__.py'
129
--- ubuntu_system_tests/helpers/music/__init__.py	2016-08-24 13:41:23 +0000
130
+++ ubuntu_system_tests/helpers/music/__init__.py	2017-03-30 19:25:29 +0000
131
@@ -22,16 +22,13 @@
132
22
    APP_ID,
22
    APP_ID,
133
23
    APP_WIN_ID,
23
    APP_WIN_ID,
134
24
    CONFIG_FILE,
24
    CONFIG_FILE,
138
25
    get_music_app_proxy,
25
    MusicPlayer,
136
26
    is_music_app_running,
137
27
    launch_music_app,
139
28
    QML,
26
    QML,
140
29
    stop_music_app,
141
30
)
27
)
142
31
from ubuntu_system_tests.helpers.music.utils import (
28
from ubuntu_system_tests.helpers.music.utils import (
143
32
    get_current_album,
29
    get_current_album,
144
33
    get_current_song,
30
    get_current_song,
146
34
    set_welcome_wizard,
31
    set_welcome_wizard
147
35
)
32
)
148
36
33
149
37
34
150
@@ -43,10 +40,7 @@
151
43
    'CONFIG_FILE',
40
    'CONFIG_FILE',
152
44
    'get_current_album',
41
    'get_current_album',
153
45
    'get_current_song',
42
    'get_current_song',
154
46
    'get_music_app_proxy',
155
47
    'is_music_app_running',
156
48
    'launch_music_app',
157
49
    'QML',
43
    'QML',
158
50
    'set_welcome_wizard',
44
    'set_welcome_wizard',
160
51
    'stop_music_app',
45
    'MusicPlayer'
161
52
]
46
]
162
53
47
163
=== modified file 'ubuntu_system_tests/helpers/music/app.py'
164
--- ubuntu_system_tests/helpers/music/app.py	2016-12-01 20:46:16 +0000
165
+++ ubuntu_system_tests/helpers/music/app.py	2017-03-30 19:25:29 +0000
166
@@ -18,12 +18,8 @@
167
18
18
168
19
import os
19
import os
169
20
20
170
21
from ubuntu_system_tests.helpers import autopilot
171
22
from ubuntu_system_tests.helpers import processes
21
from ubuntu_system_tests.helpers import processes
176
23
from ubuntu_system_tests.helpers.scopes.apps import (
22
from ubuntu_system_tests.helpers.application import Application
173
24
    launch_application_from_apps_scope
174
25
)
175
26
from ubuntu_system_tests.helpers import wait_until
177
27
from ubuntu_system_tests.helpers import file_system as fs
23
from ubuntu_system_tests.helpers import file_system as fs
178
28
24
179
29
APP = 'music-app'
25
APP = 'music-app'
180
@@ -35,35 +31,25 @@
181
35
CONFIG_FILE = os.path.join(fs.DIR_HOME_MUSIC_CONFIG, '{}.conf'.format(APP_ID))
31
CONFIG_FILE = os.path.join(fs.DIR_HOME_MUSIC_CONFIG, '{}.conf'.format(APP_ID))
182
36
32
183
37
33
216
38
def launch_music_app():
34
class MusicPlayer(Application):
217
39
    """
35
218
40
    Launch the music app from apps scope and return proxy object.
36
    def __init__(self):
219
41
37
        super().__init__(APP_NAME, APP_ID)
220
42
    :return: Proxy object for music application.
38
221
43
39
    def is_running(self):
222
44
    """
40
        """ Indicate if the music app is currently running """
223
45
    launch_application_from_apps_scope(APP_NAME)
41
        return processes.is_qmlscene_running_with_qmlfile(APP)
224
46
    wait_until(is_music_app_running, period=0.5)
42
225
47
    return get_music_app_proxy()
43
    def get_main_view(self):
226
48
44
        """
227
49
45
        Return music app proxy object from existing process.
228
50
def is_music_app_running():
46
        :return: Proxy object for music application.
229
51
    """ Indicate if the music app is currently running """
47
        """
230
52
    return processes.is_qmlscene_running_with_qmlfile(APP)
48
        from ubuntu_system_tests.helpers.music import cpo  # NOQA
231
53
49
        proxy = self.get_proxy_object()
232
54
50
        return proxy.main_view
233
55
def get_music_app_proxy():
51
234
56
    """
52
    @staticmethod
235
57
    Return music app proxy object from existing process.
53
    def stop():
236
58
54
        """ Stop the music app qml process """
237
59
    :return: Proxy object for music application.
55
        processes.stop_qmlscene_process(QML)
206
60
207
61
    """
208
62
    from ubuntu_system_tests.helpers.music import cpo  # NOQA
209
63
    proxy = autopilot.get_proxy_object(processes.get_qmlscene_process_id(APP))
210
64
    return proxy.main_view
211
65
212
66
213
67
def stop_music_app():
214
68
    """ Stop the music app qml process """
215
69
    processes.stop_qmlscene_process(QML)
238
70
56
239
=== modified file 'ubuntu_system_tests/helpers/ofono/utils.py'
240
--- ubuntu_system_tests/helpers/ofono/utils.py	2016-12-07 14:15:04 +0000
241
+++ ubuntu_system_tests/helpers/ofono/utils.py	2017-03-30 19:25:29 +0000
242
@@ -228,11 +228,14 @@
243
228
    if no slot is specified then if a SIM is inserted in
228
    if no slot is specified then if a SIM is inserted in
244
229
    any slot, otherwise False
229
    any slot, otherwise False
245
230
    """
230
    """
251
231
    bus = dbus.SystemBus()
231
    # Since phone is not really target so far, we defaul he return value to
252
232
    for ril_modem, properties in _get_all_modems(bus):
232
    # False
253
233
        if _sim_present(bus, ril_modem, properties,
233
    #
254
234
                        sim_number, ignore_phonesim):
234
    # bus = dbus.SystemBus()
255
235
            return True
235
    # for ril_modem, properties in _get_all_modems(bus):
256
236
    #     if _sim_present(bus, ril_modem, properties,
257
237
    #                     sim_number, ignore_phonesim):
258
238
    #         return True
259
236
    return False
239
    return False
260
237
240
261
238
241
262
239
242
263
=== modified file 'ubuntu_system_tests/tests/base.py'
264
--- ubuntu_system_tests/tests/base.py	2017-03-23 08:50:42 +0000
265
+++ ubuntu_system_tests/tests/base.py	2017-03-30 19:25:29 +0000
266
@@ -56,7 +56,6 @@
267
56
from ubuntu_system_tests.helpers.unity8.utils import (
56
from ubuntu_system_tests.helpers.unity8.utils import (
268
57
    disable_settings_wizard,
57
    disable_settings_wizard,
269
58
    disable_edges_intro,
58
    disable_edges_intro,
270
59
    setup_unity
271
60
)
59
)
272
61
60
273
62
from ubuntu_system_tests.tests.data.definitions import DESKTOP_PLATFORM_NAME
61
from ubuntu_system_tests.tests.data.definitions import DESKTOP_PLATFORM_NAME
274
@@ -87,7 +86,7 @@
275
87
    def setUp(self, custom_fixtures=[]):
86
    def setUp(self, custom_fixtures=[]):
276
88
        super().setUp()
87
        super().setUp()
277
89
        self.addCleanup(ensure_all_apps_closed)
88
        self.addCleanup(ensure_all_apps_closed)
279
90
        self.addCleanup(setup_unity)
89
        # self.addCleanup(setup_unity)
280
91
        self._reset_autopilot_registry()
90
        self._reset_autopilot_registry()
281
92
        self._init_shared_context()
91
        self._init_shared_context()
282
93
        if len(custom_fixtures) == 0:
92
        if len(custom_fixtures) == 0:
283
94
93
284
=== modified file 'ubuntu_system_tests/tests/indicators/base.py'
285
--- ubuntu_system_tests/tests/indicators/base.py	2016-11-16 12:37:32 +0000
286
+++ ubuntu_system_tests/tests/indicators/base.py	2017-03-30 19:25:29 +0000
287
@@ -22,7 +22,6 @@
288
22
22
289
23
23
290
24
class IndicatorTestCaseBase(base.BaseUbuntuSystemTestCase):
24
class IndicatorTestCaseBase(base.BaseUbuntuSystemTestCase):
292
25
    def setUp(self, indicator):
25
    def setUp(self, name):
293
26
        super().setUp()
26
        super().setUp()
296
27
        self.indicator_page = IndicatorsFactory.get_indicators_page(indicator)
27
        self.indicator_page = IndicatorsFactory.get_indicators_page(name)
295
28
        self.addCleanup(self.shell.close_indicator_page)
297
29
28
298
=== modified file 'ubuntu_system_tests/tests/indicators/test_indicator_bluetooth.py'
299
--- ubuntu_system_tests/tests/indicators/test_indicator_bluetooth.py	2016-11-16 12:34:58 +0000
300
+++ ubuntu_system_tests/tests/indicators/test_indicator_bluetooth.py	2017-03-30 19:25:29 +0000
301
@@ -17,9 +17,6 @@
302
17
# You should have received a copy of the GNU General Public License
17
# You should have received a copy of the GNU General Public License
303
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
304
19
#
19
#
305
20
from testtools import skipUnless
306
21
from ubuntu_system_tests.helpers.bluetooth import is_bluetooth_supported
307
22
308
23
from ubuntu_system_tests.helpers import system_settings
20
from ubuntu_system_tests.helpers import system_settings
309
24
from ubuntu_system_tests.helpers.indicators.bluetooth import (
21
from ubuntu_system_tests.helpers.indicators.bluetooth import (
310
25
    BluetoothIndicatorPage)
22
    BluetoothIndicatorPage)
311
@@ -31,7 +28,6 @@
312
31
28
313
32
class BluetoothIndicatorTestCase(base.IndicatorTestCaseBase):
29
class BluetoothIndicatorTestCase(base.IndicatorTestCaseBase):
314
33
30
315
34
    @skipUnless(is_bluetooth_supported(), 'Bluetooth support required.')
316
35
    def setUp(self):
31
    def setUp(self):
317
36
        super().setUp(BluetoothIndicatorPage.name)
32
        super().setUp(BluetoothIndicatorPage.name)
318
37
33
319
38
34
320
=== modified file 'ubuntu_system_tests/tests/indicators/test_indicator_network.py'
321
--- ubuntu_system_tests/tests/indicators/test_indicator_network.py	2016-12-02 15:06:23 +0000
322
+++ ubuntu_system_tests/tests/indicators/test_indicator_network.py	2017-03-30 19:25:29 +0000
323
@@ -16,166 +16,32 @@
324
16
#
16
#
325
17
# You should have received a copy of the GNU General Public License
17
# You should have received a copy of the GNU General Public License
326
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
331
19
19
from ubuntu_system_tests.helpers import platform
328
20
from autopilot.matchers import Eventually
329
21
from testtools.matchers import Equals, NotEquals
330
22
from testtools import skipUnless
332
23
from ubuntu_system_tests.helpers.indicators.network.cpo import (
20
from ubuntu_system_tests.helpers.indicators.network.cpo import (
333
24
    NetworkIndicatorPage)
21
    NetworkIndicatorPage)
334
25
22
335
26
from ubuntu_system_tests.helpers import (
336
27
    radio_killswitch,
337
28
    network,
338
29
)
339
30
from ubuntu_system_tests.helpers.ofono.fixture_setup import UnlockSims
340
31
from ubuntu_system_tests.helpers.ofono.utils import (
341
32
    wait_for_all_sims_registered, is_sim_inserted, get_sim_name)
342
33
from ubuntu_system_tests.helpers.platform import is_wifi_supported
343
34
344
35
from ubuntu_system_tests.helpers import system_settings
23
from ubuntu_system_tests.helpers import system_settings
345
36
from ubuntu_system_tests.tests.indicators import base
24
from ubuntu_system_tests.tests.indicators import base
346
37
25
347
38
348
39
CELLULAR_SETTINGS_PAGE = 'cellularPage'
26
CELLULAR_SETTINGS_PAGE = 'cellularPage'
349
40
WIFI_SETTINGS_PAGE = 'wifiPage'
27
WIFI_SETTINGS_PAGE = 'wifiPage'
350
41
28
351
42
29
352
43
class FlightModeTestCase(base.IndicatorTestCaseBase):
353
44
354
45
    @skipUnless(is_sim_inserted() and is_wifi_supported(),
355
46
                'SIM and Wi-Fi support required.')
356
47
    def setUp(self):
357
48
        self.assertTrue(wait_for_all_sims_registered())
358
49
        self.radio_killswitch = self.useFixture(
359
50
            radio_killswitch.RadioKillswitch(False))
360
51
        super().setUp(NetworkIndicatorPage.name)
361
52
362
53
    def assert_network_indicator_shows_flightmode_off(self,
363
54
                                                      network_indicator_page):
364
55
        """Network indicator UI elements reflect 'off' state of flight mode."""
365
56
        self.assertTrue(network_indicator_page.is_flight_mode_switch_visible())
366
57
        self.assertThat(network_indicator_page.is_sim_list_offline,
367
58
                        Eventually(Equals(False)))
368
59
        self.assertTrue(network_indicator_page.is_wifi_switch_visible())
369
60
        self.assertThat(network_indicator_page.is_wifi_enabled,
370
61
                        Eventually(Equals(True)))
371
62
        self.assertThat(network_indicator_page.get_list_of_wifi_access_points,
372
63
                        Eventually(NotEquals([])))
373
64
        self.assertTrue(network_indicator_page.is_cellular_settings_visible())
374
65
        self.assertTrue(network_indicator_page.is_wifi_settings_visible())
375
66
376
67
    def assert_network_indicator_shows_flightmode_on(self,
377
68
                                                     network_indicator_page):
378
69
        """Network indicator UI elements reflect 'on' state of flight mode."""
379
70
        self.assertThat(network_indicator_page.is_sim_list_offline,
380
71
                        Eventually(Equals(True)))
381
72
        self.assertThat(network_indicator_page.is_wifi_enabled,
382
73
                        Eventually(Equals(False)))
383
74
        self.assertThat(
384
75
            network_indicator_page.get_list_of_wifi_access_points,
385
76
            Eventually(Equals([])))
386
77
387
78
    def test_switching_on_flight_mode_must_engage_flight_mode(self):
388
79
        """Switching on 'flight mode' in the indicator must engage flight mode.
389
80
390
81
        Note that we assume we're starting in *off* mode; also we skip
391
82
        the test if no SIM is inserted.
392
83
393
84
        """
394
85
        self.assertFalse(self.radio_killswitch.is_flight_mode_on(),
395
86
                         'Test must be run with flight mode off.')
396
87
        self.assert_network_indicator_shows_flightmode_off(
397
88
            self.indicator_page)
398
89
        self.indicator_page.turn_on_flight_mode()
399
90
        self.assertThat(self.radio_killswitch.is_flight_mode_on,
400
91
                        Eventually(Equals(True)))
401
92
        self.assert_network_indicator_shows_flightmode_on(
402
93
            self.indicator_page)
403
94
        self.indicator_page.turn_off_flight_mode()
404
95
        self.assertThat(self.radio_killswitch.is_flight_mode_on,
405
96
                        Eventually(Equals(False)))
406
97
        self.assert_network_indicator_shows_flightmode_off(
407
98
            self.indicator_page)
408
99
409
100
    def assert_network_indicator_shows_wifi_enabled_flight_mode_on(
410
101
            self, network_indicator_page):
411
102
        self.assertThat(network_indicator_page.is_sim_list_offline,
412
103
                        Eventually(Equals(True)))
413
104
        self.assertThat(network_indicator_page.is_wifi_enabled,
414
105
                        Eventually(Equals(True)))
415
106
        self.assertThat(
416
107
            network_indicator_page.get_list_of_wifi_access_points,
417
108
            Eventually(NotEquals([])))
418
109
419
110
    def test_enable_wifi_in_flight_mode(self):
420
111
        """
421
112
        Enable flight mode and turn on wifi and check internet is working
422
113
423
114
        1. Switch to flight mode
424
115
        2. Turn on Wifi
425
116
        3. Ensure internet is working
426
117
        """
427
118
        self.assertFalse(self.radio_killswitch.is_flight_mode_on(),
428
119
                         'Test must be run with flight mode off.')
429
120
        self.assert_network_indicator_shows_flightmode_off(
430
121
            self.indicator_page)
431
122
        self.indicator_page.turn_on_flight_mode()
432
123
        self.addCleanup(self.indicator_page.turn_off_flight_mode)
433
124
        self.assertThat(self.radio_killswitch.is_flight_mode_on,
434
125
                        Eventually(Equals(True)))
435
126
        self.assert_network_indicator_shows_flightmode_on(
436
127
            self.indicator_page)
437
128
        self.indicator_page.turn_on_wifi()
438
129
        self.assert_network_indicator_shows_wifi_enabled_flight_mode_on(
439
130
            self.indicator_page)
440
131
        network.ensure_internet_connectivity(timeout=15)
441
132
442
133
443
134
class CellularProvidersTestCase(base.IndicatorTestCaseBase):
444
135
445
136
    @skipUnless(is_sim_inserted(), 'At least one SIM card required')
446
137
    def setUp(self):
447
138
        self.assertTrue(wait_for_all_sims_registered())
448
139
        self.useFixture(UnlockSims())
449
140
        super().setUp(NetworkIndicatorPage.name)
450
141
451
142
    def test_cellular_providers_register(self):
452
143
        """
453
144
        Prerequisite: At least one SIM is inserted into the phone.
454
145
        1. Drag down the network indicator
455
146
           - The network menu opens and shows the currently
456
147
             active SIMs names.
457
148
        """
458
149
        sims = self.indicator_page.get_list_of_sims()
459
150
        for index, sim in enumerate(sims):
460
151
            self.assertEqual(sim.get_sim_name(), get_sim_name(index))
461
152
462
153
463
154
class NetworkIndicatorTestCase(base.IndicatorTestCaseBase):
30
class NetworkIndicatorTestCase(base.IndicatorTestCaseBase):
464
155
31
465
156
    def setUp(self):
32
    def setUp(self):
466
157
        super().setUp(NetworkIndicatorPage.name)
33
        super().setUp(NetworkIndicatorPage.name)
467
158
34
469
159
    def test_cellular_settings_item_open_correct_page(self):
35
    def test_ethernet_settings_item_open_correct_page(self):
470
160
        """
36
        """
471
161
        1. Drag down the network indicator
37
        1. Drag down the network indicator
472
162
        2. Tap 'Cellular settings...'
38
        2. Tap 'Cellular settings...'
473
163
        3. Ensure cellular settings open
39
        3. Ensure cellular settings open
474
164
        """
40
        """
492
165
        self.indicator_page.open_cellular_settings()
41
        self.indicator_page.open_network_settings()
493
166
        settings_app = system_settings.get_system_settings_proxy()
42
        settings_app = system_settings.get_system_settings_proxy()
494
167
        system_settings.ensure_settings_page_visible(settings_app,
43
        expected_page = WIFI_SETTINGS_PAGE if \
495
168
                                                     CELLULAR_SETTINGS_PAGE)
44
            platform.get_device_name() is not 'desktop' \
496
169
45
            else CELLULAR_SETTINGS_PAGE
497
170
    @skipUnless(is_wifi_supported(),
46
        system_settings.ensure_settings_page_visible(settings_app,
498
171
                'Wi-Fi support required.')
47
                                                     expected_page)
482
172
    def test_wifi_settings_item_open_correct_page(self):
483
173
        """
484
174
        1. Drag down the network indicator
485
175
        2. Tap 'Wifi settings...'
486
176
        3. Ensure Wifi settings open
487
177
        """
488
178
        self.indicator_page.open_wifi_settings()
489
179
        settings_app = system_settings.get_system_settings_proxy()
490
180
        system_settings.ensure_settings_page_visible(settings_app,
491
181
                                                     WIFI_SETTINGS_PAGE)
499
182
48
500
=== modified file 'ubuntu_system_tests/tests/indicators/test_indicator_sound.py'
501
--- ubuntu_system_tests/tests/indicators/test_indicator_sound.py	2016-12-02 18:49:50 +0000
502
+++ ubuntu_system_tests/tests/indicators/test_indicator_sound.py	2017-03-30 19:25:29 +0000
503
@@ -17,16 +17,16 @@
504
17
# You should have received a copy of the GNU General Public License
17
# You should have received a copy of the GNU General Public License
505
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
506
19
#
19
#
508
20
20
import os
509
21
import shutil
21
import shutil
510
22
22
511
23
from autopilot.matchers import Eventually
23
from autopilot.matchers import Eventually
512
24
from testtools.matchers import Equals, NotEquals
24
from testtools.matchers import Equals, NotEquals
513
25
25
514
26
from ubuntu_system_tests.helpers.music.app import MusicPlayer
515
26
from ubuntu_system_tests.helpers.unity8.utils import close_all_apps
27
from ubuntu_system_tests.helpers.unity8.utils import close_all_apps
516
27
from ubuntu_system_tests.helpers.indicators.sound import SoundIndicatorPage
28
from ubuntu_system_tests.helpers.indicators.sound import SoundIndicatorPage
517
28
from ubuntu_system_tests.helpers import media
29
from ubuntu_system_tests.helpers import media
518
29
from ubuntu_system_tests.helpers import music
519
30
from ubuntu_system_tests.helpers import system_settings
30
from ubuntu_system_tests.helpers import system_settings
520
31
from ubuntu_system_tests.helpers.indicators.indicators import IndicatorsFactory
31
from ubuntu_system_tests.helpers.indicators.indicators import IndicatorsFactory
521
32
from ubuntu_system_tests.helpers.music import fixture_setup as music_fixture
32
from ubuntu_system_tests.helpers.music import fixture_setup as music_fixture
522
@@ -34,6 +34,7 @@
523
34
from ubuntu_system_tests.tests.indicators import base
34
from ubuntu_system_tests.tests.indicators import base
524
35
from ubuntu_system_tests.tests import data as test_data
35
from ubuntu_system_tests.tests import data as test_data
525
36
36
526
37
from ubuntu_system_tests.helpers import file_system as fs
527
37
38
528
38
SOUND_SETTINGS_PAGE = 'soundPage'
39
SOUND_SETTINGS_PAGE = 'soundPage'
529
39
40
530
@@ -61,9 +62,16 @@
531
61
        super().setUp()
62
        super().setUp()
532
62
        self.useFixture(media.BackupRestoreLocalMediaFixture())
63
        self.useFixture(media.BackupRestoreLocalMediaFixture())
533
63
        self.useFixture(music_fixture.MusicAppWelcomeWizard(show_wizard=True))
64
        self.useFixture(music_fixture.MusicAppWelcomeWizard(show_wizard=True))
534
65
535
66
        if not os.path.exists(fs.DIR_HOME_MUSIC):
536
67
            os.makedirs(fs.DIR_HOME_MUSIC)
537
64
        shutil.copy2(test_data.SRC_AUDIO_FILE_2, test_data.LOCAL_AUDIO_FILE_2)
68
        shutil.copy2(test_data.SRC_AUDIO_FILE_2, test_data.LOCAL_AUDIO_FILE_2)
538
65
        shutil.copy2(test_data.SRC_AUDIO_FILE_4, test_data.LOCAL_AUDIO_FILE_4)
69
        shutil.copy2(test_data.SRC_AUDIO_FILE_4, test_data.LOCAL_AUDIO_FILE_4)
540
66
        self.music_app = music.launch_music_app()
70
541
71
        music_player = MusicPlayer()
542
72
        music_player.launch_from_app_drawer()
543
73
544
74
        self.music_app = music_player.get_main_view()
545
67
        self.music_app.ensure_walkthrough_page_not_visible()
75
        self.music_app.ensure_walkthrough_page_not_visible()
546
68
76
547
69
    def test_play_pause_track_from_indicator(self):
77
    def test_play_pause_track_from_indicator(self):
Status:	Merged
Approved by:	Richard Huddie on 2017-03-31
Approved revision:	524
Merged at revision:	519
Proposed branch:	lp:~sbaldassin/ubuntu-system-tests/indicators_tests
Merge into:	lp:ubuntu-system-tests
Diff against target:	547 lines (+99/-228) 12 files modified ubuntu_system_tests/helpers/indicators/cpo.py (+1/-1) ubuntu_system_tests/helpers/indicators/datetime.py (+1/-0) ubuntu_system_tests/helpers/indicators/indicators.py (+25/-12) ubuntu_system_tests/helpers/indicators/network/cpo.py (+15/-9) ubuntu_system_tests/helpers/music/__init__.py (+3/-9) ubuntu_system_tests/helpers/music/app.py (+23/-37) ubuntu_system_tests/helpers/ofono/utils.py (+8/-5) ubuntu_system_tests/tests/base.py (+1/-2) ubuntu_system_tests/tests/indicators/base.py (+2/-3) ubuntu_system_tests/tests/indicators/test_indicator_bluetooth.py (+0/-4) ubuntu_system_tests/tests/indicators/test_indicator_network.py (+9/-143) ubuntu_system_tests/tests/indicators/test_indicator_sound.py (+11/-3)
To merge this branch:	bzr merge lp:~sbaldassin/ubuntu-system-tests/indicators_tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Richard Huddie (community)		2017-03-21	Approve on 2017-03-31
platform-qa-bot	continuous-integration		Approve on 2017-03-30
Review via email: mp+320445@code.launchpad.net