Merge lp:~fboucault/ubuntu-ui-toolkit/fix_1197355 into lp:ubuntu-ui-toolkit

[Florian Boucault]

Reverted revisions 562 & 569 that broke the autopilot tests.
Fixed button related autopilot test.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:580
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/266/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/123
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/123/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/266/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/fix_1197355]

581. By Florian Boucault on 2013-07-03

Fixed autopilot test for button.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:581
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/267/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/124
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/124/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/267/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-07-02 23:33:44 +0000
+++ debian/control	2013-07-03 18:40:32 +0000
@@ -104,8 +104,6 @@
          dpkg-dev,
          libqt5test5,
          libqt5widgets5,
-         python-autopilot (>= 1.3),
-         python-mock,
          ubuntu-ui-toolkit-examples (>= ${source:Version}),
 Description: Test package for Ubuntu UI Toolkit
  Autopilot tests for the ubuntu-ui-toolkit package

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2013-07-02 00:15:07 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2013-07-03 18:40:32 +0000
@@ -49,7 +49,7 @@
             }
 
             Button {
-                objectName: "button_iconsource_text"
+                objectName: "button_iconsource_right_text"
                 width: units.gu(15)
                 text: i18n.tr("Call")
                 iconSource: "call.png"
@@ -57,7 +57,7 @@
             }
 
             Button {
-                objectName: "button_iconsource_text"
+                objectName: "button_iconsource_left_text"
                 width: units.gu(15)
                 text: i18n.tr("Call")
                 iconSource: "call.png"

=== modified file 'tests/autopilot/UbuntuUiToolkit/__init__.py'
--- tests/autopilot/UbuntuUiToolkit/__init__.py	2013-06-27 03:11:40 +0000
+++ tests/autopilot/UbuntuUiToolkit/__init__.py	2013-07-03 18:40:32 +0000
@@ -1,17 +1,8 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2012, 2013 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
-# 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/>.
+# Copyright 2012 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as published
+# by the Free Software Foundation.
 
 """Ubuntu UI Toolkit autopilot tests and emulators - top level package."""

=== added directory 'tests/autopilot/UbuntuUiToolkit/emulators'
=== renamed file 'tests/autopilot/UbuntuUiToolkit/emulators.py' => 'tests/autopilot/UbuntuUiToolkit/emulators/__init__.py'
--- tests/autopilot/UbuntuUiToolkit/emulators.py	2013-06-27 06:40:44 +0000
+++ tests/autopilot/UbuntuUiToolkit/emulators/__init__.py	2013-07-03 18:40:32 +0000
@@ -1,113 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2012, 2013 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
-# 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 import input, platform
-from autopilot.introspection import dbus
-
-
-def get_pointing_device():
-    """Get the pointing device depending on the platform.
-
-    If the platform is `Desktop`, the pointing device will be a `Mouse`.
-    If not, the pointing device will be `Touch`.
-
-    """
-    if platform.model == 'Desktop':
-        input_device_class = input.Mouse
-    else:
-        input_device_class = input.Touch
-    return input.Pointer(input_device_class.create())
-
-
-class UbuntuUIToolkitEmulatorBase(dbus.CustomEmulatorBase):
-    """A base class for all the Ubuntu UI Toolkit emulators."""
-
-
-class MainView(UbuntuUIToolkitEmulatorBase):
-    """MainView Autopilot emulator."""
-
-    def __init__(self, *args):
-        super(MainView, self).__init__(*args)
-        self.pointing_device = get_pointing_device()
-
-    def get_header(self):
-        """Get the Header emulator of the MainView."""
-        return self.select_single('Header')
-
-    def get_toolbar(self):
-        """Get the Toolbar emulator of the MainView."""
-        return self.select_single(Toolbar)
-
-    def open_toolbar(self):
-        """Open the toolbar if it's not already opened.
-
-        :return: the toolbar.
-
-        """
-        toolbar = self.get_toolbar()
-        if not toolbar.opened:
-            self._drag_to_open_toolbar()
-            toolbar.opened.wait_for(True)
-
-        return toolbar
-
-    def _drag_to_open_toolbar(self):
-        x = self.globalRect[0]
-        y = self.globalRect[1]
-        line_x = x + self.width * 0.50
-        start_y = y + self.height - 1
-        stop_y = y + self.height * 0.95
-
-        self.pointing_device.drag(line_x, start_y, line_x, stop_y)
-
-    def close_toolbar(self):
-        """Close the toolbar if it's opened."""
-        toolbar = self.get_toolbar()
-        if toolbar.opened:
-            self._drag_to_close_toolbar()
-            toolbar.opened.wait_for(False)
-
-    def _drag_to_close_toolbar(self):
-        x = self.globalRect[0]
-        y = self.globalRect[1]
-        line_x = x + self.width * 0.50
-        start_y = y + self.height * 0.95
-        stop_y = y + self.height - 1
-
-        self.pointing_device.drag(line_x, start_y, line_x, stop_y)
-
-
-class Toolbar(UbuntuUIToolkitEmulatorBase):
-    """Toolbar Autopilot emulator."""
-
-    def __init__(self, *args):
-        super(Toolbar, self).__init__(*args)
-        self.pointing_device = get_pointing_device()
-
-    def click_button(self, object_name):
-        """Click a button of the toolbar.
-
-        :param object_name: The QML objectName property of the button.
-
-        """
-        button = self._get_button(object_name)
-        not_found_error = 'Button with objectName "{0}" not found.'.format(
-            object_name)
-        assert button is not None, not_found_error
-        self.pointing_device.click_object(button)
-
-    def _get_button(self, object_name):
-        return self.select_single('ActionItem', objectName=object_name)
+# Copyright 2012 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.

=== added file 'tests/autopilot/UbuntuUiToolkit/emulators/main_window.py'
--- tests/autopilot/UbuntuUiToolkit/emulators/main_window.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/UbuntuUiToolkit/emulators/main_window.py	2013-07-03 18:40:32 +0000
@@ -0,0 +1,22 @@
+# -*- 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.
+
+class MainWindow(object):
+    """An emulator class that makes it easy to interact with the camera-app."""
+
+    def __init__(self, app):
+        self.app = app
+
+    def get_qml_view(self):
+        """Get the main QML view"""
+        return self.app.select_single("QQuickView")
+
+    def get_object(self, typeName, name):
+        return self.app.select_single(typeName, objectName=name)
+    
+    def get_object_by_text(self, typeName, itemText):
+        return self.app.select_single(typeName, text=itemText)

=== modified file 'tests/autopilot/UbuntuUiToolkit/tests/__init__.py'
--- tests/autopilot/UbuntuUiToolkit/tests/__init__.py	2013-06-27 03:01:28 +0000
+++ tests/autopilot/UbuntuUiToolkit/tests/__init__.py	2013-07-03 18:40:32 +0000
@@ -1,18 +1,9 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2012, 2013 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
-# 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/>.
+# Copyright 2012 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as published
+# by the Free Software Foundation.
 
 """Ubuntu UI Toolkit autopilot tests."""
 
@@ -27,8 +18,7 @@
 from testtools.matchers import Is, Not, Equals
 from autopilot.testcase import AutopilotTestCase
 
-from UbuntuUiToolkit import emulators
-
+from UbuntuUiToolkit.emulators.main_window import MainWindow
 
 def get_module_include_path():
     return os.path.abspath(
@@ -39,21 +29,22 @@
             '..',
             '..',
             'modules')
-    )
+        )
 
 
 class UbuntuUiToolkitTestCase(AutopilotTestCase):
