tests/auto/widgets/util: Avoid unconditional qWait()s

Task-number: QTBUG-63992
Change-Id: I795e564b051bbabd1fc2d2fca8171da6072f99eb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>

2 files changed, 9 insertions, 17 deletions

diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
index 6fbb0fe5fa..0511c278d5 100644
--- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
@@ -1099,8 +1099,8 @@ void tst_QCompleter::multipleWidgets()
     comboBox->show();
     window.activateWindow();
     QApplication::setActiveWindow(&window);
-    QTest::qWait(50);
-    QTRY_COMPARE(QApplication::focusWidget(), comboBox);
+    QVERIFY(QTest::qWaitForWindowActive(&window));
+    QCOMPARE(QApplication::focusWidget(), comboBox);
     comboBox->lineEdit()->setText("it");
     QCOMPARE(comboBox->currentText(), QString("it")); // should not complete with setText
     QTest::keyPress(comboBox, 'e');
@@ -1112,7 +1112,6 @@ void tst_QCompleter::multipleWidgets()
     lineEdit->setCompleter(&completer);
     lineEdit->show();
     lineEdit->setFocus();
-    QTest::qWait(50);
     QTRY_COMPARE(QApplication::focusWidget(), lineEdit);
     lineEdit->setText("it");
     QCOMPARE(lineEdit->text(), QString("it")); // should not completer with setText
diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
index 67bae43c9d..43063881b2 100644
--- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
+++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
@@ -394,8 +394,7 @@ void tst_QScroller::scroll()
     // wait until finished, check that no further first scroll is sent
     sw->receivedFirst = false;
     sw->receivedScroll = false;
-    while (s1->state() == QScroller::Scrolling)
-        QTest::qWait(100);
+    QTRY_VERIFY(s1->state() != QScroller::Scrolling);
 
     QCOMPARE( sw->receivedFirst, false );
     QCOMPARE( sw->receivedScroll, true );
@@ -409,8 +408,7 @@ void tst_QScroller::scroll()
     sw->scrollArea = QRectF(0, 0, 0, 1000);
     kineticScrollNoTest(sw, QPointF(0, 500), QPoint(0, 0), QPoint(100, 0), QPoint(200, 0));
 
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
+    QTRY_COMPARE(s1->state(), QScroller::Inactive);
 
     QCOMPARE(sw->currentPos.x(), 0.0);
     QCOMPARE(sw->currentPos.y(), 500.0);
@@ -443,8 +441,7 @@ void tst_QScroller::overshoot()
     s1->setScrollerProperties(sp1);
     kineticScrollNoTest(sw, QPointF(500, 500), QPoint(0, 0), QPoint(400, 0), QPoint(490, 0));
 
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
+    QTRY_COMPARE(s1->state(), QScroller::Inactive);
 
     //qDebug() << "Overshoot fuzzy: "<<sw->currentPos;
     QVERIFY(qFuzzyCompare( sw->currentPos.x(), 0 ));
@@ -459,8 +456,7 @@ void tst_QScroller::overshoot()
     s1->setScrollerProperties(sp1);
     kineticScrollNoTest(sw, QPointF(0, 500), QPoint(0, 0), QPoint(400, 0), QPoint(490, 0));
 
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
+    QTRY_COMPARE(s1->state(), QScroller::Inactive);
 
     //qDebug() << "Overshoot fuzzy: "<<sw->currentPos;
     QVERIFY(qFuzzyCompare( sw->currentPos.x(), 0 ));
@@ -475,8 +471,7 @@ void tst_QScroller::overshoot()
     s1->setScrollerProperties(sp1);
     kineticScrollNoTest(sw, QPointF(0, 500), QPoint(0, 0), QPoint(400, 0), QPoint(490, 0));
 
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
+    QTRY_COMPARE(s1->state(), QScroller::Inactive);
 
     //qDebug() << "Overshoot fuzzy: "<<sw->currentPos;
 
@@ -492,8 +487,7 @@ void tst_QScroller::overshoot()
     s1->setScrollerProperties(sp1);
     kineticScrollNoTest(sw, QPointF(500, 500), QPoint(0, 0), QPoint(400, 0), QPoint(490, 0));
 
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
+    QTRY_COMPARE(s1->state(), QScroller::Inactive);
 
     QVERIFY(qFuzzyCompare( sw->currentPos.x(), 0 ));
     QVERIFY(qFuzzyCompare( sw->currentPos.y(), 500 ));
@@ -509,8 +503,7 @@ void tst_QScroller::overshoot()
     s1->setScrollerProperties(sp1);
     kineticScrollNoTest(sw, QPointF(500, 500), QPoint(0, 0), QPoint(400, 0), QPoint(490, 0));
 
-    while (s1->state() != QScroller::Inactive)
-        QTest::qWait(20);
+    QTRY_COMPARE(s1->state(), QScroller::Inactive);
 
     QVERIFY(qFuzzyCompare( sw->currentPos.x(), 0 ));
     QVERIFY(qFuzzyCompare( sw->currentPos.y(), 500 ));