git.iko.soy/unity8
on xenial help sign in
Reverted the open_preview autopilot helper to return a Preview object.
011c277Leo Arias
tests/autopilot/unity8/shell/emulators/dash.py+9−1
compare with xenial
unifiedsplit
@@ -142,6 +142,7 @@ class GenericScopeView(emulators.UnityEmulatorBase):
142
142
143 :parameter category: The name of the category where the application is.
143 :parameter category: The name of the category where the application is.
144 :app_name: The name of the application.
144 :app_name: The name of the application.
145+ :return: The opened preview.
145
146
146 """
147 """
147 category_element = self._get_category_element(category)
148 category_element = self._get_category_element(category)
@@ -150,8 +151,11 @@ class GenericScopeView(emulators.UnityEmulatorBase):
150 # Some categories do not show previews, like recent apps.
151 # Some categories do not show previews, like recent apps.
151 # --elopio - 2014-1-14
152 # --elopio - 2014-1-14
152 self.pointing_device.click_object(icon)
153 self.pointing_device.click_object(icon)
153− return self.get_root_instance().wait_select_single(
154+ preview_list = self.get_root_instance().wait_select_single(
154 'PreviewListView', objectName='dashContentPreviewList')
155 'PreviewListView', objectName='dashContentPreviewList')
156+ preview_list.x.wait_for(0)
157+ return preview_list.select_single(
158+ Preview, objectName='preview{}'.format(preview_list.currentIndex))
155
159
156 def _get_category_element(self, category):
160 def _get_category_element(self, category):
157 try:
161 try:
@@ -180,3 +184,7 @@ class DashApps(GenericScopeView):
180 if card.objectName != 'cardToolCard':
184 if card.objectName != 'cardToolCard':
181 result.append(card)
185 result.append(card)
182 return result
186 return result
187+
188+
189+class Preview(emulators.UnityEmulatorBase):
190+ """Autopilot custom proxy object for generic previews."""
tests/autopilot/unity8/shell/tests/test_emulators.py+3−5
@@ -141,7 +141,9 @@ class GenericScopeViewEmulatorTestCase(DashBaseTestCase):
141
141
142 def test_open_preview(self):
142 def test_open_preview(self):
143 preview = self.generic_scope.open_preview('0', 'Title.0.0')
143 preview = self.generic_scope.open_preview('0', 'Title.0.0')
144− preview.x.wait_for(0)
144+ self.assertIsInstance(preview, dash_emulators.Preview)
145+ self.assertTrue(preview.isCurrent)
146+
145
147
146class DashAppsEmulatorTestCase(DashBaseTestCase):
148class DashAppsEmulatorTestCase(DashBaseTestCase):
147
149
@@ -186,7 +188,3 @@ class DashAppsEmulatorTestCase(DashBaseTestCase):
186 category)
188 category)
187 grid = category_element.select_single('CardFilterGrid')
189 grid = category_element.select_single('CardFilterGrid')
188 return grid.columns * grid.rows
190 return grid.columns * grid.rows
189−
190− def test_open_preview(self):
191− preview = self.applications_scope.open_preview('2', 'Title.2.1')
192− preview.x.wait_for(0)