-    """Common test case class for SDK tests."""
+
+    """A common test case class that provides several useful methods for SDK tests."""
 
     if model() == 'Desktop':
         scenarios = [
-            ('with mouse', dict(input_device_class=Mouse))
+        ('with mouse', dict(input_device_class=Mouse))
         ]
     else:
         scenarios = [
-            ('with touch', dict(input_device_class=Touch))
+        ('with touch', dict(input_device_class=Touch))
         ]
-
+ 
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
         super(UbuntuUiToolkitTestCase, self).setUp()
@@ -63,8 +54,8 @@
         # If the test class has defined a 'test_qml' class attribute then we
         # write it to disk and launch it inside the Qml Viewer. If not, then we
         # silently do nothing (presumably the test has something else planned).
-        arch = subprocess.check_output(
-            ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
+        arch = subprocess.check_output(["dpkg-architecture",
+        "-qDEB_HOST_MULTIARCH"]).strip()
         if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
             qml_path = mktemp(suffix='.qml')
             open(qml_path, 'w').write(self.test_qml)
@@ -73,48 +64,39 @@
             self.app = self.launch_test_application(
                 "/usr/lib/" + arch + "/qt5/bin/qmlscene",
                 "-I", get_module_include_path(),
-                qml_path,
-                emulator_base=emulators.UbuntuUIToolkitEmulatorBase)
+                qml_path)
 
