diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-04 12:57:51 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-24 05:01:57 +0000 |
commit | 15ada2b91798638c90630c332e4a8caef7660638 (patch) | |
tree | bac271959a1dc7050ae74ed1950bdfd476b4f723 /tests/auto/widgets/kernel/qstackedlayout | |
parent | c579f49e2a80a55a4004ff8e5b2ee76bda146387 (diff) |
tests/auto/widgets/kernel: Avoid unconditional qWait()s
Task-number: QTBUG-63992
Change-Id: Icb32b516002c3bb2841c8e7a29624e54cfcbbcac
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'tests/auto/widgets/kernel/qstackedlayout')
-rw-r--r-- | tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp index 5be4846b3e..10712ea9ad 100644 --- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp +++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp @@ -103,7 +103,7 @@ void tst_QStackedLayout::init() // make sure the tests work with focus follows mouse QCursor::setPos(testWidget->geometry().center()); testWidget->activateWindow(); - QTest::qWait(250); + QVERIFY(QTest::qWaitForWindowActive(testWidget)); } void tst_QStackedLayout::cleanup() @@ -251,24 +251,13 @@ void tst_QStackedLayout::removeWidget() testLayout->addWidget(w2); vbox->addLayout(testLayout); top->setFocus(); - QTest::qWait(100); top->activateWindow(); - QTest::qWait(100); - int i =0; - for (;;) { - if (QApplication::focusWidget() == top) - break; - else if (i >= 5) - QSKIP("Can't get focus"); - QTest::qWait(100); - ++i; - } - QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(top)); + QTRY_COMPARE(QApplication::focusWidget(), top); // focus should stay at the 'top' widget testLayout->removeWidget(w1); - QCOMPARE(QApplication::focusWidget(), static_cast<QWidget *>(top)); + QCOMPARE(QApplication::focusWidget(), top); } class LineEdit : public QLineEdit |