From 74805930d1d3bc249edbd3aa07ab14c9ea28f26a Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Sun, 17 Aug 2014 18:38:41 +0200 Subject: tst_qwindowcontainer: Convert some QVERIFYs to QCOMPAREs So when they fail it's easier to figure out why. Change-Id: I7e76a6e0b8076ede30a6bb9049a031063c569dfc Reviewed-by: Gunnar Sletta --- tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp index cd6433bbe7..75ee52cf0e 100644 --- a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp +++ b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp @@ -193,7 +193,7 @@ void tst_QWindowContainer::testActivation() QVERIFY(QTest::qWaitForWindowExposed(&root)); QVERIFY(QTest::qWaitForWindowActive(root.windowHandle())); - QVERIFY(QGuiApplication::focusWindow() == root.windowHandle()); + QCOMPARE(QGuiApplication::focusWindow(), root.windowHandle()); // Verify that all states in the root widget indicate it is active QVERIFY(root.windowHandle()->isActive()); @@ -207,7 +207,7 @@ void tst_QWindowContainer::testActivation() QTest::qWait(100); window->requestActivate(); - QTRY_VERIFY(QGuiApplication::focusWindow() == window); + QTRY_COMPARE(QGuiApplication::focusWindow(), window); // Verify that all states in the root widget still indicate it is active QVERIFY(root.windowHandle()->isActive()); @@ -303,7 +303,7 @@ void tst_QWindowContainer::testDockWidget() mainWindow.show(); QVERIFY(QTest::qWaitForWindowExposed(&mainWindow)); - QVERIFY(window->parent() == mainWindow.window()->windowHandle()); + QCOMPARE(window->parent(), mainWindow.window()->windowHandle()); QTest::qWait(1000); dock->setFloating(true); -- cgit v1.2.3