-        if (hasattr(self, 'test_qml_file') and
-                isinstance(self.test_qml_file, basestring)):
+        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
             qml_path = self.test_qml_file
             self.app = self.launch_test_application(
                 "/usr/lib/" + arch + "/qt5/bin/qmlscene",
                 "-I", get_module_include_path(),
-                qml_path,
-                emulator_base=emulators.UbuntuUIToolkitEmulatorBase)
+                qml_path)
 
-        self.assertThat(
-            self.main_view.visible, Eventually(Equals(True)))
+        self.assertThat(self.main_window.get_qml_view().visible,
+                Eventually(Equals(True)))
 
     def checkListItem(self, itemText):
-        item = self.getListItem(itemText)
-        self.assertThat(item, Not(Is(None)))
+        item = self.main_window.get_object_by_text("Standard", 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-26
-        return self.main_view.select_single("Standard", text=itemText)
+        return self.main_window.get_object_by_text("Standard", 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)))
+        contentLoader = self.main_window.get_object("QQuickLoader", "contentLoader")
+        listView = self.main_window.get_object("QQuickListView", "widgetList")
+        self.assertThat(listView, Not(Is(None)));
+        self.assertThat(listView.visible, Eventually(Equals(True)));
         return (contentLoader, listView)
 
     def loadItem(self, item):
-        contentLoader = self.main_view.select_single(
-            "QQuickLoader", objectName="contentLoader")
+        contentLoader = self.main_window.get_object("QQuickLoader", "contentLoader")
         self.selectItem(item)
-        self.assertThat(contentLoader.progress, Eventually(Equals(1.0)))
-        loadedPage = self.getListItem(item)
-        self.assertThat(loadedPage, Not(Is(None)))
-        self.assertThat(loadedPage.visible, Eventually(Equals(True)))
+        self.assertThat(contentLoader.progress,Eventually(Equals(1.0)))
+        loadedPage = self.main_window.get_object_by_text("Standard", item)
+        self.assertThat(loadedPage, Not(Is(None)));
+        self.assertThat(loadedPage.visible, Eventually(Equals(True)));  
 
     def drag(self, itemText, itemTextTo):
         item = self.getListItem(itemText)
@@ -134,35 +116,39 @@
 
         self.assertThat(item.selected, Eventually(Equals(True)))
 
+    def getMainView(self):
+        mainView = self.app.select_many("MainView")[0]
+        self.assertThat(mainView, Not(Is(None)));
+        return mainView
+
     def getOrientationHelper(self):
-        orientationHelper = self.main_view.select_many(
-            "OrientationHelper")[0]
-        self.assertThat(orientationHelper, Not(Is(None)))
+        orientationHelper = self.getMainView().select_many("OrientationHelper")[0]
+        self.assertThat(orientationHelper, Not(Is(None)));
         return orientationHelper
 
-    def checkPageHeader(self, pageTitle):
-        orientationHelper = self.getOrientationHelper()
-        header = orientationHelper.select_many("Header", title=pageTitle)[0]
-        self.assertThat(header, Not(Is(None)))
+    def checkPageHeader(self,pageTitle):
+        orientationHelper = self.getOrientationHelper();
+        header = orientationHelper.select_many("Header",title=pageTitle)[0]
+        self.assertThat(header, Not(Is(None)));
         return header
 
-    def getObject(self, objectName):
+    def getObject(self,objectName):
         obj = self.app.select_single(objectName=objectName)
-        self.assertThat(obj, Not(Is(None)))
+        self.assertThat(obj, Not(Is(None)));
         return obj
 
-    def tap(self, objectName):
+    def tap(self,objectName):
         obj = self.getObject(objectName)
         self.pointing_device.move_to_object(obj)
         self.pointing_device.click()
 
-    def mousePress(self, objectName):
+    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()
+        self.pointing_device.release()     
 
     def type_string(self, string):
         self.keyboard.type(string)
