don't require TouchUpdate events for the single touch cases

the finger may not move, meaning no update with move event is generated,
even if we say "press, hold, release" when testing (the finger may not
wobble enough)

1 files changed, 26 insertions, 26 deletions

diff --git a/tests/manual/qtouchevent/main.cpp b/tests/manual/qtouchevent/main.cpp
index 9f2d413276..8097ab0e92 100644
--- a/tests/manual/qtouchevent/main.cpp
+++ b/tests/manual/qtouchevent/main.cpp
@@ -61,7 +61,7 @@ void tst_ManualMultitouch::ignoringTouchEventsEmulatesMouseEvents()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(!testWidget.greenWidget->seenTouchBegin);
-    QVERIFY(!testWidget.greenWidget->seenTouchUpdate);
+    // QVERIFY(!testWidget.greenWidget->seenTouchUpdate);
     QVERIFY(!testWidget.greenWidget->seenTouchEnd);
     QVERIFY(testWidget.greenWidget->seenMousePress);
     // QVERIFY(testWidget.greenWidget->seenMouseMove);
@@ -74,7 +74,7 @@ void tst_ManualMultitouch::ignoringTouchEventsEmulatesMouseEvents()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.greenWidget->seenTouchBegin);
-    QVERIFY(!testWidget.greenWidget->seenTouchUpdate);
+    // QVERIFY(!testWidget.greenWidget->seenTouchUpdate);
     QVERIFY(!testWidget.greenWidget->seenTouchEnd);
     QVERIFY(testWidget.greenWidget->seenMousePress);
     // QVERIFY(testWidget.greenWidget->seenMouseMove);
@@ -96,12 +96,12 @@ void tst_ManualMultitouch::basicSingleTouchEventHandling()
     testWidget.greenWidget->closeWindowOnTouchEnd = true;
     testWidget.showMaximized();
     (void) qApp->exec();
-    QVERIFY(testWidget.greenWidget->seenTouchBegin
-            && testWidget.greenWidget->seenTouchUpdate
-            && testWidget.greenWidget->seenTouchEnd);
-    QVERIFY(!testWidget.greenWidget->seenMousePress
-            && !testWidget.greenWidget->seenMouseMove
-            && !testWidget.greenWidget->seenMouseRelease);
+    QVERIFY(testWidget.greenWidget->seenTouchBegin);
+    // QVERIFY(testWidget.greenWidget->seenTouchUpdate);
+    QVERIFY(testWidget.greenWidget->seenTouchEnd);
+    QVERIFY(!testWidget.greenWidget->seenMousePress);
+    QVERIFY(!testWidget.greenWidget->seenMouseMove);
+    QVERIFY(!testWidget.greenWidget->seenMouseRelease);
 
     // again, ignoring the TouchEnd
     testWidget.greenWidget->reset();
@@ -112,7 +112,7 @@ void tst_ManualMultitouch::basicSingleTouchEventHandling()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.greenWidget->seenTouchBegin);
-    QVERIFY(testWidget.greenWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.greenWidget->seenTouchUpdate);
     QVERIFY(testWidget.greenWidget->seenTouchEnd);
     QVERIFY(!testWidget.greenWidget->seenMousePress);
     QVERIFY(!testWidget.greenWidget->seenMouseMove);
@@ -127,7 +127,7 @@ void tst_ManualMultitouch::basicSingleTouchEventHandling()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.greenWidget->seenTouchBegin);
-    QVERIFY(testWidget.greenWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.greenWidget->seenTouchUpdate);
     QVERIFY(testWidget.greenWidget->seenTouchEnd);
     QVERIFY(!testWidget.greenWidget->seenMousePress);
     QVERIFY(!testWidget.greenWidget->seenMouseMove);
@@ -142,7 +142,7 @@ void tst_ManualMultitouch::basicSingleTouchEventHandling()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.greenWidget->seenTouchBegin);
-    QVERIFY(testWidget.greenWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.greenWidget->seenTouchUpdate);
     QVERIFY(testWidget.greenWidget->seenTouchEnd);
     QVERIFY(!testWidget.greenWidget->seenMousePress);
     QVERIFY(!testWidget.greenWidget->seenMouseMove);
