Merge lp:~tpeeters/ubuntu-ui-toolkit/revert-ap16 into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Undo the MR to support AP1.6.

Undo the MR to support AP1.6 because AP1.6 is not ready yet.

[Zoltan Balogh (bzoltan)]

Do it :)

review: Approve

[Tim Peeters (tpeeters)]

I tried some random AP tests that were broken by r1642 and they work again.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1645
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2272/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1000
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1002
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1002/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/999

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2015-09-21 11:19:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2015-09-22 15:58:52 +0000
@@ -29,7 +29,6 @@
     platform
 )
 from autopilot.introspection import dbus
-import ubuntuuitoolkit
 
 logger = logging.getLogger(__name__)
 
@@ -243,7 +242,6 @@
         parent = self.get_parent()
         root = self.get_root_instance()
         while parent.id != root.id:
-            parent = ubuntuuitoolkit.QQuickFlickable.from_proxy_object(parent)
             if parent.is_flickable():
                 return parent
             parent = parent.get_parent()
@@ -265,7 +263,4 @@
         if top_container is None:
             raise ToolkitException('Could not find the top-most container.')
         else:
-            from ubuntuuitoolkit._custom_proxy_objects._mainview import (
-                MainView
-            )
-            return MainView.from_proxy_object(top_container)
+            return top_container
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2015-09-21 13:54:37 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2015-09-22 15:58:52 +0000
@@ -20,10 +20,8 @@
 from autopilot.introspection import dbus
 
 from ubuntuuitoolkit._custom_proxy_objects import (
-    _actionbar,
     _common,
-    _sections,
-    _tabbar,
+    _tabbar
 )
 
 
@@ -92,7 +90,7 @@
         try:
             # Ubuntu.Components >=1.3
             sections = self.select_single(
-                _sections.Sections, objectName='headerSectionsItem')
+                'Sections', objectName='headerSectionsItem')
             sections.click_section_button(index)
         except dbus.StateNotFoundError:
             # Ubuntu.Components < 1.3, has no headerSectionsItem.
@@ -252,7 +250,7 @@
         try:
             # for Ubuntu.Components 1.3
             actionbar = self.select_single(
-                _actionbar.ActionBar, objectName='headerActionBar')
+                'ActionBar', objectName='headerActionBar')
             actionbar.click_action_button(action_object_name)
         except dbus.StateNotFoundError:
             # for Ubuntu.Components < 1.3
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2015-09-21 11:19:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2015-09-22 15:58:52 +0000
@@ -23,7 +23,6 @@
 from autopilot import introspection
 
 from ubuntuuitoolkit._custom_proxy_objects import (
-    AppHeader,
     _common,
     popups,
     _tabs,
@@ -65,7 +64,7 @@
     def get_header(self):
         """Return the AppHeader custom proxy object of the MainView."""
         try:
-            return self.select_single(AppHeader, objectName='MainView_Header')
+            return self.select_single(objectName='MainView_Header')
         except dbus.StateNotFoundError:
             raise _common.ToolkitException('The main view has no header.')
 
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py	2015-06-19 05:28:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py	2015-09-22 15:58:52 +0000
@@ -14,21 +14,18 @@
 # 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 ubuntuuitoolkit._custom_proxy_objects import (
-    _flickable,
-    _qquicklistview
-)
+from ubuntuuitoolkit._custom_proxy_objects import _qquicklistview
 
 
 class UbuntuListView11(_qquicklistview.QQuickListView):
     """Autopilot helper for the UbuntuListView 1.1."""
 
     def pull_to_refresh_enabled(self):
-        refresh = self.select_single(_flickable.PullToRefresh)
+        refresh = self.select_single('PullToRefresh')
         return refresh.enabled
 
     def manual_refresh_wait(self):
-        refresh = self.select_single(_flickable.PullToRefresh)
+        refresh = self.select_single('PullToRefresh')
         if refresh.enabled:
             self.pull_to_refresh()
             refresh.wait_for_refresh()
@@ -36,14 +33,14 @@
         return False
 
     def manual_refresh_nowait(self):
