Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1384703-flickable_infinite_loop into lp:ubuntu-ui-toolkit

[Leo Arias]

[lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1384703-flickable_infinite_loop]

1306. By Leo Arias on 2014-10-23

Reordered the comment.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-16 13:01:01 +0000
+++ debian/changelog	2014-10-23 13:41:08 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubuntu-ui-toolkit (1.1.1298+14.10.20141016.1-0ubuntu1) 14.09; urgency=medium
 
   [ Jussi Pakkanen]
@@ -93,6 +94,18 @@
 
  -- Ubuntu daily release <[e-mail]>  Tue, 14 Oct 2014 14:40:58 +0000
 
+=======
+ubuntu-ui-toolkit (1.1.1279.1+14.10.20141014-0ubuntu1) 14.09; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Tim Peeters ]
+  * Fix margins in header contents.
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 14 Oct 2014 14:40:58 +0000
+
+>>>>>>> MERGE-SOURCE
 ubuntu-ui-toolkit (1.1.1279+14.10.20141007-0ubuntu1) 14.09; urgency=medium
 
   [ Michael Sheldon ]

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-10-16 11:43:24 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-10-23 13:41:08 +0000
@@ -41,6 +41,11 @@
     readonly property bool animating: headerStyle.state == "OUT"
                                       || leftAnchor.anchors.leftMargin < 0
 
