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

[Zsombor Egri]

Fixing swiping over active components.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1588
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2074/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/804
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/804/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/801

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

review: Approve (continuous-integration)

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

1589. By Zsombor Egri on 2015-07-30

test added

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1589
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2075/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/803/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/805/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/802/console

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

review: Needs Fixing (continuous-integration)

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

1590. By Zsombor Egri on 2015-07-30

commenting functions

1591. By Zsombor Egri on 2015-07-31

API changed

1592. By Zsombor Egri on 2015-07-31

adapting old ListItem tests to use common ListItemTestCase

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1592
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2076/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/804
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/806
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/806/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/803

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Me thinks tests/unit_x11/tst_components/tst_listitem_extras.qml should test that the Button click works, if clicked, not swiped - it only tests right now that swiping doesn't trigger it. But we should verify that clicks will be triggered as expected (it works in manual testing).

Btw nice refactor on the listitem testing.

review: Needs Fixing

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

1593. By Zsombor Egri on 2015-08-04

stage sync

1594. By Zsombor Egri on 2015-08-04

fixing test case

[Zsombor Egri (zsombi)]

> Me thinks tests/unit_x11/tst_components/tst_listitem_extras.qml should test
> that the Button click works, if clicked, not swiped - it only tests right now
> that swiping doesn't trigger it. But we should verify that clicks will be
> triggered as expected (it works in manual testing).

Clicks on the active item should not be triggered when swipe happens. Clicks on ListItem either. Click on active items are tested in tst_listitem.qml

>
> Btw nice refactor on the listitem testing.

I think it would be nice if we'd create these "CPO"s for our needs as it would help us creating tests.. of course the best would be if we wouldn't need to import UITK at all in these CPOs...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1594
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2084/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/812
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/814
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/814/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/811

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Indeed we should have more of these CPO's.

Thanks for fixing the test!

review: Approve

=== modified file 'components.api'
--- components.api	2015-07-30 13:52:23 +0000
+++ components.api	2015-08-04 20:09:32 +0000
@@ -1352,7 +1352,7 @@
     function var findInvisibleChild(var obj, var objectName)
     function var findChildWithProperty(var item, var property, var value)
     function var centerOf(var item)
-    function var mouseMoveSlowly(var item, var x, var y, var dx, var dy, var steps, var stepdelay)
+    function var mouseMoveSlowly(var item, var x, var y, var dx, var dy, var steps, var stepdelay, var buttons)
     function var flick(var item, var x, var y, var dx, var dy, var pressTimeout, var steps, var button, var modifiers, var delay)
     function var mouseLongPress(var item, var x, var y, var button, var modifiers, var delay)
     function var tryCompareFunction(var func, var expectedResult, var timeout)

=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2015-07-28 19:31:13 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2015-08-04 20:09:32 +0000
@@ -1053,6 +1053,25 @@
     return oldNode;
 }
 
+// grabs the left mouse button event by turning highlight on, and triggering
+// swipe events; child items should no longer get mouse events
+void UCListItemPrivate::grabLeftButtonEvents(QMouseEvent *event)
+{
+    Q_Q(UCListItem);
+    button = event->button();
+    // create style instance
+    loadStyleItem();
+    setHighlighted(true);
+    lastPos = pressedPos = event->localPos();
+    // connect the Flickable to know when to rebound
+    listenToRebind(true);
+    if (swiped && parentAttached) {
+        parentAttached->disableInteractive(q, true);
+    }
+    // stop any ongoing animation!
+    swipeEvent(event->localPos(), UCSwipeEvent::Started);
+}
+
 void UCListItem::mousePressEvent(QMouseEvent *event)
 {
     UCStyledItemBase::mousePressEvent(event);
@@ -1063,17 +1082,7 @@
         return;
     }
     if (d->canHighlight(event) && !d->highlighted && event->button() == Qt::LeftButton) {
-        // create style instance
-        d->loadStyleItem();
-        d->setHighlighted(true);
-        d->lastPos = d->pressedPos = event->localPos();
-        // connect the Flickable to know when to rebound
-        d->listenToRebind(true);
-        if (d->swiped && d->parentAttached) {
-            d->parentAttached->disableInteractive(this, true);
-        }
-        // stop any ongoing animation!
-        d->swipeEvent(event->localPos(), UCSwipeEvent::Started);
+        d->grabLeftButtonEvents(event);
     }
     // accept the event so we get the rest of the events as well
     event->setAccepted(true);