@@ -235,7 +235,7 @@ void tst_ManualMultitouch::acceptingTouchBeginStopsPropagation()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.blueWidget->seenTouchBegin);
-    QVERIFY(testWidget.blueWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.blueWidget->seenTouchUpdate);
     QVERIFY(testWidget.blueWidget->seenTouchEnd);
     QVERIFY(!testWidget.blueWidget->seenMousePress);
     QVERIFY(!testWidget.blueWidget->seenMouseMove);
@@ -257,7 +257,7 @@ void tst_ManualMultitouch::acceptingTouchBeginStopsPropagation()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.blueWidget->seenTouchBegin);
-    QVERIFY(testWidget.blueWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.blueWidget->seenTouchUpdate);
     QVERIFY(testWidget.blueWidget->seenTouchEnd);
     QVERIFY(!testWidget.blueWidget->seenMousePress);
     QVERIFY(!testWidget.blueWidget->seenMouseMove);
@@ -279,7 +279,7 @@ void tst_ManualMultitouch::acceptingTouchBeginStopsPropagation()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.blueWidget->seenTouchBegin);
-    QVERIFY(testWidget.blueWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.blueWidget->seenTouchUpdate);
     QVERIFY(testWidget.blueWidget->seenTouchEnd);
     QVERIFY(!testWidget.blueWidget->seenMousePress);
     QVERIFY(!testWidget.blueWidget->seenMouseMove);
@@ -301,7 +301,7 @@ void tst_ManualMultitouch::acceptingTouchBeginStopsPropagation()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.blueWidget->seenTouchBegin);
-    QVERIFY(testWidget.blueWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.blueWidget->seenTouchUpdate);
     QVERIFY(testWidget.blueWidget->seenTouchEnd);
     QVERIFY(!testWidget.blueWidget->seenMousePress);
     QVERIFY(!testWidget.blueWidget->seenMouseMove);
@@ -339,7 +339,7 @@ void tst_ManualMultitouch::ignoringTouchBeginPropagatesToParent()
     QVERIFY(!testWidget.greyWidget->seenMouseMove);
     QVERIFY(!testWidget.greyWidget->seenMouseRelease);
     QVERIFY(testWidget.redWidget->seenTouchBegin);
-    QVERIFY(testWidget.redWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.redWidget->seenTouchUpdate);
     QVERIFY(testWidget.redWidget->seenTouchEnd);
     QVERIFY(!testWidget.redWidget->seenMousePress);
     QVERIFY(!testWidget.redWidget->seenMouseMove);
@@ -362,7 +362,7 @@ void tst_ManualMultitouch::ignoringTouchBeginPropagatesToParent()
     QVERIFY(!testWidget.greyWidget->seenMouseMove);
     QVERIFY(!testWidget.greyWidget->seenMouseRelease);
     QVERIFY(testWidget.redWidget->seenTouchBegin);
-    QVERIFY(testWidget.redWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.redWidget->seenTouchUpdate);
     QVERIFY(testWidget.redWidget->seenTouchEnd);
     QVERIFY(!testWidget.redWidget->seenMousePress);
     QVERIFY(!testWidget.redWidget->seenMouseMove);
@@ -384,7 +384,7 @@ void tst_ManualMultitouch::ignoringTouchBeginPropagatesToParent()
     QVERIFY(!testWidget.greyWidget->seenMouseMove);
     QVERIFY(!testWidget.greyWidget->seenMouseRelease);
     QVERIFY(testWidget.redWidget->seenTouchBegin);
-    QVERIFY(testWidget.redWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.redWidget->seenTouchUpdate);
     QVERIFY(testWidget.redWidget->seenTouchEnd);
     QVERIFY(!testWidget.redWidget->seenMousePress);
     QVERIFY(!testWidget.redWidget->seenMouseMove);
