Unity 8

Merge lp:~elopio/unity8/generic_preview into lp:unity8

generic_preview
Merge into trunk

Proposed by Leo Arias on 2014-01-23

Status:	Merged
Approved by:	Albert Astals Cid on 2014-01-30
Approved revision:	653
Merged at revision:	676
Proposed branch:	lp:~elopio/unity8/generic_preview
Merge into:	lp:unity8
Prerequisite:	lp:~elopio/unity8/wait_for_category
Diff against target:	287 lines (+143/-63) 4 files modified qml/Dash/Generic/GenericPreview.qml (+2/-1) tests/autopilot/unity8/shell/emulators/dash.py (+51/-33) tests/autopilot/unity8/shell/fixture_setup.py (+53/-0) tests/autopilot/unity8/shell/tests/test_emulators.py (+37/-29)
To merge this branch:	bzr merge lp:~elopio/unity8/generic_preview
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2014-01-23	Approve on 2014-01-30
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-01-28
Richard Huddie		2014-01-23	Pending
Javier Collado		2014-01-23	Pending
Víctor R. Ruiz		2014-01-23	Pending
Review via email: mp+202793@code.launchpad.net

Commit message

Added the DashPreview autopilot helper.

Description of the change

[Copied from comment]

* Are there any related MPs required for this MP to build/function as expected? Yes:
https://code.launchpad.net/~elopio/unity8/wait_for_category

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable, no packaging changes.

* If you changed the UI, has there been a design review?
Not applicable, no UI changes.

lp:~elopio/unity8/generic_preview updated on 2014-01-23

651. By Leo Arias on 2014-01-23: Updated the copyright year.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2111/rebuild

review: Needs Fixing (continuous-integration)

lp:~elopio/unity8/generic_preview updated on 2014-01-23

652. By Leo Arias on 2014-01-23: Added the missing file.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2112/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2014-01-23:

Touch tests failed due to an issue with phablet-tools on the adb host. It has been resolved and this build has been restarted.

Revision history for this message

Leo Arias (elopio) wrote on 2014-01-23:

Thanks Francis.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2114/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Leo Arias (elopio) wrote on 2014-01-28:

Are there any related MPs required for this MP to build/function as expected? Yes:
https://code.launchpad.net/~elopio/unity8/wait_for_category

Did you perform an exploratory manual test run of your code change and any related functionality? Yes.
If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP? Not applicable, no packaging changes.
If you changed the UI, has there been a design review? Not applicable, no UI changes.

lp:~elopio/unity8/generic_preview updated on 2014-01-28

653. By Leo Arias on 2014-01-28: Merged with trunk.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-28:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2145/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-01-30:

* Did you perform an exploratory manual test run of the code change and any related functionality?
It's all test code, so N/A

