Merge lp:~elopio/ubuntu-ui-toolkit/loadItem-no_more into lp:ubuntu-ui-toolkit

[Leo Arias]

Remove the loadItem helper from the gallery autopilot tests.

Unmerged revisions

=== modified file 'CHANGES'
--- CHANGES	2014-05-20 08:35:14 +0000
+++ CHANGES	2014-05-30 14:35:19 +0000
@@ -12,7 +12,7 @@
 
 Compatibility Breaks
 ********************
-
+* Header component API was made internal (as it was always documented)
 
 Ubuntu.Components 1.0
 #####################

=== modified file 'components.api'
--- components.api	2014-05-26 11:36:53 +0000
+++ components.api	2014-05-30 14:35:19 +0000
@@ -31,6 +31,7 @@
 AbstractButton
     property color color
     property Gradient gradient
+    property font font
     property string iconPosition
 CheckBox 0.1 1.0
 AbstractButton
@@ -61,19 +62,6 @@
     readonly property bool running
     property size sourceSize
     readonly property int status
-Header 0.1 1.0
-StyledItem
-    property bool animate
-    function show()
-    function hide()
-    property string title
-    property Item contents
-    property var tabsModel
-    property var pageStack
-    property var actions
-    property var __customBackAction
-    property Flickable flickable
-    property bool useDeprecatedToolbar
 Icon 0.1 1.0
 Item
     property string name
@@ -94,7 +82,7 @@
     property real __leftIconMargin
     property real __rightIconMargin
     property bool __iconIsItem
-    property internal children
+    default property internal children
 Caption 0.1 1.0
 Item
     property string text
@@ -140,6 +128,7 @@
     property bool expanded
     property bool multiSelection
     property bool colourImage
+    property Component delegate
     property real containerHeight
     property int selectedIndex
     property bool currentlyExpanded
@@ -204,12 +193,14 @@
 Object 0.1 1.0
 QtObject
     default property internal children
+    property list<QtObject> __defaultPropertyFix
 OptionSelector 0.1 1.0
 ListItem.Empty
     property var model
     property bool expanded
     property bool multiSelection
     property bool colourImage
+    property Component delegate
     property real containerHeight
     property int selectedIndex
     property bool currentlyExpanded
@@ -235,6 +226,7 @@
 Page 0.1 1.0
 PageTreeNode
     property string title
+    property Item tools
     property Item __customHeaderContents
     property Flickable flickable
     property list<Action> actions
@@ -355,6 +347,7 @@
 OrientationHelper
     property Item dismissArea
     property bool grabDismissAreaEvents
+    property PropertyAnimation fadingAnimation
     function show()
     function hide()
     function __closeIfHidden()

=== modified file 'debian/ubuntu-ui-toolkit-autopilot.install'
--- debian/ubuntu-ui-toolkit-autopilot.install	2014-02-21 23:39:43 +0000
+++ debian/ubuntu-ui-toolkit-autopilot.install	2014-05-30 14:35:19 +0000
@@ -1,2 +1,3 @@
 usr/lib/python3
+usr/lib/ubuntu-ui-toolkit/launcher
 usr/lib/python2.7

=== modified file 'modules/Ubuntu/Components/AnimatedItem.qml'
--- modules/Ubuntu/Components/AnimatedItem.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/AnimatedItem.qml	2014-05-30 14:35:19 +0000
@@ -30,45 +30,8 @@
     id: root
     /*!
       \preliminary
+      \deprecated
       Specifies whether the component is on the visible area of the Flickable or not.
     */
     property bool onScreen: true
