diff options
author | Michael Brasser <michael.brasser@live.com> | 2014-03-26 14:32:29 -0500 |
---|---|---|
committer | Martin Jones <martin.jones@jollamobile.com> | 2014-07-24 01:11:29 +0200 |
commit | bca2eb550de0148dc53aeb1f9e7a036a692fd01d (patch) | |
tree | 3fad0f07d8f3411be3a2c1db49965f6abc79f3ee /tests/auto/quick/qquickpathview | |
parent | 6d8f0dbd794a97e0a87005f10d29cd5261d8387f (diff) |
Add autotest for incorrect steal of flick.
Task-number: QTBUG-37859
Change-Id: I86aa231ba264569a21d0b6cd109096eb5dd7a2fe
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'tests/auto/quick/qquickpathview')
-rw-r--r-- | tests/auto/quick/qquickpathview/data/incorrectSteal.qml | 85 | ||||
-rw-r--r-- | tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | 58 |
2 files changed, 143 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickpathview/data/incorrectSteal.qml b/tests/auto/quick/qquickpathview/data/incorrectSteal.qml new file mode 100644 index 0000000000..bcd6923b73 --- /dev/null +++ b/tests/auto/quick/qquickpathview/data/incorrectSteal.qml @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +Flickable { + objectName: "flickable" + width: 400; height: 400 + + contentHeight: height + contentWidth: width * 3 + contentX: 400 + + Row { + Rectangle { width: 400; height: 400; color: "green" } + Rectangle { + width: 400; height: 400; color: "blue" + clip: true + + PathView { + id: pathView + objectName: "pathView" + width: parent.width + height: 200 + anchors.verticalCenter: parent.verticalCenter + + dragMargin: 400 + pathItemCount: 6 + + model: 10 + path: Path { + startX: -pathView.width / 2 + startY: pathView.height / 2 + PathLine { x: pathView.width + pathView.width / 2; y: pathView.height / 2 } + } + + delegate: Rectangle { + width: 100; height: 200 + color: "purple" + MouseArea { + anchors.fill: parent + } + } + } + } + Rectangle { width: 400; height: 400; color: "yellow" } + } +} diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp index 579cb954aa..405e0267ff 100644 --- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp @@ -47,6 +47,7 @@ #include <QtQml/qqmlexpression.h> #include <QtQml/qqmlincubator.h> #include <QtQuick/private/qquickpathview_p.h> +#include <QtQuick/private/qquickflickable_p.h> #include <QtQuick/private/qquickpath_p.h> #include <QtQuick/private/qquicktext_p.h> #include <QtQuick/private/qquickrectangle_p.h> @@ -142,6 +143,7 @@ private slots: void indexAt_itemAt(); void indexAt_itemAt_data(); void cacheItemCount(); + void incorrectSteal(); }; class TestObject : public QObject @@ -2123,6 +2125,62 @@ void tst_QQuickPathView::cacheItemCount() } +void tst_QQuickPathView::incorrectSteal() +{ + QScopedPointer<QQuickView> window(createView()); + QQuickViewTestUtil::moveMouseAway(window.data()); + window->setSource(testFileUrl("incorrectSteal.qml")); + window->show(); + window->requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(window.data())); + QCOMPARE(window.data(), qGuiApp->focusWindow()); + + QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "pathView"); + QVERIFY(pathview != 0); + + QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject()); + QVERIFY(flickable != 0); + + QSignalSpy movingSpy(pathview, SIGNAL(movingChanged())); + QSignalSpy moveStartedSpy(pathview, SIGNAL(movementStarted())); + QSignalSpy moveEndedSpy(pathview, SIGNAL(movementEnded())); + + QSignalSpy fflickingSpy(flickable, SIGNAL(flickingChanged())); + QSignalSpy fflickStartedSpy(flickable, SIGNAL(flickStarted())); + QSignalSpy fflickEndedSpy(flickable, SIGNAL(flickEnded())); + + int waitInterval = 5; + + QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(23,218)); + + QTest::mouseMove(window.data(), QPoint(25,218), waitInterval); + QTest::mouseMove(window.data(), QPoint(26,218), waitInterval); + QTest::mouseMove(window.data(), QPoint(28,219), waitInterval); + QTest::mouseMove(window.data(), QPoint(31,219), waitInterval); + QTest::mouseMove(window.data(), QPoint(39,219), waitInterval); + + // first move beyond threshold does not trigger drag + QVERIFY(!pathview->isMoving()); + QVERIFY(!pathview->isDragging()); + QCOMPARE(movingSpy.count(), 0); + QCOMPARE(moveStartedSpy.count(), 0); + QCOMPARE(moveEndedSpy.count(), 0); + QCOMPARE(fflickingSpy.count(), 0); + QCOMPARE(fflickStartedSpy.count(), 0); + QCOMPARE(fflickEndedSpy.count(), 0); + + // no further moves after the initial move beyond threshold + QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(53,219)); + QTRY_COMPARE(movingSpy.count(), 2); + QTRY_COMPARE(moveEndedSpy.count(), 1); + QCOMPARE(moveStartedSpy.count(), 1); + // Flickable should not handle this + QEXPECT_FAIL("", "QTBUG-37859", Abort); + QCOMPARE(fflickingSpy.count(), 0); + QCOMPARE(fflickStartedSpy.count(), 0); + QCOMPARE(fflickEndedSpy.count(), 0); +} + QTEST_MAIN(tst_QQuickPathView) #include "tst_qquickpathview.moc" |