aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2018-02-21 10:16:14 +0200
committerVille Voutilainen <ville.voutilainen@qt.io>2018-02-23 20:00:11 +0000
commit53d1e9ed21d25e65a2f13606af479838f5f21fe7 (patch)
treeb72d5a22d0f0c3a618b51b7b87cfdb45f2cca81b /tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
parentfd85eaacd9221db3a900fc5ef1364b516ea75d69 (diff)
tests: Wrap qWaitForWindow{Active,Exposed} in QVERIFYv5.11.0-beta1
The functions are marked Q_REQUIRED_RESULT, so they give compilation warnings when not handling the bool return value. Failing the test early at an unexpected event is also better behavior anyway. Task-number: QTBUG-66559 Change-Id: I6c4db29379ec01528208c3e4ee54346b4230616c Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/quick/qquicklistview/tst_qquicklistview.cpp')
-rw-r--r--tests/auto/quick/qquicklistview/tst_qquicklistview.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index dc8c727cbe..8118cf615a 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -2282,7 +2282,7 @@ void tst_QQuickListView::sectionsDelegate_headerVisibility()
window->show();
QVERIFY(QTest::qWaitForWindowExposed(window.data()));
window->requestActivate();
- QTest::qWaitForWindowActive(window.data());
+ QVERIFY(QTest::qWaitForWindowActive(window.data()));
QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list");
QTRY_VERIFY(listview != 0);
@@ -2826,7 +2826,7 @@ void tst_QQuickListView::keyNavigation()
window->rootContext()->setContextProperty("testObject", testObject);
window->setSource(testFileUrl("listviewtest.qml"));
window->show();
- QTest::qWaitForWindowActive(window);
+ QVERIFY(QTest::qWaitForWindowActive(window));
QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list");
QTRY_VERIFY(listview != 0);
@@ -2837,7 +2837,7 @@ void tst_QQuickListView::keyNavigation()
QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
window->requestActivate();
- QTest::qWaitForWindowActive(window);
+ QVERIFY(QTest::qWaitForWindowActive(window));
QTRY_COMPARE(qGuiApp->focusWindow(), window);
QTest::keyClick(window, forwardsKey);
@@ -7264,7 +7264,7 @@ void tst_QQuickListView::parentBinding()
window->setSource(testFileUrl("parentBinding.qml"));
window->show();
- QTest::qWaitForWindowExposed(window.data());
+ QVERIFY(QTest::qWaitForWindowExposed(window.data()));
QQuickListView *listview = qobject_cast<QQuickListView*>(window->rootObject());
QVERIFY(listview != 0);
@@ -8643,7 +8643,7 @@ void tst_QQuickListView::itemFiltered()
window->setContent(QUrl(), &component, component.create());
window->show();
- QTest::qWaitForWindowExposed(window.data());
+ QVERIFY(QTest::qWaitForWindowExposed(window.data()));
// this should not crash
model.setData(model.index(2), QStringLiteral("modified three"), Qt::DisplayRole);