ubuntu-system-settings

Merge lp:~elopio/ubuntu-system-settings/refactor_about_tests into lp:ubuntu-system-settings

refactor_about_tests
Merge into trunk

Proposed by Leo Arias on 2014-07-11

Status:	Merged
Approved by:	Sebastien Bacher on 2014-07-15
Approved revision:	772
Merged at revision:	800
Proposed branch:	lp:~elopio/ubuntu-system-settings/refactor_about_tests
Merge into:	lp:ubuntu-system-settings
Prerequisite:	lp:~jonas-drange/ubuntu-system-settings/1211804-allow-technology-preference
Diff against target:	603 lines (+248/-121) 7 files modified tests/autopilot/ubuntu_system_settings/__init__.py (+155/-20) tests/autopilot/ubuntu_system_settings/tests/__init__.py (+28/-49) tests/autopilot/ubuntu_system_settings/tests/test_about.py (+51/-42) tests/autopilot/ubuntu_system_settings/tests/test_cellular.py (+7/-4) tests/autopilot/ubuntu_system_settings/tests/test_datetime.py (+4/-3) tests/autopilot/ubuntu_system_settings/tests/test_search.py (+0/-1) tests/autopilot/ubuntu_system_settings/tests/test_sound.py (+3/-2)
To merge this branch:	bzr merge lp:~elopio/ubuntu-system-settings/refactor_about_tests
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-07-11	Approve on 2014-07-15
Sebastien Bacher (community)		2014-07-11	Approve on 2014-07-15
Jonas G. Drange (community)			Approve on 2014-07-12
Brendan Donegan		2014-07-11	Pending
Review via email: mp+226468@code.launchpad.net

This proposal supersedes a proposal from 2014-07-03.

Commit message

Refactored the About autopilot tests to use the page object pattern. Added the click_item public helper to be used by UX tests.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-03: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/923/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-03: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/924/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-03: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/925/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-09: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/949/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-09: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/955/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-10: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/956/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-10: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/957/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-10: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/958/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-07-11: Posted in a previous version of this proposal

thanks, looks fine to me

review: Approve

Revision history for this message

Brendan Donegan (brendan-donegan) wrote on 2014-07-11: Posted in a previous version of this proposal

Great - thanks!

review: Approve

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-07-11:

thanks

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/970/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

FAILED: Continuous integration, rev:771
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/971/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1895/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1579/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2995/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1769/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/971/rebuild

review: Needs Fixing (continuous-integration)

lp:~elopio/ubuntu-system-settings/refactor_about_tests updated on 2014-07-11

772. By Leo Arias on 2014-07-11: Merged with trunk.

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2014-07-12:

LGTM, thanks!

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/973/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/974/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/976/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/977/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/978/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/990/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Leo Arias (elopio) wrote on 2014-07-15:

What's happening on these failed executions is that the dbus service is crashing.
https://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2232/artifact/clientlogs/ubuntu_system_settings/_usr_sbin_system-image-dbus.32011.crash

These seems more often now, but I'm not changing that part on my tests and it has just happened on the released image.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/991/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-07-15:

thanks

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/994/rebuild

review: Approve (continuous-integration)

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

Ubuntu Touch System Settings

 === modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
 --- tests/autopilot/ubuntu_system_settings/__init__.py	2014-07-11 16:12:02 +0000
 +++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-07-11 23:29:42 +0000
@@ -23,8 +23,12 @@
  from time import sleep
--from autopilot import platform
--from ubuntuuitoolkit import emulators as toolkit_emulators
++import autopilot.logging
++import ubuntuuitoolkit
++from autopilot import introspection, platform
++
++
++logger = logging.getLogger(__name__)
  class SystemSettings():
@@ -72,7 +76,7 @@
          app = testobj.launch_test_application(
              *params,
              app_type='qt',
--            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase,
++            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase,
              capture_output=True)
          return app
@@ -83,13 +87,34 @@
          return self.app.select_single(MainWindow)
