1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stabilize tst_QAccessibilityMac

Browse Source 
Introduce a TRY_EXPECT macro that uses qWaitFor, and use it whenever
EXPECT was used after a call to processEvents.

Fixes: QTBUG-94036
Pick-to: 6.2 5.15
Change-Id: Ia935444d529c2798637bf9b4a56e47a8dc9d75d2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
Volker Hilsheimer 2021-11-25 22:41:06 +01:00
parent 7e11ddc930
commit 24022bc760
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm
View File

@ -86,6 +86,7 @@ QDebug operator<<(QDebug dbg, AXErrorTag err)
return false; \
} \
#define TRY_EXPECT(cond) EXPECT(QTest::qWaitFor([&]{ return (cond); }))
@interface TestAXObject : NSObject
{
@ -546,21 +547,17 @@ bool notifications(QWidget *w)
EXPECT(notificationList.length() == 0);
le2->setFocus();
QCoreApplication::processEvents();
EXPECT(notificationList.length() == 1);
EXPECT(notificationList.at(0) == QAccessible::Focus);
TRY_EXPECT(notificationList.length() == 1);
TRY_EXPECT(notificationList.at(0) == QAccessible::Focus);
le1->setFocus();
QCoreApplication::processEvents();
EXPECT(notificationList.length() == 2);
EXPECT(notificationList.at(1) == QAccessible::Focus);
TRY_EXPECT(notificationList.length() == 2);
TRY_EXPECT(notificationList.at(1) == QAccessible::Focus);
le1->setText("hello");
QCoreApplication::processEvents();
EXPECT(notificationList.length() == 3);
EXPECT(notificationList.at(2) == QAccessible::ValueChanged);
TRY_EXPECT(notificationList.length() == 3);
TRY_EXPECT(notificationList.at(2) == QAccessible::ValueChanged);
le1->setText("foo");
QCoreApplication::processEvents();
EXPECT(notificationList.length() == 4);
EXPECT(notificationList.at(3) == QAccessible::ValueChanged);
TRY_EXPECT(notificationList.length() == 4);
TRY_EXPECT(notificationList.at(3) == QAccessible::ValueChanged);
return true;
}