-        refresh = self.select_single(_flickable.PullToRefresh)
+        refresh = self.select_single('PullToRefresh')
         if refresh.enabled:
             self.pull_to_refresh()
             return True
         return False
 
     def wait_refresh_completed(self):
-        refresh = self.select_single(_flickable.PullToRefresh)
+        refresh = self.select_single('PullToRefresh')
         if refresh.enabled:
             refresh.wait_for_refresh()
             return True
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2015-09-22 10:13:12 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2015-09-22 15:58:52 +0000
@@ -25,7 +25,6 @@
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import base, fixture_setup
-from ubuntuuitoolkit._custom_proxy_objects._mainview import MainView
 
 
 _DESKTOP_FILE_CONTENTS = ("""[Desktop Entry]
@@ -109,8 +108,7 @@
         application_name, _ = os.path.splitext(desktop_file_name)
         self.app = self.launch_upstart_application(
             application_name,
-            proxy_class=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase
-        )
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
     def use_local_modules(self, local_modules_path):
         env_vars = [
@@ -127,9 +125,8 @@
 class QMLStringAppTestCase(UbuntuUIToolkitWithFakeAppRunningTestCase):
     """Base test case for self tests that define the QML on an string."""
 
-    def setUp(self, mainview_class=MainView):
+    def setUp(self):
         super().setUp()
-        self.mainview_class = mainview_class
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
@@ -143,9 +140,7 @@
         QML code used for testing must define the objectName
         of the MainView to be 'mainView'.
         """
-        return self.mainview_class.from_proxy_object(
-            self.app.select_single(objectName='mainView')
-        )
+        return self.app.select_single(objectName='mainView')
 
 
 class FlickDirection:
@@ -160,10 +155,8 @@
     test_qml_file_path = '/path/to/file.qml'
     desktop_file_path = None
 
-    def setUp(self, mainview_class=MainView):
+    def setUp(self):
         super().setUp()
-        # Allow a test case to use a different CPO
-        self.mainview_class = mainview_class
         self.pointing_device = Pointer(self.input_device_class.create())
         self.launch_application()
 
@@ -180,6 +173,7 @@
             ]
         self.app = self.launch_test_application(
             *self.get_command_line(command_line),
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase,
             app_type='qt')
 
         self.assertThat(
@@ -201,9 +195,7 @@
         QML code used for testing must define the objectName
         of the MainView to be 'mainView'.
         """
-        return self.mainview_class.from_proxy_object(
-            self.app.select_single(objectName='mainView')
-        )
+        return self.app.select_single(objectName='mainView')
 
     def getOrientationHelper(self):
         orientationHelper = self.main_view.select_many(
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py	2015-06-19 05:28:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py	2015-09-22 15:58:52 +0000
@@ -18,10 +18,7 @@
 
 import os
 
-from ubuntuuitoolkit import (
-    QQuickFlickable,
-    tests
-)
+from ubuntuuitoolkit import tests
 
 
 class DialogScrollTestCase(tests.QMLFileAppTestCase):
@@ -43,7 +40,7 @@
         button = self.main_view.select_single(objectName='button_huge')
         self.pointing_device.click_object(button)
         dialog = self.main_view.select_single(objectName='dialog_huge')
-        flickable = dialog.select_single(QQuickFlickable)
+        flickable = dialog.select_single('QQuickFlickable')
         buttlet = dialog.select_single(objectName='buttlet49')
         # We can scroll
         self.assertFalse(flickable.atYEnd)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-07-20 23:40:12 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-09-22 15:58:52 +0000
@@ -23,11 +23,7 @@
 from autopilot.input._common import get_center_point
 from autopilot import platform
 
-from ubuntuuitoolkit import (
-    TextArea,
-    TextField,
-    tests
-)
+from ubuntuuitoolkit import tests
 
 
 class CaretTextInputTestCase(tests.QMLFileAppTestCase):
@@ -46,20 +42,16 @@
     scenarios = [
         ('textfield',
             dict(test_qml_file_path=textfield_qml_file_path,
-                 objectName='textfield',
-                 cpo_class=TextField)),
+                 objectName='textfield')),
         ('textarea',
             dict(test_qml_file_path=textarea_qml_file_path,
-                 objectName='textarea',
-                 cpo_class=TextArea)),
+                 objectName='textarea')),
         ('customfield',
             dict(test_qml_file_path=customfield_qml_file_path,
-                 objectName='textfield',
-                 cpo_class=TextField)),
+                 objectName='textfield')),
         ('header',
             dict(test_qml_file_path=header_qml_file_path,
-                 objectName='textfield',
-                 cpo_class=TextField)),
+                 objectName='textfield')),
     ]
 
     def get_command_line(self, command_line):
@@ -68,10 +60,8 @@
 
     def setUp(self):
         super().setUp()
-        # Create either a TextField or TextArea.
-        self.textfield = self.cpo_class.from_proxy_object(
-            self.main_view.select_single(objectName=self.objectName)
-        )
+        self.textfield = self.main_view.select_single(
+            objectName=self.objectName)
         self.assertFalse(self.textfield.focus)
 
     def select_cursor(self, positionProperty):
@@ -132,20 +122,16 @@
     scenarios = [
         ('textfield',
          dict(test_qml_file_path=textfield_qml_file_path,
-              objectName='textfield',
-              cpo_class=TextField)),
+              objectName='textfield')),
         ('textarea',
          dict(test_qml_file_path=textarea_qml_file_path,
-              objectName='textarea',
-              cpo_class=TextField)),
+              objectName='textarea')),
         ('customfield',
          dict(test_qml_file_path=customfield_qml_file_path,
-              objectName='textfield',
-              cpo_class=TextField)),
+              objectName='textfield')),
         ('header',
          dict(test_qml_file_path=header_qml_file_path,
-              objectName='textfield',
-              cpo_class=TextField)),
+              objectName='textfield')),
     ]
 
     def get_command_line(self, command_line):
@@ -153,12 +139,9 @@
         return command_line
 
     def setUp(self):
-
         super().setUp()
-        # textfield will either be a textfield or textarea.
-        self.textfield = self.cpo_class.from_proxy_object(
-            self.main_view.select_single(objectName=self.objectName)
-        )
+        self.textfield = self.main_view.select_single(
+            objectName=self.objectName)
         self.assertFalse(self.textfield.focus)
 
     def assert_buttons(self, texts):
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_actionbar.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_actionbar.py	2015-07-20 23:19:04 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_actionbar.py	2015-09-22 15:58:52 +0000
@@ -29,7 +29,7 @@
     def setUp(self):
         super().setUp()
         self.actionbar = self.app.select_single(
-            ubuntuuitoolkit.ActionBar, objectName='ActionBar')
+            'ActionBar', objectName='ActionBar')
         self.label = self.app.select_single(
             'Label', objectName='Label')
         self.assertEqual(self.label.text, 'No action triggered.')
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py	2015-06-16 04:21:58 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py	2015-09-22 15:58:52 +0000
@@ -16,10 +16,7 @@
 
 import os
 
-from ubuntuuitoolkit import (
-    TextArea,
-    tests
-)
+from ubuntuuitoolkit import tests
 
 
 class DialogTestCase(tests.QMLFileAppTestCase):
@@ -34,7 +31,7 @@
         self.pointing_device.click_object(open_button)
         dialog = self.main_view.wait_select_single('Dialog',
                                                    title="Dialog")
-        text_area = dialog.wait_select_single(TextArea,
+        text_area = dialog.wait_select_single('TextArea',
                                               objectName='textfield_standard')
         text_area.write('test')
         self.assertEqual(text_area.text, 'test')
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2015-07-21 06:37:52 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2015-09-22 15:58:52 +0000
@@ -79,33 +79,16 @@
 }
 """)
 
