@@ -22,24 +22,10 @@ from testscenarios import multiply_scenarios
2222
2323from autopilot import platform
2424
25−from unity8 import indicators, fixture_setup
26−from unity8.process_helpers import unlock_unity
27−from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
25+from unity8.indicators import tests
2826
2927
30−class IndicatorTestCase(UnityTestCase):
31−
32− device_emulation_scenarios = _get_device_emulation_scenarios()
33−
34− def setUp(self):
35− if platform.model() == 'Desktop':
36− self.skipTest('Test cannot be run on the desktop.')
37− super(IndicatorTestCase, self).setUp()
38− self.unity_proxy = self.launch_unity()
39− unlock_unity(self.unity_proxy)
40−
41−
42−class IndicatorExistsTestCase(IndicatorTestCase):
28+class IndicatorExistsTestCase(tests.IndicatorTestCase):
4329
4430 indicator_scenarios = [
4531 ('Bluetooth', dict(indicator_name='indicator-bluetooth')),
@@ -52,7 +38,7 @@ class IndicatorExistsTestCase(IndicatorTestCase):
5238 ]
5339 scenarios = multiply_scenarios(
5440 indicator_scenarios,
55− IndicatorTestCase.device_emulation_scenarios
41+ tests.IndicatorTestCase.device_emulation_scenarios
5642 )
5743
5844 def setUp(self):
@@ -67,7 +53,7 @@ class IndicatorExistsTestCase(IndicatorTestCase):
6753 )
6854
6955
70−class IndicatorPageTitleMatchesWidgetTestCase(IndicatorTestCase):
56+class IndicatorPageTitleMatchesWidgetTestCase(tests.IndicatorTestCase):
7157
7258 indicator_scenarios = [
7359 ('Bluetooth', dict(indicator_name='indicator-bluetooth',
@@ -87,7 +73,7 @@ class IndicatorPageTitleMatchesWidgetTestCase(IndicatorTestCase):
8773 ]
8874 scenarios = multiply_scenarios(
8975 indicator_scenarios,
90− IndicatorTestCase.device_emulation_scenarios
76+ tests.IndicatorTestCase.device_emulation_scenarios
9177 )
9278
9379 def setUp(self):
@@ -105,17 +91,3 @@ class IndicatorPageTitleMatchesWidgetTestCase(IndicatorTestCase):
10591 self.indicator_name)
10692 self.assertTrue(indicator_page.visible)
10793 self.assertEqual(indicator_page.title, self.title)
108−
109−
110−class DisplayIndicatorTestCase(IndicatorTestCase):
111−
112− def test(self):
113− display_indicator = indicators.DisplayIndicator(self.main_window)
114− display_indicator_page = display_indicator.open()
115− fixture = fixture_setup.DisplayRotationLock(False)
116−
117− display_indicator_page.unlock_rotation()
118− self.assertEqual(fixture._is_rotation_lock_enabled(), False)
119−
120− display_indicator_page.lock_rotation()
121− self.assertEqual(fixture._is_rotation_lock_enabled(), True)