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

[Leo Arias]

NOT READY FOR REVIEW

[Sebastien Bacher (seb128)]

Thanks for your work, I didn't review the changes yet but could you describe the changeset a bit?

[lp:~elopio/ubuntu-system-settings/click_item]

758. By Leo Arias on 2014-07-02

Refactored the search test cases.

759. By Leo Arias on 2014-07-02

Refactored the time zone tests.

[Leo Arias (elopio)]

Sorry Sebastian, I'm currently working on this.
I wanted to add a helper to be used on UX tests that involve the system settings app and other apps.
But then I got caught refactoring tests and adding more helpers. Now I'm just trying to make them run again without this branch growing twice as big.

[Sebastien Bacher (seb128)]

@Leo: when things are not ready for review it's better to set the merge request on "work in progress" rather than "needs review" (Iain just did that for you there)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:757
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/915/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1453
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/107
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2419
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2419/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9141
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1031
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1399
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1399/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

This got unmanageable so I'm splitting it in smaller chunks.
Here's the first one: https://code.launchpad.net/~elopio/ubuntu-system-settings/refactor_about_tests/+merge/225425

Unmerged revisions

759. By Leo Arias on 2014-07-02

Refactored the time zone tests.

758. By Leo Arias on 2014-07-02

Refactored the search test cases.

757. By Leo Arias on 2014-07-02

First part of the refactors to add the click_item autopilot helper.

=== modified file 'plugins/about/License.qml'
--- plugins/about/License.qml	2014-03-18 17:34:06 +0000
+++ plugins/about/License.qml	2014-07-02 09:53:40 +0000
@@ -32,4 +32,3 @@
         }
     }
 }
-

=== modified file 'plugins/time-date/ChooseTimeZone.qml'
--- plugins/time-date/ChooseTimeZone.qml	2014-06-11 13:05:23 +0000
+++ plugins/time-date/ChooseTimeZone.qml	2014-07-02 09:53:40 +0000
@@ -25,6 +25,7 @@
 import Ubuntu.SystemSettings.TimeDate 1.0
 
 ItemPage {
+    objectName: "timeZonePage"
     title: i18n.tr("Time zone")
 
     Timer {

=== modified file 'src/qml/EntryComponent.qml'
--- src/qml/EntryComponent.qml	2013-11-13 15:12:36 +0000
+++ src/qml/EntryComponent.qml	2014-07-02 09:53:40 +0000
@@ -43,6 +43,7 @@
             source: model.icon
         }
         Label {
+            objectName: 'entryComponentNameLabel'
             anchors.horizontalCenter: parent.horizontalCenter
             text: i18n.dtr(model.item.translations, model.displayName)
             width: col.width

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-06-11 09:36:44 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-07-02 09:53:40 +0000
@@ -14,10 +14,14 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from time import sleep
-
-from autopilot import platform
-from ubuntuuitoolkit import emulators as toolkit_emulators
+import logging
+
+import autopilot.logging
+import ubuntuuitoolkit
+from autopilot import introspection, platform
+
+
+logger = logging.getLogger(__name__)
 
 
 class SystemSettings():
@@ -65,7 +69,7 @@
         app = testobj.launch_test_application(
             *params,
             app_type='qt',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
         return app
 
@@ -75,38 +79,72 @@
         return self.app.select_single(MainWindow)
 
 
-class MainWindow(toolkit_emulators.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()
-
-    def scroll_to(self, obj):
-        page = self.select_single(objectName='systemSettingsPage')
-        page_right = page.globalRect[0] + page.globalRect[2]
-        page_bottom = page.globalRect[1] + page.globalRect[3]
-        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(
-                page_center_x,
-                page_center_y,
-                page_center_x,
-                page_center_y - obj.height * 2
-            )
-            # avoid a flick
-            sleep(0.5)
-
-    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')
+class MainWindow(ubuntuuitoolkit.MainView):
+
+    """An Autopilot helper for the Main Window."""
+
+    @autopilot.logging.log_action(logger.debug)
+    def search(self, query):
+        search_text_field = self.select_single(
+            ubuntuuitoolkit.TextField, objectName='searchTextField')
+        search_text_field.swipe_into_view()
+        search_text_field.write(query)
+
+    def get_items(self):
+        """Get the available items on the System Settings page.
+
+        :return: A list with the names of the visible items, sorted in the same
+            order they are displayed.
+
+        """
+        entry_components = self.select_many('EntryComponent')
+        # sort by y, x
+        entry_components = sorted(
+            entry_components,
+            key=lambda entry: (entry.globalRect.y, entry.globalRect.x))
+
+        result = []
+        for entry in entry_components:
+            if entry.visible:
+                label = entry.select_single(
+                    'Label', objectName='entryComponentNameLabel')
+                result.append(label.text)
+        return result
+
+    @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
+
+    @autopilot.logging.log_action(logger.info)
+    def go_to_time_and_date_page(self):
+        """Open the Time & Date page.
+
+        :return: The Time & Date page.
+
+        """
+        return self._go_to_page('entryComponent-time-date', 'timeDatePage')
 
     @property
     def cellular_page(self):
@@ -119,21 +157,137 @@
         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')
 
     @property
-    def updates_page(self):
-        """ Return 'System Update' page """
-        return self.select_single(objectName='systemUpdatesPage')
-
-    @property
     def sound_page(self):
         """ Return 'Sound' page """
         return self.select_single(objectName='soundPage')
+
+
+class ItemPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    class_name = b'ItemPage'
+    object_name = None
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        name = introspection.get_classname_from_path(path)
+        if name == cls.class_name:
+            if cls.object_name == state['objectName'][1]:
+                return True
+        return False
+
+
+class AboutPage(ItemPage):
+
+    """Autopilot helper for the About page."""
+
+    object_name = 'aboutPage'
+
+    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(ItemPage):
+
+    """Autopilot helper for the Licenses page."""
+
+    object_name = 'licensesPage'
+
+
+class SystemUpdatesPage(ItemPage):
+
+    """Autopilot helper for the System Updates page."""
+
+    object_name = 'systemUpdatesPage'
+
+
+class PageComponent(ItemPage):
+
+    """Autopilot helper for Page Components."""
+
+    class_name = b'PageComponent'
+
+
+class TimeAndDatePage(PageComponent):
+
+    """Autopilot helper for the Time & Date page."""
+
+    object_name = 'timeDatePage'
+
+    @autopilot.logging.log_action(logger.info)
+    def go_to_time_zone_page(self):
+        time_zone_item = self.select_single(objectName='timeZone')
+        self.pointing_device.click_object(time_zone_item)
+        time_zone_page = self.get_root_instance().wait_select_single(
+            objectName='timeZonePage')
+        time_zone_page.active.wait_for(True)
+        return time_zone_page
+
+
+class TimeZonePage(ItemPage):
+
+    """Autopilot helper for the Time Zone page."""
+
+    object_name = 'timeZonePage'
+
+    @autopilot.logging.log_action(logger.info)
+    def search(self, query):
+        text_field = self.select_single(
+            ubuntuuitoolkit.TextField, objectName='selectTimeZoneField')
+        text_field.write(query)

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-06-11 09:36:44 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-07-02 09:53:40 +0000
@@ -11,25 +11,20 @@
 
 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 ubuntuuitoolkit
 
 import dbus
 import dbusmock
 import subprocess
 
 
-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()
@@ -132,24 +127,18 @@
 
     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)))
+        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 """
         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):
@@ -185,18 +174,7 @@
     def setUp(self):
         """ 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):