-    class Label(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-        pass
-
     scenarios = [
-        ('main view', dict(
-            cpo_class=ubuntuuitoolkit.MainView,
-            object_name='mainView',
-            is_flickable=False)),
-        ('flickable', dict(
-            cpo_class=ubuntuuitoolkit.QQuickFlickable,
-            object_name='flickable',
-            is_flickable=True)),
-        ('list view', dict(
-            cpo_class=ubuntuuitoolkit.QQuickListView,
-            object_name='listView',
-            is_flickable=True)),
-        ('label', dict(
-            cpo_class=Label,
-            object_name='label',
-            is_flickable=False))
+        ('main view', dict(object_name='mainView', is_flickable=False)),
+        ('flickable', dict(object_name='flickable', is_flickable=True)),
+        ('list view', dict(object_name='listView', is_flickable=True)),
+        ('label', dict(object_name='label', is_flickable=False))
     ]
 
     def test_is_flickable(self):
         """Test that is_flickable identifies the elements correctly."""
-        element = self.app.select_single(
-            self.cpo_class,
-            objectName=self.object_name)
+        element = self.app.select_single(objectName=self.object_name)
         self.assertEqual(element.is_flickable(), self.is_flickable)
 
 
@@ -160,9 +143,6 @@
 }
 """)
 
-    class Button(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-        pass
-
     def setUp(self):
         super().setUp()
         self.flickable = self.main_view.select_single(
@@ -174,9 +154,7 @@
     def test_swipe_into_view_bottom_element(self):
         self.main_view.close_toolbar()
 
-        button = self.main_view.select_single(
-            self.Button,
-            objectName='bottomButton')
+        button = self.main_view.select_single(objectName='bottomButton')
         button.swipe_into_view()
 
         self.pointing_device.click_object(button)
@@ -184,14 +162,10 @@
 
     def test_swipe_into_view_top_element(self):
         self.main_view.close_toolbar()
-        bottomButton = self.main_view.select_single(
-            self.Button,
-            objectName='bottomButton')
+        bottomButton = self.main_view.select_single(objectName='bottomButton')
         bottomButton.swipe_into_view()
 
-        topButton = self.main_view.select_single(
-            self.Button,
-            objectName='topButton')
+        topButton = self.main_view.select_single(objectName='topButton')
         topButton.swipe_into_view()
 
         self.pointing_device.click_object(topButton)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2015-06-17 23:26:34 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2015-09-22 15:58:52 +0000
@@ -22,12 +22,7 @@
 from autopilot import introspection
 
 import ubuntuuitoolkit
-from ubuntuuitoolkit import (
-    CheckBox,
-    MainView,
-    UbuntuUIToolkitCustomProxyObjectBase as ProxyBase,
-    tests
-)
+from ubuntuuitoolkit import tests
 
 
 class HideShowTestCase(tests.QMLFileAppTestCase):
@@ -77,12 +72,8 @@
     def setUp(self):
         super().setUp()
         self.header = self.main_view.get_header()
-        self.label = ProxyBase.from_proxy_object(
-            self.app.select_single(
-                'Label',
-                objectName='clicked_label'
-            )
-        )
+        self.label = self.app.select_single(
+            'Label', objectName='clicked_label')
         self.assertEqual(self.label.text, 'No button clicked.')
 
     def test_header_custom_proxy_object(self):
@@ -114,9 +105,7 @@
         self.assertEqual(self.label.text, 'Cancel button clicked.')
 
     def test_click_header_action_button_with_hidden_header(self):
-        bottom_label = ProxyBase.from_proxy_object(
-            self.main_view.select_single(objectName='end_label')
-        )
+        bottom_label = self.main_view.select_single(objectName='end_label')
         bottom_label.swipe_into_view()
         self.assertFalse(self.header._is_visible())
         self.header.click_action_button('action0')
@@ -157,7 +146,7 @@
 
     def test_select_sections_with_sections_disabled(self):
         sectionsEnabledSwitch = self.app.select_single(
-            CheckBox, objectName='sections_enabled_switch')
+            'CheckBox', objectName='sections_enabled_switch')
         sectionsEnabledSwitch.uncheck()
         for index in [1, 0, 2]:
             self.header.switch_to_section_by_index(index)
@@ -194,7 +183,7 @@
 
     def test_select_sections_with_sections_disabled(self):
         sectionsEnabledSwitch = self.app.select_single(
-            CheckBox, objectName='sections_enabled_switch')
+            'CheckBox', objectName='sections_enabled_switch')
         sectionsEnabledSwitch.uncheck()
         error = self.assertRaises(
             ubuntuuitoolkit.ToolkitException,
@@ -223,12 +212,7 @@
 
     @property
     def main_view(self):
-        # This change will allow the test to pass, but I don't feel this test
-        # is really relevant as it is really testing the from_proxy_method to
-        # create a MainView object.
-        return MainView.from_proxy_object(
-            self.app.select_single(objectName='customMainView')
-        )
+        return self.app.select_single(objectName='customMainView')
 
     def test_get_header_from_custom_main_view(self):
         """Test that we can get the header from a custom main view.
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py	2015-07-02 18:41:11 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py	2015-09-22 15:58:52 +0000
@@ -17,9 +17,7 @@
 import os
 
 import ubuntuuitoolkit
