diff options
| author | J-P Nurmi <j-p.nurmi@nokia.com> | 2012-09-14 11:18:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-15 19:35:25 +0200 |
| commit | 7329ad3ee59fedc68758289677f3ece617858708 (patch) | |
| tree | 8565012cc06174e73c2c27d310f0530301175217 /tests | |
| parent | 83b1ed1ea8168e3de15de7a8a44a5224db5a2284 (diff) | |
Attempt to stabilize QMenu auto tests
Change-Id: I7d8260570a280182990d78e07d696aa4b46e1747
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index a61e34f898..5d464aa869 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -556,7 +556,7 @@ void tst_QMenu::tearOff() widget.activateWindow(); QVERIFY(QTest::qWaitForWindowActive(&widget)); menu->popup(QPoint(0,0)); - QTest::qWait(50); + QVERIFY(QTest::qWaitForWindowActive(menu)); QVERIFY(!menu->isTearOffMenuVisible()); QTest::mouseClick(menu, Qt::LeftButton, 0, QPoint(3, 3), 10); @@ -791,12 +791,12 @@ void tst_QMenu::task258920_mouseBorder() QTest::qWait(30); QTest::mouseMove(&menu, actionRect.center() + QPoint(10, 0)); QTest::qWait(30); - QCOMPARE(action, menu.activeAction()); + QTRY_COMPARE(action, menu.activeAction()); menu.painted = false; QTest::mouseMove(&menu, QPoint(actionRect.center().x(), actionRect.bottom() + 1)); QTest::qWait(30); - QCOMPARE(static_cast<QAction*>(0), menu.activeAction()); - QVERIFY(menu.painted); + QTRY_COMPARE(static_cast<QAction*>(0), menu.activeAction()); + QTRY_VERIFY(menu.painted); } void tst_QMenu::setFixedWidth() |