@@ -205,11 +183,8 @@
     def setUp(self):
         """ 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 09:53:40 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-07-02 09:53:40 +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()
@@ -90,37 +91,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,
@@ -128,31 +140,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 """
@@ -258,10 +265,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-04-04 15:31:49 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-07-02 09:53:40 +0000
@@ -23,10 +23,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"))

=== 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-02 09:53:40 +0000
@@ -10,7 +10,7 @@
 from time import sleep
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, NotEquals, GreaterThan
+from testtools.matchers import Equals, GreaterThan
 
 from ubuntu_system_settings.tests import UbuntuSystemSettingsTestCase
 from ubuntu_system_settings.utils.i18n import ugettext as _
@@ -20,7 +20,8 @@
 
 class TimeDateTestCase(UbuntuSystemSettingsTestCase,
                        dbusmock.DBusTestCase):
-    """ Tests for the Time & Date Page """
+
+    """Tests for the Time & Date Page."""
 
     @classmethod
     def setUpClass(klass):
@@ -31,21 +32,11 @@
         )
 
     def setUp(self):
-        """ Go to Time & Date page """
+        """Go to Time & Date page."""
         self.obj_timedate1.Reset()
-        super(TimeDateTestCase, self).setUp("time-date")
-
-    @property
-    def time_date_page(self):
-        return self.system_settings.main_view.select_single(
-            objectName='timeDatePage'
-        )
-
-    @property
-    def tz_page(self):
-        return self.system_settings.main_view.select_single(
-            objectName='timeZone'
-        )
+        super(TimeDateTestCase, self).setUp()
+        self.time_and_date_page = (
+            self.system_settings.main_view.go_to_time_and_date_page())
 
     @staticmethod
     def wait_select_listview_first(listview):
@@ -60,29 +51,22 @@
                 else:
                     raise e
 
