50340fa · unity8 · git.iko.soy

tests/autopilot/unity8/fixture_setup.py+1−1

compare with xenial

unifiedsplit

@@ -133,7 +133,7 @@ class LaunchUnityWithFakeSensors(fixtures.Fixture):

133 args = [binary_arg] + env_args

134 self.unity_proxy = process_helpers.restart_unity_with_testability(

135 *args)

136− self.main_win = self.unity_proxy.select_single(shell.QQuickView)

136+ self.main_win = self.unity_proxy.select_single(shell.ShellView)

137

138 def _create_sensors(self):

139 # Wait for unity to start running.

tests/autopilot/unity8/greeter/tests/__init__.py+1−1

@@ -24,5 +24,5 @@ from unity8.shell.tests import UnityTestCase

24class GreeterTestCase(UnityTestCase):

25 def get_shell(self, unity_proxy):

26 main_window = (

27− unity_proxy.select_single(shell.QQuickView))

27+ unity_proxy.select_single(shell.ShellView))

28 return main_window.select_single('Shell')

tests/autopilot/unity8/launcher.py+1−1

@@ -42,7 +42,7 @@ class Launcher(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):

42 logger.debug('The launcher is already opened.')

43

44 def _swipe_to_show_launcher(self):

45− view = self.get_root_instance().select_single('QQuickView')

45+ view = self.get_root_instance().select_single('ShellView')

46 start_y = stop_y = view.y + view.height // 2

47

48 start_x = view.x + 1

tests/autopilot/unity8/shell/__init__.py+1−1

@@ -93,7 +93,7 @@ def _get_urgency(urgency):

93 return _urgency_enums.get(urgency.upper())

94

95

96−class QQuickView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):

96+class ShellView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):

97 """An helper class that makes it easy to interact with the shell"""

98

99 def get_greeter(self):

tests/autopilot/unity8/shell/tests/__init__.py+1−1

@@ -297,7 +297,7 @@ class UnityTestCase(AutopilotTestCase):

297

298 @property

299 def main_window(self):

300− return self._proxy.select_single(shell.QQuickView)

300+ return self._proxy.select_single(shell.ShellView)

301

302

303class DashBaseTestCase(AutopilotTestCase):