-from ubuntuuitoolkit import (
-    tests
-)
+from ubuntuuitoolkit import tests
 
 
 class ListItemTestCase(tests.QMLFileAppTestCase):
@@ -29,12 +27,11 @@
         dir_path, 'test_listitem.ListItemTestCase.qml')
 
     def setUp(self):
-
         super().setUp()
         self.list_view = self.main_view.select_single(
             ubuntuuitoolkit.QQuickListView, objectName='test_view')
         self.test_listitem = self.main_view.select_single(
-            ubuntuuitoolkit.UCListItem, objectName='listitem0')
+            'UCListItem', objectName='listitem0')
         self.test_page = self.main_view.select_single(
             objectName='test_page')
         self.assertEqual(self.test_page.title, 'No action triggered')
@@ -96,6 +93,6 @@
         self.assertTrue(self.test_listitem.selected)
         # select an other one
         listItem3 = self.main_view.select_single(
-            ubuntuuitoolkit.UCListItem, objectName='listitem3')
+            'UCListItem', objectName='listitem3')
         listItem3.toggle_selected()
         self.assertTrue(listItem3.selected)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	2015-06-18 04:17:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	2015-09-22 15:58:52 +0000
@@ -76,8 +76,6 @@
 
 
 class MainView12TestCase(tests.QMLStringAppTestCase):
