From 0fadbc7ed909de1caa7833abaf7cb1c3b20b4efb Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 28 Mar 2014 11:05:00 +0100 Subject: tst_qaccessibility: Introduce QTRY_VERIFY to menuTest(). Fixes failures on Windows 8.1. Task-number: QTBUG-37822 Change-Id: I30460f430e2249555c4e857237e27aa9b03dfa1b Reviewed-by: Oliver Wolff --- tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') 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()); -- cgit v1.2.3