+    // for Unity8
+    // FIXME: Remove this property when we introduce a header preset that does not
+    //  have a separator.
+    property alias __separator_visible: separator.visible
+
     BorderImage {
         id: separator
         anchors {
@@ -123,6 +128,7 @@
             right: parent.right
         }
         source: headerStyle.separatorBottomSource
+        visible: separator.visible
     }
 
     states: [

=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2014-10-07 14:52:27 +0000
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2014-10-23 13:41:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * Copyright 2012, 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
@@ -29,45 +29,45 @@
     This class extends the default QML TestCase class which is available in QtTest 1.0.
 */
 TestCase {
-	TestUtil {
-		id:util
-	}
+    TestUtil {
+        id:util
+    }
 
-	/*!
-		Find a child from the item based on the objectName.
-	*/
-	function findChild(obj,objectName) {
-		var childs = new Array(0);
-		childs.push(obj)
-		while (childs.length > 0) {
-			if (childs[0].objectName == objectName) {
-				return childs[0]
-			}
-			for (var i in childs[0].children) {
-				childs.push(childs[0].children[i])
-			}
-			childs.splice(0, 1);
-		}
-		return null;
-	}
+    /*!
+        Find a child from the item based on the objectName.
+    */
+    function findChild(obj,objectName) {
+        var childs = new Array(0);
+        childs.push(obj)
+        while (childs.length > 0) {
+            if (childs[0].objectName == objectName) {
+                return childs[0]
+            }
+            for (var i in childs[0].children) {
+                childs.push(childs[0].children[i])
+            }
+            childs.splice(0, 1);
+        }
+        return null;
+    }
 
     /*!
       Find a non-visual child such as QtObject based on objectName.
       */
-	function findInvisibleChild(obj,objectName) {
-		var childs = new Array(0);
-		childs.push(obj)
-		while (childs.length > 0) {
-			if (childs[0].objectName == objectName) {
-				return childs[0]
-			}
-			for (var i in childs[0].data) {
-				childs.push(childs[0].data[i])
-			}
-			childs.splice(0, 1);
-		}
-		return null;
-	}
+    function findInvisibleChild(obj,objectName) {
+        var childs = new Array(0);
+        childs.push(obj)
+        while (childs.length > 0) {
+            if (childs[0].objectName == objectName) {
+                return childs[0]
+            }
+            for (var i in childs[0].data) {
+                childs.push(childs[0].data[i])
+            }
+            childs.splice(0, 1);
+        }
+        return null;
+    }
 
     /*!
       Finds a visible child of an \a item having a given \a property with a given
@@ -194,44 +194,43 @@
     }
 
     /*!
-		Keeps executing a given parameter-less function until it returns the given
-		expected result or the timemout is reached (in which case a test failure
-		is generated)
-	*/
+        Keeps executing a given parameter-less function until it returns the given
+        expected result or the timemout is reached (in which case a test failure
+        is generated)
+    */
 
-	function tryCompareFunction(func, expectedResult, timeout) {
-		var timeSpent = 0
-		var success = false
-		var actualResult
-		if (timeout == undefined) {
+    function tryCompareFunction(func, expectedResult, timeout) {
+        var timeSpent = 0
+        var success = false
+        var actualResult
+        if (timeout == undefined) {
                     timeout = 5000;
                 }
-		while (timeSpent < timeout && !success) {
-			actualResult = func()
-			success = qtest_compareInternal(actualResult, expectedResult)
-			if (success === false) {
-				wait(50)
-				timeSpent += 50
-			}
-		}
-
-		var act = qtest_results.stringify(actualResult)
-		var exp = qtest_results.stringify(expectedResult)
-		if (!qtest_results.compare(success,
-				"function returned unexpected result",
-				act, exp,
-				util.callerFile(), util.callerLine())) {
-			throw new Error("QtQuickTest::fail")
-		}
-	}
-
-	/*!
-		Convenience function to allow typing a full string instead of single characters
-	*/
-	function typeString(string) {
-		for (var i = 0; i < string.length; i++) {
-			keyClick(string[i]);
-		}
-	}
+        while (timeSpent < timeout && !success) {
+            actualResult = func()
+            success = qtest_compareInternal(actualResult, expectedResult)
+            if (success === false) {
+                wait(50)
+                timeSpent += 50
+            }
+        }
+
+        var act = qtest_results.stringify(actualResult)
+        var exp = qtest_results.stringify(expectedResult)
+        if (!qtest_results.compare(success,
+                "function returned unexpected result",
+                act, exp,
+                util.callerFile(), util.callerLine())) {
+            throw new Error("QtQuickTest::fail")
+        }
+    }
+
+    /*!
+        Convenience function to allow typing a full string instead of single characters
+    */
+    function typeString(string) {
+        for (var i = 0; i < string.length; i++) {
+            keyClick(string[i]);
+        }
+    }
 }
-

=== modified file 'po/cs.po'
--- po/cs.po	2014-10-23 07:24:16 +0000
+++ po/cs.po	2014-10-23 13:41:08 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Czech translation for ubuntu-ui-toolkit
 # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the ubuntu-ui-toolkit package.
@@ -130,3 +131,137 @@
 #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
 msgid "Pull to refresh..."
 msgstr ""
+=======
+# Czech translation for ubuntu-ui-toolkit
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the ubuntu-ui-toolkit package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-ui-toolkit\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-01 19:02+0200\n"
+"PO-Revision-Date: 2014-10-12 19:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-10-13 06:11+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
+
+#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:154
+#, qt-format
+msgid ""
+"property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" "
+"of type %5"
+msgstr ""
+
+#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:163
+#, qt-format
+msgid "property \"%1\" does not exist or is not writable for object %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucalarm.cpp:42
+#: Ubuntu/Components/plugin/ucalarm.cpp:136
+msgid "Alarm"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucalarm.cpp:684
+#: Ubuntu/Components/plugin/ucalarm.cpp:716
+msgid "Alarm has a pending operation."
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucarguments.cpp:188
+msgid "Usage: "
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucarguments.cpp:209
+msgid "Options:"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucarguments.cpp:498
+#, qt-format
+msgid "%1 is expecting an additional argument: %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucarguments.cpp:503
+#, qt-format
+msgid "%1 is expecting a value for argument: %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucarguments.cpp:520
+#, qt-format
+msgid "%1 is expecting additional arguments: %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucmousefilters.cpp:1064
+msgid "Ignoring AfterItem priority for InverseMouse filters."
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucstatesaver.cpp:46
+msgid "Warning: attachee must have an ID. State will not be saved."
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucstatesaver.cpp:56
+#, qt-format
+msgid ""
+"Warning: attachee's UUID is already registered, state won't be saved: %1"
+msgstr ""
+
+#: Ubuntu/Components/plugin/ucstatesaver.cpp:102
+#, qt-format
+msgid ""
+"All the parents must have an id.\n"
+"State saving disabled for %1, class %2"
+msgstr ""
+
+#: Ubuntu/Components/plugin/uctheme.cpp:233
+msgid "Theme not found: "
+msgstr ""
+
+#: Ubuntu/Components/Popups/ComposerSheet.qml:80
+msgid "Cancel"
+msgstr ""
+
+#: Ubuntu/Components/Popups/ComposerSheet.qml:90
+msgid "Confirm"
+msgstr ""
+
+#: Ubuntu/Components/Popups/DefaultSheet.qml:89
+msgid "Close"
+msgstr ""
+
+#: Ubuntu/Components/Popups/DefaultSheet.qml:99
+msgid "Done"
+msgstr ""
+
+#: Ubuntu/Components/TextInputPopover.qml:27
+msgid "Select All"
+msgstr ""
+
+#: Ubuntu/Components/TextInputPopover.qml:33
+msgid "Cut"
+msgstr ""
+
+#: Ubuntu/Components/TextInputPopover.qml:42
+msgid "Copy"
+msgstr ""
+
+#: Ubuntu/Components/TextInputPopover.qml:49
+msgid "Paste"
+msgstr ""
+
+#: Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml:57
+msgid "In Progress"
+msgstr ""
+
+#: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
+msgid "Release to refresh..."
+msgstr ""
+
+#: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
+msgid "Pull to refresh..."
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'po/ubuntu-ui-toolkit.pot'
--- po/ubuntu-ui-toolkit.pot	2014-09-01 17:02:40 +0000
+++ po/ubuntu-ui-toolkit.pot	2014-10-23 13:41:08 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-ui-toolkit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-01 19:02+0200\n"
+"POT-Creation-Date: 2014-10-20 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,14 +17,18 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:154
+#: Ubuntu/Components/ListItems/Empty.qml:413
+msgid "Delete"
+msgstr ""
+
+#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:176
 #, qt-format
 msgid ""
 "property \"%1\" of object %2 has type %3 and cannot be set to value \"%4\" "
 "of type %5"
 msgstr ""
 
-#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:163
+#: Ubuntu/Components/plugin/statesaverbackend_p.cpp:185
 #, qt-format
 msgid "property \"%1\" does not exist or is not writable for object %2"
 msgstr ""
@@ -130,3 +134,7 @@
 #: Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml:28
 msgid "Pull to refresh..."
 msgstr ""
+
+#: Ubuntu/Components/ToolbarItems.qml:142
+msgid "Back"
+msgstr ""

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-08-03 03:06:54 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-10-23 13:41:08 +0000
@@ -77,15 +77,20 @@
     def _slow_drag(self, start_x, stop_x, start_y, stop_y):
         # If we drag too fast, we end up scrolling more than what we
         # should, sometimes missing the  element we are looking for.
+        original_content_y = self.contentY
+
         # I found that when the flickDeceleration is 1500, the rate should be
         # 5 and that when it's 100, the rate should be 1. With those two points
-        # we can get that the following equation.
+        # we can get the following equation.
         # XXX The deceleration might not be linear with respect to the rate,
         # but this works for the two types of scrollables we have for now.
         # --elopio - 2014-05-08
         rate = (self.flickDeceleration + 250) / 350
         self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate=rate)
 
+        if self.contentY == original_content_y:
+            raise _common.ToolkitException('Could not swipe in the flickable.')
+
 
 class QQuickFlickable(Scrollable):
 
@@ -105,7 +110,6 @@
 
     @autopilot_logging.log_action(logger.info)
     def _swipe_non_visible_child_into_view(self, child, containers):
-        original_content_y = self.contentY
         while not self._is_child_visible(child, containers):
             # Check the direction of the swipe based on the position of the
             # child relative to the immediate flickable container.
@@ -114,12 +118,8 @@
             else:
                 self.swipe_to_show_more_below(containers)
 
-            if self.contentY == original_content_y:
-                raise _common.ToolkitException(
-                    "Couldn't swipe in the flickable.")
-
     @autopilot_logging.log_action(logger.info)
-    def swipe_to_show_more_above(self, containers):
+    def swipe_to_show_more_above(self, containers=None):
         if self.atYBeginning:
             raise _common.ToolkitException(
                 "Can't swipe more, we are already at the top of the "
@@ -128,7 +128,7 @@
             self._swipe_to_show_more('above', containers)
 
     @autopilot_logging.log_action(logger.info)
-    def swipe_to_show_more_below(self, containers):
+    def swipe_to_show_more_below(self, containers=None):
         if self.atYEnd:
             raise _common.ToolkitException(
                 "Can't swipe more, we are already at the bottom of the "
@@ -136,7 +136,9 @@
         else:
             self._swipe_to_show_more('below', containers)
 
-    def _swipe_to_show_more(self, direction, containers):
+    def _swipe_to_show_more(self, direction, containers=None):
+        if containers is None:
+            containers = self._get_containers()
         start_x = stop_x = self.globalRect.x + (self.globalRect.width // 2)
         # Start and stop just a little under the top and a little over the
         # bottom.

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py	2014-06-16 21:26:30 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py	2014-10-23 13:41:08 +0000
@@ -108,6 +108,48 @@
     pass
 
 
+class Expandable(Empty):
+
+    @autopilot_logging.log_action(logger.info)
+    def expand(self):
+        """Expand an expandable list item.
+
+        If the item is already expanded, no action will be executed.
+        If you want to check if the item is expanded, you can use the
+        ``expanded`` property.
+
+        """
+        if not self.expanded:
+            self._click_always_visible_section()
+            self.expanded.wait_for(True)
+            self.height.wait_for(self.expandedHeight)
+        else:
+            logger.debug('The item is already expanded.')
+
+    @autopilot_logging.log_action(logger.debug)
+    def _click_always_visible_section(self):
+        self.pointing_device.move(
+            self.globalRect.x + self.globalRect.width // 2,
+            self.globalRect.y + self.collapsedHeight // 2)
+        self.pointing_device.click()
+
+    @autopilot_logging.log_action(logger.info)
+    def collapse(self):
+        """Collapse an expandable list item.
+
+        If the item is already collapsed, no action will be executed.
+        If you want to check if the item is expanded, you can use the
+        ``expanded`` property.
+
+        """
+        if self.expanded:
+            self._click_always_visible_section()
+            self.expanded.wait_for(False)
+            self.height.wait_for(self.collapsedHeight)
+        else:
+            logger.debug('The item is already collapsed.')
+
+
 class Standard(Empty):
     pass
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2014-09-04 09:16:49 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2014-10-23 13:41:08 +0000
@@ -14,10 +14,14 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import testtools
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
-from ubuntuuitoolkit._custom_proxy_objects import _common
 
 
 class FlickableTestCase(testtools.TestCase):
@@ -27,7 +31,7 @@
         dummy_id = (0, 0)
         dummy_flicking = (0, 'dummy')
         state_with_flicking = {'id': dummy_id, 'flicking': dummy_flicking}
-        element = _common.UbuntuUIToolkitCustomProxyObjectBase(
+        element = ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase(
             state_with_flicking, '/dummy'.encode(), 'dummy')
 
         with element.no_automatic_refreshing():
@@ -37,7 +41,7 @@
         """is_flickable returns False if flickable property doesn't exist."""
         dummy_id = (0, 0)
         state_without_flicking = {'id': dummy_id}
-        element = _common.UbuntuUIToolkitCustomProxyObjectBase(
+        element = ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase(
             state_without_flicking, '/dummy'.encode(), 'dummy')
 
         with element.no_automatic_refreshing():
@@ -179,6 +183,52 @@
         self.flickable.swipe_to_bottom()
         self.assertTrue(self.flickable.atYEnd)
 
+    def test_swipe_to_show_more_above_with_containers(self):
+        """Swipe to show more above must receive containers as parameter."""
+        self.flickable.swipe_to_bottom()
+        self.assertTrue(self.flickable.atYEnd)
+
+        containers = self.flickable._get_containers()
+        self.flickable.swipe_to_show_more_above(containers)
+        self.assertFalse(self.flickable.atYEnd)
+
+    def test_swipe_to_show_more_above_without_arguments(self):
+        """Calling swipe to show more above must get containers by default."""
+        self.flickable.swipe_to_bottom()
+        self.assertTrue(self.flickable.atYEnd)
+
+        self.flickable.swipe_to_show_more_above()
+        self.assertFalse(self.flickable.atYEnd)
+
+    def test_swipe_to_show_more_below_with_containers(self):
+        """Swipe to show more below must receive containers as parameter."""
+        self.flickable.swipe_to_top()
+        self.assertTrue(self.flickable.atYBeginning)
+
+        containers = self.flickable._get_containers()
+        self.flickable.swipe_to_show_more_below(containers)
+        self.assertFalse(self.flickable.atYBeginning)
+
+    def test_swipe_to_show_more_below_without_arguments(self):
+        """Calling swipe to show more below must get containers by default."""
+        self.flickable.swipe_to_top()
+        self.assertTrue(self.flickable.atYBeginning)
+
+        self.flickable.swipe_to_show_more_below()
+        self.assertFalse(self.flickable.atYBeginning)
+
+    def test_failed_drag_must_raise_exception(self):
+        dummy_coordinates = (0, 0, 10, 10)
+        # Patch the pointing device so it does nothing and the swipe fails.
+        with mock.patch.object(self.flickable, 'pointing_device'):
+            error = self.assertRaises(
+                ubuntuuitoolkit.ToolkitException,
+                self.flickable._slow_drag,
+                *dummy_coordinates
+            )
+
+        self.assertEqual('Could not swipe in the flickable.', str(error))
+
 
 class UnityFlickableTestCase(tests.QMLStringAppTestCase):
 

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.ExpandableTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.ExpandableTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.ExpandableTestCase.qml	2014-10-23 13:41:08 +0000
@@ -0,0 +1,66 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1
+
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+
+    Column {
+        anchors.fill: parent
+
+        Repeater {
+            model: 2
+            Expandable {
+                id: expandingItem
+                objectName: "expandable" + index
+                expandedHeight: contentCol.height + units.gu(1)
+
+                onClicked: {
+                    expanded = !expanded;
+                }
+
+                Column {
+                    id: contentCol
+                    anchors { left: parent.left; right: parent.right }
+                    Item {
+                        anchors { left: parent.left; right: parent.right}
+                        height: expandingItem.collapsedHeight
+                        Label {
+                            anchors {
+                                left: parent.left
+                                right: parent.right
+                                verticalCenter: parent.verticalCenter
+                            }
+                            text: "Item " + index
+                        }
+                    }
+
+                    UbuntuShape {
+                        objectName: "shape" + index
+                        anchors { left: parent.left; right: parent.right }
+                        height: units.gu(6)
+                    }
+                }
+            }
+        }
+    }
+}

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	2014-06-12 22:56:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	2014-10-23 13:41:08 +0000
@@ -14,15 +14,43 @@
 # 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/>.
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import logging
+import os
 
 import fixtures
+import testtools
 from testtools.matchers import Contains
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import listitems, tests
 
 
+class ListItemsTestCase(testtools.TestCase):
+
+    def test_supported_class(self):
+        self.assertTrue(issubclass(
+            listitems.Base, listitems.Empty))
+        self.assertTrue(issubclass(
+            listitems.Expandable, listitems.Empty))
+        self.assertTrue(issubclass(
+            listitems.ItemSelector, listitems.Empty))
+        self.assertTrue(issubclass(
+            listitems.Standard, listitems.Empty))
+        self.assertTrue(issubclass(
+            listitems.SingleControl, listitems.Empty))
+        self.assertTrue(issubclass(
+            listitems.MultiValue, listitems.Base))
+        self.assertTrue(issubclass(
+            listitems.SingleValue, listitems.Base))
+        self.assertTrue(issubclass(
+            listitems.Subtitled, listitems.Base))
+
+
 class SwipeToDeleteTestCase(tests.QMLStringAppTestCase):
 
     test_qml = ("""
@@ -97,22 +125,6 @@
             listitems.Standard, objectName='listitem_standard')
         self.assertTrue(self._item.exists())
 
-    def test_supported_class(self):
-        self.assertTrue(issubclass(
-            listitems.Base, listitems.Empty))
-        self.assertTrue(issubclass(
-            listitems.ItemSelector, listitems.Empty))
-        self.assertTrue(issubclass(
-            listitems.Standard, listitems.Empty))
-        self.assertTrue(issubclass(
-            listitems.SingleControl, listitems.Empty))
-        self.assertTrue(issubclass(
-            listitems.MultiValue, listitems.Base))
-        self.assertTrue(issubclass(
-            listitems.SingleValue, listitems.Base))
-        self.assertTrue(issubclass(
-            listitems.Subtitled, listitems.Base))
-
     def test_standard_custom_proxy_object(self):
         self.assertIsInstance(self._item, listitems.Standard)
 
@@ -185,3 +197,40 @@
             objectName='listitem_destroyed_on_remove_without_confirm')
         item.swipe_to_delete()
         self.assertFalse(item.exists())
+
+
+class ExpandableTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_listitems.ExpandableTestCase.qml')
+
+    def setUp(self):
+        super(ExpandableTestCase, self).setUp()
+        self.test_expandable = self.main_view.select_single(
+            listitems.Expandable, objectName='expandable0')
+
+    def test_expand_item(self):
+        self.test_expandable.expand()
+        self.assertTrue(self.test_expandable.expanded)
+
+    def test_expand_already_expanded_item_must_do_nothing(self):
+        self.test_expandable.expand()
+
+        # Replace the pointer with None, so we make sure it's not being called.
+        with mock.patch.object(self.test_expandable, 'pointing_device', None):
+            self.test_expandable.expand()
+
+    def test_collapse_item(self):
+        self.test_expandable.expand()
+
+        self.test_expandable.collapse()
+        self.assertFalse(self.test_expandable.expanded)
+
+    def test_collapse_already_collapsed_item_must_do_nothing(self):
+        self.test_expandable.collapse()
+
+        # Replace the pointer with None, so we make sure it's not being called.
+        with mock.patch.object(self.test_expandable, 'pointing_device', None):
+            self.test_expandable.collapse()