-
-    QtObject {
-        id: internal
-        property Flickable flickable
-
-        // returns whether the component is in the visible area of the flickable
-        function checkOnScreen()
-        {
-            var pos = root.mapToItem(flickable, 0, 0)
-            root.onScreen = (pos.y + root.height >= 0) && (pos.y <= internal.flickable.height) &&
-                            (pos.x + root.width >= 0) && (pos.x <= internal.flickable.width)
-        }
-        // lookup for a flickable parent
-        function updateFlickableParent()
-        {
-            var flickable = root.parent
-            while (flickable) {
-                if (flickable.hasOwnProperty("flicking") && flickable.hasOwnProperty("flickableDirection")) {
-                    // non-interactive flickables must be skipped as those do not provide
-                    // on-screen detection support
-                    if (flickable.interactive)
-                        break
-                }
-                flickable = flickable.parent
-            }
-            internal.flickable = flickable
-        }
-    }
-
-    Connections {
-        target: internal.flickable
-
-        onContentXChanged: internal.checkOnScreen()
-        onContentYChanged: internal.checkOnScreen()
-    }
-
-    Component.onCompleted: internal.updateFlickableParent()
-    onParentChanged: internal.updateFlickableParent()
 }

=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
--- modules/Ubuntu/Components/ListItems/Base.qml	2014-04-28 19:24:56 +0000
+++ modules/Ubuntu/Components/ListItems/Base.qml	2014-05-30 14:35:19 +0000
@@ -159,7 +159,7 @@
     /*!
       \internal
      */
