Input handler tests: remember positions of stationary points

We need Handlers to receive accurate positions for stationary touch
points: that is, the last-known position from the previous touch
event.  (And we hope that all actual touch-capable platforms also send
proper QPA events with correct positions for stationary points.
We assert that it's a bug if they don't.)

As explained in qtbase 7cef4b6463fdb73ff602ade64b222333dd23e46c, it's
OK to retain a copy of a QTest::QTouchEventSequence for this purpose,
so that the QMap<int, QTouchEvent::TouchPoint> previousPoints will not
be discarded between events.

We have done this in other tests, but not consistently; e.g.
468626e99a90d6ac21cb311cde05c658ccb3b781 fixed the PinchArea test.

Change-Id: I4dbe69f8dcc4b1cca30fd7ce91d7d2ecf5ec4bc3
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

1 files changed, 9 insertions, 8 deletions

diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp b/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp
index 187463be2e..73d9b0b464 100644
--- a/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp
+++ b/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp
@@ -576,6 +576,7 @@ void tst_FlickableInterop::touchDragSliderAndFlickable()
     QVERIFY(knob);
     QQuickFlickable *flickable = window->rootObject()->findChild<QQuickFlickable*>();
     QVERIFY(flickable);
+    QTest::QTouchEventSequence touchSeq = QTest::touchEvent(window, touchDevice, false);
 
     // The knob is initially centered over the slider's "groove"
     qreal initialXOffset = qAbs(knob->mapToScene(knob->clipRect().center()).x() - slider->mapToScene
@@ -584,32 +585,32 @@ void tst_FlickableInterop::touchDragSliderAndFlickable()
 
     // Drag the slider in the allowed (vertical) direction with one finger
     QPoint p1 = knob->mapToScene(knob->clipRect().center()).toPoint();
-    QTest::touchEvent(window, touchDevice).press(1, p1, window);
+    touchSeq.press(1, p1, window).commit();
     QQuickTouchUtils::flush(window);
     p1 += QPoint(0, dragThreshold);
-    QTest::touchEvent(window, touchDevice).move(1, p1, window);
+    touchSeq.move(1, p1, window).commit();
     QQuickTouchUtils::flush(window);
     p1 += QPoint(0, dragThreshold);
-    QTest::touchEvent(window, touchDevice).move(1, p1, window);
+    touchSeq.move(1, p1, window).commit();
     QQuickTouchUtils::flush(window);
     p1 += QPoint(0, dragThreshold);
-    QTest::touchEvent(window, touchDevice).move(1, p1, window);
+    touchSeq.move(1, p1, window).commit();
     QQuickTouchUtils::flush(window);
     QTRY_VERIFY(slider->property("value").toInt() < 49);
     QVERIFY(!flickable->isMoving());
 
     // Drag the Flickable with a second finger
     QPoint p2(300,300);
-    QTest::touchEvent(window, touchDevice).stationary(1).press(2, p2, window);
+    touchSeq.stationary(1).press(2, p2, window).commit();
     QQuickTouchUtils::flush(window);
     for (int i = 0; i < 4; ++i) {
         p1 += QPoint(-10, -10);
         p2 += QPoint(dragThreshold, 0);
-        QTest::touchEvent(window, touchDevice).move(1, p1, window).stationary(2);
+        touchSeq.move(1, p1, window).stationary(2).commit();
         QQuickTouchUtils::flush(window);
         p1 += QPoint(-10, -10);
         p2 += QPoint(dragThreshold, 0);
-        QTest::touchEvent(window, touchDevice).stationary(1).move(2, p2, window);
+        touchSeq.stationary(1).move(2, p2, window).commit();
         QQuickTouchUtils::flush(window);
         qCDebug(lcPointerTests) << "step" << i << ": fingers @" << p1 << p2 << "is Flickable moving yet?" << flickable->isMoving();
     }
@@ -622,7 +623,7 @@ void tst_FlickableInterop::touchDragSliderAndFlickable()
     QVERIFY(qAbs(knobSliderXOffset) <= 1);
 
     // Release
-    QTest::touchEvent(window, touchDevice).release(1, p1, window).release(2, p2, window);
+    touchSeq.release(1, p1, window).release(2, p2, window).commit();
 }
 
 QTEST_MAIN(tst_FlickableInterop)