Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-set-shapes-debug-description into lp:ubuntu-ui-toolkit

[Loïc Molinari]

Set QSGNode debug description on the shape-based nodes to ease renderer debugging.

Set QSGNode debug description on the shape-based nodes to ease renderer debugging.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1459
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2194/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2008
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/757
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1770
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2006
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2006/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19231
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/610
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/900
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/900/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2015-03-02 13:55:42 +0000
+++ debian/control	2015-03-27 11:25:30 +0000
@@ -47,6 +47,7 @@
                locales,
                suru-icon-theme,
                uuid-runtime,
+               python-autopilot (>= 1.4),
                python3-sphinx,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-ui-toolkit

=== modified file 'documentation/autopilot-helpers/conf.py'
--- documentation/autopilot-helpers/conf.py	2015-01-26 16:22:07 +0000
+++ documentation/autopilot-helpers/conf.py	2015-03-27 11:25:30 +0000
@@ -19,7 +19,7 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.join(os.path.abspath('../..'), 'tests/autopilot/'))
 
 # -- General configuration ------------------------------------------------
 

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Sliders.qml'
--- examples/ubuntu-ui-toolkit-gallery/Sliders.qml	2015-03-03 13:20:06 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Sliders.qml	2015-03-27 11:25:30 +0000
@@ -69,5 +69,30 @@
                 font.weight: Font.Light
             }
         }
+
+        TemplateFlow {
+            title: i18n.tr("Labels")
+
+            Slider {
+                id: longBubbleSlider
+                objectName: "slider_long_bubble"
+                width: parent.width
+                value: 50
+                minimumValue: 0
+                maximumValue: 100
+                function formatValue(v) {
+                    if (v < maximumValue/4)
+                        return i18n.tr("Small")
+                    else if (v < maximumValue/1.5)
+                        return i18n.tr("Medium")
+                    else
+                        return i18n.tr("Large")
+                }
+            }
+            Label {
+                text: i18n.tr("Actual value: %1").arg(longBubbleSlider.value)
+                font.weight: Font.Light
+            }
+        }
     }
 }

=== removed file 'examples/ubuntu-ui-toolkit-gallery/Toolbar.qml'
--- examples/ubuntu-ui-toolkit-gallery/Toolbar.qml	2015-03-11 17:10:20 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Toolbar.qml	1970-01-01 00:00:00 +0000
@@ -1,49 +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.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-Template {
-    objectName: "popoversTemplate"
-
-    tools: ToolbarItems {
-        ToolbarButton {
-            text: "Call"
-            iconName: "call-start"
-        }
-        ToolbarButton {
-            text: i18n.tr("Share")
-            iconName: "share"
-        }
-        ToolbarButton {
-            iconName: "settings"
-        }
-        ToolbarButton {
-            iconName: "speaker"
-        }
-    }
-
-    TemplateSection {
-        className: "Toolbar"
-        documentation: "qml-ubuntu-components-toolbaritems.html".arg(className.toLowerCase())
-
-        TemplateRow {
-            title: i18n.tr("See below")
-        }
-    }
-}

=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2015-03-03 13:20:06 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2015-03-27 11:25:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-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
@@ -39,11 +39,6 @@
         source: "Toggles.qml"
     }
     ListElement {
-        objectName: "toolbarElement"
-        label: "Toolbar"
-        source: "Toolbar.qml"
-    }
-    ListElement {
         objectName: "buttonsElement"
         label: "Buttons"
         source: "Buttons.qml"

=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
--- modules/Ubuntu/Components/TextCursor.qml	2015-03-10 11:49:27 +0000
+++ modules/Ubuntu/Components/TextCursor.qml	2015-03-27 11:25:30 +0000
@@ -54,7 +54,7 @@
         var flickable = handler.main;
         do {
             flickable = flickable.parent;
-        } while (!flickable.contentY && flickable != fakeCursor.parent);
+        } while (flickable && !flickable.contentY && flickable != fakeCursor.parent);
         return fakeCursor.parent.mapFromItem(handler.main, cursorItem.x, cursorItem.y).y
     }
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2015-03-10 12:16:04 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2015-03-27 11:25:30 +0000
@@ -87,7 +87,10 @@
     BubbleShape {
         id: bubbleShape
 
-        width: units.gu(8)
+        property real minimumWidth: units.gu(8)
+        property real horizontalPadding: units.gu(1)
+
+        width: Math.max(minimumWidth, label.implicitWidth + 2*horizontalPadding)
         height: units.gu(6)
 
         // FIXME: very temporary implementation

=== modified file 'modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp'
--- modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2015-02-26 15:09:23 +0000
+++ modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2015-03-27 11:25:30 +0000
@@ -292,6 +292,12 @@
     }
 }
 