-    property alias children: middle.data
+    default property alias children: middle.data
     Item {
         id: middle
         property bool anchorToIconHelper: !__iconIsItem && iconHelper.source != ""

=== modified file 'modules/Ubuntu/Components/PageStack.qml'
--- modules/Ubuntu/Components/PageStack.qml	2014-05-13 09:09:35 +0000
+++ modules/Ubuntu/Components/PageStack.qml	2014-05-30 14:35:19 +0000
@@ -192,6 +192,7 @@
      */
     default property alias data: inactiveNode.data
     PageTreeNode {
+        anchors.fill: parent
         id: inactiveNode
         active: false
     }

=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-05-07 10:42:31 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-05-30 14:35:19 +0000
@@ -523,7 +523,8 @@
         function updatePickers() {
             if (completed) {
                 // check mode flags first
-                var modes = datePicker.mode.split(/\W/g);
+                // FIXME: The js split(/\W/g) terminates the process on armhf with Qt 5.3 (v4 js) (https://bugreports.qt-project.org/browse/QTBUG-39255)
+                var modes = datePicker.mode.match(/\w+/g);
 
                 showYearPicker = showMonthPicker = showDayPicker =
                 showHoursPicker = showMinutesPicker = showSecondsPicker = false;
@@ -607,7 +608,8 @@
             completed = false;
 
             // use short format to exclude any extra characters
-            var format = datePicker.locale.dateFormat(Locale.ShortFormat).split(/\W/g);
+            // FIXME: The js split(/\W/g) terminates the process on armhf with Qt 5.3 (v4 js) (https://bugreports.qt-project.org/browse/QTBUG-39255)
+            var format = datePicker.locale.dateFormat(Locale.ShortFormat).match(/\w+/g);
             // loop through the format to decide the position of the tumbler
             var formatIndex = 0;
             for (var i in format) {

=== modified file 'modules/Ubuntu/Components/plugin/i18n.cpp'
--- modules/Ubuntu/Components/plugin/i18n.cpp	2014-05-22 15:54:13 +0000
+++ modules/Ubuntu/Components/plugin/i18n.cpp	2014-05-30 14:35:19 +0000
@@ -103,13 +103,14 @@
     /*
      The default is /usr/share/locale if we don't set a folder
      For click we use APP_DIR/share/locale
-     eg. /usr/share/click/preinstalled/com.example.foo/current/share/locale
+     e.g. /usr/share/click/preinstalled/com.example.foo/current/share/locale
      */
-    QDir appDir(getenv("APP_DIR"));
-    if (appDir.exists()) {
-        QString localePath(appDir.filePath("share/locale"));
-        C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
+    QString appDir(getenv("APP_DIR"));
+    if (!QDir::isAbsolutePath (appDir)) {
+        appDir = "/usr";
     }
+    QString localePath(QDir(appDir).filePath("share/locale"));
+    C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
     Q_EMIT domainChanged();
 }
 

=== modified file 'modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp'
--- modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp	2014-02-25 09:14:23 +0000
+++ modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp	2014-05-30 14:35:19 +0000
@@ -43,12 +43,15 @@
      * is the only way around the issue for now. */
     std::string src_path(QUrl(id).path().toUtf8().data());
     std::string tgt_path;
+    const int xlarge_cutoff = 512;
+    const int large_cutoff = 256;
+    const int small_cutoff = 128;
     try {
         ThumbnailSize desiredSize;
-        const int large_cutoff = 256;
-        const int small_cutoff = 128;
-        if(requestedSize.width() > large_cutoff || requestedSize.height() > large_cutoff) {
+        if(requestedSize.width() > xlarge_cutoff || requestedSize.height() > xlarge_cutoff) {
             desiredSize = TN_SIZE_ORIGINAL;
+        } else if(requestedSize.width() > large_cutoff || requestedSize.height() > large_cutoff) {
+            desiredSize = TN_SIZE_XLARGE;
         } else if(requestedSize.width() > small_cutoff || requestedSize.height() > small_cutoff) {
             desiredSize = TN_SIZE_LARGE;
         } else {

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/qmldir	2014-05-30 14:35:19 +0000
@@ -29,7 +29,7 @@
 internal PageTreeNode PageTreeNode.qml
 PageStack 0.1 PageStack.qml
 internal Toolbar Toolbar.qml
-Header 0.1 Header.qml
+internal Header Header.qml
 internal AnimatedItem AnimatedItem.qml
 internal PageWrapper PageWrapper.qml
 UbuntuShape 0.1 UbuntuShape.qml
@@ -76,7 +76,6 @@
 OptionSelectorDelegate 1.0 OptionSelectorDelegate.qml
 Page 1.0 Page.qml
 PageStack 1.0 PageStack.qml
-Header 1.0 Header.qml
 UbuntuShape 1.0 UbuntuShape.qml
 CrossFadeImage 1.0 CrossFadeImage.qml
 Icon 1.0 Icon.qml

=== modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-04-23 08:50:20 +0000
+++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-05-30 14:35:19 +0000
@@ -16,6 +16,7 @@
 
 import copy
 import os
+import shutil
 import tempfile
 
 import fixtures
@@ -118,3 +119,47 @@
                 original_value)
         else:
             self.addCleanup(environment.unset_initctl_env_var, variable)
+
+
+class FakeHome(fixtures.Fixture):
+
+    # We copy the Xauthority file to allow executions using XVFB. If it is not
+    # on the user's HOME directory, nothing will happen.
+    should_copy_xauthority_file = True
+
+    def __init__(self, directory=None):
+        super(FakeHome, self).__init__()
+        self.directory = directory
+
+    def setUp(self):
+        super(FakeHome, self).setUp()
+        self.directory = self._make_directory_if_not_specified()
+        if self.should_copy_xauthority_file:
+            self._copy_xauthority_file(self.directory)
+        # We patch both environment variables so it works on the desktop and on
+        # the phone.
+        self.useFixture(
+            InitctlEnvironmentVariable(HOME=self.directory))
+        self.useFixture(
+            fixtures.EnvironmentVariable('HOME', newvalue=self.directory))
+
+    def _make_directory_if_not_specified(self):
+        if self.directory is None:
+            parent_directory = os.path.join(
+                os.environ.get('HOME'), 'autopilot', 'fakeenv')
+            if not os.path.exists(parent_directory):
+                os.makedirs(parent_directory)
+            temp_dir_fixture = fixtures.TempDir(parent_directory)
+            self.useFixture(temp_dir_fixture)
+            return temp_dir_fixture.path
+        else:
+            return self.directory
+
+    def _copy_xauthority_file(self, directory):
+        """Copy the .Xauthority file if it exists in the user's home."""
+        xauthority_file_path = os.path.join(
+            os.environ.get('HOME'), '.Xauthority')
+        if os.path.isfile(xauthority_file_path):
+            shutil.copyfile(
+                xauthority_file_path,
+                os.path.join(directory, '.Xauthority'))

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-04-23 08:50:20 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-05-30 14:35:19 +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
@@ -161,19 +161,6 @@
         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)

=== 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-05-30 14:35:19 +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,6 +19,7 @@
 import os
 import shutil
 
+import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
 
 
@@ -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-05-30 14:35:19 +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-05-26 12:37:32 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2014-05-30 14:35:19 +0000
@@ -19,7 +19,6 @@
 from autopilot.matchers import Eventually
 from testtools.matchers import Is, Not, Equals
 
-from ubuntuuitoolkit import emulators
 from ubuntuuitoolkit.tests import gallery
 
 
@@ -33,15 +32,8 @@
         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_slider(self):
-        item = "Slider"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('slidersElement')
 
         item_data = [
             ["slider_standard"],
@@ -57,9 +49,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 +69,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 +103,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-05-30 14:35:19 +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_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-05-30 14:35:19 +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-05-30 14:35:19 +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(

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2014-03-10 16:51:01 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2014-05-30 14:35:19 +0000
@@ -15,6 +15,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import tempfile
 
 try:
     # Python 3.
@@ -24,7 +25,7 @@
     import mock
 import testtools
 from autopilot import testcase as autopilot_testcase
-from testtools.matchers import Contains, Not, FileExists
+from testtools.matchers import Contains, FileExists, Not
 
 from ubuntuuitoolkit import base, environment, fixture_setup
 
@@ -233,3 +234,73 @@
         self.assertEqual(
             'original test value',
             environment.get_initctl_env_var('testenvvarforfixture'))
+
+
+class FakeHomeTestCase(testtools.TestCase):
+
+    def test_fake_home_fixture_patches_initctl_env_var(self):
+        original_home = environment.get_initctl_env_var('HOME')
+        fake_home = original_home + 'fake'
+        result = testtools.TestResult()
+
+        def inner_test():
+            class TestWithFakeHome(testtools.TestCase):
+                def test_it(self):
+                    fake_home_fixture = fixture_setup.FakeHome(fake_home)
+                    fake_home_fixture.should_copy_xauthority_file = False
+                    self.useFixture(fake_home_fixture)
+                    self.assertEqual(
+                        fake_home, environment.get_initctl_env_var('HOME'))
+            return TestWithFakeHome('test_it')
+
+        inner_test().run(result)
+
+        self.assertTrue(
+            result.wasSuccessful(),
+            'Failed to fake the home: {}'.format(result.errors))
+        self.assertEqual(
+            original_home,
+            environment.get_initctl_env_var('HOME'))
+
+    def test_fake_home_fixture_patches_env_var(self):
+        original_home = os.environ.get('HOME')
+        fake_home = tempfile.gettempdir()
+        result = testtools.TestResult()
+
+        def inner_test():
+            class TestWithFakeHome(testtools.TestCase):
+                def test_it(self):
+                    fake_home_fixture = fixture_setup.FakeHome(fake_home)
+                    fake_home_fixture.should_copy_xauthority_file = False
+                    self.useFixture(fake_home_fixture)
+                    self.assertEqual(
+                        fake_home, os.environ.get('HOME'))
+            return TestWithFakeHome('test_it')
+
+        inner_test().run(result)
+
+        self.assertTrue(
+            result.wasSuccessful(),
+            'Failed to fake the home: {}'.format(result.failures))
+        self.assertEqual(original_home, os.environ.get('HOME'))
+
+    def test_fake_home_fixture_must_create_default_directory(self):
+        original_home = os.environ.get('HOME')
+        self.useFixture(fixture_setup.FakeHome())
+
+        home_parent_directory, _ = os.path.split(os.environ.get('HOME'))
+        self.assertEqual(
+            home_parent_directory,
+            os.path.join(original_home, 'autopilot', 'fakeenv'))
+
+    def test_fake_home_fixture_must_copy_xauthority(self):
+        # Fake the home first so we don't write the xauthority on the real
+        # home.
+        self.useFixture(fixture_setup.FakeHome())
+
+        open(os.path.join(os.environ.get('HOME'), '.Xauthority')).close()
+
+        self.useFixture(fixture_setup.FakeHome())
+        self.assertTrue(
+            os.path.exists(
+                os.path.join(os.environ.get('HOME'), '.Xauthority')))

=== added directory 'tests/launcher'
=== added file 'tests/launcher/launcher.cpp'
--- tests/launcher/launcher.cpp	1970-01-01 00:00:00 +0000
+++ tests/launcher/launcher.cpp	2014-05-30 14:35:19 +0000
@@ -0,0 +1,143 @@
+/*
+ * Copyright 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
+ * 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/>.
+ *
+ * QML launcher with the ability to setup the QQuickView/ QQmlEngine differently
+ *
+ * Rationale: Different variants of qmlscene exist as well as C++ and Go apps
+ * This is to write Autopilot test cases that exhibit specific behavior
+ */
+
+#include <iostream>
+#include <QtCore/qdebug.h>
+#include <QtQuick/QQuickView>
+#include <QtGui/QGuiApplication>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlContext>
+#include <QtCore/QFileInfo>
+#include <QLibrary>
+#include <QOpenGLContext>
+#include <QtGui/private/qopenglcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
+
+int usage()
+{
+    QString self(QGuiApplication::instance()->arguments().at(0));
+    std::cout << "Usage\n  "
+        << qPrintable(self)
+        << " -testability -frameless -engine"
+        << " --desktop_file_path=DESKTOP_FILE"
+        << " -I MODULE_PATH FILENAME\n";
+    return 1;
+}
+
+int main(int argc, const char *argv[])
+{
+    // QPlatformIntegration::ThreadedOpenGL
+    setenv("QML_FORCE_THREADED_RENDERER", "1", 1);
+    // QPlatformIntegration::BufferQueueingOpenGL
+    setenv("QML_FIXED_ANIMATION_STEP", "1", 1);
+    // Oxide and QWebEngine need a shared context
+    QScopedPointer<QOpenGLContext> shareContext;
+    shareContext.reset(new QOpenGLContext);
+    QSGContext::setSharedOpenGLContext(shareContext.data());
+
+    QGuiApplication::setApplicationName("UITK Launcher");
+    QGuiApplication application(argc, (char**)argv);
+    QStringList args (application.arguments());
+
+    int _testability(args.indexOf("-testability"));
+    args.removeAt(_testability);
+    int _frameless(args.indexOf("-frameless"));
+    args.removeAt(_frameless);
+    int _engine(args.indexOf("-engine"));
+    args.removeAt(_engine);
+
+    Q_FOREACH(QString arg, args) {
+        if (arg.startsWith("--desktop_file_hint")) {
+            // This will not be used - it only needs to be ignored
+            int _desktop_file_hint(args.indexOf(arg));
+            args.removeAt(_desktop_file_hint);
+        }
+    }
+
+    // Testability is only supported out of the box by QApplication not QGuiApplication
+    if (_testability > -1 || getenv("QT_LOAD_TESTABILITY")) {
+        QLibrary testLib(QLatin1String("qttestability"));
+        if (testLib.load()) {
+            typedef void (*TasInitialize)(void);
+            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
+            if (initFunction) {
+                initFunction();
+            } else {
+                qCritical("Library qttestability resolve failed!");
+                return 1;
+            }
+        } else {
+            qCritical("Library qttestability load failed!");
+            return 1;
+        }
+    }
+
+    QQmlEngine* engine;
+    // The default constructor affects the components tree (autopilot vis)
+    QQuickView* view;
+    if (_engine > -1) {
+        view = new QQuickView();
+        engine = view->engine();
+    } else {
+        engine = new QQmlEngine();
+        view = new QQuickView(engine, NULL);
+    }
+
+    int _import(args.indexOf("-I"));
+    args.removeAt(_import);
+    if (_import > -1) {
+        if (args.count() > _import) {
+            QString importPath(args.at(_import));
+            args.removeAt(_import);
+            engine->addImportPath(importPath);
+        }
+    }
+
+    view->setResizeMode(QQuickView::SizeRootObjectToView);
+    view->setTitle("UI Toolkit QQuickView");
+    if (_frameless > -1) {
+        view->setFlags(Qt::FramelessWindowHint);
+    }
+
+    // The remaining unnamed argument must be a filename
+    if (args.count() == 1) {
+        qCritical() << "Missing filename";
+        return usage();
+    }
+    QString filename(args.at(1));
+    // The first argument is the launcher itself
+    args.removeAt(0);
+
+    QUrl source(QUrl::fromLocalFile(filename));
+    view->setSource(source);
+    if (view->errors().count() > 0) {
+        return usage();
+    }
+    view->show();
+
+    if (args.count() > 1) {
+        qCritical() << "Invalid arguments passed" << args;
+        return usage();
+    }
+
+    return application.exec();
+}
+

=== added file 'tests/launcher/launcher.pro'
--- tests/launcher/launcher.pro	1970-01-01 00:00:00 +0000
+++ tests/launcher/launcher.pro	2014-05-30 14:35:19 +0000
@@ -0,0 +1,11 @@
+TEMPLATE = app
+QT += qml quick
+# For setSharedOpenGLContext
+QT += core-private gui-private quick-private
+CONFIG += no_keywords
+SOURCES += \
+    launcher.cpp
+launcher.path = /usr/lib/ubuntu-ui-toolkit
+launcher.files = launcher
+INSTALLS += launcher
+

=== modified file 'tests/qmlapicheck.py'
--- tests/qmlapicheck.py	2014-04-24 09:18:38 +0000
+++ tests/qmlapicheck.py	2014-05-30 14:35:19 +0000
@@ -130,10 +130,10 @@
     if '{' in line and '}' in line:
         if filetype == 'qmltypes' and not in_builtin_type:
             print('    ' + line.strip())
-        continue
+            continue
 
     # End of function/ signal/ Item block
-    if '}' in line:
+    if '}' in line and not '{' in line:
         in_block -= 1
         block_meta = {}
         if in_block == 1 and in_builtin_type:
@@ -143,7 +143,7 @@
     # Only root "Item {" is inspected for QML, otherwise all children
     if in_block == 1 or filetype == 'qmltypes':
         # Left hand side specifies a keyword, a type and a variable name
-        declaration = line.split(':')[0]
+        declaration = line.split(':', 1)[0]
         words = declaration.strip().split(' ')
         # Skip types with prefixes considered builtin
         if filetype == 'qmltypes' and words[0] == 'name':
@@ -175,7 +175,8 @@
         for word in words:
             if word in keywords:
                 if filetype == 'qml':
-                    signature = declaration.split('{')[0].strip()
+                    separator = '{' if 'function' in declaration else ':'
+                    signature = declaration.split(separator, 1)[0].strip()
                     if 'alias' in line:
                         no_mods = signature
                         for mod in ['readonly', 'default']:
@@ -198,7 +199,7 @@
                 break
 
     # Start of function/ signal/ Item block
-    if '{' in line:
+    if '{' in line and not '}' in line:
         in_block += 1
         block_meta = {}
         # The parent type can affect API

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2014-02-21 23:39:43 +0000
+++ tests/tests.pro	2014-05-30 14:35:19 +0000
@@ -7,4 +7,6 @@
 autopilot2_module.path = /usr/lib/python2.7/dist-packages/ubuntuuitoolkit
 autopilot2_module.files = autopilot/ubuntuuitoolkit/*
 
+SUBDIRS += launcher
+
 INSTALLS += autopilot_module autopilot2_module