Merge lp:~zsombi/ubuntu-ui-toolkit/oneUbuntuListView into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Move UbuntuListView 1.3 code into one single file

Move UbuntuListView 1.3 code into one single file

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1775
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2647/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1375/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1378/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1374/console

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

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Looks pretty straightforward, merge of two parts of the same class. Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/1433/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/741/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/740/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/744/console

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/oneUbuntuListView]

1776. By Zsombor Egri on 2015-12-17

rename UbuntuListView file to match the type; add 1.3 specific UbuntuListView

1777. By Zsombor Egri on 2015-12-17

sync staging

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1777
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2666/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1392
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1392/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1390

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

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-12-17 09:15:45 +0000
+++ components.api	2015-12-17 13:53:59 +0000
@@ -1561,7 +1561,8 @@
     property int expandedIndex
 Ubuntu.Components.UbuntuListView 1.1: UbuntuListView
     readonly property PullToRefresh pullToRefresh
-Ubuntu.Components.UbuntuListView 1.3: UbuntuListView
+Ubuntu.Components.UbuntuListView 1.3: ListView
+    property int expandedIndex
     readonly property PullToRefresh pullToRefresh
 Ubuntu.Components.UbuntuNumberAnimation 1.0 0.1: PropertyAnimation
 Ubuntu.Components.UbuntuNumberAnimation 1.3: PropertyAnimation

=== modified file 'examples/ubuntu-ui-toolkit-gallery/MainPage.qml'
--- examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2015-12-15 14:20:33 +0000
+++ examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2015-12-17 13:53:59 +0000
@@ -101,36 +101,14 @@
 
         delegate: ListItem {
             objectName: model.objectName
-            contentItem {
-                anchors.leftMargin: units.gu(2)
-                anchors.rightMargin: units.gu(2)
-            }
             enabled: source != ""
             // Used by Autopilot
             property string text: label
             onClicked: widgetList.currentIndex = index
-            Label {
-                id: labelItem
-                anchors {
-                    fill: parent
-                    rightMargin: units.gu(4)
-                }
-                text: label
-                verticalAlignment: Text.AlignVCenter
-            }
-            Icon {
-                name: "next"
-                width: units.gu(2)
-                height: units.gu(2)
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    right: parent.right
-                }
-            }
-        }
-        highlight: Rectangle {
-            color: theme.palette.selected.background
-        }
-        highlightMoveDuration: 0
+            ListItemLayout {
+                title.text: label
+                ProgressionSlot {}
+            }
+        }
     }
 }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml'
--- examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2015-04-29 07:21:29 +0000
+++ examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2015-12-17 13:53:59 +0000
@@ -16,7 +16,6 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Template {
     objectName: "ubuntuListViewTemplate"
@@ -52,9 +51,14 @@
             height: units.gu(36)
             model: fruitModel
             clip: true
+            currentIndex: -1
 
-            delegate: ListItem.Standard {
-                text: name
+            delegate: ListItem {
+                ListItemLayout {
+                    title.text: name
+                }
+                // to enable highlight
+                onClicked: ListView.view.currentIndex = index
             }
 
             pullToRefresh {

=== removed file 'src/Ubuntu/Components/1.3/UbuntuListView.qml'
--- src/Ubuntu/Components/1.3/UbuntuListView.qml	2015-04-29 07:21:29 +0000
+++ src/Ubuntu/Components/1.3/UbuntuListView.qml	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-/*
- * 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.4
-import Ubuntu.Components 1.3 as Toolkit
-
-/*!
-    \qmltype UbuntuListView
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief A ListView with special features tailored for a look and feel fitting the
-    Ubuntu Touch platform.
-    The UbuntuListView works just like a regular ListView, but it adds special features
-    such as expanding/collapsing items (when used together with the Expandable item).
-    It provides features like automatically positioning the expanding item when it
-    expands and collapsing it again when the user taps outside of it.
-
-    Examples:
-    \qml
-        import Ubuntu.Components 1.3
-        import Ubuntu.Components.ListItems 1.3 as ListItem
-
-        Item {
-            ListModel {
-                id: listModel
-            }
-
-            UbuntuListView {
-                id: ubuntuListView
-                anchors { left: parent.left; right: parent.right }
-                height: units.gu(24)
-                model: listModel
-
-                delegate: ListItem.Expandable {
-                    id: expandingItem
-
-                    expandedHeight: units.gu(30)
-
-                    onClicked: {
-                        ubuntuListView.expandedIndex = index;
-                    }
-                }
-            }
-        }
-    \endqml
-*/
-
-ListView {
-    id: root
-
-    /*!
-      The index of the currently expanded item. -1 if no item is expanded.
-     */
-    property int expandedIndex: -1
-
-    QtObject {
-        id: priv
-
-        function positionViewAtIndexAnimated(expandedIndex) {
-            animation.from = root.contentY;
-            root.currentIndex = expandedIndex;
-            if (expandedIndex == root.count - 1) {
-                root.positionViewAtIndex(expandedIndex, ListView.End);
-            } else {
-                root.positionViewAtIndex(expandedIndex + 1, ListView.End);
-            }
-
-            var effectiveExpandedHeight = Math.min(root.currentItem.expandedHeight, root.height - root.currentItem.collapsedHeight);
-            if (root.contentY - root.originY == 0) {
-                if (((root.currentIndex + 1) * root.currentItem.collapsedHeight) + effectiveExpandedHeight > root.height) {
-                    animation.to = ((root.currentIndex + 1) * root.currentItem.collapsedHeight + effectiveExpandedHeight) - root.height + root.originY
-                } else {
-                    animation.to = root.originY
-                }
-            } else {
-                animation.to = root.contentY + (effectiveExpandedHeight - root.currentItem.collapsedHeight);
-            }
-            animation.start();
-        }
-
-        function requestFocus(reason) {
-            // lookup for the currentItem, and if it is a FocusScope, focus the view
-            // this will also focus the currentItem
-            if (root.currentItem && root.currentItem.hasOwnProperty("activeFocusOnPress")) {
-                root.forceActiveFocus(reason);
-            }
-        }
-    }
-
-    focus: true
-
-    /*!
-      \internal
-      Grab focus when moved, flicked or clicked
-     */
-    onMovementStarted: priv.requestFocus(Qt.MouseFocusReason)
-    onFlickStarted: priv.requestFocus(Qt.MouseFocusReason)
-    Toolkit.Mouse.onClicked: priv.requestFocus(Qt.MouseFocusReason)
-
-    /*!
-      Expand the item at the given index.
-     */
-    onExpandedIndexChanged: {
-        if (expandedIndex < 0) {
-            return;
-        }
-        priv.positionViewAtIndexAnimated(expandedIndex, ListView.End)
-    }
-
-    UbuntuNumberAnimation {
-        id: animation
-        target: root
-        property: "contentY"
-    }
-
-    MouseArea {
-        parent: contentItem
-        anchors.fill: parent
-        z: 2
-        enabled: root.expandedIndex != -1
-        onClicked: root.expandedIndex = -1;
-    }
-
-    // animate move displaced
-    moveDisplaced: Transition {
-        UbuntuNumberAnimation {
-            properties: "x,y"
-        }
-    }
-}

=== renamed file 'src/Ubuntu/Components/1.3/UbuntuListView11.qml' => 'src/Ubuntu/Components/1.3/UbuntuListView.qml'
--- src/Ubuntu/Components/1.3/UbuntuListView11.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/UbuntuListView.qml	2015-12-17 13:53:59 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2015 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
@@ -15,19 +15,188 @@
  */
 
 import QtQuick 2.4
-
-// documentation in UbuntuListView11.qdoc
-UbuntuListView {
-
-    /*!
-      \internal
-      \qmlproperty PullToRefresh pullToRefresh
+import Ubuntu.Components 1.3 as Toolkit
+
+/*!
+    \qmltype UbuntuListView
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \inherits ListView
+    \brief A ListView with special features tailored for a look and feel fitting the
+    Ubuntu Touch platform.
+    The UbuntuListView works just like a regular ListView, but it adds special features
+    such as expanding/collapsing items (when used together with the Expandable item).
+    It provides features like automatically positioning the expanding item when it
+    expands and collapsing it again when the user taps outside of it.
+
+    Examples:
+    \qml
+        import Ubuntu.Components 1.3
+        import Ubuntu.Components.ListItems 1.3 as ListItem
+
+        Item {
+            ListModel {
+                id: listModel
+            }
+
+            UbuntuListView {
+                id: ubuntuListView
+                anchors { left: parent.left; right: parent.right }
+                height: units.gu(24)
+                model: listModel
+
+                delegate: ListItem.Expandable {
+                    id: expandingItem
+
+                    expandedHeight: units.gu(30)
+
+                    onClicked: {
+                        ubuntuListView.expandedIndex = index;
+                    }
+                }
+            }
+        }
+    \endqml
+*/
+
+ListView {
+    id: root
+
+    /*!
+      \deprecated
+      The index of the currently expanded item. -1 if no item is expanded.
+      \b {THIS PROPERTY IS DEPRECATED. USE THE NEW ListItem TO HANDLE EXPANSION}
+     */
+    property int expandedIndex: -1
+
+    /*!
+      \qmlproperty pullToRefresh UbuntuListView::pullToRefresh
+      \readonly
+      \since Ubuntu.Components 1.1
+
+      Attached PullToRefresh to control manual model refresh. The component is disabled
+      by default.
+
+      \qml
+      import QtQuick 2.4
+      import Ubuntu.Components 1.3
+
+      UbuntuListView {
+          width: units.gu(40)
+          height: units.gu(71)
+          model: XmlListModel {
+              source: "http://feeds.reuters.com/reuters/topNews"
+              query: "/rss/channel/item"
+              XmlRole { name: "title"; query: "title/string()" }
+          }
+          // let refresh control know when the refresh gets completed
+          pullToRefresh {
+              enable: true
+              refreshing: model.status === XmlListModel.Loading
+              onRefresh: model.reload()
+          }
+          delegate: ListItem {
+              ListItemLayout {
+                  title.text: modelData
+              }
+              onClicked: {
+                  ListView.view.model.reload();
+              }
+          }
+      }
+      \endqml
       */
-    property alias pullToRefresh: refreshItem
+    readonly property alias pullToRefresh: refreshItem
 
     PullToRefresh {
         objectName: "listview_pulltorefresh"
         id: refreshItem
         enabled: false
     }
+
+    QtObject {
+        id: priv
+
+        function positionViewAtIndexAnimated(expandedIndex) {
+            animation.from = root.contentY;
+            root.currentIndex = expandedIndex;
+            if (expandedIndex == root.count - 1) {
+                root.positionViewAtIndex(expandedIndex, ListView.End);
+            } else {
+                root.positionViewAtIndex(expandedIndex + 1, ListView.End);
+            }
+
+            var effectiveExpandedHeight = Math.min(root.currentItem.expandedHeight, root.height - root.currentItem.collapsedHeight);
+            if (root.contentY - root.originY == 0) {
+                if (((root.currentIndex + 1) * root.currentItem.collapsedHeight) + effectiveExpandedHeight > root.height) {
+                    animation.to = ((root.currentIndex + 1) * root.currentItem.collapsedHeight + effectiveExpandedHeight) - root.height + root.originY
+                } else {
+                    animation.to = root.originY
+                }
+            } else {
+                animation.to = root.contentY + (effectiveExpandedHeight - root.currentItem.collapsedHeight);
+            }
+            animation.start();
+        }
+
+        function requestFocus(reason) {
+            // lookup for the currentItem, and if it is a FocusScope, focus the view
+            // this will also focus the currentItem
+            if (root.currentItem && root.currentItem.hasOwnProperty("activeFocusOnPress")) {
+                // is the currentItem a ListItem?
+                if (QuickUtils.inherits(root.currentItem, "UCListItem")) {
+                    root.currentItem.requestFocus(reason);
+                } else {
+                    root.forceActiveFocus(reason);
+                }
+            }
+        }
+    }
+
+    focus: true
+
+    /*!
+      \internal
+      Grab focus when moved, flicked or clicked
+     */
+    onMovementStarted: priv.requestFocus(Qt.MouseFocusReason)
+    onFlickStarted: priv.requestFocus(Qt.MouseFocusReason)
+    Toolkit.Mouse.onClicked: priv.requestFocus(Qt.MouseFocusReason)
+
+    /*!
+      Expand the item at the given index.
+     */
+    onExpandedIndexChanged: {
+        if (expandedIndex < 0) {
+            return;
+        }
+        priv.positionViewAtIndexAnimated(expandedIndex, ListView.End)
+    }
+
+    UbuntuNumberAnimation {
+        id: animation
+        target: root
+        property: "contentY"
+    }
+
+    MouseArea {
+        parent: contentItem
+        anchors.fill: parent
+        z: 2
+        enabled: root.expandedIndex != -1
+        onClicked: root.expandedIndex = -1;
+    }
+
+    // animate move displaced
+    moveDisplaced: Transition {
+        UbuntuNumberAnimation {
+            properties: "x,y"
+        }
+    }
+
+    // highlight current item
+    highlight: Rectangle {
+        color: theme.palette.selected.background
+    }
+    highlightMoveDuration: 0
 }

=== removed file 'src/Ubuntu/Components/1.3/UbuntuListView11.qdoc'
--- src/Ubuntu/Components/1.3/UbuntuListView11.qdoc	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/UbuntuListView11.qdoc	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*!
-  \qmlproperty pullToRefresh UbuntuListView::pullToRefresh
-  \readonly
-  \since Ubuntu.Components 1.1
-
-  Attached PullToRefresh to control manual model refresh. The component is disabled
-  by default.
-
-  \qml
-  import QtQuick 2.4
-  import Ubuntu.Components 1.2
-  import Ubuntu.Components.ListItems 1.0
-
-  UbuntuListView {
-      width: units.gu(40)
-      height: units.gu(71)
-      model: XmlListModel {
-          source: "http://feeds.reuters.com/reuters/topNews"
-          query: "/rss/channel/item"
-          XmlRole { name: "title"; query: "title/string()" }
-      }
-      // let refresh control know when the refresh gets completed
-      pullToRefresh {
-          enable: true
-          refreshing: model.status === XmlListModel.Loading
-          onRefresh: model.reload()
-      }
-      delegate: ListItem.Standard {
-          width: ListView.view.width
-          height: units.gu(5)
-          text: modelData
-          onClicked: {
-              ListView.view.model.reload();
-          }
-      }
-  }
-  \endqml
-  */

=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2015-12-17 09:13:29 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2015-12-17 13:53:59 +0000
@@ -124,7 +124,6 @@
              1.3/ToolbarItems.qml \
              1.3/tree.js \
              1.3/UbuntuColors.qml \
-             1.3/UbuntuListView11.qml \
              1.3/UbuntuListView.qml \
              1.3/UbuntuNumberAnimation.qml \
              1.3/ListItemPopover.qml \
@@ -136,7 +135,6 @@
 
 OTHER_FILES+= qmldir \
              1.3/CrossFadeImage.qdoc \
-             1.3/UbuntuListView11.qdoc \
              1.3/PageHeadConfiguration.qdoc \
              1.3/MainView.qdoc \
              1.3/Icon.qdoc

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2015-12-11 08:38:42 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2015-12-17 13:53:59 +0000
@@ -92,8 +92,10 @@
     }
 
     Component.onDestruction: {
-        rootItem.__propagated.header.visibleChanged.disconnect(fixTopMargin);
-        rootItem.__propagated.header.heightChanged.disconnect(fixTopMargin);
+        if (rootItem && rootItem.__propagated && rootItem.__propagated.header) {
+            rootItem.__propagated.header.visibleChanged.disconnect(fixTopMargin);
+            rootItem.__propagated.header.heightChanged.disconnect(fixTopMargin);
+        }
     }
 
     function fixTopMargin() {

=== modified file 'src/Ubuntu/Components/qmldir'
--- src/Ubuntu/Components/qmldir	2015-12-17 09:13:29 +0000
+++ src/Ubuntu/Components/qmldir	2015-12-17 13:53:59 +0000
@@ -130,7 +130,7 @@
 OrientationHelper 1.3 1.3/OrientationHelper.qml
 UbuntuNumberAnimation 1.3 1.3/UbuntuNumberAnimation.qml
 PullToRefresh 1.3 1.3/PullToRefresh.qml
-UbuntuListView 1.3 1.3/UbuntuListView11.qml
+UbuntuListView 1.3 1.3/UbuntuListView.qml
 Captions 1.3 1.3/Captions.qml
 internal ColorUtils 1.3/colorUtils.js
 DateUtils 1.3 1.3/dateUtils.js

=== modified file 'tests/autopilot/ubuntuuitoolkit/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/__init__.py	2015-05-28 15:23:13 +0000
+++ tests/autopilot/ubuntuuitoolkit/__init__.py	2015-12-17 13:53:59 +0000
@@ -48,6 +48,7 @@
     'ToolkitException',
     'ubuntu_scenarios',
     'UbuntuListView11',
+    'UbuntuListView',
     'UbuntuUIToolkitCustomProxyObjectBase',
 ]
 
@@ -86,4 +87,5 @@
     ToolkitException,
     UbuntuUIToolkitCustomProxyObjectBase,
     UbuntuListView11,
+    UbuntuListView,
 )

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2015-09-30 14:46:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2015-12-17 13:53:59 +0000
@@ -44,6 +44,7 @@
     'Toolbar',
     'ToolkitException',
     'UbuntuListView11',
+    'UbuntuListView',
     'UbuntuUIToolkitCustomProxyObjectBase',
 ]
 
@@ -90,5 +91,6 @@
 from ubuntuuitoolkit._custom_proxy_objects._textfield import TextField
 from ubuntuuitoolkit._custom_proxy_objects._toolbar import Toolbar
 from ubuntuuitoolkit._custom_proxy_objects._ubuntulistview import (
-    UbuntuListView11
+    UbuntuListView11,
+    UbuntuListView,
 )

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py	2015-09-22 15:56:35 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py	2015-12-17 13:53:59 +0000
@@ -45,3 +45,7 @@
             refresh.wait_for_refresh()
             return True
         return False
+
+
+class UbuntuListView(UbuntuListView11):
+    """Autopilot helper for the UbuntuListView 1.3."""

=== added file 'tests/unit_x11/tst_components/tst_ubuntulistview13.qml'
--- tests/unit_x11/tst_components/tst_ubuntulistview13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_ubuntulistview13.qml	2015-12-17 13:53:59 +0000
@@ -0,0 +1,105 @@
+/*
+ * 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.4
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.3
+
+Item {
+    width: units.gu(40)
+    height: units.gu(60)
+
+    ListModel {
+        id: dummyModel
+        Component.onCompleted: {
+            reload();
+        }
+        function reload() {
+            clear();
+            for (var i = 0; i < 20; ++i) {
+                dummyModel.append({idx: i});
+            }
+        }
+    }
+
+    // timer used to simulate the model refresh
+    Timer {
+        id: refreshTimer
+        interval: 500
+        onTriggered: {
+            dummyModel.reload();
+        }
+    }
+
+    UbuntuListView {
+        id: ubuntuListView
+        anchors.fill: parent
+        clip: true
+        model: dummyModel
+
+        pullToRefresh {
+            refreshing: refreshTimer.running
+            onRefresh: refreshTimer.restart()
+        }
+
+        delegate: ListItem {
+            id: expandable
+            Label { text: "item " + index }
+        }
+    }
+
+    UbuntuTestCase {
+        name: "UbuntuListView"
+        when: windowShown
+
+        SignalSpy {
+            id: refreshSpy
+            signalName: "onRefresh"
+        }
+
+        function initTestCase() {
+            tryCompare(dummyModel, "count", 20);
+        }
+
+        function init() {
+            waitForRendering(ubuntuListView, 1000);
+        }
+
+        function cleanup() {
+            // scroll the ListView back to top
+            ubuntuListView.positionViewAtIndex(0, ListView.Beginning);
+            refreshSpy.clear();
+            refreshSpy.target = null;
+            ubuntuListView.pullToRefresh.enabled = false;
+        }
+
+        function test_0_defaults() {
+            verify(ubuntuListView.hasOwnProperty("pullToRefresh"), "PullToRefresh is missing");
+            compare(ubuntuListView.pullToRefresh.enabled, false, "PullToRefresh functionality is disabled by default");
+        }
+
+        function test_pullToRefresh_manual_refresh() {
+            ubuntuListView.pullToRefresh.enabled = true;
+            refreshSpy.target = ubuntuListView.pullToRefresh
+            var x = ubuntuListView.width / 2;
+            mouseDrag(ubuntuListView, x, units.gu(1), 0, ubuntuListView.height);
+            refreshSpy.wait();
+            tryCompareFunction(function() { return ubuntuListView.pullToRefresh.refreshing; }, false, 1000);
+            waitForRendering(ubuntuListView, 1000);
+        }
+    }
+}