From 0cb940b1d3b9a1ba50f2d1973fca411706da266d Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Fri, 6 Apr 2018 16:25:21 +0300 Subject: tests/auto/widgets/widgets: Avoid unconditional qWait()s Task-number: QTBUG-63992 Change-Id: I7b0c259800082284ddae4e25d139ad3adc858467 Reviewed-by: Gatis Paeglis --- tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp') diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp index 59ddd54194..22e8097949 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp @@ -164,6 +164,7 @@ void tst_QDoubleSpinBox::initTestCase() testFocusWidget = new QWidget(0); testFocusWidget->resize(200, 100); testFocusWidget->show(); + QVERIFY(QTest::qWaitForWindowActive(testFocusWidget)); } void tst_QDoubleSpinBox::cleanupTestCase() @@ -770,8 +771,7 @@ void tst_QDoubleSpinBox::editingFinished() testFocusWidget->show(); QApplication::setActiveWindow(testFocusWidget); - QTest::qWait(10); - QTRY_VERIFY(testFocusWidget->isActiveWindow()); + QVERIFY(QTest::qWaitForWindowActive(testFocusWidget)); box->setFocus(); QTRY_VERIFY(box->hasFocus()); @@ -997,7 +997,7 @@ void tst_QDoubleSpinBox::task224497_fltMax() dspin->setMinimum(3); dspin->setMaximum(FLT_MAX); dspin->show(); - QTest::qWait(1000); + QVERIFY(QTest::qWaitForWindowActive(dspin)); dspin->lineEdit()->selectAll(); QTest::keyClick(dspin->lineEdit(), Qt::Key_Delete); QTest::keyClick(dspin->lineEdit(), Qt::Key_1); -- cgit v1.2.3