Add cat. logging in wantsEventPoint; improve FlickableInterop test

It was too hard to debug behavior in this test.

Change-Id: Iaec9534cca17bdd90b94cfa8fa8b21b7026839ae
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

1 files changed, 12 insertions, 33 deletions

diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp b/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp
index f3513881cd..187463be2e 100644
--- a/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp
+++ b/tests/auto/quick/pointerhandlers/flickableinterop/tst_flickableinterop.cpp
@@ -602,39 +602,18 @@ void tst_FlickableInterop::touchDragSliderAndFlickable()
     QPoint p2(300,300);
     QTest::touchEvent(window, touchDevice).stationary(1).press(2, p2, window);
     QQuickTouchUtils::flush(window);
-    p1 += QPoint(-10, -10);
-    p2 += QPoint(dragThreshold, 0);
-    QTest::touchEvent(window, touchDevice).move(1, p1, window).stationary(2);
-    QQuickTouchUtils::flush(window);
-    p1 += QPoint(-10, -10);
-    p2 += QPoint(dragThreshold, 0);
-    QTest::touchEvent(window, touchDevice).stationary(1).move(2, p2, window);
-    QQuickTouchUtils::flush(window);
-    p1 += QPoint(-10, -10);
-    p2 += QPoint(dragThreshold, 0);
-    QTest::touchEvent(window, touchDevice).move(1, p1, window).stationary(2);
-    QQuickTouchUtils::flush(window);
-    p1 += QPoint(-10, -10);
-    p2 += QPoint(dragThreshold, 0);
-    QTest::touchEvent(window, touchDevice).stationary(1).move(2, p2, window);
-    QQuickTouchUtils::flush(window);
-    p1 += QPoint(-10, -10);
-    p2 += QPoint(dragThreshold, 0);
-    QTest::touchEvent(window, touchDevice).move(1, p1, window).stationary(2);
-    QQuickTouchUtils::flush(window);
-    p1 += QPoint(-10, -10);
-    p2 += QPoint(dragThreshold, 0);
-    QTest::touchEvent(window, touchDevice).stationary(1).move(2, p2, window);
-    QQuickTouchUtils::flush(window);
-    p1 += QPoint(-10, -10);
-    p2 += QPoint(dragThreshold, 0);
-    QTest::touchEvent(window, touchDevice).move(1, p1, window).stationary(2);
-    QQuickTouchUtils::flush(window);
-    p1 += QPoint(-10, -10);
-    p2 += QPoint(dragThreshold, 0);
-    QTest::touchEvent(window, touchDevice).stationary(1).move(2, p2, window);
-    QQuickTouchUtils::flush(window);
-    QTRY_VERIFY(flickable->isMoving());
+    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);
+        QQuickTouchUtils::flush(window);
+        p1 += QPoint(-10, -10);
+        p2 += QPoint(dragThreshold, 0);
+        QTest::touchEvent(window, touchDevice).stationary(1).move(2, p2, window);
+        QQuickTouchUtils::flush(window);
+        qCDebug(lcPointerTests) << "step" << i << ": fingers @" << p1 << p2 << "is Flickable moving yet?" << flickable->isMoving();
+    }
+    QVERIFY(flickable->isMoving());
     qreal knobSliderXOffset = qAbs(knob->mapToScene(knob->clipRect().center()).toPoint().x() -
         slider->mapToScene(slider->clipRect().center()).toPoint().x()) - initialXOffset;
     if (knobSliderXOffset > 1)