Fixes: NB#201768 - MWindow::isInSwitcher() returns true for closed prestarted applications.

RevBy: Antti Kervinen, Juha Lintula

Details: Send switcherExited() + reset isInSwitcher when minimized application is closed.

2 files changed, 35 insertions, 0 deletions

diff --git a/tests/ut_mwindow/ut_mwindow.cpp b/tests/ut_mwindow/ut_mwindow.cpp
index e73f8af9..479e7448 100644
--- a/tests/ut_mwindow/ut_mwindow.cpp
+++ b/tests/ut_mwindow/ut_mwindow.cpp
@@ -379,6 +379,39 @@ void Ut_MWindow::testDisplayExitedOnCloseLazyShutdownApp()
     QCOMPARE(spy.count(), 1);
 }
 
+void Ut_MWindow::testSwitcherExitedOnClose()
+{
+    // Test that switcherExited() is sent when
+    // a minimized application is closed
+    win->showMinimized();
+    QSignalSpy spy(win, SIGNAL(switcherExited()));
+    win->close();
+    QCOMPARE(spy.count(), 1);
+    QVERIFY(win->isInSwitcher() == false);
+
+    // Test that switcherExited() is NOT sent when
+    // a maximized application is closed
+    win->show();
+    QSignalSpy spy2(win, SIGNAL(switcherExited()));
+    win->close();
+    QCOMPARE(spy2.count(), 0);
+}
+
+void Ut_MWindow::testIsInSwitcher()
+{
+    win->show();
+
+    QSignalSpy spy(win, SIGNAL(switcherEntered()));
+    win->showMinimized();
+    QCOMPARE(spy.count(), 1);
+    QVERIFY(win->isInSwitcher() == true);
+
+    QSignalSpy spy2(win, SIGNAL(switcherExited()));
+    win->showMaximized();
+    QCOMPARE(spy2.count(), 1);
+    QVERIFY(win->isInSwitcher() == false);
+}
+
 void Ut_MWindow::testCloseOnLazyShutdown()
 {
     win->setCloseOnLazyShutdown(true);
diff --git a/tests/ut_mwindow/ut_mwindow.h b/tests/ut_mwindow/ut_mwindow.h
index e08bb69f..b0f1ed71 100644
--- a/tests/ut_mwindow/ut_mwindow.h
+++ b/tests/ut_mwindow/ut_mwindow.h
@@ -64,6 +64,8 @@ private slots:
     void testDisplayExitedSignal();
     void testDisplayExitedOnClose();
     void testDisplayExitedOnCloseLazyShutdownApp();
+    void testSwitcherExitedOnClose();
+    void testIsInSwitcher();
     void testCloseOnLazyShutdown();
     void testGlobalAlpha();
     void testVideoGlobalAlpha();