Merge lp:~elopio/ubuntu-ui-toolkit/clean_gallery_tests2 into lp:ubuntu-ui-toolkit/staging

[Leo Arias]

More clean ups to the autopilot tests for the widget gallery.

[Tim Peeters (tpeeters)]

did you run the AP tests for the applications to make sure none of the removed functions are used there?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1093
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/323/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/579
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/155
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/155/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1068
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1212
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1212/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8025
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/514
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/718
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/718/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/323/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

the removed functions are not private, are we sure they are not being called by app tests?

[Tim Peeters (tpeeters)]

150 +import ubuntuuitoolkit
151 from ubuntuuitoolkit import tests

do we need two imports of ubuntuuitoolkit?

[Leo Arias (elopio)]

I didn't run all the tests of the apps, but no test outside the toolkit should use the class QMLFileAppTestCase. Actually, we should turn that into private, not export anything from the tests module and if something is needed by the apps move it to ubuntuuitoolkit.base. However, I know some apps use the global methods on that modules, so that needs a little more cleanup.

With the import, you are right. I've made the change and IMO it looks better.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1094
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/338/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/671
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/614
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/170
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/170
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1282
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8091
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/753
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/753/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/338/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1094
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/345/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/177
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1318
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1318/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/780
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/780/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/345/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/162/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/732
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/675
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/106
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/106
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1375
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1375/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8195
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/814
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/814/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-ui-toolkit/clean_gallery_tests2]

1095. By Leo Arias on 2014-06-09

Merged with staging.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1095
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/359/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/768
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/191
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/191/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1424
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1424/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/844
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/844/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/359/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-05-29 16:17:56 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-06-09 17:21:28 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013 Canonical Ltd.
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
 #
 # 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
@@ -142,91 +142,6 @@
     def main_view(self):
         return self.app.select_single(emulators.MainView)
 
-    def checkListItem(self, itemText):
-        item = self.getListItem(itemText)
-        self.assertThat(item, Not(Is(None)))
-
-    def getListItem(self, itemText):
-        # XXX We shouldn't access the elements by text, because that's likely
-        # to change often and might be translated. We should always use the
-        # objectName instead. --elopio - 2013-06-26216
-        return self.main_view.select_single("Standard", text=itemText)
-
-    def getWidgetLoaderAndListView(self):
-        contentLoader = self.main_view.select_single(
-            "QQuickLoader", objectName="contentLoader")
-        listView = self.main_view.select_single(
-            "QQuickListView", objectName="widgetList")
-        self.assertThat(listView, Not(Is(None)))
-        self.assertThat(listView.visible, Eventually(Equals(True)))
-        return (contentLoader, listView)
-
-    def loadItem(self, item):
-        self.selectItem(item)
-        contentLoader = self.main_view.select_single(
-            "QQuickLoader", objectName="contentLoader")
-        self.assertThat(contentLoader.progress, Eventually(Equals(1.0)))
-        loadedPage = self.getListItem(item)
-        self.assertThat(loadedPage, Not(Is(None)))
-        #loadedPage is not a page, it is the list item which goes in
-        #background when the item is selected, which changes the visible
-        #property of item in list itself to False. So followin check
-        #fails on Nexus 4. Commenting it for now.
-        #self.assertThat(loadedPage.visible, Eventually(Equals(True)))
-
-    def drag(self, itemText, itemTextTo):
-        item = self.getListItem(itemText)
-        itemTo = self.getListItem(itemTextTo)
-
-        self.pointing_device.move_to_object(item)
-        self.pointing_device.press()
-        self.pointing_device.move_to_object(itemTo)
-        self.pointing_device.release()
-
-    def reveal_item_by_flick(self, item, flickable, direction):
-        x1, y1, w1, h1 = item.globalRect
-        x2, y2, w2, h2 = flickable.globalRect
-        if direction is FlickDirection.UP:
-            while y1 + h1 > y2 + h2:
-                self.flick(flickable, direction)
-                x1, y1, w1, h1 = item.globalRect
-        elif direction is FlickDirection.DOWN:
-            while y1 < y2:
-                self.flick(flickable, direction)
-                x1, y1, w1, h1 = item.globalRect
-
-    def flick(self, flickable, direction, delta=40):
-        """This funcito flicks the page from middle to the given direction."""
-        x, y, w, h = flickable.globalRect
-        if direction == FlickDirection.UP:
-            self.pointing_device.drag(x + w / 2, y + h / 2, x + w / 2,
-                                      y + h / 2 - delta)
-            flickable.flicking.wait_for(False)
-        elif direction == FlickDirection.DOWN:
-            self.pointing_device.drag(x + w / 2, y + h / 2, x + w / 2,
-                                      y + h / 2 + delta)
-            flickable.flicking.wait_for(False)
-        else:
-            raise ValueError("Invalid direction or not implementd yet")
-
-    def selectItem(self, itemText):
-        item = self.getListItem(itemText)
-        x1, y1, w1, h1 = item.globalRect
-        x2, y2, w2, h2 = self.main_view.globalRect
-
-        orientationHelper = self.getOrientationHelper()
-        rot = orientationHelper.rotation
-        scrollTo = h2 / 2 - (y1 - h2 - h1)
-        if rot == 0.0 and y1 > h2:
-            self.pointing_device.drag(w2 / 2, h2 / 2, w2 / 2, scrollTo)
-
-        self.assertThat(item.selected, Eventually(Equals(False)))
-
-        self.pointing_device.move_to_object(item)
-        self.pointing_device.click()
-
-        self.assertThat(item.selected, Eventually(Equals(True)))
-
     def getOrientationHelper(self):
         orientationHelper = self.main_view.select_many(
             "OrientationHelper")[0]