* Did CI run pass? If not, please explain why.
No, sd test broken, the rest and new ones work

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Leo Arias

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Dash/Generic/GenericPreview.qml'
 --- qml/Dash/Generic/GenericPreview.qml	2013-10-11 13:54:24 +0000
 +++ qml/Dash/Generic/GenericPreview.qml	2014-01-28 14:43:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013, 2014 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -120,6 +120,7 @@
              Label {
                  id: descriptionLabel
++                objectName: "descriptionLabel"
                  anchors { left: parent.left; right: parent.right }
                  visible: text != ""
                  fontSize: "small"
 === modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
 --- tests/autopilot/unity8/shell/emulators/dash.py	2014-01-28 14:43:06 +0000
 +++ tests/autopilot/unity8/shell/emulators/dash.py	2014-01-28 14:43:06 +0000
@@ -137,32 +137,23 @@
          self.dash_content_list.currentIndex.wait_for(original_index + 1)
++class DashPreview(emulators.UnityEmulatorBase):
++    """Autopilot emulator for the generic preview."""
++
++    def get_details(self):
++        """Return the details of the open preview."""
++        title = self.select_single('Label', objectName='titleLabel').text
++        subtitle = self.select_single(
++            'Label', objectName='subtitleLabel').text
++        description = self.select_single(
++            'Label', objectName='descriptionLabel').text
++        return dict(title=title, subtitle=subtitle, description=description)
++
++
  class GenericScopeView(emulators.UnityEmulatorBase):
      """Autopilot emulator for generic scopes."""
--
--class DashApps(emulators.UnityEmulatorBase):
--    """Autopilot emulator for the applications scope."""
--
--    def get_applications(self, category):
--        """Return the list of applications on a category.
--
--        :parameter category: The name of the category.
--
--        """
--        category_element = self._get_category_element(category)
--        application_tiles = category_element.select_many('Tile')
--        # TODO return them on the same order they are displayed.
--        # --elopio - 2014-1-15
--        return [tile.text for tile in application_tiles]
--
--    def _get_category_element(self, category):
--        try:
--            return self.wait_select_single(
--                'Base', objectName='dashCategory{}'.format(category))
--        except dbus.StateNotFoundError:
--            raise emulators.UnityEmulatorException(
--                'No category found with name {}'.format(category))
++    preview_class = DashPreview
      @autopilot_logging.log_action(logger.info)
      def open_preview(self, category, app_name):
@@ -178,19 +169,46 @@
          # Some categories do not show previews, like recent apps.
          # --elopio - 2014-1-14
          self.pointing_device.click_object(icon)
--        return self.get_root_instance().wait_select_single(AppPreview)
--
--
--class AppPreview(emulators.UnityEmulatorBase):
++        preview = self.get_root_instance().wait_select_single(
++            self.preview_class, isCurrent=True)
++        preview.showProcessingAction.wait_for(False)
++        return preview
++
++    def _get_category_element(self, category):
++        try:
++            return self.wait_select_single(
++                'Base', objectName='dashCategory{}'.format(category))
++        except dbus.StateNotFoundError:
++            raise emulators.UnityEmulatorException(
++                'No category found with name {}'.format(category))
++
++
++class AppPreview(DashPreview):
      """Autopilot emulator for the application preview."""
      def get_details(self):
          """Return the details of the application showed in its preview."""
--        title = self.select_single('Label', objectName='titleLabel').text
--        publisher = self.select_single(
--            'Label', objectName='subtitleLabel').text
--        description = self.select_single(
--            'Label', objectName='descriptionLabel').text
++        details = super(AppPreview, self).get_details()
          # TODO return screenshots, icon, rating and reviews.
          # --elopio - 2014-1-15
--        return dict(title=title, publisher=publisher, description=description)
++        return dict(
++            title=details.get('title'), publisher=details.get('subtitle'),
++            description=details.get('description'))
++
++
++class DashApps(GenericScopeView):
++    """Autopilot emulator for the applications scope."""
++
++    preview_class = AppPreview
++
++    def get_applications(self, category):
++        """Return the list of applications on a category.
++
++        :parameter category: The name of the category.
++
++        """
++        category_element = self._get_category_element(category)
++        application_tiles = category_element.select_many('Tile')
++        # TODO return them on the same order they are displayed.
++        # --elopio - 2014-1-15
++        return [tile.text for tile in application_tiles]
 === added file 'tests/autopilot/unity8/shell/fixture_setup.py'
 --- tests/autopilot/unity8/shell/fixture_setup.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/unity8/shell/fixture_setup.py	2014-01-28 14:43:06 +0000
@@ -0,0 +1,53 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++#
++# Unity Autopilot Test Suite
++# Copyright (C) 2014 Canonical
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++#
++
++"""Set up and clean up fixtures for the Unity acceptance tests."""
++
++import os
++import sysconfig
++
++import fixtures
++
++import unity8
++
++
++class FakeScopes(fixtures.Fixture):
++
++    def setUp(self):
++        super(FakeScopes, self).setUp()
++        self.useFixture(
++            fixtures.EnvironmentVariable(
++                'QML2_IMPORT_PATH',
++                newvalue=self._get_fake_scopes_library_path()))
++
++    def _get_fake_scopes_library_path(self):
++        if unity8.running_installed_tests():
++            mock_path = 'qml/scopefakes/'
++        else:
++            mock_path = os.path.join(
++                '../lib/', sysconfig.get_config_var('MULTIARCH'),
++                'unity8/qml/scopefakes/')
++        lib_path = unity8.get_lib_path()
++        ld_library_path = os.path.abspath(os.path.join(lib_path, mock_path))
++
++        if not os.path.exists(ld_library_path):
++            raise RuntimeError(
++                'Expected library path does not exists: %s.' % (
++                    ld_library_path))
++        return ld_library_path
 === modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
 --- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-01-16 17:35:23 +0000
 +++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-01-28 14:43:06 +0000
@@ -27,17 +27,12 @@
  """
--import os
--import sysconfig
--
  import mock
--import fixtures
  from testtools.matchers import Contains, HasLength
--import unity8
  from unity8 import process_helpers
--from unity8.shell import emulators, tests
++from unity8.shell import emulators, fixture_setup, tests
  from unity8.shell.emulators import dash as dash_emulators
@@ -140,6 +135,30 @@
          self.assertIsInstance(scope, dash_emulators.DashApps)
++class GenericScopeViewEmulatorTestCase(DashBaseTestCase):
++
++    def setUp(self):
++        # Set up the fake scopes before launching unity.
++        self.useFixture(fixture_setup.FakeScopes())
++        super(GenericScopeViewEmulatorTestCase, self).setUp()
++        self.home_scope = self.dash.open_scope('home')
++
++    def test_open_preview(self):
++        preview = self.home_scope.open_preview('0', 'Title.0')
++        self.assertIsInstance(preview, dash_emulators.DashPreview)
++        self.assertTrue(preview.isCurrent)
++        self.assertFalse(preview.showProcessingAction)
++
++    def test_get_details(self):
++        expected_details = dict(
++            title='Title', subtitle='Subtitle', description='Description')
++
++        preview = self.home_scope.open_preview('0', 'Title.0')
++        details = preview.get_details()
++
++        self.assertEqual(expected_details, details)
++
++
  class DashAppsEmulatorTestCase(DashBaseTestCase):
      available_applications = [
@@ -148,32 +167,11 @@
          'Title.201', 'Title.221', 'Title.241', 'Title.261', 'Title.281']
      def setUp(self):
--        self._use_scope_fakes()
++        # Set up the fake scopes before launching unity.
++        self.useFixture(fixture_setup.FakeScopes())
          super(DashAppsEmulatorTestCase, self).setUp()
          self.applications_scope = self.dash.open_scope('applications')
--    def _use_scope_fakes(self):
--        self.useFixture(
--            fixtures.EnvironmentVariable(
--                'QML2_IMPORT_PATH',
--                newvalue=self._get_fake_scopes_library_path()))
--
--    def _get_fake_scopes_library_path(self):
--        if unity8.running_installed_tests():
--            mock_path = 'qml/scopefakes/'
--        else:
--            mock_path = os.path.join(
--                '../lib/', sysconfig.get_config_var('MULTIARCH'),
--                'unity8/qml/scopefakes/')
--        lib_path = unity8.get_lib_path()
--        ld_library_path = os.path.abspath(os.path.join(lib_path, mock_path))
--
--        if not os.path.exists(ld_library_path):
--            raise RuntimeError(
--                'Expected library path does not exists: %s.' % (
--                    ld_library_path))
--        return ld_library_path
--
      def test_get_applications_with_unexisting_category(self):
          exception = self.assertRaises(
              emulators.UnityEmulatorException,
@@ -205,3 +203,13 @@
          preview = self.applications_scope.open_preview('installed', 'Title.1')
          self.assertIsInstance(preview, dash_emulators.AppPreview)
          self.assertTrue(preview.isCurrent)
++        self.assertFalse(preview.showProcessingAction)
++
++    def test_get_details(self):
++        expected_details = dict(
++            title='Title', publisher='', description='Description')
++
++        preview = self.applications_scope.open_preview('installed', 'Title.1')
++        details = preview.get_details()
++
++        self.assertEqual(expected_details, details)