fix(tests/main-view): avoid usage of QTRY_VERIFY_WITH_TIMEOUT

This commit is contained in:
Ronan Abhamon 2017-07-19 12:08:51 +02:00
parent dd794f92cd
commit 62e9a39351
2 changed files with 4 additions and 4 deletions

View file

@ -27,8 +27,8 @@
#define CHECK_VIRTUAL_WINDOW_CONTENT_INFO(WINDOW, TYPE, NAME) \
do { \
QQuickItem *virtualWindowContent; \
QTRY_VERIFY_WITH_TIMEOUT(virtualWindowContent = TestUtils::getVirtualWindowContent(WINDOW), 1000); \
QQuickItem *virtualWindowContent = TestUtils::getVirtualWindowContent(WINDOW); \
QVERIFY(virtualWindowContent); \
QVERIFY(!strncmp(virtualWindowContent->metaObject()->className(), TYPE, sizeof TYPE - 1)); \
QCOMPARE(virtualWindowContent->objectName(), QStringLiteral(NAME)); \
} while (0)

View file

@ -39,7 +39,7 @@ void MainViewTest::showAboutPopup () {
// Close popup.
QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(476, 392));
QTRY_VERIFY_WITH_TIMEOUT(!TestUtils::getVirtualWindowContent(mainWindow), 1000);
QVERIFY(!TestUtils::getVirtualWindowContent(mainWindow));
}
void MainViewTest::showManageAccountsPopup () {
@ -52,7 +52,7 @@ void MainViewTest::showManageAccountsPopup () {
// Close popup.
QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(476, 392));
QTRY_VERIFY_WITH_TIMEOUT(!TestUtils::getVirtualWindowContent(mainWindow), 1000);
QVERIFY(!TestUtils::getVirtualWindowContent(mainWindow));
}
void MainViewTest::showSettingsWindow () {