diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-06 16:25:21 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-25 11:55:34 +0000 |
| commit | 0cb940b1d3b9a1ba50f2d1973fca411706da266d (patch) | |
| tree | 326e6a32edef67c9e4000862a47fa49db2dd8263 /tests/auto/widgets/widgets/qtoolbar | |
| parent | 7917305aa5acdad117632bc2723d9bec85daa0e0 (diff) | |
tests/auto/widgets/widgets: Avoid unconditional qWait()s
Task-number: QTBUG-63992
Change-Id: I7b0c259800082284ddae4e25d139ad3adc858467
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets/qtoolbar')
| -rw-r--r-- | tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp index 3525dcddd6..301801ed2e 100644 --- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp +++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp @@ -1038,11 +1038,9 @@ void tst_QToolBar::accel() mw.show(); QApplication::setActiveWindow(&mw); - QTest::qWait(100); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&mw)); + QVERIFY(QTest::qWaitForWindowActive(&mw)); QTest::keyClick(&mw, Qt::Key_T, Qt::AltModifier); - QTest::qWait(300); QTRY_COMPARE(spy.count(), 1); #ifdef Q_OS_MAC @@ -1085,19 +1083,19 @@ void tst_QToolBar::task197996_visibility() pAction->setVisible(true); mw.show(); + QVERIFY(QTest::qWaitForWindowActive(&mw)); QVERIFY(toolBar->widgetForAction(pAction)->isVisible()); toolBar->setVisible(false); pAction->setVisible(false); + QVERIFY(!toolBar->widgetForAction(pAction)->isVisible()); + toolBar->setVisible(true); pAction->setVisible(true); - QTest::qWait(100); - - QVERIFY(toolBar->widgetForAction(pAction)->isVisible()); - + QTRY_VERIFY(toolBar->widgetForAction(pAction)->isVisible()); } QTEST_MAIN(tst_QToolBar) |