@@ -170,14 +156,14 @@
     def type_key(self, key):
         self.keyboard.key(key)
 
-    def tap_clearButton(self, objectName):
+    def tap_clearButton(self,objectName):
         textField = self.getObject(objectName)
-        self.assertThat(textField.hasClearButton, Equals(True))
+        self.assertThat(textField.hasClearButton, Equals(True));
         btn = textField.select_single("AbstractButton")
         self.pointing_device.move_to_object(btn)
         self.pointing_device.click()
 
     @property
-    def main_view(self):
-        """Return the MainView of the application."""
-        return self.app.select_single(emulators.MainView)
+    def main_window(self):
+        return MainWindow(self.app)
+

=== modified file 'tests/autopilot/UbuntuUiToolkit/tests/gallery/__init__.py'
--- tests/autopilot/UbuntuUiToolkit/tests/gallery/__init__.py	2013-06-27 03:11:40 +0000
+++ tests/autopilot/UbuntuUiToolkit/tests/gallery/__init__.py	2013-07-03 18:40:32 +0000
@@ -1,17 +1,9 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2012, 2013 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
-# 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/>.
+# Copyright 2012 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as published
+# by the Free Software Foundation.
+
 
 """Tests for the Ubuntu UI Toolkit Gallery"""

=== modified file 'tests/autopilot/UbuntuUiToolkit/tests/gallery/test_gallery.py'
--- tests/autopilot/UbuntuUiToolkit/tests/gallery/test_gallery.py	2013-06-27 02:29:35 +0000
+++ tests/autopilot/UbuntuUiToolkit/tests/gallery/test_gallery.py	2013-07-03 18:40:32 +0000
@@ -1,18 +1,9 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2012, 2013 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
-# 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/>.
+# Copyright 2012 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as published
+# by the Free Software Foundation.
 
 """Tests for the Ubuntu UI Toolkit Gallery"""
 
@@ -23,6 +14,7 @@
 import os
 import time
 from UbuntuUiToolkit.tests import UbuntuUiToolkitTestCase
+from UbuntuUiToolkit.emulators.main_window import MainWindow
 
 
 class GenericTests(UbuntuUiToolkitTestCase):
@@ -30,44 +22,40 @@
 
     # Support both running from system and in the source directory
     runPath = os.path.dirname(os.path.realpath(__file__))
-    localSourceFile = (
-        runPath + "/../../../../../examples/ubuntu-ui-toolkit-gallery/"
-        "ubuntu-ui-toolkit-gallery.qml")
+    localSourceFile = runPath + "/../../../../../examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml"
     if (os.path.isfile(localSourceFile)):
         print "Using local source directory"
         test_qml_file = localSourceFile
     else:
         print "Using system QML file"
-        test_qml_file = (
-            "/usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery/"
-            "ubuntu-ui-toolkit-gallery.qml")
+        test_qml_file = "/usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml"
 
     def test_0_can_select_mainwindow(self):
         """Must be able to select the main window."""
 
-        rootItem = self.main_view
+        rootItem = self.main_window.get_qml_view()
         self.assertThat(rootItem, Not(Is(None)))
-        self.assertThat(rootItem.visible, Eventually(Equals(True)))
+        self.assertThat(rootItem.visible,Eventually(Equals(True)))
 
     def test_can_select_listview(self):
-        """Must be able to select the listview from main"""
-
-        contentLoader, listView = self.getWidgetLoaderAndListView()
-
-        # Don't have the first, already selected item as the first item to
-        # check.
+        """Must be able to select the listview from main"""    
+
+        contentLoader,listView = self.getWidgetLoaderAndListView();
+
+        # Don't have the first, already selected item as the first item to check
         items = [
-            "Navigation",
-            "Toggles",
-            "Buttons",
-            "Slider",
-            "Text Field",
-            "Progress and activity",
-            "Ubuntu Shape",
-            "Icons",
-            "Label",
-            "List Items",
-        ]
+                    "Navigation",
+                    "Toggles", 
+                    "Buttons", 
+                    "Slider", 
+                    "Text Field", 
+                    "Progress and activity", 
+                    "Ubuntu Shape", 
+                    "Icons", 
+                    "Label",
+                    "List Items", 
+                ]                  
+
 
         for item in items:
             self.checkListItem(item)