+void AlarmDataAdapter::copyAlarmData(const UCAlarm &other)
+{
+    AlarmDataAdapter *pOther = static_cast<AlarmDataAdapter*>(AlarmDataAdapter::get(&other));
+    setData(pOther->data());
+}
+
 void AlarmDataAdapter::adjustDowSettings(UCAlarm::AlarmType type, UCAlarm::DaysOfWeek days)
 {
     QOrganizerItemRecurrence old = event.detail(QOrganizerItemDetail::TypeRecurrence);
@@ -369,13 +375,6 @@
     }
 }
 
-void AlarmDataAdapter::copyData(const UCAlarm &other)
-{
-    AlarmDataAdapter *pOther = static_cast<AlarmDataAdapter*>(AlarmDataAdapter::get(&other));
-    setData(pOther->data());
-}
-
-
 /*-----------------------------------------------------------------------------
  * Adaptation layer for Alarms.
  */

=== modified file 'modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h'
--- modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2015-02-26 15:09:23 +0000
+++ modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2015-03-27 11:25:30 +0000
@@ -58,6 +58,7 @@
     bool wait(int msec);
     void completeSave();
     void completeCancel();
+    void copyAlarmData(const UCAlarm &other);
 
 // adaptation specific data
     void adjustDowSettings(UCAlarm::AlarmType type, UCAlarm::DaysOfWeek days);
@@ -69,7 +70,6 @@
         return event;
     }
     void setData(const QOrganizerTodo &data);
-    void copyData(const UCAlarm &other);
 
 protected:
     QOrganizerTodo event;
@@ -108,7 +108,7 @@
         UCAlarm *oldAlarm = takeAt(index);
         // copy the other alarm data
         AlarmDataAdapter *pAlarm = static_cast<AlarmDataAdapter*>(AlarmDataAdapter::get(oldAlarm));
-        pAlarm->copyData(alarm);
+        pAlarm->copyAlarmData(alarm);
         // and insert it back
         QDateTime dt = oldAlarm->date();
         QOrganizerItemId id = oldAlarm->cookie().value<QOrganizerItemId>();
@@ -123,7 +123,7 @@
         QOrganizerItemId id = alarm.cookie().value<QOrganizerItemId>();
         idHash.insert(id, dt);
         UCAlarm *newAlarm = new UCAlarm;
-        static_cast<AlarmDataAdapter*>(AlarmDataAdapter::get(newAlarm))->copyData(alarm);
+        UCAlarmPrivate::get(newAlarm)->copyAlarmData(alarm);
         data.insert(QPair<QDateTime, QOrganizerItemId>(dt, id), newAlarm);
         return indexOf(id);
     }
@@ -140,6 +140,8 @@
         UCAlarm *alarm = takeAt(index);
         delete alarm;
     }