-    def click_tz_search_field(self):
-        self.system_settings.main_view.scroll_to_and_click(self.tz_page)
-        text_field = self.system_settings.main_view.select_single(
-            objectName='selectTimeZoneField'
-        )
-        self.system_settings.main_view.pointer.move_to_object(text_field)
-
-    def test_time_date_page(self):
-        """ Checks whether Time & Date page is available """
-        self.assertThat(self.time_date_page, NotEquals(None))
-        self.assertThat(self.time_date_page.title, Equals(_('Time & Date')))
+    def test_open_time_and_date_page(self):
+        """Checks whether Time & Date page is available."""
+        self.assertThat(
+            self.time_and_date_page.title, Equals(_('Time & Date')))
 
     def test_tz_list_initially_empty(self):
-        """ Checks that no list is displayed initially """
-        self.system_settings.main_view.scroll_to_and_click(self.tz_page)
-        labelVisible = self.system_settings.main_view.wait_select_single(
+        """Checks that no list is displayed initially."""
+        time_zone_page = self.time_and_date_page.go_to_time_zone_page()
+        labelVisible = time_zone_page.wait_select_single(
             objectName='nothingLabel').visible
         self.assertThat(labelVisible, Equals(True))
 
     def test_searching_tz(self):
-        """ Check that searching for a valid location shows something """
-        self.click_tz_search_field()
-        self.keyboard.type('London, United Kingdom')
+        """Check that searching for a valid location shows something."""
+        time_zone_page = self.time_and_date_page.go_to_time_zone_page()
+        time_zone_page.search('London, United Kingdom')
         listview = self.system_settings.main_view.select_single(
             objectName='locationsListView'
         )
@@ -90,8 +74,8 @@
 
     def test_searching_tz_not_found(self):
         """ Check that searching for an invalid location shows nothing """
-        self.click_tz_search_field()
-        self.keyboard.type('Oh no you don\'t!')
+        time_zone_page = self.time_and_date_page.go_to_time_zone_page()
+        time_zone_page.search('Oh no you don\'t!')
         listview = self.system_settings.main_view.select_single(
             objectName='locationsListView'
         )
@@ -102,13 +86,13 @@
 
     def test_manual_tz_selection(self):
         """ Check that manually selecting a timezone sets it properly """
-        self.click_tz_search_field()
-        self.keyboard.type('London, United Kingdom')
+        time_zone_page = self.time_and_date_page.go_to_time_zone_page()
+        time_zone_page.search('London, United Kingdom')
         listview = self.system_settings.main_view.select_single(
             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 +112,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-02 09:53:40 +0000
@@ -1,53 +1,36 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# 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.
+# Copyright 2013, 2014 Canonical
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from autopilot.introspection.dbus import StateNotFoundError
-from testtools.matchers import Equals
-from autopilot.matchers import Eventually
+""" Tests for Ubuntu System Settings """
 
 from ubuntu_system_settings.tests import UbuntuSystemSettingsTestCase
-from ubuntu_system_settings.utils.i18n import ugettext as _
-
-
-""" Tests for Ubuntu System Settings """
 
 
 class SearchTestCases(UbuntuSystemSettingsTestCase):
     """ Tests for Search """
 
-    def setUp(self):
-        super(SearchTestCases, self).setUp()
-
-    def _get_entry_component(self, name):
-        return self.system_settings.main_view.wait_select_single(
-            objectName='entryComponent-' + name
-        )
-
-    def _get_all_entry_components(self):
-        return self.system_settings.main_view.select_many(
-            'EntryComponent')
-
-    def _type_into_search_box(self, text):
-        search_box = self.system_settings.main_view.select_single(
-            objectName='searchTextField'
-        )
-        self.system_settings.main_view.scroll_to_and_click(search_box)
-        self.keyboard.type(_(text))
-        self.assertThat(search_box.text, Eventually(Equals(text)))
-
     def test_search_filter_results(self):
         """ Checks whether Search box actually filters the results """
-        self._type_into_search_box('Sound')
-        sound_icon = self._get_entry_component('sound')
+        self.system_settings.main_view.search('Sound')
+        visible_items = self.system_settings.main_view.get_items()
 
-        self.assertThat(sound_icon.visible, Eventually(Equals(True)))
-        self.assertEquals(len(self._get_all_entry_components()), 1)
+        self.assertIn('Sound', visible_items)
 
     def test_search_filter_no_matches(self):
         """ Checks that no results are returned if nothing matches """
-        self._type_into_search_box('foobar')
-        self.assertEquals(len(self._get_all_entry_components()), 0)
+        self.system_settings.main_view.search('foobar')
+        visible_items = self.system_settings.main_view.get_items()
+
+        self.assertEquals(visible_items, [])

=== 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-02 09:53:40 +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))