@@ -1125,35 +1134,44 @@
     d->setHighlighted(false);
 }
 
-void UCListItem::mouseReleaseEvent(QMouseEvent *event)
+// ungrabs any previously grabbed left mouse button event
+void UCListItemPrivate::ungrabLeftButtonEvents(QMouseEvent *event)
 {
-    UCStyledItemBase::mouseReleaseEvent(event);
-    Q_D(UCListItem);
-    d->button = Qt::NoButton;
+    Q_Q(UCListItem);
     // set released
-    if (d->highlighted) {
+    if (highlighted) {
         // unblock ascending Flickables
-        d->listenToRebind(false);
-        if (d->parentAttached) {
-            d->parentAttached->disableInteractive(this, false);
+        listenToRebind(false);
+        if (parentAttached) {
+            parentAttached->disableInteractive(q, false);
         }
 
-        if (!d->suppressClick) {
+        if (!suppressClick) {
             // emit clicked only if not swiped
-            if (!d->swiped) {
-                Q_EMIT clicked();
-                if (d->mainAction) {
-                    Q_EMIT d->mainAction->trigger(d->index());
+            if (!swiped) {
+                Q_EMIT q->clicked();
+                if (mainAction) {
+                    Q_EMIT mainAction->trigger(index());
                 }
             }
-            d->snapOut();
+            snapOut();
         } else {
             // inform style about mouse/touch release
-            d->swipeEvent(event->localPos(), UCSwipeEvent::Finished);
-            d->suppressClick = false;
-            d->setHighlighted(false);
+            swipeEvent(event->localPos(), UCSwipeEvent::Finished);
+            suppressClick = false;
+            setHighlighted(false);
         }
     }
+    button = Qt::NoButton;
+}
+
+void UCListItem::mouseReleaseEvent(QMouseEvent *event)
+{
+    UCStyledItemBase::mouseReleaseEvent(event);
+    Q_D(UCListItem);
+    d->ungrabLeftButtonEvents(event);
+    // make sure we ungrab the mouse!
+    ungrabMouse();
 }
 
 void UCListItem13::mouseReleaseEvent(QMouseEvent *event)
@@ -1162,6 +1180,15 @@
         UCListItem::mouseReleaseEvent(event);
 }
 
+// returns true if the mouse is swiped over the threshold value
+bool UCListItemPrivate::swipedOverThreshold(const QPointF &mousePos, const QPointF relativePos)
+{
+    qreal threshold = UCUnits::instance().gu(xAxisMoveThresholdGU);
+    qreal mouseX = mousePos.x();
+    qreal pressedX = relativePos.x();
+    return ((mouseX < (pressedX - threshold)) || (mouseX > (pressedX + threshold)));
+}
+
 void UCListItem::mouseMoveEvent(QMouseEvent *event)
 {
     Q_D(UCListItem);
@@ -1177,16 +1204,14 @@
     if (d->button == Qt::LeftButton && d->highlighted && !d->swiped && (d->leadingActions || d->trailingActions)) {
         // check if we can initiate the drag at all
         // only X direction matters, if Y-direction leaves the threshold, but X not, the tug is not valid
-        qreal threshold = UCUnits::instance().gu(d->xAxisMoveThresholdGU);
-        qreal mouseX = event->localPos().x();
-        qreal pressedX = d->pressedPos.x();
-
-        if ((mouseX < (pressedX - threshold)) || (mouseX > (pressedX + threshold))) {
+        if (d->swipedOverThreshold(event->localPos(), d->pressedPos)) {
             // the press went out of the threshold area, enable move, if the direction allows it
             d->lastPos = event->localPos();
             if (d->parentAttached) {
                 d->parentAttached->disableInteractive(this, true);
             }
+            qreal mouseX = event->localPos().x();
+            qreal pressedX = d->pressedPos.x();
             bool doSwipe = (d->leadingActions && (mouseX > pressedX)) ||
                            (d->trailingActions && (mouseX < pressedX));
             d->setSwiped(doSwipe);
@@ -1208,20 +1233,38 @@
 bool UCListItem::childMouseEventFilter(QQuickItem *child, QEvent *event)
 {
     QEvent::Type type = event->type();
+    Q_D(UCListItem);
     if (type == QEvent::MouseButtonPress) {
         // suppress click event if pressed over an active area, except Text, which can also handle
         // mouse clicks when content is an URL
         QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
         if (child->isEnabled() && (child->acceptedMouseButtons() & mouse->button()) && !qobject_cast<QQuickText*>(child)) {
-            Q_D(UCListItem);
             // suppress click
             d->suppressClick = true;
             // listen for flickable to be able to rebind if movement started there!
             d->listenToRebind(true);
+            // if left button pressed, remember the position
+            if (mouse->button() == Qt::LeftButton) {
+                d->pressedPos = mapFromItem(child, mouse->localPos());
+                d->button = mouse->button();
+            }
         }
     } else if (type == QEvent::MouseButtonRelease) {
         Q_D(UCListItem);
         d->suppressClick = false;
+    } else if (type == QEvent::MouseMove) {
+        QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
+        const QPointF localPos = mapFromItem(child, mouse->localPos());
+        if ((mouse->buttons() & Qt::LeftButton) && d->swipedOverThreshold(localPos, d->pressedPos) && !d->highlighted) {
+            // grab the event from the child, so the click doesn't happen anymore, and initiate swiping
+            QMouseEvent pressed(QEvent::MouseButtonPress, localPos, mouse->windowPos(), mouse->screenPos(),
+                                    Qt::LeftButton, mouse->buttons(), mouse->modifiers());
+            d->grabLeftButtonEvents(&pressed);
+            // stop click and pressAndHold, then grab the mouse so children do not get the mouse events anymore
+            d->suppressClick = true;
+            d->pressAndHoldTimer.stop();
+            grabMouse();
+        }
     }
     return UCStyledItemBase::childMouseEventFilter(child, event);
 }

=== modified file 'src/Ubuntu/Components/plugin/uclistitem_p.h'
--- src/Ubuntu/Components/plugin/uclistitem_p.h	2015-07-28 19:29:19 +0000
+++ src/Ubuntu/Components/plugin/uclistitem_p.h	2015-08-04 20:09:32 +0000
@@ -67,6 +67,9 @@
     void update();
     void snapOut();
     void swipeEvent(const QPointF &localPos, UCSwipeEvent::Status status);
+    bool swipedOverThreshold(const QPointF &mousePos, const QPointF relativePos);
+    void grabLeftButtonEvents(QMouseEvent *event);
+    void ungrabLeftButtonEvents(QMouseEvent *event);
 
     quint16 defaultThemeVersion;
     bool highlighted:1;

=== modified file 'src/Ubuntu/Test/UbuntuTestCase.qml'
--- src/Ubuntu/Test/UbuntuTestCase.qml	2015-03-20 10:34:45 +0000
+++ src/Ubuntu/Test/UbuntuTestCase.qml	2015-08-04 20:09:32 +0000
@@ -102,10 +102,10 @@
     }
 
     /*!
-        Move Mouse from x,y to distance of dx, dy divided to steps with a stepdelay (ms).
+        Move Mouse from x,y to distance of dx, dy divided to steps with a stepdelay (ms) and buttons.
     */
-    function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay) {
-        mouseMove(item, x, y);
+    function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay,buttons) {
+        mouseMove(item, x, y, buttons);
         var abs_dx = Math.abs(dx)
         var abs_dy = Math.abs(dy)
         var step_dx = dx / steps;
@@ -121,7 +121,7 @@
             if (Math.abs(iy) < abs_dy) {
                 iy += step_dy;
             }
-            mouseMove(item, x + ix, y + iy, stepdelay);
+            mouseMove(item, x + ix, y + iy, stepdelay, buttons);
         }
     }
 
@@ -164,7 +164,7 @@
             wait(pressTimeout);
         }
         // mouse moves are all processed immediately, without delay in between events
-        mouseMoveSlowly(item, x, y, dx, dy, steps, delay);
+        mouseMoveSlowly(item, x, y, dx, dy, steps, delay, button);
         mouseRelease(item, x + dx, y + dy, button, modifiers);
         // empty event buffer
         wait(200);

=== modified file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	2015-07-22 18:57:58 +0000
+++ tests/resources/listitems/ListItemTest.qml	2015-08-04 20:09:32 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Styles 1.2
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Styles 1.3
 import QtQuick.Layouts 1.1
 
 MainView {

=== added file 'tests/unit_x11/tst_components/ListItemTestCase.qml'
--- tests/unit_x11/tst_components/ListItemTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/ListItemTestCase.qml	2015-08-04 20:09:32 +0000
@@ -0,0 +1,137 @@
+/*
+ * 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.4
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.2
+
+/*
+ * Common test case functions for ListItem. A CPO for unit tests.
+ */
+UbuntuTestCase {
+    when: windowShown
+
+    SignalSpy {
+        id: signalSpy
+    }
+
+    // set up the spy component for an item and a signal
+    function setupSpy(item, signalName) {
+        if (item.hasOwnProperty("leadingActions")) {
+            signalSpy.target = item;
+            signalSpy.signalName = signalName;
+        }
+    }
+    // wait on the previosuly set up spy
+    function spyWait(timeout) {
+        if (timeout == undefined) {
+            timeout = 500;
+        }
+        if (signalSpy.target) {
+            signalSpy.wait(timeout);
+            signalSpy.clear();
+            signalSpy.target = null;
+        } else {
+            wait(timeout);
+        }
+    }
+
+    // rebounds a ListItem
+    function rebound(item, watchTarget) {
+        if (watchTarget === undefined) {
+            watchTarget = item;
+        }
+
+        if (watchTarget.contentItem.x != watchTarget.contentItem.anchors.leftMargin) {
+            mouseClick(item, 1, 1);
+            tryCompareFunction(function() {
+                return watchTarget.contentItem.x == watchTarget.contentItem.anchors.leftMargin;
+            }, true, 500);
+        }
+    }
+
+    // delayed swipe, gives few millisecond timeout between each move
+    // so Repeater has time to create the panel actions in style
+    function swipe(item, x, y, dx, dy) {
+        setupSpy(item, "contentMovementEnded");
+        flick(item, x, y, dx, dy, 0, 0, undefined, undefined, 100);
+        spyWait();
+    }
+    function swipeNoWait(item, x, y, dx, dy) {
+        flick(item, x, y, dx, dy, 0, 0, undefined, undefined, 100);
+    }
+
+    function tug(item, x, y, dx, dy) {
+        setupSpy(item, "contentMovementEnded");
+        TestExtras.touchDrag(0, item, Qt.point(x, y), Qt.point(dx, dy));
+        spyWait();
+    }
+
+    // returns the leading or trailing panel item
+    function panelItem(item, leading) {
+        return findInvisibleChild(item, (leading ? "ListItemPanelLeading" : "ListItemPanelTrailing"));
+    }
+
+    function toggleSelectMode(view, enabled, scrollToTop) {
+        if (view.hasOwnProperty("positionViewAtBeginning") && scrollToTop) {
+            // use the topmost listItem to wait for rendering completion
+            view.positionViewAtBeginning();
+        }
+        var listItem = findChild(view, "listItem0");
+        verify(listItem);
+        view.ViewItems.selectMode = enabled;
+        // waitForRendering aint seems to be reliable here, so we wait ~400 msecs
+        wait(400);
+    }
+
+    function toggleDragMode(view, enabled) {
+        // use the topmost listItem to wait for rendering completion
+        view.positionViewAtBeginning();
+        var listItem = findChild(view, "listItem0");
+        verify(listItem);
+        view.ViewItems.dragMode = enabled;
+        // waitForRendering aint seems to be reliable here, so we wait ~400 msecs
+        wait(400);
+    }
+
+    function drag(view, from, to) {
+        var dragArea = findChild(view, "drag_area");
+        verify(dragArea, "Cannot locate drag area");
+
+        // grab the source item
+        view.positionViewAtBeginning(from,ListView.Beginning);
+        var panel = findChild(view, "drag_panel" + from);
+        verify(panel, "Cannot locate source panel");
+        var dragPos = dragArea.mapFromItem(panel, centerOf(panel).x, centerOf(panel).y);
+        // move the mouse
+        var dy = Math.abs(to - from) * panel.height + units.gu(1);
+        dy *= (to > from) ? 1 : -1;
+        mousePress(dragArea, dragPos.x, dragPos.y);
+        wait(100);
+        var draggedItem = findChild(view.contentItem, "DraggedListItem");
+        if (draggedItem) {
+            setupSpy(draggedItem.__styleInstance.dropAnimation, "stopped");
+        }
+        // use 10 steps to be sure the move is properly detected by the drag area
+        mouseMoveSlowly(dragArea, dragPos.x, dragPos.y, 0, dy, 10, 100);
+        // drop it, needs two mouse releases, this generates the Drop event also
+        mouseRelease(dragArea, dragPos.x, dragPos.y + dy);
+        // needs one more mouse release
+        mouseRelease(dragArea, dragPos.x, dragPos.y + dy);
+        spyWait();
+    }
+}

=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
--- tests/unit_x11/tst_components/tst_listitem.qml	2015-07-28 19:31:13 +0000
+++ tests/unit_x11/tst_components/tst_listitem.qml	2015-08-04 20:09:32 +0000
@@ -172,7 +172,7 @@
         }
     }
 
-    UbuntuTestCase {
+    ListItemTestCase {
         id: testCase
         name: "ListItemAPI"
         when: windowShown
@@ -202,88 +202,11 @@
             signalName: "interactiveChanged"
         }
 
-        function panelItem(item, leading) {
-            return findInvisibleChild(item, (leading ? "ListItemPanelLeading" : "ListItemPanelTrailing"));
-        }
-
-        function rebound(item, watchTarget) {
-            if (watchTarget === undefined) {
-                watchTarget = item;
-            }
-
-            if (watchTarget.contentItem.x != watchTarget.contentItem.anchors.leftMargin) {
-                mouseClick(item, centerOf(item).x, centerOf(item).y);
-                tryCompareFunction(function() {
-                    return watchTarget.contentItem.x == watchTarget.contentItem.anchors.leftMargin;
-                }, true, 500);
-            }
-        }
-
-        // delayed swipe, gives few millisecond timeout between each move
-        // so Repeater has time to create the panel actions in style
-        function swipe(item, x, y, dx, dy) {
-            flick(item, x, y, dx, dy, 0, 0, undefined, undefined, 100);
-        }
-
         SignalSpy {
             id: dropSpy
             signalName: "stopped"
         }
 
-        function toggleSelectMode(view, enabled, scrollToTop) {
-            if (view.hasOwnProperty("positionViewAtBeginning") && scrollToTop) {
-                // use the topmost listItem to wait for rendering completion
-                view.positionViewAtBeginning();
-            }
-            var listItem = findChild(view, "listItem0");
-            verify(listItem);
-            view.ViewItems.selectMode = enabled;
-            // waitForRendering aint seems to be reliable here, so we wait ~400 msecs
-            wait(400);
-        }
-
-        function toggleDragMode(view, enabled) {
-            // use the topmost listItem to wait for rendering completion
-            view.positionViewAtBeginning();
-            var listItem = findChild(view, "listItem0");
-            verify(listItem);
-            view.ViewItems.dragMode = enabled;
-            // waitForRendering aint seems to be reliable here, so we wait ~400 msecs
-            wait(400);
-        }
-
-        function drag(view, from, to) {
-            var dragArea = findChild(view, "drag_area");
-            verify(dragArea, "Cannot locate drag area");
-
-            // grab the source item
-            view.positionViewAtBeginning(from,ListView.Beginning);
-            var panel = findChild(view, "drag_panel" + from);
-            verify(panel, "Cannot locate source panel");
-            var dragPos = dragArea.mapFromItem(panel, centerOf(panel).x, centerOf(panel).y);
-            // move the mouse
-            var dy = Math.abs(to - from) * panel.height + units.gu(1);
-            dy *= (to > from) ? 1 : -1;
-            mousePress(dragArea, dragPos.x, dragPos.y);
-            wait(100);
-            var draggedItem = findChild(view.contentItem, "DraggedListItem");
-            if (draggedItem) {
-                dropSpy.target = draggedItem.__styleInstance.dropAnimation;
-            }
-            // use 10 steps to be sure the move is properly detected by the drag area
-            mouseMoveSlowly(dragArea, dragPos.x, dragPos.y, 0, dy, 10, 100);
-            // drop it, needs two mouse releases, this generates the Drop event also
-            mouseRelease(dragArea, dragPos.x, dragPos.y + dy);
-            // needs one more mouse release
-            mouseRelease(dragArea, dragPos.x, dragPos.y + dy);
-            if (dropSpy.target) {
-                dropSpy.wait();
-            } else {
-                // draggedItem cannot be found, we might be trying to drag a restricted item
-                wait(200);
-            }
-        }
-
         function initTestCase() {
             TestExtras.registerTouchDevice();
             waitForRendering(main);
@@ -405,12 +328,10 @@
             var item = findChild(listView, "listItem0");
             clickSpy.target = item;
             clickSpy.clear();
-            movingSpy.target = item;
             swipe(item, centerOf(item).x, centerOf(item).y, units.gu(20), 0);
-            movingSpy.wait();
 
             // click over the contentItem
-            movingSpy.clear();
+            movingSpy.target = item;
             mouseClick(item.contentItem, 1, 1);
             compare(clickSpy.count, 0, "No click() should be emitted on a swiped in ListItem.");
             movingSpy.wait();
@@ -420,12 +341,10 @@
             var item = findChild(listView, "listItem0");
             pressAndHoldSpy.target = item;
             pressAndHoldSpy.clear();
-            movingSpy.target = item;
             swipe(item, centerOf(item).x, centerOf(item).y, units.gu(20), 0);
-            movingSpy.wait();
 
             // press and hold
-            movingSpy.clear();
+            movingSpy.target = item;
             mouseLongPress(item.contentItem, 1, 1);
             mouseRelease(item.contentItem, 1, 1);
             mouseRelease(item.contentItem, 1, 1);
@@ -490,13 +409,11 @@
         }
         function test_tug_actions(data) {
             listView.positionViewAtBeginning();
-            movingSpy.target = data.item;
             if (data.mouse) {
                 swipe(data.item, data.pos.x, data.pos.y, data.dx, 0);
             } else {
-                TestExtras.touchDrag(0, data.item, data.pos, Qt.point(data.dx, 0));
+                tug(data.item, data.pos.x, data.pos.y, data.dx, 0);
             }
-            movingSpy.wait();
             if (data.positiveDirection) {
                 verify(data.item.contentItem.x > 0, data.tag + " actions did not show up");
             } else {
@@ -527,13 +444,11 @@
         }
         function test_rebound_when_pressed_outside_or_clicked(data) {
             listView.positionViewAtBeginning();
-            movingSpy.target = data.item;
             if (data.mouse) {
                 swipe(data.item, data.pos.x, data.pos.y, data.dx, 0);
             } else {
-                TestExtras.touchDrag(0, data.item, data.pos, Qt.point(data.dx, 0));
+                tug(data.item, data.pos.x, data.pos.y, data.dx, 0);
             }
-            movingSpy.wait();
             verify(data.item.contentItem.x != 0, "The component wasn't tugged!");
             // dismiss
             rebound(data.clickOn, data.item)
@@ -553,14 +468,12 @@
             listView.positionViewAtBeginning();
             interactiveSpy.target = listView;
             compare(listView.interactive, true, "ListView is not interactive");
-            movingSpy.target = data.item;
             interactiveSpy.target = listView;
             if (data.mouse) {
                 swipe(data.item, data.pos.x, data.pos.y, data.dx, data.dy);
             } else {
-                TestExtras.touchDrag(0, data.item, data.pos, Qt.point(data.dx, data.dy));
+                tug(data.item, data.pos.x, data.pos.y, data.dx, data.dy);
             }
-            movingSpy.wait();
             // animation should no longer be running!
             compare(listView.interactive, true, "The ListView is still non-interactive!");
             compare(interactiveSpy.count, 2, "Less/more times changed!");
@@ -580,9 +493,7 @@
             ];
         }
         function test_visualized_actions(data) {
-            movingSpy.target = data.item;
             swipe(data.item, centerOf(data.item).x, centerOf(data.item).y, data.leading ? units.gu(20) : -units.gu(20), 0);
-            movingSpy.wait();
 
             // check if the action is visible
             var panel = panelItem(data.item, data.leading);
@@ -604,9 +515,7 @@
         }
         function test_listitem_margins(data) {
             data.item.contentItem.anchors.margins = units.gu(1);
-            movingSpy.target = data.item;
             swipe(data.item, centerOf(data.item).x, centerOf(data.item).y, data.dx, 0);
-            movingSpy.wait();
             var panel = panelItem(data.item, data.leading);
             verify(panel && panel.visible, "Panel not visible.");
             // cleanup
@@ -624,13 +533,11 @@
         }
         function test_selecting_action_rebounds(data) {
             listView.positionViewAtBeginning();
-            movingSpy.target = data.item;
             if (data.mouse) {
                 swipe(data.item, data.pos.x, data.pos.y, data.dx, 0);
             } else {
-                TestExtras.touchDrag(0, data.item, data.pos, Qt.point(data.dx, 0));
+                tug(data.item, data.pos.x, data.pos.y, data.dx, 0);
             }
-            movingSpy.wait();
             verify(data.item.contentItem.x > 0, "Not snapped in!");
             var panel = panelItem(data.item, data.leading);
             verify(panel, "panelItem not found");
@@ -638,7 +545,7 @@
             verify(selectedAction, "Cannot select action " + data.select);
 
             // dismiss
-            movingSpy.clear();
+            movingSpy.target = data.item;
             if (data.mouse) {
                 mouseClick(selectedAction, centerOf(selectedAction).x, centerOf(selectedAction).y);
             } else {
@@ -653,7 +560,7 @@
             listView.positionViewAtBeginning();
             var item = findChild(listView, "listItem0");
             movingSpy.target = item;
-            swipe(item, centerOf(item).x, centerOf(item).y, -units.gu(20), 0);
+            swipeNoWait(item, centerOf(item).x, centerOf(item).y, -units.gu(20), 0);
             var panel = panelItem(item, false);
             verify(panel, "Panel is not visible");
             var custom = findChild(panel, "custom_delegate");
@@ -677,11 +584,8 @@
             ];
         }
         function test_snap(data) {
-            movingSpy.target = data.item;
             swipe(data.item, centerOf(data.item).x, centerOf(data.item).y, data.dx, 0);
-            movingSpy.wait();
             waitForRendering(data.item.contentItem, 400);
-            movingSpy.clear();
             if (data.snapIn) {
                 verify(data.item.contentItem.x != 0.0, "Not snapped to be visible");
                 // cleanup
@@ -741,9 +645,7 @@
         }
         function test_verify_action_value(data) {
             // tug actions in
-            movingSpy.target = data.item;
             swipe(data.item, 1, centerOf(data.item).y, units.gu(40), 0);
-            movingSpy.wait();
             wait(2000);
             verify(data.item.contentItem.x != data.item.contentItem.anchors.leftMargin, "Not snapped in");
 
@@ -754,7 +656,7 @@
             actionSpy.target = data.item.leadingActions.actions[1];
 
             // select the action
-            movingSpy.clear();
+            movingSpy.target = data.item;
             mouseClick(action, centerOf(action).x, centerOf(action).y);
             movingSpy.wait();
 
@@ -843,10 +745,8 @@
             var listItem = findChild(nestedListView, "listItem0");
             verify(listItem, "Cannot find test item");
             interactiveSpy.target = testFlickable;
-            movingSpy.target = listItem;
             // tug leading
             swipe(listItem, centerOf(listItem).x, centerOf(listItem).y, listItem.width / 2, 0);
-            movingSpy.wait();
             // check if interactive got changed
             interactiveSpy.wait();
 
@@ -963,7 +863,7 @@
 
             // try to tug leading
             movingSpy.clear();
-            swipe(testItem, centerOf(testItem).x, centerOf(testItem).y, units.gu(10), 0);
+            swipeNoWait(testItem, centerOf(testItem).x, centerOf(testItem).y, units.gu(10), 0);
             compare(movingSpy.count, 0, "No tug allowed when in selection mode");
         }
 
@@ -1241,9 +1141,7 @@
             listView.LayoutMirroring.enabled = true;
             waitForRendering(listView, 500);
             var listItem = findChild(listView, data.item);
-            movingSpy.target = listItem;
             swipe(listItem, centerOf(listItem).x, centerOf(listItem).y, data.leading ? -units.gu(20) : units.gu(20), 0);
-            movingSpy.wait();
 
             // check if the action is visible
             var panel = panelItem(listItem, data.leading);
@@ -1298,9 +1196,7 @@
             var height = testItem.height;
             testItem.height = units.gu(15);
 
-            movingSpy.target = testItem;
             swipe(testItem, centerOf(testItem).x, centerOf(testItem).y, data.dx);
-            movingSpy.wait();
 
             var icon = findChild(testItem, data.action);
             verify(icon);

=== added file 'tests/unit_x11/tst_components/tst_listitem_extras.qml'
--- tests/unit_x11/tst_components/tst_listitem_extras.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_listitem_extras.qml	2015-08-04 20:09:32 +0000
@@ -0,0 +1,92 @@
+/*
+ * 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.4
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.3
+
+Item {
+    id: main
+    width: units.gu(50)
+    height: units.gu(100)
+
+    ListItemActions {
+        id: trailing
+        actions: [
+            Action {
+                iconName: "starred"
+                text: 'Bookmark'
+                objectName: "leading_1"
+            },
+            Action {
+                iconName: "edit"
+                text: 'Edit'
+                objectName: "leading_2"
+                onTriggered: text = 'Edit Again'
+            },
+            Action {
+                iconName: "camcorder"
+                text: 'Record'
+                objectName: "leading_3"
+            }
+        ]
+    }
+    ListItemActions {
+        id: leading
+        actions: Action {
+            id: stockAction
+            iconName: "torch-on"
+            objectName: "stockAction"
+            text: 'Switch lights on'
+        }
+    }
+
+    Column {
+        anchors.fill: parent
+
+        ListItem {
+            id: testWithActiveItem
+            leadingActions: leading
+            trailingActions: trailing
+            Button {
+                id: activeItem
+                text: "pressme"
+                anchors.centerIn: parent
+            }
+        }
+    }
+
+    ListItemTestCase {
+
+        SignalSpy {
+            id: clickSpy
+            signalName: "clicked"
+        }
+
+        function cleanup() {
+            rebound(testWithActiveItem);
+            clickSpy.target = null;
+            clickSpy.clear();
+        }
+
+        function test_swipe_over_active_item() {
+            clickSpy.target = activeItem;
+            swipe(activeItem, centerOf(activeItem).x, centerOf(activeItem).y, units.gu(10));
+            compare(clickSpy.count, 0, "activeItem was clicked");
+        }
+    }
+}