git.iko.soy/unity8
on xenial help sign in
Make the last tests i had marked as non passing pass

Hopefully this does not regress the rest of the tests, will check tomorrow

commit7e36abedab34ad2670719b63268509163077a31d authorAlbert Astals <albert.astals@canonical.com> dateMon 10 Mar 2014, 18:03 (13 years ago) parent3782963
5 files changed+16−69
compare with xenial
unifiedsplit
qml/Dash/Card.qml+1 qml/Dash/DashContent.qml+7−6 tests/autopilot/unity8/shell/emulators/dash.py+3−35 tests/autopilot/unity8/shell/tests/test_emulators.py+4−27 tests/mocks/Unity/fake_scopes.cpp+1−1
qml/Dash/Card.qml+1
@@ -26,6 +26,7 @@ AbstractButton {
2626 property alias fontScale: header.fontScale
2727 property alias headerAlignment: header.headerAlignment
2828 property alias headerHeight: header.height
29+ readonly property alias title: header.title
2930
3031 property bool showHeader: true
3132
qml/Dash/DashContent.qml+7−6
@@ -24,7 +24,7 @@ Item {
2424
2525 property var model: null
2626 property var scopes: null
27− property alias currentIndex: dashContentList.currentIndex
27+ readonly property alias currentIndex: dashContentList.currentIndex
2828 property alias previewOpen: previewListView.open
2929
3030 property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
@@ -51,6 +51,12 @@ Item {
5151 }
5252
5353 function setCurrentScopeAtIndex(index, animate, reset) {
54+ // if the scopes haven't loaded yet, then wait until they are.
55+ if (!scopes.loaded) {
56+ set_current_index = [ index, animate, reset ]
57+ return;
58+ }
59+
5460 var storedMoveDuration = dashContentList.highlightMoveDuration
5561 var storedMoveSpeed = dashContentList.highlightMoveVelocity
5662 if (!animate) {
@@ -58,11 +64,6 @@ Item {
5864 dashContentList.highlightMoveDuration = 0
5965 }
6066
61− // if the scopes haven't loaded yet, then wait until they are.
62− if (!scopes.loaded) {
63− set_current_index = [ index, animate, reset ]
64− return;
65− }
6667 set_current_index = undefined;
6768
6869 if (dashContentList.count > index)
tests/autopilot/unity8/shell/emulators/dash.py+3−35
@@ -136,24 +136,9 @@ class Dash(emulators.UnityEmulatorBase):
136136 self.dash_content_list.currentIndex.wait_for(original_index + 1)
137137
138138
139−class DashPreview(emulators.UnityEmulatorBase):
140− """Autopilot emulator for the generic preview."""
141−
142− def get_details(self):
143− """Return the details of the open preview."""
144− title = self.select_single('Label', objectName='titleLabel').text
145− subtitle = self.select_single(
146− 'Label', objectName='subtitleLabel').text
147− description = self.select_single(
148− 'Label', objectName='descriptionLabel').text
149− return dict(title=title, subtitle=subtitle, description=description)
150−
151−
152139class GenericScopeView(emulators.UnityEmulatorBase):
153140 """Autopilot emulator for generic scopes."""
154141
155− preview_class = DashPreview
156−
157142 @autopilot_logging.log_action(logger.info)
158143 def open_preview(self, category, app_name):
159144 """Open the preview of an application.
@@ -163,15 +148,13 @@ class GenericScopeView(emulators.UnityEmulatorBase):
163148
164149 """
165150 category_element = self._get_category_element(category)
166− icon = category_element.select_single('Tile', text=app_name)
151+ icon = category_element.select_single('Card', title=app_name)
167152 # FIXME some categories need a long press in order to see the preview.
168153 # Some categories do not show previews, like recent apps.
169154 # --elopio - 2014-1-14
170155 self.pointing_device.click_object(icon)
171− preview = self.get_root_instance().wait_select_single(
172− self.preview_class, isCurrent=True)
173− preview.showProcessingAction.wait_for(False)
174− return preview
156+ return self.get_root_instance().wait_select_single(
157+ 'PreviewListView', objectName='dashContentPreviewList')
175158
176159 def _get_category_element(self, category):
177160 try:
@@ -182,24 +165,9 @@ class GenericScopeView(emulators.UnityEmulatorBase):
182165 'No category found with name {}'.format(category))
183166
184167
185−class AppPreview(DashPreview):
186− """Autopilot emulator for the application preview."""
187−
188− def get_details(self):
189− """Return the details of the application showed in its preview."""
190− details = super(AppPreview, self).get_details()
191− # TODO return screenshots, icon, rating and reviews.
192− # --elopio - 2014-1-15
193− return dict(
194− title=details.get('title'), publisher=details.get('subtitle'),
195− description=details.get('description'))
196−
197−
198168class DashApps(GenericScopeView):
199169 """Autopilot emulator for the applications scope."""
200170
201− preview_class = AppPreview
202−
203171 def get_applications(self, category):
204172 """Return the list of applications on a category.
205173
tests/autopilot/unity8/shell/tests/test_emulators.py+4−27
@@ -140,20 +140,8 @@ class GenericScopeViewEmulatorTestCase(DashBaseTestCase):
140140 self.generic_scope = self.dash.open_scope('MockScope1')
141141
142142 def test_open_preview(self):
143− preview = self.generic_scope.open_preview('0', 'Title.0')
144− self.assertIsInstance(preview, dash_emulators.DashPreview)
145− self.assertTrue(preview.isCurrent)
146− self.assertFalse(preview.showProcessingAction)
147−
148− def test_get_details(self):
149− expected_details = dict(
150− title='Title', subtitle='Subtitle', description='Description')
151−
152− preview = self.generic_scope.open_preview('0', 'Title.0')
153− details = preview.get_details()
154−
155− self.assertEqual(expected_details, details)
156−
143+ preview = self.generic_scope.open_preview('0', 'Title.0.0')
144+ preview.x.wait_for(0)
157145
158146class DashAppsEmulatorTestCase(DashBaseTestCase):
159147
@@ -200,16 +188,5 @@ class DashAppsEmulatorTestCase(DashBaseTestCase):
200188 return grid.columns * grid.rows
201189
202190 def test_open_preview(self):
203− preview = self.applications_scope.open_preview('installed', 'Title.1')
204− self.assertIsInstance(preview, dash_emulators.AppPreview)
205− self.assertTrue(preview.isCurrent)
206− self.assertFalse(preview.showProcessingAction)
207−
208− def test_get_details(self):
209− expected_details = dict(
210− title='Title', publisher='', description='Description')
211−
212− preview = self.applications_scope.open_preview('installed', 'Title.1')
213− details = preview.get_details()
214−
215− self.assertEqual(expected_details, details)
191+ preview = self.applications_scope.open_preview('2', 'Title.2.1')
192+ preview.x.wait_for(0)
tests/mocks/Unity/fake_scopes.cpp+1−1
@@ -39,7 +39,7 @@ Scopes::Scopes(QObject *parent)
3939 QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));
4040
4141 timer.setSingleShot(true);
42− timer.setInterval(100);
42+ timer.setInterval(500);
4343 QObject::connect(&timer, SIGNAL(timeout()), this, SLOT(updateScopes()));
4444 load();
4545}