+
+protected:
     // removes alarm data at index and returns the alarm pointer
     UCAlarm *takeAt(int index)
     {

=== modified file 'modules/Ubuntu/Components/plugin/ucalarm_p.h'
--- modules/Ubuntu/Components/plugin/ucalarm_p.h	2014-12-02 11:21:22 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm_p.h	2015-03-27 11:25:30 +0000
@@ -59,6 +59,7 @@
     virtual void reset() = 0;
     virtual void completeSave() = 0;
     virtual void completeCancel() = 0;
+    virtual void copyAlarmData(const UCAlarm &other) = 0;
 
     // common privates
     UCAlarm *q_ptr;

=== modified file 'modules/Ubuntu/Components/plugin/ucalarmmodel.cpp'
--- modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2015-03-27 11:25:30 +0000
@@ -22,6 +22,7 @@
 #include "alarmmanager_p.h"
 #include <QtQml/QQmlPropertyMap>
 #include <QtQml/QQmlInfo>
+#include <QtQml/QQmlEngine>
 
 /*!
  * \qmltype AlarmModel
@@ -213,7 +214,14 @@
  */
 UCAlarm* UCAlarmModel::get(int index)
 {
-    return AlarmManager::instance().alarmAt(index);
+    UCAlarm *alarm = AlarmManager::instance().alarmAt(index);
+    if (alarm) {
+        UCAlarm *tempAlarm = new UCAlarm(this);
+        UCAlarmPrivate::get(tempAlarm)->copyAlarmData(*alarm);
+        alarm = tempAlarm;
+        QQmlEngine::setObjectOwnership(tempAlarm, QQmlEngine::JavaScriptOwnership);
+    }
+    return alarm;
 }
 
 /*!

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-03-10 13:25:19 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-03-27 11:25:30 +0000
@@ -162,6 +162,9 @@
     m_geometry.setVertexDataPattern(vertexDataPattern);
     setMaterial(&m_material);
     setGeometry(&m_geometry);
+#ifdef QSG_RUNTIME_DESCRIPTION
+    qsgnode_set_description(this, QLatin1String("ubuntushape"));
+#endif
 }
 
 // static

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-03-10 12:16:04 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-03-27 11:25:30 +0000
@@ -67,6 +67,9 @@
     m_geometry.setVertexDataPattern(ShapeNode::vertexDataPattern);
     setMaterial(&m_material);
     setGeometry(&m_geometry);
+#ifdef QSG_RUNTIME_DESCRIPTION
+    qsgnode_set_description(this, QLatin1String("ubuntushapeoverlay"));
+#endif
 }
 
 // static

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py	2015-02-17 06:57:53 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py	2015-03-27 11:25:30 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+# Copyright (C) 2012, 2013, 2014, 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,8 +15,13 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import logging
+import time
 
-from autopilot import logging as autopilot_logging
+from autopilot import (
+    input,
+    logging as autopilot_logging,
+    platform
+)
 from autopilot.introspection import dbus
 
 from ubuntuuitoolkit._custom_proxy_objects import _common, _flickable
@@ -86,12 +91,6 @@
         containers = self._get_containers()
         return self._is_child_visible(child, containers)
 
-    def _get_first_item(self):
-        """Returns the first item from the ListView."""
-        items = self.get_children_by_type('QQuickItem')[0].get_children()
-        items = sorted(items, key=lambda item: item.globalRect.y)
-        return items[0]
-
     @autopilot_logging.log_action(logger.info)
     def enable_select_mode(self):
         """Default implementation to enable select mode. Performs a long tap
@@ -107,3 +106,119 @@
         except dbus.StateNotFoundError:
             raise _common.ToolkitException(
                 'ListView delegate is not a ListItem or not in selectMode')
+
+    def _get_first_item(self):
+        """Returns the first item from the ListView."""
+        items = self.get_children_by_type('QQuickItem')[0].get_children()
+        items = sorted(items, key=lambda item: item.globalRect.y)
+        return items[0]
+
+    @autopilot_logging.log_action(logger.info)
+    def drag_item(self, from_index, to_index):
+        if platform.model() != 'Desktop':
+            raise NotImplementedError(
+                'Drag does not work on the phone because of bug #1266601')
+
+        self._enable_drag_mode()
+
+        both_items_visible = (
+            self._is_drag_panel_visible(from_index) and
+            self._is_drag_panel_visible(to_index))
+        if both_items_visible:
+            self._drag_both_items_visible(from_index, to_index)
+        else:
+            self._drag_item_with_pagination(from_index, to_index)
+        # wait 1 second till all animations complete
+        time.sleep(1)
+
+    @autopilot_logging.log_action(logger.debug)
+    def _enable_drag_mode(self):
+        self.swipe_to_top()
+        first_item = self._get_first_item()
+        self.pointing_device.click_object(first_item, press_duration=2)
+        self._get_drag_panel(wait=True)
+
+    def _is_drag_panel_visible(self, index):
+        try:
+            drag_panel = self._get_drag_panel(index)
+        except:
+            return False
+        else:
+            return self.is_child_visible(drag_panel)
+
+    def _get_drag_panel(self, index=0, wait=False):
+        select_method = self.wait_select_single if wait else self.select_single
+        try:
+            return select_method(
+                'QQuickItem', objectName='drag_panel{}'.format(index))
+        except ValueError:
+            # While we are dragging, each panel item is duplicated.
+            # A ValueError will be raised in this scenario. We can take
+            # any of the returned elements, as they have the same position.
+            return self.select_many(
+                'QQuickItem', objectName='drag_panel{}'.format(index))[0]
+
+    def _drag_both_items_visible(self, from_index, to_index):
+        from_drag_handler = self._get_drag_panel(from_index)
+        to_drag_handler = self._get_drag_panel(to_index)
+        start_x, start_y = input.get_center_point(from_drag_handler)
+        stop_x, stop_y = input.get_center_point(to_drag_handler)
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+
+    def _drag_item_with_pagination(self, from_index, to_index):
+        # the from_index might be invisible
+        from_item = self._find_element('listitem{}'.format(from_index))
+        from_item.swipe_into_view()
+        from_drag_panel = self._get_drag_panel(from_index)
+        containers = self._get_containers()
+        if from_index < to_index:
+            self._drag_downwards(from_drag_panel, to_index, containers)
+        else:
+            self._drag_upwards(from_drag_panel, to_index, containers)
+
+    def _drag_downwards(self, drag_panel, to_index, containers):
+        visible_bottom = _flickable._get_visible_container_bottom(
+            containers)
+        start_x, start_y = input.get_center_point(drag_panel)
+
+        self.pointing_device.move(start_x, start_y)
+        self.pointing_device.press()
+        stop_x = start_x
+        self.pointing_device.move(stop_x, visible_bottom)
+        to_drag_panel = self._get_drag_panel(to_index, wait=True)
+        while not self.is_child_visible(to_drag_panel):
+            pass
+        # stop moving
+        h = to_drag_panel.height / 2
+        self.pointing_device.move(stop_x, self.pointing_device.y - h)
+        # move under the item with the to_index
+        to_drag_panel = self._get_drag_panel(to_index - 1)
+        stop_y = (
+            to_drag_panel.globalRect.y +
+            to_drag_panel.globalRect.height)
+        self.pointing_device.move(stop_x, stop_y)
+        self.pointing_device.release()
+
+    def _drag_upwards(self, handler, to_index, containers):
+        visible_top = _flickable._get_visible_container_top(
+            containers)
+        start_x, start_y = input.get_center_point(handler)
+
+        self.pointing_device.move(start_x, start_y)
+        self.pointing_device.press()
+        stop_x = start_x
+        # Header alters topMargin, therefore drag only till that edge
+        self.pointing_device.move(stop_x, visible_top + self.topMargin)
+        to_drag_panel = self._get_drag_panel(to_index, wait=True)
+        while not self.is_child_visible(to_drag_panel):
+            pass
+        # stop moving
+        h = to_drag_panel.height / 2
+        self.pointing_device.move(stop_x, self.pointing_device.y + h)
+        # move after the item with the to_index
+        to_drag_panel = self._get_drag_panel(to_index)
+        stop_y = (
+            to_drag_panel.globalRect.y +
+            to_drag_panel.globalRect.height)
+        self.pointing_device.move(stop_x, stop_y)
+        self.pointing_device.release()

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListViewWithLiveDraggingTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListViewWithLiveDraggingTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListViewWithLiveDraggingTestCase.qml	2015-03-27 11:25:30 +0000
@@ -0,0 +1,62 @@
+/*
+ * 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
+ * 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.2
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Page {
+        id: testPage
+        objectName: "test_page"
+        title: listView.ViewItems.dragMode ? "In drag mode" : "Test app"
+        ListView {
+            id: listView
+            objectName: "test_view"
+            ViewItems.objectName: "test_attached"
+            ViewItems.onDragUpdated: {
+                if (event.status == ListItemDrag.Moving) {
+                    model.move(event.from, event.to, 1)
+                }
+            }
+
+            anchors.fill: parent
+            model: ListModel {
+                Component.onCompleted: {
+                    for (var i = 0; i < 25; i++) {
+                        append({data: i});
+                    }
+                }
+            }
+            moveDisplaced: Transition {
+                UbuntuNumberAnimation {
+                    properties: "y";
+                }
+            }
+            delegate: ListItem {
+                objectName: "listitem" + index
+                ListView.objectName: "bumm"
+                onPressAndHold: ListView.view.ViewItems.dragMode = !ListView.view.ViewItems.dragMode
+                Label {
+                    text: "List item #" + modelData
+                }
+            }
+        }
+    }
+}

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListViewWithoutLiveDraggingTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListViewWithoutLiveDraggingTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListViewWithoutLiveDraggingTestCase.qml	2015-03-27 11:25:30 +0000
@@ -0,0 +1,65 @@
+/*
+ * 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
+ * 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.2
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Page {
+        id: testPage
+        objectName: "test_page"
+        title: listView.ViewItems.dragMode ? "In drag mode" : "Test app"
+        ListView {
+            id: listView
+            objectName: "test_view"
+            ViewItems.objectName: "test_attached"
+            ViewItems.onDragUpdated: {
+                if (event.status == ListItemDrag.Moving) {
+                    // disable live move.
+                    event.accept = false;
+                } else if (event.status == ListItemDrag.Dropped) {
+                    model.move(event.from, event.to, 1)
+                }
+            }
+
+            anchors.fill: parent
+            model: ListModel {
+                Component.onCompleted: {
+                    for (var i = 0; i < 25; i++) {
+                        append({data: i});
+                    }
+                }
+            }
+            moveDisplaced: Transition {
+                UbuntuNumberAnimation {
+                    properties: "y";
+                }
+            }
+            delegate: ListItem {
+                objectName: "listitem" + index
+                ListView.objectName: "bumm"
+                onPressAndHold: ListView.view.ViewItems.dragMode = !ListView.view.ViewItems.dragMode
+                Label {
+                    text: "List item #" + modelData
+                }
+            }
+        }
+    }
+}

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2015-03-27 11:25:30 +0000
@@ -19,6 +19,10 @@
 except ImportError:
     import mock
 
+import os
+
+import testscenarios
+from autopilot import platform
 from autopilot.introspection import dbus
 
 import ubuntuuitoolkit
@@ -224,3 +228,75 @@
 
         self.list_view.click_element('testListElement9')
         self.assertEqual(self.label.text, 'testListElement9')
+
+
+class QQuickListViewDraggingBaseTestCase(tests.QMLFileAppTestCase):
+
+    def setUp(self):
+        path = os.path.abspath(__file__)
+        dir_path = os.path.dirname(path)
+        self.test_qml_file_path = os.path.join(
+            dir_path, self.qml_file_name)
+
+        super(QQuickListViewDraggingBaseTestCase, self).setUp()
+        self.list_view = self.main_view.select_single(
+            ubuntuuitoolkit.QQuickListView, objectName='test_view')
+
+
+class QQuickListViewDraggingTestCase(QQuickListViewDraggingBaseTestCase):
+
+    qml_file_name = 'test_listitem.ListViewWithLiveDraggingTestCase.qml'
+
+    def test_long_press_must_enable_drag_mode(self):
+        list_item = self.list_view.select_single(
+            'UCListItem', objectName='listitem0')
+        self.assertFalse(list_item.dragMode)
+        self.list_view._enable_drag_mode()
+        self.assertTrue(list_item.dragMode)
+
+
+class QQuickListViewReorderingTestCase(QQuickListViewDraggingBaseTestCase):
+
+    dragging_scenarios = [
+        ('with live dragging', {
+            'qml_file_name': (
+                'test_listitem.ListViewWithLiveDraggingTestCase.qml')}),
+        ('without live dragging', {
+            'qml_file_name': (
+                'test_listitem.ListViewWithoutLiveDraggingTestCase.qml')}),
+    ]
+    reorder_scenarios = [
+        ('both items visible, to bottom', {'from_index': 0, 'to_index': 1}),
+        ('both items visible, to top', {'from_index': 1, 'to_index': 0}),
+        ('both items visible, to bottom, first non visible', {
+            'from_index': 0, 'to_index': 7}),
+        ('to item not visible, to top', {'from_index': 15, 'to_index': 0}),
+        ('to item not visible, to middle down', {
+            'from_index': 0, 'to_index': 15}),
+        ('to item not visible, to bottom', {'from_index': 0, 'to_index': 24})
+    ]
+    scenarios = testscenarios.multiply_scenarios(
+        dragging_scenarios, reorder_scenarios)
+
+    def _find_item(self, index):
+        object_name = 'listitem{}'.format(index)
+        try:
+            return self.list_view.select_single(objectName=object_name)
+        except dbus.StateNotFoundError:
+            return self.list_view._find_element(object_name)
+
+    def _get_item_text(self, index):
+        item = self._find_item(index)
+        return item.select_single('Label').text
+
+    def test_drag_item_must_reorder_list(self):
+        if platform.model() != 'Desktop':
+            self.skipTest(
+                'Drag does not work on the phone because of bug #1266601')
+
+        original_from_text = self._get_item_text(self.from_index)
+
+        self.list_view.drag_item(self.from_index, self.to_index)
+
+        self.assertEqual(
+            original_from_text, self._get_item_text(self.to_index))

=== modified file 'tests/unit_x11/tst_components/tst_components.pro'
--- tests/unit_x11/tst_components/tst_components.pro	2014-08-01 15:26:23 +0000
+++ tests/unit_x11/tst_components/tst_components.pro	2015-03-27 11:25:30 +0000
@@ -7,4 +7,5 @@
 SOURCES += tst_components.cpp tabsmodel.cpp
 HEADERS += tabsmodel.h
 
-OTHER_FILES += $$system(ls *.qml)
+OTHER_FILES += $$system(ls *.qml) \
+    tst_stress_alarmmodel.qml

=== added file 'tests/unit_x11/tst_components/tst_stress_alarmmodel.qml'
--- tests/unit_x11/tst_components/tst_stress_alarmmodel.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_stress_alarmmodel.qml	2015-03-27 11:25:30 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright 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 QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.2
+
+MainView {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    AlarmModel {
+        id: model
+    }
+
+    Alarm {
+        id: testAlarm
+    }
+
+    UbuntuTestCase {
+        name: "AlarmModelStressTest"
+        when: windowShown
+
+        SignalSpy {
+            id: modelSpy
+            signalName: "modelReset"
+            target: model
+        }
+
+        property string testAlarmMessage: "test_"
+
+        function createAlarm(pattern, idx) {
+            testAlarm.reset();
+            testAlarm.message = pattern + idx;
+            var dt = new Date();
+            dt.setMinutes(dt.getMinutes() + 10);
+            testAlarm.date = dt;
+            modelSpy.signalName = "rowsInserted";
+            testAlarm.save();
+            modelSpy.wait();
+        }
+
+        function clearTestAlarms(pattern) {
+            var i = 0;
+            modelSpy.signalName = "rowsRemoved";
+            while (i < model.count) {
+                var alarm = model.get(i);
+                // this will fail if get() returns NULL
+                if (alarm.message.indexOf(pattern) == 0) {
+                    alarm.cancel();
+                    modelSpy.wait();
+                    modelSpy.clear();
+                    i = 0;
+                } else {
+                    i++;
+                }
+            }
+        }
+
+        // need to create a huge amount of alarms then cleanone part of it
+        function initTestCase() {
+            for (var i = 0; i < 20; i++) {
+                createAlarm(testAlarmMessage, i)
+            }
+            for (var i = 0; i < 40; i++) {
+                createAlarm("testAlarm_", i)
+            }
+        }
+        function cleanupTestCase() {
+            clearTestAlarms(testAlarmMessage);
+        }
+
+        function test_remove_alarms()
+        {
+            clearTestAlarms("testAlarm_");
+        }
+    }
+}