@@ -75,20 +63,20 @@
             self.checkPageHeader(item)
 
         # scroll view to expose more items
-        self.drag("Icons", "Text Field")
+        self.drag("Icons","Text Field")
 
-        # Wait for the scrolling to finish, the next click fails on the
+        # Wait for the scrolling to finish, the next click fails on the 
         # slower Intel machine but succeeds on AMD and NVIDIA.
         # (LP: #1180226)
         time.sleep(1)
 
         # now that we have more items, lets continue
         items = [
-            "Dialog",
-            "Popover",
-            "Sheet",
-            "Animations"
-        ]
+                    "Dialog", 
+                    "Popover",
+                    "Sheet",
+                    "Animations"
+                ]
 
         for item in items:
             self.checkListItem(item)
@@ -108,14 +96,14 @@
 
         # check default states
         item_data = [
-            ["checkbox_unchecked", False, True],
-            ["checkbox_checked", True, True],
-            ["checkbox_disabled_unchecked", False, False],
-            ["checkbox_disabled_checked", True, False],
-            ["switch_unchecked", False, True],
-            ["switch_checked", True, True],
-            ["switch_disabled_unchecked", False, False],
-            ["switch_disabled_checked", True, False]
+            ["checkbox_unchecked",False,True],
+            ["checkbox_checked",True,True],
+            ["checkbox_disabled_unchecked",False,False],
+            ["checkbox_disabled_checked",True,False],
+            ["switch_unchecked",False,True],
+            ["switch_checked",True,True],
+            ["switch_disabled_unchecked",False,False],
+            ["switch_disabled_checked",True,False]
         ]
 
         for data in item_data:
@@ -126,7 +114,7 @@
             obj = self.getObject(objName)
             self.assertThat(obj.checked, Equals(objChecked))
             self.assertThat(obj.enabled, Equals(objEnabled))
-
+            
             # try to interact with objects
             self.tap(objName)
 
@@ -141,11 +129,12 @@
         self.checkPageHeader(item)
 
         item_data = [
-            ["button_text", True, None, None, "Call"],
-            ["button_text_disabled", False, None, None, "Call"],
-            ["button_color", True, [93, 163, 87, 255], None, "Call"],
-            ["button_iconsource", True, None, "call_icon.png", None],
-            ["button_iconsource_text", True, None, "call_icon.png", "Call"]
+            ["button_text",True,None,None,"Call"],
+            ["button_text_disabled",False,None,None,"Call"],
+            ["button_color",True,[0,0,0,255],None,"Call"],
+            ["button_iconsource",True,None,"call.png",None],
+            ["button_iconsource_right_text",True,None,"call.png","Call"],
+            ["button_iconsource_left_text",True,None,"call.png","Call"]
         ]
 
         for data in item_data:
@@ -159,15 +148,15 @@
             self.assertThat(obj.enabled, Equals(objEnabled))
 
             print obj.color
-            if (objColor is not None):
+            if (objColor != None):
                 self.assertThat(obj.color, Equals(objColor))
 
-            if (objIcon is not None):
+            if (objIcon != None):
                 self.assertThat(obj.iconSource.endswith(objIcon), Equals(True))
 
-            if (objText is not None):
+            if (objText != None):
                 self.assertThat(obj.text, Equals(objText))
-
+            
             # try to interact with objects
             self.mousePress(objName)
 
@@ -179,16 +168,16 @@
             self.mouseRelease()
 
             self.assertThat(obj.pressed, Equals(False))
-
+    
     def test_slider(self):
         item = "Slider"
         self.loadItem(item)
         self.checkPageHeader(item)
 
         item_data = [
-            ["slider_standard"],
-            ["slider_live"],
-            ["slider_range"]
+            [ "slider_standard" ],
+            [ "slider_live" ],
+            [ "slider_range" ]
         ]
 
         for data in item_data:
@@ -197,18 +186,18 @@
             self.tap(objName)
 
             # TODO: move slider value
-
+        
 #     def test_textarea(self):
 #         item = "Text Field"
 #         self.loadItem(item)
 #         self.checkPageHeader(item)
 
 #         template_textinputs = self.getObject("textinputs")
-
+        
 #         item_data = [
