Stabilize the drag related autotests for higher dpi displays

Higher DPI displays might have a larger StartDragDistance (at
least on X11), breaking the autotest on these displays.

Change-Id: I9768a245a7654665dd9f718100289e9416d8c855
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/tests/auto/quick/qquickpathview/data/nestedmousearea.qml b/tests/auto/quick/qquickpathview/data/nestedmousearea.qml
index bdd2865..a50a479 100644 (file)
--- a/tests/auto/quick/qquickpathview/data/nestedmousearea.qml
+++ b/tests/auto/quick/qquickpathview/data/nestedmousearea.qml
@@ -1,8 +1,8 @@
 import QtQuick 2.0
 
 PathView {
-    width: 400
-    height: 400
+    width: 500
+    height: 500
 
     model: 2
     path: Path {

diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 992b234..4b39570 100644 (file)
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -1485,7 +1485,7 @@ void tst_QQuickPathView::mouseDrag()
     QTest::qWait(100);
 
     {
-        QMouseEvent mv(QEvent::MouseMove, QPoint(30,100), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QMouseEvent mv(QEvent::MouseMove, QPoint(50,100), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
         QGuiApplication::sendEvent(window.data(), &mv);
     }
     // first move beyond threshold does not trigger drag
@@ -1540,7 +1540,7 @@ void tst_QQuickPathView::nestedMouseAreaDrag()
     QVERIFY(pathview != 0);
 
     // Dragging the child mouse area should move it and not animate the PathView
-    flick(window.data(), QPoint(200,200), QPoint(300,200), 200);
+    flick(window.data(), QPoint(200,200), QPoint(400,200), 200);
     QVERIFY(!pathview->isMoving());
 
     // Dragging outside the mouse are should animate the PathView.
@@ -1795,8 +1795,8 @@ void tst_QQuickPathView::cancelDrag()
     // drag between snap points
     QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(10,100));
     QTest::qWait(100);
-    QTest::mouseMove(window.data(), QPoint(30, 100));
-    QTest::mouseMove(window.data(), QPoint(85, 100));
+    QTest::mouseMove(window.data(), QPoint(80, 100));
+    QTest::mouseMove(window.data(), QPoint(130, 100));
 
     QTRY_VERIFY(hasFraction(pathview->offset()));
     QTRY_VERIFY(pathview->isMoving());
@@ -2213,7 +2213,7 @@ void tst_QQuickPathView::nestedinFlickable()
     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);
+    QTest::mouseMove(window.data(), QPoint(53,219), waitInterval);
 
     // first move beyond threshold does not trigger drag
     QVERIFY(!pathview->isMoving());
@@ -2226,7 +2226,7 @@ void tst_QQuickPathView::nestedinFlickable()
     QCOMPARE(fflickEndedSpy.count(), 0);
 
     // no further moves after the initial move beyond threshold
-    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(53,219));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(73,219));
     QTRY_COMPARE(movingSpy.count(), 2);
     QTRY_COMPARE(moveEndedSpy.count(), 1);
     QCOMPARE(moveStartedSpy.count(), 1);