From 08e083e682d92290e36e4fb09abaf0318575dd41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 8 Sep 2017 18:42:25 +0200 Subject: Ensure result of all QTest::qWaitFor are verified The qWaitFor functions themselves can not trigger a test failure, as that will not result in the test function exiting early, so every single call to qWaitFor needs to be wrapped in a QVERIFY. Change-Id: Id15a1549f31d06cdbf788e1d84ea431c28636ec8 Reviewed-by: Thiago Macieira --- .../gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp | 2 +- .../gui/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp | 2 +- tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/benchmarks/gui/graphicsview') diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp index 55f2fd0dcc..87ab80d74f 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp @@ -326,7 +326,7 @@ void tst_GraphicsViewBenchmark::initTestCase() currentListSize = -1; currentListType = None; - QTest::qWaitForWindowShown(mMainView); + QVERIFY(QTest::qWaitForWindowShown(mMainView)); } void tst_GraphicsViewBenchmark::cleanupTestCase() diff --git a/tests/benchmarks/gui/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/benchmarks/gui/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp index b1a54a831d..1db130203a 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/benchmarks/gui/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp @@ -110,7 +110,7 @@ void tst_QGraphicsLayout::invalidate() view->show(); - QTest::qWaitForWindowShown(view); + QVERIFY(QTest::qWaitForWindowShown(view)); // ...then measure... diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index cdec833f4e..9bb5231528 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -160,7 +160,7 @@ void tst_QGraphicsView::initTestCase() mView.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); mView.tryResize(100, 100); mView.show(); - QTest::qWaitForWindowExposed(&mView); + QVERIFY(QTest::qWaitForWindowExposed(&mView)); QTest::qWait(300); processEvents(); } @@ -409,7 +409,7 @@ void tst_QGraphicsView::chipTester() tester.setOpenGL(opengl); tester.setOperation(ChipTester::Operation(operation)); tester.show(); - QTest::qWaitForWindowExposed(&tester); + QVERIFY(QTest::qWaitForWindowExposed(&tester)); QTest::qWait(250); processEvents(); -- cgit v1.2.3