Merge lp:~dandrader/qtmir/focusFromSideToMainStage into lp:qtmir

[Daniel d'Andrada]

Don't suspend&resume the main stage app when switching focus from side to main stage

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:310
http://jenkins.qa.ubuntu.com/job/qtmir-ci/200/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/51/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/51/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/200/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:310
http://jenkins.qa.ubuntu.com/job/qtmir-ci/202/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/53/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/202/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Y

review: Approve

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2015-01-07 17:56:07 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2015-01-27 12:29:39 +0000
@@ -413,7 +413,9 @@
     if (m_focusedApplication) {
         m_focusedApplication->setFocused(false);
         Application *lastApplication = applicationForStage(application->stage());
-        suspendApplication(lastApplication);
+        if (lastApplication != application) {
+            suspendApplication(lastApplication);
+        }
     }
 
     if (application->stage() == Application::MainStage) {

=== modified file 'tests/modules/ApplicationManager/application_manager_test.cpp'
--- tests/modules/ApplicationManager/application_manager_test.cpp	2014-11-13 16:26:03 +0000
+++ tests/modules/ApplicationManager/application_manager_test.cpp	2015-01-27 12:29:39 +0000
@@ -2135,3 +2135,100 @@
         cv.wait(lk, [&] { return done; } );
     }
 }
+
+/*
+   1 - launch and focus a main stage app
+     * main stage app is running and focused
+   2 - launch and focus a side stage app
+     * main stage app is running but is not focused
+     * side stage app is running and has focus
+   3 - focus the main stage app
+     * main stage app is running and has focus
+     * side stage app is running but is not focused
+
+   This is a regression test for the bug where on step 3, the main stage app was momentarily
+   suspended and then resumed again.
+ */
+TEST_F(ApplicationManagerTests, focusMainStageAfterSideStage)
+{
+    using namespace testing;
+
+    QString webbrowserAppId("webbrowser-app");
+    quint64 webbrowserPID = 123;
+    std::shared_ptr<mir::scene::Surface> webbrowserSurface(nullptr);
+
+    QString dialerAppId("dialer-app");
+    quint64 dialerPID = 456;
+    std::shared_ptr<mir::scene::Surface> dialerSurface(nullptr);
+
+    /*** Start webbrowser-app (main stage) ***/
+
+    ON_CALL(appController,appIdHasProcessId(webbrowserPID, webbrowserAppId)).WillByDefault(Return(true));
+
+    {
+        auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(webbrowserAppId, QFileInfo());
+        ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
+        ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(webbrowserAppId));
+        ON_CALL(*mockDesktopFileReader, stageHint()).WillByDefault(Return("MainStage"));
+
+        ON_CALL(desktopFileReaderFactory, createInstance(webbrowserAppId, _))
+            .WillByDefault(Return(mockDesktopFileReader));
+    }
+
+    EXPECT_CALL(appController, startApplicationWithAppIdAndArgs(webbrowserAppId, _))
+            .Times(1)
+            .WillOnce(Return(true));
+
+    /*auto application =*/ applicationManager.startApplication(webbrowserAppId, ApplicationManager::NoFlag);
+    applicationManager.onProcessStarting(webbrowserAppId);
+
+    {
+        bool authed = false;
+        applicationManager.authorizeSession(webbrowserPID, authed);
+        EXPECT_EQ(authed, true);
+    }
+
+    auto webbrowserSession = std::make_shared<mir::scene::MockSession>(webbrowserAppId.toStdString(), webbrowserPID);
+    sessionManager.onSessionStarting(webbrowserSession);
+    applicationManager.focusApplication(webbrowserAppId);
+    applicationManager.onSessionCreatedSurface(webbrowserSession.get(), webbrowserSurface);
+
+    /*** Start dialer-app (side stage) ***/
+
+    ON_CALL(appController, appIdHasProcessId(dialerPID, dialerAppId)).WillByDefault(Return(true));
+
+    {
+        auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(dialerAppId, QFileInfo());
+        ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
+        ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(dialerAppId));
+        ON_CALL(*mockDesktopFileReader, stageHint()).WillByDefault(Return("SideStage"));
+
+        ON_CALL(desktopFileReaderFactory, createInstance(dialerAppId, _))
+            .WillByDefault(Return(mockDesktopFileReader));
+    }
+
+    EXPECT_CALL(appController, startApplicationWithAppIdAndArgs(dialerAppId, _))
+            .Times(1)
+            .WillOnce(Return(true));
+
+    /*auto application =*/ applicationManager.startApplication(dialerAppId, ApplicationManager::NoFlag);
+    applicationManager.onProcessStarting(dialerAppId);
+
+    {
+        bool authed = false;
+        applicationManager.authorizeSession(dialerPID, authed);
+        EXPECT_EQ(authed, true);
+    }
+
+    auto dialerSession = std::make_shared<mir::scene::MockSession>(dialerAppId.toStdString(), dialerPID);
+    sessionManager.onSessionStarting(dialerSession);
+    applicationManager.focusApplication(dialerAppId);
+    applicationManager.onSessionCreatedSurface(dialerSession.get(), dialerSurface);
+
+    /*** Focus webbrowser ***/
+
+    // Nothing should happen as it's already the running main stage app
+    EXPECT_CALL(*webbrowserSession.get(), set_lifecycle_state(_))
+            .Times(0);
+    applicationManager.focusApplication(webbrowserAppId);
+}