Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/autopilot-nolivedragging into lp:ubuntu-ui-toolkit/staging

[Leo Arias]

Added a scenario for autopilot tests without live dragging.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1454
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1568/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1837
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/295
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/298
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/298/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/295
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1835
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1835/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18956

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

review: Needs Fixing (continuous-integration)

[Brendan Donegan (brendan-donegan)]

Looks good from a code point of view. I'll leave sorting out the tests to someone else.

review: Approve

[Zsombor Egri (zsombi)]

Looks good, thanks! CPO now fully covers the ListItem functionality. Thx again!!!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== renamed file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListViewDraggingTestCase.qml' => 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListViewWithLiveDraggingTestCase.qml'
=== 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-18 17:14:29 +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-18 17:14:29 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2015-03-18 17:14:29 +0000
@@ -21,6 +21,7 @@
 
 import os
 
+import testscenarios
 from autopilot import platform
 from autopilot.introspection import dbus
 
@@ -231,12 +232,12 @@
 
 class QQuickListViewDraggingBaseTestCase(tests.QMLFileAppTestCase):
 
-    path = os.path.abspath(__file__)
-    dir_path = os.path.dirname(path)
-    test_qml_file_path = os.path.join(
-        dir_path, 'test_listitem.ListViewDraggingTestCase.qml')
-
     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')
@@ -244,6 +245,8 @@
 
 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')
@@ -254,7 +257,15 @@
 
 class QQuickListViewReorderingTestCase(QQuickListViewDraggingBaseTestCase):
 
-    scenarios = [
+    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', {
@@ -264,6 +275,8 @@
             '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)