@@ -137,32 +137,23 @@ class Dash(emulators.UnityEmulatorBase):
137137 self.dash_content_list.currentIndex.wait_for(original_index + 1)
138138
139139
140−class GenericScopeView(emulators.UnityEmulatorBase):
141− """Autopilot emulator for generic scopes."""
140+class DashPreview(emulators.UnityEmulatorBase):
141+ """Autopilot emulator for the generic preview."""
142142
143+ def get_details(self):
144+ """Return the details of the open preview."""
145+ title = self.select_single('Label', objectName='titleLabel').text
146+ subtitle = self.select_single(
147+ 'Label', objectName='subtitleLabel').text
148+ description = self.select_single(
149+ 'Label', objectName='descriptionLabel').text
150+ return dict(title=title, subtitle=subtitle, description=description)
143151
144−class DashApps(emulators.UnityEmulatorBase):
145− """Autopilot emulator for the applications scope."""
146−
147− def get_applications(self, category):
148− """Return the list of applications on a category.
149−
150− :parameter category: The name of the category.
151152
152− """
153− category_element = self._get_category_element(category)
154− application_tiles = category_element.select_many('Tile')
155− # TODO return them on the same order they are displayed.
156− # --elopio - 2014-1-15
157− return [tile.text for tile in application_tiles]
153+class GenericScopeView(emulators.UnityEmulatorBase):
154+ """Autopilot emulator for generic scopes."""
158155
159− def _get_category_element(self, category):
160− try:
161− return self.wait_select_single(
162− 'Base', objectName='dashCategory{}'.format(category))
163− except dbus.StateNotFoundError:
164− raise emulators.UnityEmulatorException(
165− 'No category found with name {}'.format(category))
156+ preview_class = DashPreview
166157
167158 @autopilot_logging.log_action(logger.info)
168159 def open_preview(self, category, app_name):
@@ -178,19 +169,46 @@ class DashApps(emulators.UnityEmulatorBase):
178169 # Some categories do not show previews, like recent apps.
179170 # --elopio - 2014-1-14
180171 self.pointing_device.click_object(icon)
181− return self.get_root_instance().wait_select_single(AppPreview)
172+ preview = self.get_root_instance().wait_select_single(
173+ self.preview_class, isCurrent=True)
174+ preview.showProcessingAction.wait_for(False)
175+ return preview
182176
177+ def _get_category_element(self, category):
178+ try:
179+ return self.wait_select_single(
180+ 'Base', objectName='dashCategory{}'.format(category))
181+ except dbus.StateNotFoundError:
182+ raise emulators.UnityEmulatorException(
183+ 'No category found with name {}'.format(category))
183184
184−class AppPreview(emulators.UnityEmulatorBase):
185+
186+class AppPreview(DashPreview):
185187 """Autopilot emulator for the application preview."""
186188
187189 def get_details(self):
188190 """Return the details of the application showed in its preview."""
189− title = self.select_single('Label', objectName='titleLabel').text
190− publisher = self.select_single(
191− 'Label', objectName='subtitleLabel').text
192− description = self.select_single(
193− 'Label', objectName='descriptionLabel').text
191+ details = super(AppPreview, self).get_details()
194192 # TODO return screenshots, icon, rating and reviews.
195193 # --elopio - 2014-1-15
196− return dict(title=title, publisher=publisher, description=description)
194+ return dict(
195+ title=details.get('title'), publisher=details.get('subtitle'),
196+ description=details.get('description'))
197+
198+
199+class DashApps(GenericScopeView):
200+ """Autopilot emulator for the applications scope."""
201+
202+ preview_class = AppPreview
203+
204+ def get_applications(self, category):
205+ """Return the list of applications on a category.
206+
207+ :parameter category: The name of the category.
208+
209+ """
210+ category_element = self._get_category_element(category)
211+ application_tiles = category_element.select_many('Tile')
212+ # TODO return them on the same order they are displayed.
213+ # --elopio - 2014-1-15
214+ return [tile.text for tile in application_tiles]