From 2c860b9c4de8a1f423a1a6c10a3460552e959d95 Mon Sep 17 00:00:00 2001 From: Alan Alpert <416365416c@gmail.com> Date: Mon, 30 Mar 2015 18:06:44 -0700 Subject: Remove testing of active window change on hide We don't actually control where the window manager assigns focus if the currently active window is hidden, so don't test for specific behavior. We can now remove the blacklist entry for this test. Change-Id: Ie09fc91c6317f6bb2d4b91000641ef241556fddf Reviewed-by: Frederik Gladhorn --- tests/auto/quick/qquickwindow/BLACKLIST | 2 -- tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 8 -------- 2 files changed, 10 deletions(-) delete mode 100644 tests/auto/quick/qquickwindow/BLACKLIST (limited to 'tests/auto/quick/qquickwindow') diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST deleted file mode 100644 index 1201ef12f0..0000000000 --- a/tests/auto/quick/qquickwindow/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[testWindowVisibilityOrder] -osx diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 7c94cf6d17..f638505c72 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -1716,14 +1716,6 @@ void tst_qquickwindow::testWindowVisibilityOrder() QTest::qWaitForWindowExposed(window5); QVERIFY(window4->isVisible()); QVERIFY(window5->isVisible()); - window4->hide(); - window5->hide(); - - window3->hide(); - QTRY_COMPARE(window2 == QGuiApplication::focusWindow(), true); - - window2->hide(); - QTRY_COMPARE(window1 == QGuiApplication::focusWindow(), true); } void tst_qquickwindow::blockClosing() -- cgit v1.2.3