Merge lp:~nick-dedekind/qtmir/1355173.trust-prompt-suspend into lp:qtmir

[Nick Dedekind]

Notify prompt sessions that sessions have been suspended/resumed.

 * 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?
No

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Code looks reasonable, I didn't test though

review: Approve (code)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Again, code is reasonable. Need to functional test

review: Approve (code)

[Gerry Boland (gerboland)]

Please merge qtmir trunk. Note you also need to do this: http://pastebin.ubuntu.com/9698152/ to have it build.

Just building to test now.

review: Needs Fixing

[Gerry Boland (gerboland)]

Manual Testing brought up no issues, functionally it looks good to me

review: Approve (functional)

[Gerry Boland (gerboland)]

review: Needs Fixing (code)

[lp:~nick-dedekind/qtmir/1355173.trust-prompt-suspend]

280. By Nick Dedekind on 2015-01-09

mirConfig->mirServer

281. By Nick Dedekind on 2015-01-09

merged with trunk

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Good to go

 * 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.
Is fine

review: Approve

=== modified file 'src/modules/Unity/Application/session.cpp'
--- src/modules/Unity/Application/session.cpp	2014-09-11 16:18:40 +0000
+++ src/modules/Unity/Application/session.cpp	2015-01-09 15:14:09 +0000
@@ -26,6 +26,7 @@
 
 // mir
 #include <mir/scene/session.h>
+#include <mir/scene/prompt_session.h>
 #include <mir/scene/prompt_session_manager.h>
 
 // Qt
@@ -223,7 +224,6 @@
         {
         case Session::State::Suspended:
             if (m_state == Session::State::Running) {
-                stopPromptSessions();
                 session()->set_lifecycle_state(mir_lifecycle_state_will_suspend);
                 m_suspendTimer->start(3000);
             }
@@ -253,6 +253,19 @@
         m_state = state;
         Q_EMIT stateChanged(state);
 
+        foreachPromptSession([this, state](const std::shared_ptr<ms::PromptSession>& promptSession) {
+            switch (state) {
+                case Session::State::Suspended:
+                    m_promptSessionManager->suspend_prompt_session(promptSession);
+                    break;
+                case Session::State::Running:
+                    m_promptSessionManager->resume_prompt_session(promptSession);
+                    break;
+                default:
+                    break;
+            }
+        });
+
         foreachChildSession([state](SessionInterface* session) {
             session->setState(state);
         });
 
=== modified file 'tests/modules/SessionManager/session_test.cpp'
--- tests/modules/SessionManager/session_test.cpp	2014-12-01 11:05:01 +0000
+++ tests/modules/SessionManager/session_test.cpp	2015-01-09 15:14:09 +0000
@@ -191,3 +191,61 @@
     delete session;
     EXPECT_THAT(destroyed, UnorderedElementsAre(session1, session2, session3));
 }
+
+class MockQtMirSession : public qtmir::Session
+{
+public:
+    MockQtMirSession(const std::shared_ptr<ms::Session>& session,
+                     const std::shared_ptr<ms::PromptSessionManager>& promptSessionManager)
+    : Session(session, promptSessionManager)
+    {}
+
+    using SessionInterface::appendPromptSession;
+};
+
+TEST_F(SessionTests, SuspendPromptSessionWhenSessionSuspends)
+{
+    using namespace testing;
+
+    const QString appId("test-app");
+    quint64 procId = 5551;
+
+    auto mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
+    EXPECT_CALL(*mirSession, set_lifecycle_state(_));
+
+    auto session = std::make_shared<MockQtMirSession>(mirSession, mirServer->the_prompt_session_manager());
+    session->setState(Session::State::Running);
+
+    auto mirPromptSession = std::make_shared<ms::MockPromptSession>();
+    session->appendPromptSession(mirPromptSession);
+
+    EXPECT_CALL(*mirServer->the_mock_prompt_session_manager(), suspend_prompt_session(_)).Times(1);
+
+    session->setState(Session::State::Suspended);
+
+    Mock::VerifyAndClear(mirServer->the_mock_prompt_session_manager().get());
+}
+
+TEST_F(SessionTests, ResumePromptSessionWhenSessionResumes)
+{
+    using namespace testing;
+
+    const QString appId("test-app");
+    quint64 procId = 5551;
+
+    auto mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
+    EXPECT_CALL(*mirSession, set_lifecycle_state(_));
+
+    auto session = std::make_shared<MockQtMirSession>(mirSession, mirServer->the_prompt_session_manager());
+    session->setState(Session::State::Suspended);
+
+    auto mirPromptSession = std::make_shared<ms::MockPromptSession>();
+    session->appendPromptSession(mirPromptSession);
+
+    EXPECT_CALL(*mirServer->the_mock_prompt_session_manager(), resume_prompt_session(_)).Times(1);
+
+    session->setState(Session::State::Running);
+
+    Mock::VerifyAndClear(mirServer->the_mock_prompt_session_manager().get());
+}
+
 
=== modified file 'tests/modules/common/mock_mir_session.h'
--- tests/modules/common/mock_mir_session.h	2015-01-06 17:28:52 +0000
+++ tests/modules/common/mock_mir_session.h	2015-01-09 15:14:09 +0000
@@ -31,7 +31,7 @@
 struct MockSession : public Session
 {
     MockSession() {}
-    MockSession(std::string const& sessionName, pid_t processId) 
+    MockSession(std::string const& sessionName, pid_t processId)
         : m_sessionName(sessionName), m_sessionId(processId)
     {}