@@ -406,7 +406,7 @@ void tst_ManualMultitouch::ignoringTouchBeginPropagatesToParent()
     QVERIFY(!testWidget.greyWidget->seenMouseMove);
     QVERIFY(!testWidget.greyWidget->seenMouseRelease);
     QVERIFY(testWidget.redWidget->seenTouchBegin);
-    QVERIFY(testWidget.redWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.redWidget->seenTouchUpdate);
     QVERIFY(testWidget.redWidget->seenTouchEnd);
     QVERIFY(!testWidget.redWidget->seenMousePress);
     QVERIFY(!testWidget.redWidget->seenMouseMove);
@@ -428,7 +428,7 @@ void tst_ManualMultitouch::ignoringTouchBeginPropagatesToParent()
     QVERIFY(!testWidget.greyWidget->seenMouseMove);
     QVERIFY(!testWidget.blueWidget->seenMouseRelease);
     QVERIFY(testWidget.redWidget->seenTouchBegin);
-    QVERIFY(testWidget.redWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.redWidget->seenTouchUpdate);
     QVERIFY(testWidget.redWidget->seenTouchEnd);
     QVERIFY(!testWidget.redWidget->seenMousePress);
     QVERIFY(!testWidget.redWidget->seenMouseMove);
@@ -449,7 +449,7 @@ void tst_ManualMultitouch::secondTouchPointOnParentGoesToChild()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.blueWidget->seenTouchBegin);
-    QVERIFY(testWidget.blueWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.blueWidget->seenTouchUpdate);
     QVERIFY(testWidget.blueWidget->seenTouchEnd);
     QVERIFY(!testWidget.blueWidget->seenMousePress);
     QVERIFY(!testWidget.blueWidget->seenMouseMove);
@@ -477,7 +477,7 @@ void tst_ManualMultitouch::secondTouchPointOnChildGoesToParent()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.redWidget->seenTouchBegin);
-    QVERIFY(testWidget.redWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.redWidget->seenTouchUpdate);
     QVERIFY(testWidget.redWidget->seenTouchEnd);
     QVERIFY(!testWidget.redWidget->seenMousePress);
     QVERIFY(!testWidget.redWidget->seenMouseMove);
@@ -506,13 +506,13 @@ void tst_ManualMultitouch::secondTouchPointOnSiblingGoesToSibling()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.greenWidget->seenTouchBegin);
-    QVERIFY(testWidget.greenWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.greenWidget->seenTouchUpdate);
     QVERIFY(testWidget.greenWidget->seenTouchEnd);
     QVERIFY(!testWidget.greenWidget->seenMousePress);
     QVERIFY(!testWidget.greenWidget->seenMouseMove);
     QVERIFY(!testWidget.greenWidget->seenMouseRelease);
     QVERIFY(testWidget.redWidget->seenTouchBegin);
-    QVERIFY(testWidget.redWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.redWidget->seenTouchUpdate);
     QVERIFY(testWidget.redWidget->seenTouchEnd);
     QVERIFY(!testWidget.redWidget->seenMousePress);
     QVERIFY(!testWidget.redWidget->seenMouseMove);
@@ -534,13 +534,13 @@ void tst_ManualMultitouch::secondTouchPointOnCousinGoesToCousin()
     testWidget.showMaximized();
     (void) qApp->exec();
     QVERIFY(testWidget.blueWidget->seenTouchBegin);
-    QVERIFY(testWidget.blueWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.blueWidget->seenTouchUpdate);
     QVERIFY(testWidget.blueWidget->seenTouchEnd);
     QVERIFY(!testWidget.blueWidget->seenMousePress);
     QVERIFY(!testWidget.blueWidget->seenMouseMove);
     QVERIFY(!testWidget.blueWidget->seenMouseRelease);
     QVERIFY(testWidget.greyWidget->seenTouchBegin);
-    QVERIFY(testWidget.greyWidget->seenTouchUpdate);
+    // QVERIFY(testWidget.greyWidget->seenTouchUpdate);
     QVERIFY(testWidget.greyWidget->seenTouchEnd);
     QVERIFY(!testWidget.greyWidget->seenMousePress);
     QVERIFY(!testWidget.greyWidget->seenMouseMove);