git.iko.soy/unity8
on xenial help sign in
Privatize get_indicator_widget and get_indicator_page.
b2a5e15Allan LeSage
tests/autopilot/unity8/indicators/tests/test_indicators.py+1−1
compare with xenial
unifiedsplit
@@ -55,7 +55,7 @@ class IndicatorExistsTestCase(IndicatorTestCase):
55 )
55 )
56
56
57 def test_indicator_exists(self):
57 def test_indicator_exists(self):
58− self.main_window.get_indicator_widget(
58+ self.main_window._get_indicator_widget(
59 self.indicator_name
59 self.indicator_name
60 )
60 )
61
61
tests/autopilot/unity8/shell/emulators/main_window.py+4−4
@@ -88,13 +88,13 @@ class QQuickView(emulators.UnityEmulatorBase):
88 def get_pinentryField(self):
88 def get_pinentryField(self):
89 return self.select_single(objectName="pinentryField")
89 return self.select_single(objectName="pinentryField")
90
90
91− def get_indicator_widget(self, indicator_name):
91+ def _get_indicator_widget(self, indicator_name):
92 return self.select_single(
92 return self.select_single(
93 'DefaultIndicatorWidget',
93 'DefaultIndicatorWidget',
94 objectName=indicator_name+'-widget'
94 objectName=indicator_name+'-widget'
95 )
95 )
96
96
97− def get_indicator_page(self, indicator_name):
97+ def _get_indicator_page(self, indicator_name):
98 return self.select_single(
98 return self.select_single(
99 'DefaultIndicatorPage',
99 'DefaultIndicatorPage',
100 objectName=indicator_name+'-page'
100 objectName=indicator_name+'-page'
@@ -106,13 +106,13 @@ class QQuickView(emulators.UnityEmulatorBase):
106
106
107 :returns: The indicator page.
107 :returns: The indicator page.
108 """
108 """
109− widget = self.get_indicator_widget(indicator_name)
109+ widget = self._get_indicator_widget(indicator_name)
110 start_x, start_y = get_center_point(widget)
110 start_x, start_y = get_center_point(widget)
111 end_x = start_x
111 end_x = start_x
112 end_y = self.height
112 end_y = self.height
113 self.pointing_device.drag(start_x, start_y, end_x, end_y)
113 self.pointing_device.drag(start_x, start_y, end_x, end_y)
114 self.wait_select_single('Indicators', fullyOpened=True)
114 self.wait_select_single('Indicators', fullyOpened=True)
115− return self.get_indicator_page(indicator_name)
115+ return self._get_indicator_page(indicator_name)
116
116
117 def get_shell_background(self):
117 def get_shell_background(self):
118 return self.select_single(
118 return self.select_single(