diff options
author | Robin Burchell <robin.burchell@viroteck.net> | 2014-08-17 18:38:41 +0200 |
---|---|---|
committer | Robin Burchell <robin.burchell@viroteck.net> | 2014-08-18 13:53:01 +0200 |
commit | 74805930d1d3bc249edbd3aa07ab14c9ea28f26a (patch) | |
tree | fa983f1df05e1631711a3608205de6f8920f4554 /tests/auto | |
parent | 037125ee4aa37185a5dd44fa7c6b4492106a6f8b (diff) |
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 <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); |