Improve tst_QQuickMouseArea::pressedCanceledOnWindowDeactivate

Make it more reliable and faster - average run time goes down by ~400 ms
while the test passes reliable for me after this change.
Most QTRY_* will return instantly since the condition will be good in
any case.
On my laptop the test tended to fail roughly every 4th run without this
patch. The failure was the second click on the new window not working
without the QTRY_VERIFY.
Removing the extra 200 ms wait time is what makes it faster - I see no
good reason for the wait here.

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

1 files changed, 6 insertions, 8 deletions

diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
index aa1474df91..6ab7f79ce1 100644
--- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
+++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
@@ -791,14 +791,14 @@ void tst_QQuickMouseArea::pressedCanceledOnWindowDeactivate()
 
     QGuiApplication::sendEvent(&window, &pressEvent);
 
-    QVERIFY(window.rootObject()->property("pressed").toBool());
+    QTRY_VERIFY(window.rootObject()->property("pressed").toBool());
     QVERIFY(!window.rootObject()->property("canceled").toBool());
     QCOMPARE(window.rootObject()->property("released").toInt(), expectedRelease);
     QCOMPARE(window.rootObject()->property("clicked").toInt(), expectedClicks);
 
     if (doubleClick) {
         QGuiApplication::sendEvent(&window, &releaseEvent);
-        QVERIFY(!window.rootObject()->property("pressed").toBool());
+        QTRY_VERIFY(!window.rootObject()->property("pressed").toBool());
         QVERIFY(!window.rootObject()->property("canceled").toBool());
         QCOMPARE(window.rootObject()->property("released").toInt(), ++expectedRelease);
         QCOMPARE(window.rootObject()->property("clicked").toInt(), ++expectedClicks);
@@ -807,7 +807,7 @@ void tst_QQuickMouseArea::pressedCanceledOnWindowDeactivate()
         QMouseEvent pressEvent2(QEvent::MouseButtonDblClick, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
         QGuiApplication::sendEvent(&window, &pressEvent2);
 
-        QVERIFY(window.rootObject()->property("pressed").toBool());
+        QTRY_VERIFY(window.rootObject()->property("pressed").toBool());
         QVERIFY(!window.rootObject()->property("canceled").toBool());
         QCOMPARE(window.rootObject()->property("released").toInt(), expectedRelease);
         QCOMPARE(window.rootObject()->property("clicked").toInt(), expectedClicks);
@@ -819,23 +819,21 @@ void tst_QQuickMouseArea::pressedCanceledOnWindowDeactivate()
     secondWindow->setProperty("visible", true);
     QTest::qWaitForWindowExposed(secondWindow);
 
-    QVERIFY(!window.rootObject()->property("pressed").toBool());
+    QTRY_VERIFY(!window.rootObject()->property("pressed").toBool());
     QVERIFY(window.rootObject()->property("canceled").toBool());
     QCOMPARE(window.rootObject()->property("released").toInt(), expectedRelease);
     QCOMPARE(window.rootObject()->property("clicked").toInt(), expectedClicks);
 
     //press again
     QGuiApplication::sendEvent(&window, &pressEvent);
-    QVERIFY(window.rootObject()->property("pressed").toBool());
+    QTRY_VERIFY(window.rootObject()->property("pressed").toBool());
     QVERIFY(!window.rootObject()->property("canceled").toBool());
     QCOMPARE(window.rootObject()->property("released").toInt(), expectedRelease);
     QCOMPARE(window.rootObject()->property("clicked").toInt(), expectedClicks);
 
-    QTest::qWait(200);
-
     //release
     QGuiApplication::sendEvent(&window, &releaseEvent);
-    QVERIFY(!window.rootObject()->property("pressed").toBool());
+    QTRY_VERIFY(!window.rootObject()->property("pressed").toBool());
     QVERIFY(!window.rootObject()->property("canceled").toBool());
     QCOMPARE(window.rootObject()->property("released").toInt(), ++expectedRelease);
     QCOMPARE(window.rootObject()->property("clicked").toInt(), ++expectedClicks);