-    # veebers: Note some of these tests might be unneeded due to how the CPOs
-    # work now.
 
     test_qml = ("""
 import QtQuick 2.3
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2015-07-02 18:41:11 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2015-09-22 15:58:52 +0000
@@ -23,9 +23,7 @@
 from autopilot.introspection import dbus
 
 import ubuntuuitoolkit
-from ubuntuuitoolkit import (
-    tests
-)
+from ubuntuuitoolkit import tests
 
 
 class QQuickListViewTestCase(tests.QMLStringAppTestCase):
@@ -206,7 +204,6 @@
 
     def setUp(self):
         super().setUp()
-
         self.list_view = self.main_view.select_single(
             ubuntuuitoolkit.QQuickListView, objectName='testListView')
         self.label = self.main_view.select_single(
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_sections.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_sections.py	2015-07-20 23:19:04 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_sections.py	2015-09-22 15:58:52 +0000
@@ -29,7 +29,7 @@
     def setUp(self):
         super().setUp()
         self.sections = self.app.select_single(
-            ubuntuuitoolkit.Sections, objectName='sections')
+            'Sections', objectName='sections')
         self.label = self.app.select_single(
             'Label', objectName='label')
         self.assertEqual(self.label.text, 'Section 0 is selected.')
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_ubuntulistview.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_ubuntulistview.py	2015-06-19 05:28:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_ubuntulistview.py	2015-09-22 15:58:52 +0000
@@ -32,12 +32,8 @@
         self.checkPageHeader(element.text)
         self.main_view.wait_select_single(
             "Template", objectName="ubuntuListViewTemplate")
-        self.listView = ubuntuuitoolkit.UbuntuListView11.from_proxy_object(
-            self.main_view.select_single(
-                ubuntuuitoolkit.UbuntuListView11,
-                objectName="ubuntuListView"
-            )
-        )
+        self.listView = self.main_view.select_single(
+            ubuntuuitoolkit.UbuntuListView11, objectName="ubuntuListView")
 
     def test_pull_to_refresh_enabled(self):
         self._open_page()