@@ -249,29 +164,3 @@
         obj = self.getObject(objectName)
         self.pointing_device.move_to_object(obj)
         self.pointing_device.click()
-
-    def mousePress(self, objectName):
-        obj = self.getObject(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.press()
-
-    def mouseRelease(self):
-        self.pointing_device.release()
-
-    def type_string(self, string):
-        self.keyboard.type(string)
-
-    def type_key(self, key):
-        self.keyboard.key(key)
-
-    def tap_clearButton(self, objectName):
-        textField = self.getObject(objectName)
-        self.assertIsNotNone(textField)
-        self.pointing_device.click_object(textField)
-        self.assertThat(textField.focus, Eventually(Equals(True)))
-        self.assertThat(textField.hasClearButton, Eventually(Equals(True)))
-        btn = textField.select_single("AbstractButton")
-        self.assertIsNotNone(btn)
-        self.assertThat(btn.visible, Eventually(Equals(True)))
-        self.pointing_device.click_object(btn)
-        self.assertThat(btn.pressed, Eventually(Equals(False)))

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2013-10-24 11:01:03 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2014-06-09 17:21:28 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013 Canonical Ltd.
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
 #
 # 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
@@ -19,10 +19,10 @@
 import os
 import shutil
 
-from ubuntuuitoolkit import tests
-
-
-class GalleryTestCase(tests.QMLFileAppTestCase):
+import ubuntuuitoolkit
+
+
+class GalleryTestCase(ubuntuuitoolkit.tests.QMLFileAppTestCase):
     """Base class for gallery test cases."""
 
     local_desktop_file_path = None
@@ -39,7 +39,7 @@
 
     def _get_path_to_gallery_source(self):
         return os.path.join(
-            tests.get_path_to_source_root(), 'examples',
+            ubuntuuitoolkit.tests.get_path_to_source_root(), 'examples',
             'ubuntu-ui-toolkit-gallery')
 
     def _application_source_exists(self):
@@ -58,7 +58,8 @@
             self.test_source_path,
             'ubuntu-ui-toolkit-gallery.desktop')
         if self._application_source_exists():
-            local_desktop_file_dir = tests.get_local_desktop_file_directory()
+            local_desktop_file_dir = (
+                ubuntuuitoolkit.tests.get_local_desktop_file_directory())
             if not os.path.exists(local_desktop_file_dir):
                 os.makedirs(local_desktop_file_dir)
             local_desktop_file_path = os.path.join(
@@ -71,6 +72,19 @@
         else:
             return desktop_file_path
 
+    def open_page(self, page):
+        """Open a page of the widget gallery.
+
+        :param page: The objectName of the element in the index list that opens
+            the page.
+
+        """
+        list_view = self.main_view.select_single(
+            ubuntuuitoolkit.QQuickListView, objectName="widgetList")
+        list_view.click_element(page)
+        element = self.main_view.select_single('Standard', objectName=page)
+        element.selected.wait_for(True)
+
     def tearDown(self):
         super(GalleryTestCase, self).tearDown()
         # We can't delete the desktop file before we close the application,

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py	2014-02-11 01:55:49 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py	2014-06-09 17:21:28 +0000
@@ -45,9 +45,7 @@
     ]
 
     def test_buttons(self):
