1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_qwindowcontainer: Convert some QVERIFYs to QCOMPAREs

Browse Source 
So when they fail it's easier to figure out why.

Change-Id: I7e76a6e0b8076ede30a6bb9049a031063c569dfc
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
This commit is contained in:
Robin Burchell 2014-08-17 18:38:41 +02:00
parent 037125ee4a
commit 74805930d1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
View File

@ -193,7 +193,7 @@ void tst_QWindowContainer::testActivation()
QVERIFY(QTest::qWaitForWindowExposed(&root)); QVERIFY(QTest::qWaitForWindowExposed(&root));
QVERIFY(QTest::qWaitForWindowActive(root.windowHandle())); 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 // Verify that all states in the root widget indicate it is active
QVERIFY(root.windowHandle()->isActive()); QVERIFY(root.windowHandle()->isActive());
@ -207,7 +207,7 @@ void tst_QWindowContainer::testActivation()
QTest::qWait(100); QTest::qWait(100);
window->requestActivate(); 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 // Verify that all states in the root widget still indicate it is active
QVERIFY(root.windowHandle()->isActive()); QVERIFY(root.windowHandle()->isActive());
@ -303,7 +303,7 @@ void tst_QWindowContainer::testDockWidget()
mainWindow.show(); mainWindow.show();
QVERIFY(QTest::qWaitForWindowExposed(&mainWindow)); QVERIFY(QTest::qWaitForWindowExposed(&mainWindow));
QVERIFY(window->parent() == mainWindow.window()->windowHandle()); QCOMPARE(window->parent(), mainWindow.window()->windowHandle());
QTest::qWait(1000); QTest::qWait(1000);
dock->setFloating(true); dock->setFloating(true);