-#         ["textarea_default", True, -1, template_textinputs.longText, None ],
-#         [ "textarea_expanding", True, -1, "", None],
-#         [ "textarea_richtext", True, -1, template_textinputs.richText, None ]
+#             [ "textarea_default", True, -1, template_textinputs.longText, None ],
+#             [ "textarea_expanding", True, -1, "", None],
+#             [ "textarea_richtext", True, -1, template_textinputs.richText, None ]
 #         ]
 
 #         for data in item_data:
@@ -222,7 +211,7 @@
 #             self.tap(objName)
 
 #             self.assertThat(obj.enabled, Equals(objEnabled))
-# #            self.assertThat(obj.focus, Equals(obj.enabled))
+# #            self.assertThat(obj.focus, Equals(obj.enabled)) 
 #             self.assertThat(obj.highlighted, Equals(obj.focus))
 #             #self.assertThat(obj.hasClearButton, Equals(True))
 #             self.assertThat(obj.text, Equals(objText))
@@ -236,18 +225,21 @@
 
             # self.assertThat(obj.text,Equals("Hello World!"))
 
+
+
+
     def test_textfield(self):
         item = "Text Field"
         self.loadItem(item)
         self.checkPageHeader(item)
 
         template_textinputs = self.getObject("textinputs")
-
+        
         item_data = [
-            ["textfield_standard", True, 0, "", None],
-            ["textfield_password", True, 2, "password", None],
-            ["textfield_numbers", True, 0, "123", True],
-            ["textfield_disabled", False, 0, "", None],
+            [ "textfield_standard", True, 0, "", None ],
+            [ "textfield_password", True, 2, "password", None ],
+            [ "textfield_numbers", True, 0, "123", True ],
+            [ "textfield_disabled", False, 0, "", None ],
         ]
 
         for data in item_data:
@@ -261,26 +253,25 @@
             self.tap(objName)
 
             self.assertThat(obj.enabled, Equals(objEnabled))
-            self.assertThat(obj.focus, Equals(obj.enabled))
+            self.assertThat(obj.focus, Equals(obj.enabled)) 
             self.assertThat(obj.highlighted, Equals(obj.focus))
             self.assertThat(obj.errorHighlight, Equals(False))
             self.assertThat(obj.acceptableInput, Equals(True))
             self.assertThat(obj.hasClearButton, Equals(True))
             self.assertThat(obj.text, Equals(objText))
 
-            if (objEchoMode != -1):
+            if (objEchoMode!=-1):
                 self.assertThat(obj.echoMode, Equals(objEchoMode))
-
+            
             if (objNumbersOnly):
                 self.type_string("abc")
-                self.assertThat(obj.text, Equals(objText))
+                self.assertThat(obj.text,Equals(objText))
                 self.assertThat(obj.errorHighlight, Equals(False))
                 self.assertThat(obj.acceptableInput, Equals(True))
             else:
                 self.type_string("Hello World!")
                 if (objEnabled):
-                    self.assertThat(
-                        obj.text, Equals("%sHello World!" % (objText)))
+                    self.assertThat(obj.text, Equals("%sHello World!" % (objText)))
                     self.assertThat(obj.errorHighlight, Equals(False))
                     self.assertThat(obj.acceptableInput, Equals(True))
                 else:
@@ -288,15 +279,18 @@
 
             self.tap_clearButton(objName)
 
+
+            
+
     def test_progress_and_activity(self):
         item = "Progress and activity"
         self.loadItem(item)
         self.checkPageHeader(item)
 
         item_data = [
-            ["progressbar_standard"],
-            ["progressbar_indeterminate"],
-            ["activityindicator_standard"]
+            [ "progressbar_standard" ],
+            [ "progressbar_indeterminate" ],
+            [ "activityindicator_standard" ]
         ]
 
         for data in item_data:
@@ -305,6 +299,7 @@
             self.tap(objName)
 
             # TODO: check for properties
+        
 
     def test_ubuntushape(self):
         item = "Ubuntu Shape"