-        item = "Buttons"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('buttonsElement')
 
         button = self.app.select_single(objectName=self.button_name)
         self.assertIsNot(button, None)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2014-06-04 08:18:44 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2014-06-09 17:21:28 +0000
@@ -16,32 +16,19 @@
 
 """Tests for the Ubuntu UI Toolkit Gallery"""
 
-from autopilot.matchers import Eventually
-from testtools.matchers import Is, Not, Equals
-
-from ubuntuuitoolkit import emulators
+import ubuntuuitoolkit
 from ubuntuuitoolkit.tests import gallery
 
 
-class GenericTests(gallery.GalleryTestCase):
+class GalleryAppTestCase(gallery.GalleryTestCase):
     """Generic tests for the Gallery"""
 
-    def test_0_can_select_mainwindow(self):
-        """Must be able to select the main window."""
-
-        rootItem = self.main_view
-        self.assertThat(rootItem, Not(Is(None)))
-        self.assertThat(rootItem.visible, Eventually(Equals(True)))
-
-    def test_navigation(self):
-        item = "Navigation"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+    def test_select_main_view_must_return_main_window_emulator(self):
+        main_view = self.main_view
+        self.assertIsInstance(main_view, ubuntuuitoolkit.MainView)
 
     def test_slider(self):
-        item = "Slider"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('slidersElement')
 
         item_data = [
             ["slider_standard"],
@@ -57,9 +44,7 @@
             # TODO: move slider value
 
     def test_progress_and_activity(self):
-        item = "Progress and activity"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('progressBarsElement')
 
         item_data = [
             ["progressbar_standard"],
@@ -79,9 +64,7 @@
         # FIXME: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1308979
         return
 
-        item = "Ubuntu Shape"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('ubuntuShapesElement')
 
         item_data = [
             ["ubuntushape_color_hex"],
@@ -115,12 +98,9 @@
     ]
 
     def test_open_page(self):
-        list_view = self.main_view.select_single(
-            emulators.QQuickListView, objectName="widgetList")
-        list_view.click_element(self.element_name)
+        self.open_page(self.element_name)
         element = self.main_view.select_single(
             'Standard', objectName=self.element_name)
-        element.selected.wait_for(True)
         self.checkPageHeader(element.text)
         if self.template_name == 'textinputsTemplate':
             page_type = 'TextInputs'

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2014-05-23 09:50:42 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2014-06-09 17:21:28 +0000
@@ -24,9 +24,7 @@
 
     def setUp(self):
         super(OptionSelectorTestCase, self).setUp()
-        item = "Option Selector"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('optionSelectorsElement')
 
     def test_select_option_from_collapsed_optionselector(self):
         collapsed_option_selector = self.main_view.select_single(

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py	2014-05-07 09:23:39 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py	2014-06-09 17:21:28 +0000
@@ -23,10 +23,8 @@
 
     def setUp(self):
         super(ScrollBarTestCase, self).setUp()
-        item = 'Navigation'
-        self.loadItem(item)
-        self.checkPageHeader(item)
-        self.scrollbar = self.main_view.select_single(
+        self.open_page('navigationElement')
+        self.scrollbar = self.main_view.wait_select_single(
             'Scrollbar', objectName="TemplateScrollbar")
 
     def move_mouse_to_thumb(self):

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2014-04-30 09:40:17 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2014-06-09 17:21:28 +0000
@@ -54,9 +54,7 @@
         # Apply the user locale from the environment
         # The UITK does the same, so the test must be localized
         locale.setlocale(locale.LC_ALL, "")
-        item = 'Text Field'
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('textinputsElement')
 
     def test_write_on_textfield_must_update_text(self):
         textfield = self.main_view.select_single(
@@ -78,9 +76,7 @@
 
     def setUp(self):
         super(DisabledTextInputTestCase, self).setUp()
-        item = 'Text Field'
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('textinputsElement')
 
     def test_textfield_disabled(self):
         textfield_disabled = self.main_view.select_single(

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py	2013-11-01 15:15:30 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py	2014-06-09 17:21:28 +0000
@@ -35,10 +35,7 @@
 
     def setUp(self):
         super(EnabledTogglesTestCase, self).setUp()
-        item = "Toggles"
-        self.checkListItem(item)
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('togglesElement')
 
     def test_change_toggles_state(self):
         toggle = self.main_view.select_single(
@@ -65,10 +62,7 @@
 
     def setUp(self):
         super(DisabledTogglesTestCase, self).setUp()
-        item = "Toggles"
-        self.checkListItem(item)
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('togglesElement')
 
     def test_change_toggles_state(self):
         toggle = self.main_view.select_single(