diff options
author | Martin Jones <martin.jones@nokia.com> | 2012-03-25 12:37:08 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-26 06:10:56 +0200 |
commit | adb8811e960876fa00eff621364edba8a79936f7 (patch) | |
tree | c2df7fc16fbcbe45acf25ca7306fa66ac1236d72 /tests/auto/quick/qquickpathview | |
parent | d3bcce569f699177ccb98d7a21d96519dd70949a (diff) |
PathView was missing the maximumFlickVelocity property
Change-Id: I0ed4ff0fe169187f7a8e03597be7407e9896100d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickpathview')
-rw-r--r-- | tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp index 613156b2f5..85d2c3b6ea 100644 --- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp @@ -124,6 +124,7 @@ private slots: void currentOffsetOnInsertion(); void asynchronous(); void cancelDrag(); + void maximumFlickVelocity(); }; class TestObject : public QObject @@ -944,6 +945,13 @@ void tst_QQuickPathView::propertyChanges() QCOMPARE(snapPositionSpy.count(), 1); QCOMPARE(dragMarginSpy.count(), 1); + + QSignalSpy maximumFlickVelocitySpy(pathView, SIGNAL(maximumFlickVelocityChanged())); + pathView->setMaximumFlickVelocity(1000); + QCOMPARE(maximumFlickVelocitySpy.count(), 1); + pathView->setMaximumFlickVelocity(1000); + QCOMPARE(maximumFlickVelocitySpy.count(), 1); + delete canvas; } @@ -1488,6 +1496,52 @@ void tst_QQuickPathView::cancelDrag() delete canvas; } +void tst_QQuickPathView::maximumFlickVelocity() +{ + QQuickView *canvas = createView(); + canvas->setSource(testFileUrl("dragpath.qml")); + canvas->show(); + canvas->requestActivateWindow(); + QTest::qWaitForWindowShown(canvas); + QTRY_COMPARE(canvas, qGuiApp->focusWindow()); + + QQuickPathView *pathview = qobject_cast<QQuickPathView*>(canvas->rootObject()); + QVERIFY(pathview != 0); + + pathview->setMaximumFlickVelocity(700); + flick(canvas, QPoint(200,10), QPoint(10,10), 180); + QVERIFY(pathview->isMoving()); + QVERIFY(pathview->isFlicking()); + QTRY_VERIFY(!pathview->isMoving()); + + double dist1 = 100 - pathview->offset(); + + pathview->setOffset(0.); + pathview->setMaximumFlickVelocity(300); + flick(canvas, QPoint(200,10), QPoint(10,10), 180); + QVERIFY(pathview->isMoving()); + QVERIFY(pathview->isFlicking()); + QTRY_VERIFY(!pathview->isMoving()); + + double dist2 = 100 - pathview->offset(); + + pathview->setOffset(0.); + pathview->setMaximumFlickVelocity(500); + flick(canvas, QPoint(200,10), QPoint(10,10), 180); + QVERIFY(pathview->isMoving()); + QVERIFY(pathview->isFlicking()); + QTRY_VERIFY(!pathview->isMoving()); + + double dist3 = 100 - pathview->offset(); + + QVERIFY(dist1 > dist2); + QVERIFY(dist3 > dist2); + QVERIFY(dist2 < dist1); + + delete canvas; +} + + QTEST_MAIN(tst_QQuickPathView) |