@@ -312,16 +307,18 @@
         self.checkPageHeader(item)
 
         item_data = [
-            ["ubuntushape_color_hex"],
-            ["ubuntushape_color_lightblue"],
-            ["ubuntushape_color_darkgray"],
-            ["ubuntushape_image"],
-            ["ubuntushape_radius_small"],
-            ["ubuntushape_radius_medium"],
-            ["ubuntushape_sizes_15_6"],
-            ["ubuntushape_sizes_10_14"]
+            [ "ubuntushape_color_hex" ],
+            [ "ubuntushape_color_lightblue" ],
+            [ "ubuntushape_color_darkgray" ],
+            [ "ubuntushape_image" ],
+            [ "ubuntushape_radius_small" ],
+            [ "ubuntushape_radius_medium" ],
+            [ "ubuntushape_sizes_15_6" ],
+            [ "ubuntushape_sizes_10_14" ]
         ]
 
         for data in item_data:
             objName = data[0]
             obj = self.getObject(objName)
+        
+        

=== removed file 'tests/autopilot/UbuntuUiToolkit/tests/test_emulators.py'
--- tests/autopilot/UbuntuUiToolkit/tests/test_emulators.py	2013-06-28 18:14:58 +0000
+++ tests/autopilot/UbuntuUiToolkit/tests/test_emulators.py	1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2013 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
-# 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/>.
-
-import mock
-
-from UbuntuUiToolkit import tests
-from UbuntuUiToolkit import emulators
-
-
-class MainViewTestCase(tests.UbuntuUiToolkitTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-}
-""")
-
-    def test_main_view_custom_emulator(self):
-        self.assertIsInstance(self.main_view, emulators.MainView)
-
-    def test_get_header_without_header(self):
-        header = self.main_view.get_header()
-        self.assertFalse(header.visible)
-
-    def test_toolbar_custom_emulator(self):
-        toolbar = self.main_view.get_toolbar()
-        self.assertIsInstance(toolbar, emulators.Toolbar)
-        self.assertFalse(toolbar.opened)
-
-
-class PageTestCase(tests.UbuntuUiToolkitTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-
-    Page {
-        title: "Test title"
-    }
-}
-""")
-
-    def test_get_header(self):
-        header = self.main_view.get_header()
-        self.assertTrue(header.visible)
-        self.assertEqual(header.title, "Test title")
-
-
-class ToolbarTestCase(tests.UbuntuUiToolkitTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-MainView {
-    width: units.gu(50)
-    height: units.gu(50)
-
-    Page {
-
-        Label {
-            id: "label"
-            objectName: "clicked_label"
-            anchors.centerIn: parent
-            text: "Button not clicked."
-        }
-
-        tools: ToolbarItems {
-            ToolbarButton {
-                objectName: "buttonName"
-                action: Action {
-                    text: "buttonText"
-                    onTriggered: label.text = "Button clicked."
-                }
-            }
-            locked: false
-            opened: false
-        }
-    }
-}
-""")
-
-    def test_open_toolbar(self):
-        toolbar = self.main_view.open_toolbar()
-        self.assertTrue(toolbar.opened)
-
-    def test_opened_toolbar_is_not_opened_again(self):
-        toolbar = self.main_view.open_toolbar()
-        with mock.patch.object(
-                self.main_view.pointing_device, 'drag') as mock_drag:
-            self.main_view.open_toolbar()
-
-        self.assertFalse(mock_drag.called)
-        self.assertTrue(toolbar.opened)
-
-    def test_close_toolbar(self):
-        toolbar = self.main_view.open_toolbar()
-        self.main_view.close_toolbar()
-        self.assertFalse(toolbar.opened)
-
-    def test_closed_toolbar_is_not_closed_again(self):
-        with mock.patch.object(
-                self.main_view.pointing_device, 'drag') as mock_drag:
-            self.main_view.close_toolbar()
-
-        self.assertFalse(mock_drag.called)
-        self.assertFalse(self.main_view.get_toolbar().opened)
-
-    def test_click_toolbar_button(self):
-        label = self.app.select_single('Label', objectName='clicked_label')
-        self.assertNotEqual(label.text, 'Button clicked.')
-        toolbar = self.main_view.open_toolbar()
-        toolbar.click_button('buttonName')
-        self.assertEqual(label.text, 'Button clicked.')
-
-    def test_click_unexisting_button(self):
-        toolbar = self.main_view.open_toolbar()
-        error = self.assertRaises(
-            AssertionError, toolbar.click_button, 'unexisting')
-        self.assertEqual(
-            error.message, 'Button with objectName "unexisting" not found.')