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/qsplitter/tst_qsplitter.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'tests/auto/widgets/widgets/qsplitter') diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp index cad7bd69d7..77abf5e5a7 100644 --- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp @@ -287,7 +287,7 @@ void tst_QSplitter::saveAndRestoreStateOfNotYetShownSplitter() QByteArray ba = spl->saveState(); spl->restoreState(ba); spl->show(); - QTest::qWait(500); + QVERIFY(QTest::qWaitForWindowActive(spl)); QCOMPARE(l1->geometry().isValid(), true); QCOMPARE(l2->geometry().isValid(), true); @@ -607,8 +607,7 @@ void tst_QSplitter::testShowHide() lay->addWidget(split); widget.setLayout(lay); topLevel.show(); - - QTest::qWait(100); + QVERIFY(QTest::qWaitForWindowActive(&topLevel)); widget.hide(); split->widget(0)->setHidden(hideWidget1); @@ -976,14 +975,13 @@ void tst_QSplitter::task169702_sizes() outerSplitter->setGeometry(100, 100, 500, 500); topLevel.show(); + QVERIFY(QTest::qWaitForWindowActive(&topLevel)); - QTest::qWait(100); testW->m_iFactor++; testW->updateGeometry(); - QTest::qWait(500); //Make sure the minimimSizeHint is respected - QCOMPARE(testW->size().height(), testW->minimumSizeHint().height()); + QTRY_COMPARE(testW->size().height(), testW->minimumSizeHint().height()); } void tst_QSplitter::taskQTBUG_4101_ensureOneNonCollapsedWidget_data() @@ -1012,8 +1010,7 @@ void tst_QSplitter::taskQTBUG_4101_ensureOneNonCollapsedWidget() l->hide(); else delete l; - QTest::qWait(100); - QVERIFY(s.sizes().at(0) > 0); + QTRY_VERIFY(s.sizes().at(0) > 0); } void tst_QSplitter::setLayout() -- cgit v1.2.3