git.iko.soy/unity8
on xenial help sign in
Just use strings to identify indicators by name.
commit1ddb1143df24c62b65c5e96d5b0f256982a929a2 authorAllan LeSage <allan.lesage@canonical.com> dateThu 24 Oct 2013, 15:38 (13 years ago) parent3548c1c
2 files changed+24−19
compare with xenial
unifiedsplit
tests/autopilot/unity8/indicators/tests/test_indicators.py+7−6 tests/autopilot/unity8/shell/emulators/main_window.py+17−13
tests/autopilot/unity8/indicators/tests/test_indicators.py+7−6
@@ -26,12 +26,13 @@ from unity8.shell.tests import UnityTestCase
2626class IndicatorTestCase(UnityTestCase):
2727
2828 scenarios = [
29− ('Network', dict(indicator_name=IndicatorType.network)),
30− ('Location', dict(indicator_name=IndicatorType.location)),
31− ('Messaging', dict(indicator_name=IndicatorType.messaging)),
32− ('Power', dict(indicator_name=IndicatorType.power)),
33− ('Sound', dict(indicator_name=IndicatorType.sound)),
34− ('Datetime', dict(indicator_name=IndicatorType.datetime)),
29+ ('Network', dict(indicator_name='indicator-network')),
30+ ('Location', dict(indicator_name='indicator-location')),
31+ ('Messaging', dict(indicator_name='indicator-messaging')),
32+ ('Power', dict(indicator_name='indicator-power')),
33+ ('Sound', dict(indicator_name='indicator-sound')),
34+ ('Datetime', dict(indicator_name='indicator-datetime')),
35+ ('Bluetooth', dict(indicator_name='indicator-bluetooth')),
3536 ]
3637
3738 def test_indicator_exists(self):
tests/autopilot/unity8/shell/emulators/main_window.py+17−13
@@ -95,16 +95,20 @@ class MainWindow(object):
9595 return self.app.select_single(objectName="pinentryField")
9696
9797 def get_indicator(self, indicator_name):
98− return self.app.select_single(
99− "Tab",
100− objectName=indicator_name
101− )
102−
103−
104−class IndicatorType:
105− network = 'indicator-network'
106− location = 'indicator-location'
107− messaging = 'indicator-messages'
108− power = 'indicator-power'
109− sound = 'indicator-sound'
110− datetime = 'indicator-datetime'
98+ # TODO this is temporary until proper objectNames can be added
99+ indicator_bus_names = {
100+ 'indicator-network': 'com.canonical.indicator.network',
101+ 'indicator-power': 'com.canonical.indicator.power',
102+ 'indicator-bluetooth': 'com.canonical.indicator.bluetooth',
103+ 'indicator-sound': 'com.canonical.indicator.sound',
104+ 'indicator-location': 'com.canonical.indicator.location',
105+ 'indicator-datetime': 'com.canonical.indicator.datetime',
106+ 'indicator-location': 'com.canonical.indicator.location'
107+ }
108+ try:
109+ return self.app.select_single(
110+ 'DefaultIndicatorWidget',
111+ busName=indicator_bus_names[indicator_name]
112+ )
113+ except IndexError:
114+ return None