summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-03-28 11:05:00 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-28 22:52:19 +0100
commit0fadbc7ed909de1caa7833abaf7cb1c3b20b4efb (patch)
treed5b9a2c8099497fe99accb5fe8b089b9294b98e9 /tests
parent27fa02e29d873db4fdf1e77feee600f1e15e94f4 (diff)
tst_qaccessibility: Introduce QTRY_VERIFY to menuTest().
Fixes failures on Windows 8.1. Task-number: QTBUG-37822 Change-Id: I30460f430e2249555c4e857237e27aa9b03dfa1b Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/other/qaccessibility/tst_qaccessibility.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 2bf8a40451..9f0540173a 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -1415,19 +1415,19 @@ void tst_QAccessibility::menuTest()
iFile->actionInterface()->doAction(QAccessibleActionInterface::showMenuAction());
if(menuFade)
QTest::qWait(menuFadeDelay);
- QVERIFY(file->isVisible() && !edit->isVisible() && !help->isVisible());
+ QTRY_VERIFY(file->isVisible() && !edit->isVisible() && !help->isVisible());
iEdit->actionInterface()->doAction(QAccessibleActionInterface::showMenuAction());
if(menuFade)
QTest::qWait(menuFadeDelay);
- QVERIFY(!file->isVisible() && edit->isVisible() && !help->isVisible());
+ QTRY_VERIFY(!file->isVisible() && edit->isVisible() && !help->isVisible());
iHelp->actionInterface()->doAction(QAccessibleActionInterface::showMenuAction());
if(menuFade)
QTest::qWait(menuFadeDelay);
- QVERIFY(!file->isVisible() && !edit->isVisible() && help->isVisible());
+ QTRY_VERIFY(!file->isVisible() && !edit->isVisible() && help->isVisible());
iAction->actionInterface()->doAction(QAccessibleActionInterface::showMenuAction());
if(menuFade)
QTest::qWait(menuFadeDelay);
- QVERIFY(!file->isVisible() && !edit->isVisible() && !help->isVisible());
+ QTRY_VERIFY(!file->isVisible() && !edit->isVisible() && !help->isVisible());
QVERIFY(interface->actionInterface());
QCOMPARE(interface->actionInterface()->actionNames(), QStringList());
@@ -1500,8 +1500,8 @@ void tst_QAccessibility::menuTest()
iFile->actionInterface()->doAction(QAccessibleActionInterface::showMenuAction());
iFileNew->actionInterface()->doAction(QAccessibleActionInterface::showMenuAction());
- QVERIFY(file->isVisible());
- QVERIFY(fileNew->isVisible());
+ QTRY_VERIFY(file->isVisible());
+ QTRY_VERIFY(fileNew->isVisible());
QVERIFY(!edit->isVisible());
QVERIFY(!help->isVisible());