--class MainWindow(toolkit_emulators.MainView):
++class MainWindow(ubuntuuitoolkit.MainView):
      """An emulator class that makes it easy to interact with the UI."""
--    @property
--    def pointer(self):
--        """ Return pointer """
--        return toolkit_emulators.get_pointing_device()
++    @autopilot.logging.log_action(logger.debug)
++    def click_item(self, object_name):
++        """Click a system settings item.
++
++        :param object_name: The objectName property of the item to click.
++
++        """
++        item = self.select_single(objectName=object_name)
++        item.swipe_into_view()
++        self.pointing_device.click_object(item)
++
++    @autopilot.logging.log_action(logger.info)
++    def go_to_about_page(self):
++        """Open the About page.
++
++        :return: The About page.
++
++        """
++        return self._go_to_page('entryComponent-about', 'aboutPage')
++
++    def _go_to_page(self, item_object_name, page_object_name):
++        self.click_item(item_object_name)
++        page = self.wait_select_single(objectName=page_object_name)
++        page.active.wait_for(True)
++        return page
      def scroll_to(self, obj):
          page = self.select_single(objectName='systemSettingsPage')
@@ -98,7 +123,7 @@
          page_center_x = int(page_right / 2)
          page_center_y = int(page_bottom / 2)
          while obj.globalRect[1] + obj.height > page_bottom:
--            self.pointer.drag(
++            self.pointing_device.drag(
                  page_center_x,
                  page_center_y,
                  page_center_x,
@@ -109,12 +134,7 @@
      def scroll_to_and_click(self, obj):
          self.scroll_to(obj)
--        self.pointer.click_object(obj)
--
--    @property
--    def about_page(self):
--        """ Return 'About' page """
--        return self.select_single(objectName='aboutPage')
++        self.pointing_device.click_object(obj)
      @property
      def cellular_page(self):
@@ -127,11 +147,6 @@
          return self.select_single(objectName="chooseCarrierPage")
      @property
--    def licenses_page(self):
--        """ Return 'License' page """
--        return self.select_single(objectName='licensesPage')
--
--    @property
      def storage_page(self):
          """ Return 'Storage' page """
          return self.select_single(objectName='storagePage')
@@ -145,3 +160,123 @@
      def sound_page(self):
          """ Return 'Sound' page """
          return self.select_single(objectName='soundPage')
++
++
++class CelullarPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++
++    """Autopilot helper for the Sound page."""
++
++    @classmethod
++    def validate_dbus_object(cls, path, state):
++        name = introspection.get_classname_from_path(path)
++        if name == b'ItemPage':
++            if state['objectName'][1] == 'cellularPage':
++                return True
++        return False
++
++
++class SoundPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++
++    """Autopilot helper for the Sound page."""
++
++    @classmethod
++    def validate_dbus_object(cls, path, state):
++        name = introspection.get_classname_from_path(path)
++        if name == b'ItemPage':
++            if state['objectName'][1] == 'soundPage':
++                return True
++        return False
++
++
++class AboutPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++
++    """Autopilot helper for the About page."""
++
++    @classmethod
++    def validate_dbus_object(cls, path, state):
++        name = introspection.get_classname_from_path(path)
++        if name == b'ItemPage':
++            if state['objectName'][1] == 'aboutPage':
++                return True
++        return False
++
++    def get_device_name(self):
++        device_label = self.select_single(objectName='deviceLabel')
++        return device_label.text
++
++    def is_serial_visible(self):
++        serial_item = self._get_serial_item()
++        return serial_item.visible
++
++    def _get_serial_item(self):
++        return self.select_single(objectName='serialItem')
++
++    def get_serial(self):
++        serial_item = self._get_serial_item()
++        return serial_item.value
++
++    def is_imei_visible(self):
++        imei_item = self._get_imei_item()
++        return imei_item.visible
++
++    def _get_imei_item(self):
++        return self.wait_select_single(objectName='imeiItem')
++
++    def get_imei(self):
++        imei_item = self._get_imei_item()
++        return imei_item.value
++
++    def get_os_information(self):
++        os_item = self.select_single(objectName='osItem')
++        return os_item.value
++
++    def get_last_updated_date(self):
++        last_updated_item = self.select_single(objectName='lastUpdatedItem')
++        return last_updated_item.value
++
++    @autopilot.logging.log_action(logger.info)
++    def go_to_check_for_updates(self):
++        check_for_updates_button = self.select_single(
++            objectName='updateButton')
++        self.pointing_device.click_object(check_for_updates_button)
++        system_updates_page = self.get_root_instance().wait_select_single(
++            objectName='systemUpdatesPage')
++        system_updates_page.active.wait_for(True)
++        return system_updates_page
++
++    @autopilot.logging.log_action(logger.info)
++    def go_to_software_licenses(self):
++        license_item = self.select_single(
++            ubuntuuitoolkit.listitems.Standard, objectName='licenseItem')
++        license_item.swipe_into_view()
++        self.pointing_device.click_object(license_item)
++        licenses_page = self.get_root_instance().wait_select_single(
++            objectName='licensesPage')
++        licenses_page.active.wait_for(True)
++        return licenses_page
++
++
++class LicensesPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++
++    """Autopilot helper for the Licenses page."""
++
++    @classmethod
++    def validate_dbus_object(cls, path, state):
++        name = introspection.get_classname_from_path(path)
++        if name == b'ItemPage':
++            if state['objectName'][1] == 'licensesPage':
++                return True
++        return False
++
++
++class SystemUpdatesPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++
++    """Autopilot helper for the System Updates page."""
++
++    @classmethod
++    def validate_dbus_object(cls, path, state):
++        name = introspection.get_classname_from_path(path)
++        if name == b'ItemPage':
++            if state['objectName'][1] == 'systemUpdatesPage':
++                return True
++        return False
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
 --- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-07-09 10:02:47 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-07-11 23:29:42 +0000
@@ -9,30 +9,26 @@
  from __future__ import absolute_import
--from ubuntu_system_settings import SystemSettings
--
--from autopilot.input import Mouse, Touch
--from autopilot.platform import model
--from autopilot.matchers import Eventually
--from testtools.matchers import Equals, NotEquals, GreaterThan
--
--from ubuntuuitoolkit.base import UbuntuUIToolkitAppTestCase
  import dbus
  import dbusmock
  import subprocess
++import ubuntuuitoolkit
++from autopilot.matchers import Eventually
++from testtools.matchers import Equals, NotEquals, GreaterThan
++
++from ubuntu_system_settings import SystemSettings
++
++
  CONNMAN_IFACE = 'org.ofono.ConnectionManager'
  RDO_IFACE = 'org.ofono.RadioSettings'
--class UbuntuSystemSettingsTestCase(UbuntuUIToolkitAppTestCase):
--    """ Base class for Ubuntu System Settings """
++class UbuntuSystemSettingsTestCase(
++        ubuntuuitoolkit.base.UbuntuUIToolkitAppTestCase):
--    if model() == 'Desktop':
--        scenarios = [('with mouse', dict(input_device_class=Mouse))]
--    else:
--        scenarios = [('with touch', dict(input_device_class=Touch))]
++    """Base class for Ubuntu System Settings."""
      def setUp(self, panel=None):
          super(UbuntuSystemSettingsTestCase, self).setUp()
@@ -185,28 +181,23 @@
  class AboutBaseTestCase(UbuntuSystemSettingsTestCase):
--    """ Base class for About this phone tests """
++
++    """Base class for About this phone tests."""
      def setUp(self):
--        """ Go to About page """
--        super(AboutBaseTestCase, self).setUp('about')
--        self.assertThat(self.system_settings.main_view.about_page.active,
--                        Eventually(Equals(True)))
++        """Go to About page."""
++        super(AboutBaseTestCase, self).setUp()
++        self.about_page = self.system_settings.main_view.go_to_about_page()
  class StorageBaseTestCase(AboutBaseTestCase):
--    """ Base class for Storage page tests """
++
++    """Base class for Storage page tests."""
      def setUp(self):
--        """ Go to Storage Page """
++        """Go to Storage Page."""
          super(StorageBaseTestCase, self).setUp()
--        # Click on 'Storage' option
--        button = self.system_settings.main_view.about_page.select_single(
--            'Standard',
--            objectName='storageItem'
--        )
--        self.assertThat(button, NotEquals(None))
--        self.system_settings.main_view.scroll_to_and_click(button)
++        self.system_settings.main_view.click_item('storageItem')
          self.assertThat(self.storage_page.active, Eventually(Equals(True)))
      def assert_space_item(self, object_name, text):
@@ -236,36 +227,24 @@
  class LicenseBaseTestCase(AboutBaseTestCase):
--    """ Base class for Licenses page tests """
++
++    """Base class for Licenses page tests."""
      def setUp(self):
--        """ Go to License Page """
++        """Go to License Page."""
          super(LicenseBaseTestCase, self).setUp()
--        # Click on 'Software licenses' option
--        button = self.system_settings.main_view.select_single(
--            'Standard',
--            objectName='licenseItem')
--        self.system_settings.main_view.scroll_to_and_click(button)
--
--    @property
--    def licenses_page(self):
--        """ Return 'License' page """
--        return self.main_view.wait_select_single(
--            'ItemPage', objectName='licensesPage'
--        )
++        self.licenses_page = self.about_page.go_to_software_licenses()
  class SystemUpdatesBaseTestCase(UbuntuSystemSettingsTestCase):
--    """ Base class for SystemUpdates page tests """
++
++    """Base class for SystemUpdates page tests."""
      def setUp(self):
--        """ Go to SystemUpdates Page """
++        """Go to SystemUpdates Page."""
          super(SystemUpdatesBaseTestCase, self).setUp()
--        # Click on 'System Updates' option
--        button = self.system_settings.main_view.select_single(
--            objectName='entryComponent-system-update')
--        self.assertThat(button, NotEquals(None))
--        self.system_settings.main_view.scroll_to_and_click(button)
++        self.system_settings.main_view.click_item(
++            'entryComponent-system-update')
  class SoundBaseTestCase(UbuntuSystemSettingsTestCase):
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-07-02 18:27:59 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-07-11 23:29:42 +0000
@@ -27,7 +27,8 @@
  class AboutTestCase(AboutBaseTestCase):
--    """ Tests for About this phone Page """
++
++    """Tests for About this phone Page."""
      def _get_imei_from_dbus(self):
          bus = dbus.SystemBus()
@@ -93,37 +94,48 @@
          else:
              return str(info.split()[0])
--    def test_serial(self):
++    def test_device_with_serial_number_must_display_it(self):
          """Checks whether the UI is showing the correct serial number."""
--        item = self.system_settings.main_view.about_page.select_single(
--            objectName='serialItem'
--        )
--        serial = self._get_device_serial_number()
--
--        if not serial:
--            self.assertThat(item.visible, Equals(False))
++        device_serial = self._get_device_serial_number()
++        if not device_serial:
++            self.skipTest('The device has no serial number.')
          else:
++            self.assertTrue(self.about_page.is_serial_visible())
++            displayed_serial = self.about_page.get_serial()
              self.assertThat(
--                item.value, Equals(self._get_device_serial_number())
--            )
--
--    def test_imei_information_is_correct(self):
++                displayed_serial, Equals(device_serial))
++
++    def test_device_without_serial_must_not_display_it(self):
++        device_serial = self._get_device_serial_number()
++        if device_serial:
++            self.skipTest('The device has serial number.')
++        else:
++            self.assertFalse(self.about_page.is_serial_visible())
++
++    def test_device_with_imei_must_display_it(self):
          """Checks whether the UI is exposing the right IMEI."""
--        imei_item = self.system_settings.main_view.about_page.wait_select_single(
--            objectName='imeiItem')
--        imei_ofono = self._get_imei_from_dbus()
++        device_imei = self._get_imei_from_dbus()
++        if not device_imei:
++            self.skipTest('The device has no imei.')
++        else:
++            self.assertTrue(self.about_page.is_imei_visible())
++            displayed_imei = self.about_page.get_imei()
++            self.assertThat(displayed_imei, Equals(device_imei))
--        if not imei_ofono:
--            self.assertThat(imei_item.visible, Equals(False))
++    def test_device_without_imei_must_not_display_it(self):
++        device_imei = self._get_imei_from_dbus()
++        if device_imei:
++            self.skipTest('The device has imei.')
          else:
--            self.assertEquals(imei_item.value, imei_ofono)
++            self.assertFalse(self.about_page.is_imei_visible())
      def test_settings_show_correct_version_of_the_os(self):
          """Ensure the UI is showing the correct version of the OS."""
--        item = self.system_settings.main_view.about_page.select_single(objectName='osItem')
++        device_os_version = self._get_os_name()
++        displayed_os_info = self.about_page.get_os_information()
          # TODO: find a way to check the image build number as well
          # -- om26er 10-03-2014
--        self.assertTrue(self._get_os_name() in item.value)
++        self.assertTrue(device_os_version in displayed_os_info)
      @skipIf(subprocess.call(
          ['which', 'getprop'], stdout=subprocess.PIPE) != 0,
@@ -131,31 +143,26 @@
+     )
      def test_hardware_name(self):
          """Ensure the UI is showing the correct device name."""
--        device_label = self.system_settings.main_view.about_page.select_single(
--            objectName='deviceLabel'
--            ).text
++        displayed_device_name = self.about_page.get_device_name()
          device_name_from_getprop = self._get_device_manufacturer_and_model()
--        self.assertEquals(device_label, device_name_from_getprop)
++        self.assertEquals(displayed_device_name, device_name_from_getprop)
      def test_last_updated(self):
          """Checks whether Last Updated info is correct."""
--        last_updated = self.system_settings.main_view.about_page.select_single(
--            objectName='lastUpdatedItem'
--            ).value
--
--        self.assertEquals(last_updated, self._get_last_updated_date())
++        last_updated_date_displayed = self.about_page.get_last_updated_date()
++        self.assertEquals(
++            last_updated_date_displayed, self._get_last_updated_date())
      def test_check_for_updates(self):
          """
          Checks whether clicking on Check for Updates brings us
          to the Updates page.
          """
--        update_button = self.system_settings.main_view.about_page.select_single(
--            objectName='updateButton')
--        self.system_settings.main_view.pointer.click_object(update_button)
--        self.assertThat(self.system_settings.main_view.updates_page.visible,
--            Eventually(Equals(True)))
++        system_updates_page = self.about_page.go_to_check_for_updates()
++        self.assertThat(
++            system_updates_page.visible, Eventually(Equals(True)))
++
  class StorageTestCase(StorageBaseTestCase):
      """ Tests for Storage """
@@ -261,10 +268,12 @@
  class LicenseTestCase(LicenseBaseTestCase):
--    """ Tests for Licenses """
--
--    def test_licenses_page(self):
--        """ Check whether Storage page is available """
--        self.assertThat(
--            self.system_settings.main_view.licenses_page.active,
--            Eventually(Equals(True)))
++
++    """Tests for Licenses."""
++
++    def test_open_licenses_page(self):
++        """Check whether Storage page is available."""
++        # FIXME this is not a good Autopilot tests. It would be better if it
++        # opens one of the licenses and checks that it is visible.
++        # --elopio - 2014-07-02
++        self.assertThat(self.licenses_page.active, Equals(True))
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-07-11 16:12:02 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-07-11 23:29:42 +0000
@@ -4,8 +4,10 @@
  # This program is free software: you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
++
  import dbus
  from time import sleep
++
  from autopilot.introspection.dbus import StateNotFoundError
  from gi.repository import Gio
  from testtools.matchers import Equals, NotEquals, raises
@@ -43,7 +45,7 @@
      def select_preference(self, label):
          """Helper method that clicks a preference that matches provided label"""
          pref = self.data_preference_selector.select_single('Label', text=label)
--        self.system_settings.main_view.pointer.click_object(pref)
++        self.system_settings.main_view.pointing_device.click_object(pref)
      def assert_selected_preference(self, index):
          """Helper method asserting that the selected data technology preference
@@ -56,10 +58,11 @@
              objectName="autoChooseCarrierSelector"
+         )
          manual = selector.select_single('Label', text=_("Manually"))
--        self.system_settings.main_view.pointer.click_object(manual)
++        self.system_settings.main_view.pointing_device.click_object(manual)
          choosecarrier = self.system_settings.main_view.cellular_page.\
              select_single(objectName="chooseCarrier")
--        self.system_settings.main_view.pointer.click_object(choosecarrier)
++        self.system_settings.main_view.pointing_device.click_object(
++            choosecarrier)
          self.assertThat(
              self.system_settings.main_view.choose_page.title,
              Equals(_("Carrier"))
@@ -211,7 +214,7 @@
          self.system_settings.main_view.go_back()
--        self.system_settings.main_view.pointer.click_object(
++        self.system_settings.main_view.pointing_device.click_object(
              self.system_settings.main_view.select_single(
                  objectName='entryComponent-cellular'))
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_datetime.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	2014-06-12 10:33:31 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	2014-07-11 23:29:42 +0000
@@ -65,7 +65,8 @@
          text_field = self.system_settings.main_view.select_single(
              objectName='selectTimeZoneField'
+         )
--        self.system_settings.main_view.pointer.move_to_object(text_field)
++        self.system_settings.main_view.pointing_device.move_to_object(
++            text_field)
      def test_time_date_page(self):
          """ Checks whether Time & Date page is available """
@@ -108,7 +109,7 @@
              objectName='locationsListView'
+         )
          london = TimeDateTestCase.wait_select_listview_first(listview)
--        self.system_settings.main_view.pointer.click_object(london)
++        self.system_settings.main_view.pointing_device.click_object(london)
          header = self.system_settings.main_view.select_single(
              objectName='MainView_Header'
+         )
@@ -128,7 +129,7 @@
+         )
          preston = TimeDateTestCase.wait_select_listview_first(listview)
--        self.system_settings.main_view.pointer.click_object(preston)
++        self.system_settings.main_view.pointing_device.click_object(preston)
          # The timer is 1 second, wait and see that we haven't moved pages
          sleep(2)
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_search.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_search.py	2014-05-27 15:56:15 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_search.py	2014-07-11 23:29:42 +0000
@@ -5,7 +5,6 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
--from autopilot.introspection.dbus import StateNotFoundError
  from testtools.matchers import Equals
  from autopilot.matchers import Eventually
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_sound.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_sound.py	2014-06-11 09:38:03 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_sound.py	2014-07-11 23:29:42 +0000
@@ -30,5 +30,6 @@
          kbd_snd = self.system_settings.main_view.sound_page.select_single(
              objectName="keyboardSoundSwitch")
          current_value = kbd_snd.get_properties()["checked"]
--        self.system_settings.main_view.pointer.click_object(kbd_snd)
--        self.assertThat(kbd_snd.get_properties()["checked"], NotEquals(current_value))
++        self.system_settings.main_view.pointing_device.click_object(kbd_snd)
++        self.assertThat(
++            kbd_snd.get_properties()["checked"], NotEquals(current_value))

ubuntu-system-settings

Merge lp:~elopio/ubuntu-system-settings/refactor_about_tests into lp:ubuntu-system-settings

Commit message

Description of the change

Preview Diff

Subscribers