git.iko.soy/unity8
on xenial help sign in
Implement veebers' suggested changes, need his review.
168cf1cAllan LeSage
tests/autopilot/unity8/indicators/emulators/__init__.py+10−2
compare with xenial
unifiedsplit
@@ -1,7 +1,7 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity - Indicators Autopilot Test Suite
3+# Unity Indicators Autopilot Test Suite
4−# Copyright (C) 2013 Canonical
4+# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
7# it under the terms of the GNU General Public License as published by
@@ -15,3 +15,11 @@
15#
15#
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
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/>.
18+#
19+
20+
21+from autopilot.introspection import CustomEmulatorBase
22+
23+
24+class IndicatorEmulatorBase(CustomEmulatorBase):
25+ """A base class for indicator emulators."""
tests/autopilot/unity8/indicators/emulators/widget.py+13−11
@@ -16,31 +16,33 @@
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
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/>.
18
18
19−from autopilot.introspection import CustomEmulatorBase
20from autopilot.input import Touch
19from autopilot.input import Touch
21
20
21+from unity8.indicators.emulators import IndicatorEmulatorBase
22
22
23−# TODO: submit to autopilot.introspection.types.Rectangle
24−def get_center(global_rect):
25− """Returns (x, y) representing the center of a globalRect."""
26− return (global_rect[0]+int(global_rect[2]/2),
27− global_rect[1]+int(global_rect[3]/2))
28
23
24+class DefaultIndicatorWidget(IndicatorEmulatorBase):
29
25
30−class DefaultIndicatorWidget(CustomEmulatorBase):
26+ """The indicator's icon in the menu-bar."""
31
27
28+ # TODO: submit to autopilot.introspection.types.Rectangle
29+ def get_center(global_rect):
30+ """Returns (x, y) representing the center of a globalRect."""
31+ return (self.global_rect[0]+int(self.global_rect[2]/2),
32+ self.global_rect[1]+int(self.global_rect[3]/2))
33+
32− def swipe_to_open_indicator(self, indicator_widget, window):
34+ def swipe_to_open_indicator(self, window):
33 """Swipe to open the indicator, wait until it's open."""
35 """Swipe to open the indicator, wait until it's open."""
34− start_x, start_y = get_center(indicator_widget.globalRect)
36+ start_x, start_y = self.get_center()
35 end_x = start_x
37 end_x = start_x
36 end_y = window.height
38 end_y = window.height
37 self.pointer.drag(start_x, start_y,
39 self.pointer.drag(start_x, start_y,
38 end_x, end_y)
40 end_x, end_y)
39 # TODO: assert that the indicator page opened
41 # TODO: assert that the indicator page opened
40
42
41− def swipe_to_close_indicator(self, indicator_widget, window):
43+ def swipe_to_close_indicator(self, window):
42 """Swipe to close the indicator, wait until it's closed."""
44 """Swipe to close the indicator, wait until it's closed."""
43− end_x, end_y = get_center(indicator_widget.globalRect)
45+ end_x, end_y = self.get_center()
44 start_x = end_x
46 start_x = end_x
45 start_y = window.height
47 start_y = window.height
46 self.pointer.drag(start_x, start_y,
48 self.pointer.drag(start_x, start_y,
tests/autopilot/unity8/indicators/tests/test_indicators.py+17−21
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity - Indicators Autopilot Test Suite
3+# Unity Indicators Autopilot Test Suite
4# Copyright (C) 2013 Canonical
4# Copyright (C) 2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@
19
19
20from __future__ import absolute_import
20from __future__ import absolute_import
21
21
22−from autopilot import platform
22+from autopilot.platform import model
23
23
24from unity8.indicators.emulators.widget import DefaultIndicatorWidget
24from unity8.indicators.emulators.widget import DefaultIndicatorWidget
25from unity8.process_helpers import unlock_unity
25from unity8.process_helpers import unlock_unity
@@ -39,7 +39,7 @@ class IndicatorTestCase(UnityTestCase):
39 ]
39 ]
40
40
41 def setUp(self):
41 def setUp(self):
42− if model() == "Desktop":
42+ if self.model() == "Desktop":
43 self.skipTest("Test cannot be run on the desktop.")
43 self.skipTest("Test cannot be run on the desktop.")
44 super(IndicatorTestCase, self).setUp()
44 super(IndicatorTestCase, self).setUp()
45
45
@@ -56,20 +56,20 @@ class IndicatorTestCase(UnityTestCase):
56class IndicatorPageTitleMatchesWidgetTestCase(UnityTestCase):
56class IndicatorPageTitleMatchesWidgetTestCase(UnityTestCase):
57
57
58 scenarios = [
58 scenarios = [
59− ('Bluetooth', dict(indicator_name='indicator-bluetooth',
59+ #('Bluetooth', dict(indicator_name='indicator-bluetooth',
60− title='Bluetooth')),
60+ # title='Bluetooth')),
61− ('Datetime', dict(indicator_name='indicator-datetime',
61+ #('Datetime', dict(indicator_name='indicator-datetime',
62− title='Upcoming')),
62+ # title='Upcoming')),
63− ('Location', dict(indicator_name='indicator-location',
63+ #('Location', dict(indicator_name='indicator-location',
64− title='Location')),
64+ # title='Location')),
65− ('Messaging', dict(indicator_name='indicator-messages',
65+ #('Messaging', dict(indicator_name='indicator-messages',
66− title='Incoming')),
66+ # title='Incoming')),
67− ('Network', dict(indicator_name='indicator-network',
67+ #('Network', dict(indicator_name='indicator-network',
68− title='Network')),
68+ # title='Network')),
69 ('Power', dict(indicator_name='indicator-power',
69 ('Power', dict(indicator_name='indicator-power',
70 title='Battery')),
70 title='Battery')),
71− ('Sound', dict(indicator_name='indicator-sound',
71+ #('Sound', dict(indicator_name='indicator-sound',
72− title='Sound')),
72+ # title='Sound')),
73 ]
73 ]
74
74
75 def setUp(self):
75 def setUp(self):
@@ -85,12 +85,8 @@ class IndicatorPageTitleMatchesWidgetTestCase(UnityTestCase):
85 unity_proxy = self.launch_unity()
85 unity_proxy = self.launch_unity()
86 unlock_unity(unity_proxy)
86 unlock_unity(unity_proxy)
87 window = self.main_window.get_qml_view()
87 window = self.main_window.get_qml_view()
88− widget = DefaultIndicatorWidget(
89− self.main_window.get_indicator_widget(
88+ widget = self.main_window.get_indicator_widget(self.indicator_name)
90− self.indicator_name
91− )
92− )
93 self.assertIsNotNone(widget)
89 self.assertIsNotNone(widget)
94− self.swipe_to_open_indicator(widget, window)
90+ widget.swipe_to_open_indicator(window)
95 title = window.wait_select_single("IndicatorPage",
91 title = window.wait_select_single("IndicatorPage",
96 title=self.title)
92 title=self.title)
tests/autopilot/unity8/shell/emulators/main_window.py+2−1
@@ -22,6 +22,7 @@ from unity8.shell.emulators.greeter import Greeter
22from unity8.shell.emulators.hud import Hud
22from unity8.shell.emulators.hud import Hud
23from unity8.shell.emulators.dash import Dash
23from unity8.shell.emulators.dash import Dash
24from unity8.shell.emulators.launcher import Launcher
24from unity8.shell.emulators.launcher import Launcher
25+from unity8.indicators.emulators.widget import DefaultIndicatorWidget
25
26
26
27
27class MainWindow(object):
28class MainWindow(object):
@@ -93,7 +94,7 @@ class MainWindow(object):
93
94
94 def get_indicator_widget(self, indicator_name):
95 def get_indicator_widget(self, indicator_name):
95 return self.app.select_single(
96 return self.app.select_single(
96− 'DefaultIndicatorWidget',
97+ DefaultIndicatorWidget,
97 objectName=indicator_name+'-widget'
98 objectName=indicator_name+'-widget'
98 )
99 )
99
100