QtMir

Merge lp:~alan-griffiths/qtmir/MirServer-is-an-implementation-detail into lp:qtmir

MirServer-is-an-implementation-detail
Merge into trunk

Proposed by Alan Griffiths on 2016-05-06

Status:	Merged
Approved by:	Daniel d'Andrada on 2016-07-20
Approved revision:	492
Merged at revision:	540
Proposed branch:	lp:~alan-griffiths/qtmir/MirServer-is-an-implementation-detail
Merge into:	lp:qtmir
Prerequisite:	lp:~alan-griffiths/qtmir/MirServer-is-not-a-context-object
Diff against target:	523 lines (+99/-111) 11 files modified src/modules/Unity/Application/sessionmanager.cpp (+15/-7) src/modules/Unity/Application/sessionmanager.h (+2/-4) src/platforms/mirserver/mirserverintegration.cpp (+1/-4) src/platforms/mirserver/nativeinterface.cpp (+3/-22) src/platforms/mirserver/nativeinterface.h (+6/-2) src/platforms/mirserver/qmirserver.cpp (+37/-6) src/platforms/mirserver/qmirserver.h (+10/-3) tests/framework/qtmir_test.cpp (+1/-37) tests/framework/qtmir_test.h (+0/-2) tests/modules/Application/application_test.cpp (+1/-1) tests/modules/SessionManager/session_test.cpp (+23/-23)
To merge this branch:	bzr merge lp:~alan-griffiths/qtmir/MirServer-is-an-implementation-detail
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel d'Andrada (community)		2016-05-06	Approve on 2016-07-20
Unity8 CI Bot	continuous-integration		Approve on 2016-06-01
Michał Sawicz			Needs Fixing on 2016-05-25
Review via email: mp+293992@code.launchpad.net

Commit Message

Reduce MirServer to an implementation detail of QMirServer (nothing else needs to touch it).

Description of the Change

Reduce MirServer to an implementation detail of QMirServer (nothing else needs to touch it).

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-06:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/207/rebuild

review: Approve (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-05-06:

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

* Did CI run pass? If not, please explain why.
Yes

review: Approve

Michał Sawicz (saviq) wrote on 2016-05-25:

This is causing tests to hang indefinitely on vivid.

review: Needs Fixing

Michał Sawicz (saviq) wrote on 2016-05-25:

This is where it showed up:
https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-059/+build/9803367
https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-059/+build/9803369
https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-059/+build/9803370

lp:~alan-griffiths/qtmir/MirServer-is-an-implementation-detail updated on 2016-05-25

489. By Alan Griffiths on 2016-05-25: merge lp:qtmir

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-30:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/238/rebuild

review: Needs Fixing (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2016-05-31:

> This is causing tests to hang indefinitely on vivid.

That's interesting. I wonder what changed in the time between doing this work and trying to integrate it.

Alan Griffiths (alan-griffiths) wrote on 2016-05-31:

More and more interesting!

The same hang is happening in sharedwakelock_test, sessionmanager_test and application_test before reaching main() in tls_get_addr_tail(). Presumably some implicitly linked .so is failing to initialize horribly and that original failure is "eaten" by the link loader.

It is hard to see how the changes proposed here affect anything so early in process start-up (especially for sharedwakelock_test) but empirically, that is what happens.

lp:~alan-griffiths/qtmir/MirServer-is-an-implementation-detail updated on 2016-05-31

490. By Alan Griffiths on 2016-05-31: Stop the tests hanging

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-31:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/241/rebuild

review: Needs Fixing (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2016-06-01:

/sigh.

That's the trouble with fixes that seem crazy. They only work on my kit.

lp:~alan-griffiths/qtmir/MirServer-is-an-implementation-detail updated on 2016-06-01

491. By Alan Griffiths on 2016-06-01: Use frig_to_force_libmirserver_linkage to discourage optimizer from dropping it
492. By Alan Griffiths on 2016-06-01: Another approach to forcing a linker dependency

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-01:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/242/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-01:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/243/rebuild

review: Approve (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-07-20:

Still ok

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alan Griffiths

Daniel d'Andrada

Mir development team

 === modified file 'src/modules/Unity/Application/sessionmanager.cpp'
 --- src/modules/Unity/Application/sessionmanager.cpp	2016-05-06 08:41:15 +0000
 +++ src/modules/Unity/Application/sessionmanager.cpp	2016-06-01 09:31:31 +0000
@@ -24,7 +24,6 @@
  // QPA mirserver
  #include "nativeinterface.h"
--#include "mirserver.h"
  #include "sessionlistener.h"
  #include "logging.h"
  #include "promptsessionlistener.h"
@@ -32,6 +31,7 @@
  // mir
  #include <mir/scene/prompt_session.h>
  #include <mir/scene/prompt_session_manager.h>
++#include <mir/report_exception.h>
  namespace ms = mir::scene;
@@ -61,6 +61,7 @@
+ }
  SessionManager* SessionManager::singleton()
++try
+ {
      if (!the_session_manager) {
@@ -75,20 +76,28 @@
          SessionListener *sessionListener = static_cast<SessionListener*>(nativeInterface->nativeResourceForIntegration("SessionListener"));
          PromptSessionListener *promptSessionListener = static_cast<PromptSessionListener*>(nativeInterface->nativeResourceForIntegration("PromptSessionListener"));
--        the_session_manager = new SessionManager(nativeInterface->mirServer(), ApplicationManager::singleton());
++        the_session_manager = new SessionManager(nativeInterface->thePromptSessionManager(), ApplicationManager::singleton());
          connectToSessionListener(the_session_manager, sessionListener);
          connectToPromptSessionListener(the_session_manager, promptSessionListener);
+     }
      return the_session_manager;
+ }
++catch (...)
++{
++    // We only call mir::report_exception() here to force linkage against libmirserver.
++    // Unless we force this module to have a link dependency on libmirserver we get
++    // several tests hanging during link loading. I wish I understood why.    alan_g
++    mir::report_exception();
++    throw;
++}
  SessionManager::SessionManager(
--        const QSharedPointer<MirServer>& mirServer,
++        const std::shared_ptr<mir::scene::PromptSessionManager>& promptSessionManager,
          ApplicationManager* applicationManager,
          QObject *parent)
      : SessionModel(parent)
--    , m_mirServer(mirServer)
++    , m_promptSessionManager(promptSessionManager)
      , m_applicationManager(applicationManager)
+ {
      qCDebug(QTMIR_SESSIONS) << "SessionManager::SessionManager - this=" << this;
@@ -115,8 +124,7 @@
+ {
      qCDebug(QTMIR_SESSIONS) << "SessionManager::onSessionStarting - sessionName=" <<  session->name().c_str();
--    Session* qmlSession = new Session(session,
--                                       m_mirServer->the_prompt_session_manager());
++    Session* qmlSession = new Session(session, m_promptSessionManager);
      insert(0, qmlSession);
      Application* application = m_applicationManager->findApplicationWithSession(session);
@@ -149,7 +157,7 @@
+ {
      qCDebug(QTMIR_SESSIONS) << "SessionManager::onPromptSessionStarting - promptSession=" << promptSession.get();
--    std::shared_ptr<mir::scene::Session> appSession = m_mirServer->the_prompt_session_manager()->application_for(promptSession);
++    std::shared_ptr<mir::scene::Session> appSession = m_promptSessionManager->application_for(promptSession);
      SessionInterface *qmlAppSession = findSession(appSession.get());
      if (qmlAppSession) {
          m_mirPromptToSessionHash[promptSession.get()] = qmlAppSession;
 === modified file 'src/modules/Unity/Application/sessionmanager.h'
 --- src/modules/Unity/Application/sessionmanager.h	2015-08-11 12:08:32 +0000
 +++ src/modules/Unity/Application/sessionmanager.h	2016-06-01 09:31:31 +0000
@@ -38,8 +38,6 @@
+     }
+ }
--class MirServer;
--
  namespace qtmir {
  class Application;
@@ -51,7 +49,7 @@
  public:
      explicit SessionManager(
--        const QSharedPointer<MirServer>& mirServer,
++        const std::shared_ptr<mir::scene::PromptSessionManager>& promptSessionManager,
          ApplicationManager* applicationManager,
          QObject *parent = 0
      );
@@ -77,7 +75,7 @@
  protected:
  private:
--    QSharedPointer<MirServer> m_mirServer;
++    const std::shared_ptr<mir::scene::PromptSessionManager> m_promptSessionManager;
      ApplicationManager* m_applicationManager;
      static SessionManager *the_session_manager;
 === modified file 'src/platforms/mirserver/mirserverintegration.cpp'
 --- src/platforms/mirserver/mirserverintegration.cpp	2016-05-05 14:34:21 +0000
 +++ src/platforms/mirserver/mirserverintegration.cpp	2016-06-01 09:31:31 +0000
@@ -15,7 +15,6 @@
   */
  #include "mirserverintegration.h"
--#include "mirserver.h"
  #include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
  #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
@@ -29,7 +28,6 @@
  #include <QGuiApplication>
  #include <QStringList>
--#include <QOpenGLContext>
  #include <QDebug>
  // Mir
@@ -128,8 +126,7 @@
  QPlatformOpenGLContext *MirServerIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
+ {
--    auto server = m_mirServer->mirServer().lock();
--    return new MirOpenGLContext(*server->the_display(), *server->the_gl_config(), context->format());
++    return m_mirServer->createPlatformOpenGLContext(context);
+ }
  QAbstractEventDispatcher *MirServerIntegration::createEventDispatcher() const
 === modified file 'src/platforms/mirserver/nativeinterface.cpp'
 --- src/platforms/mirserver/nativeinterface.cpp	2016-05-05 14:17:14 +0000
 +++ src/platforms/mirserver/nativeinterface.cpp	2016-06-01 09:31:31 +0000
@@ -15,7 +15,6 @@
   */
  #include "nativeinterface.h"
--#include "mirserver.h"
  #include "qmirserver.h"
  #include "screen.h"
@@ -27,25 +26,7 @@
  void *NativeInterface::nativeResourceForIntegration(const QByteArray &resource)
+ {
--    void *result = nullptr;
--
--    auto const server = m_qMirServer->mirServer().lock();
--
--    if (server) {
--        if (resource == "SessionAuthorizer")
--            result = server->sessionAuthorizer();
--        else if (resource == "Shell")
--            result = server->shell();
--        else if (resource == "SessionListener")
--            result = server->sessionListener();
--        else if (resource == "PromptSessionListener")
--            result = server->promptSessionListener();
--        else if (resource == "WindowManager")
--            result = server->windowManager();
--        else if (resource == "ScreensController")
--            result = m_qMirServer->screensController().data();
--    }
--    return result;
++    return m_qMirServer->nativeResourceForIntegration(resource);
+ }
  // Changes to these properties are emitted via the UbuntuNativeInterface::windowPropertyChanged
@@ -92,7 +73,7 @@
+     }
+ }
--QWeakPointer<MirServer> NativeInterface::mirServer()
++std::shared_ptr<mir::scene::PromptSessionManager> NativeInterface::thePromptSessionManager() const
+ {
--    return m_qMirServer->mirServer();
++    return m_qMirServer->thePromptSessionManager();
+ }
 === modified file 'src/platforms/mirserver/nativeinterface.h'
 --- src/platforms/mirserver/nativeinterface.h	2016-05-05 14:17:14 +0000
 +++ src/platforms/mirserver/nativeinterface.h	2016-06-01 09:31:31 +0000
@@ -21,10 +21,14 @@
  #include <QSharedPointer>
  #include <qpa/qplatformnativeinterface.h>
++#include <memory>
++
  // local
--class MirServer;
  class QMirServer;
++// mir
++namespace mir { namespace scene { class PromptSessionManager; }}
++
  class NativeInterface : public QPlatformNativeInterface
+ {
  public:
@@ -36,7 +40,7 @@
      QVariant windowProperty(QPlatformWindow *window, const QString &name) const override;
      QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const override;
--    QWeakPointer<MirServer> mirServer();
++    std::shared_ptr<mir::scene::PromptSessionManager> thePromptSessionManager() const;
  private:
      QMirServer *m_qMirServer;
 === modified file 'src/platforms/mirserver/qmirserver.cpp'
 --- src/platforms/mirserver/qmirserver.cpp	2016-04-29 15:41:00 +0000
 +++ src/platforms/mirserver/qmirserver.cpp	2016-06-01 09:31:31 +0000
@@ -18,12 +18,14 @@
  #include <QObject>
  #include <QCoreApplication>
  #include <QDebug>
++#include <QOpenGLContext>
  // local
  #include "mirserver.h"
  #include "qmirserver.h"
  #include "qmirserver_p.h"
  #include "screen.h"
++#include "miropenglcontext.h"
  QMirServer::QMirServer(int &argc, char **argv, QObject *parent)
      : QObject(parent)
@@ -85,12 +87,6 @@
      return d->serverThread->isRunning();
+ }
--QWeakPointer<MirServer> QMirServer::mirServer() const
--{
--    Q_D(const QMirServer);
--    return d->server.toWeakRef();
--}
--
  QWeakPointer<ScreensModel> QMirServer::screensModel() const
+ {
      Q_D(const QMirServer);
@@ -102,3 +98,38 @@
      Q_D(const QMirServer);
      return d->screensController;
+ }
++
++QPlatformOpenGLContext *QMirServer::createPlatformOpenGLContext(QOpenGLContext *context) const
++{
++    Q_D(const QMirServer);
++    return new MirOpenGLContext(*d->server->the_display(), *d->server->the_gl_config(), context->format());
++}
++
++void *QMirServer::nativeResourceForIntegration(const QByteArray &resource) const
++{
++    Q_D(const QMirServer);
++    void *result = nullptr;
++
++    if (d->server) {
++        if (resource == "SessionAuthorizer")
++            result = d->server->sessionAuthorizer();
++        else if (resource == "Shell")
++            result = d->server->shell();
++        else if (resource == "SessionListener")
++            result = d->server->sessionListener();
++        else if (resource == "PromptSessionListener")
++            result = d->server->promptSessionListener();
++        else if (resource == "WindowManager")
++            result = d->server->windowManager();
++        else if (resource == "ScreensController")
++            result = screensController().data();
++    }
++    return result;
++}
++
++std::shared_ptr<mir::scene::PromptSessionManager> QMirServer::thePromptSessionManager() const
++{
++    Q_D(const QMirServer);
++
++    return d->server->the_prompt_session_manager();
++}
 === modified file 'src/platforms/mirserver/qmirserver.h'
 --- src/platforms/mirserver/qmirserver.h	2016-04-29 15:41:00 +0000
 +++ src/platforms/mirserver/qmirserver.h	2016-06-01 09:31:31 +0000
@@ -21,10 +21,16 @@
  #include <QObject>
  #include <QWeakPointer>
++#include <memory>
++
++// mir
++namespace mir { namespace scene { class PromptSessionManager; }}
++
  class QMirServerPrivate;
--class MirServer;
  class ScreensController;
  class ScreensModel;
++class QPlatformOpenGLContext;
++class QOpenGLContext;
  class QMirServer: public QObject
+ {
@@ -38,10 +44,11 @@
      Q_SLOT void stop();
      bool isRunning() const;
--    QWeakPointer<MirServer> mirServer() const;
--
      QWeakPointer<ScreensController> screensController() const;
      QWeakPointer<ScreensModel> screensModel() const;
++    QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
++    void *nativeResourceForIntegration(const QByteArray &resource) const;
++    std::shared_ptr<mir::scene::PromptSessionManager> thePromptSessionManager() const;
  Q_SIGNALS:
      void started();
 === modified file 'tests/framework/qtmir_test.cpp'
 --- tests/framework/qtmir_test.cpp	2016-05-06 08:23:46 +0000
 +++ tests/framework/qtmir_test.cpp	2016-06-01 09:31:31 +0000
@@ -77,41 +77,6 @@
          break;
+     }
+ }
--
--// Initialization of mir::Server needed for by tests
--class TestMirServerInit : public virtual mir::Server
--{
--public:
--    TestMirServerInit(std::shared_ptr<StubPromptSessionManager> const& promptSessionManager)
--        : mock_prompt_session_manager(promptSessionManager)
--    {
--        override_the_prompt_session_manager(
--            [this]{ return the_mock_prompt_session_manager(); });
--    }
--
--    std::shared_ptr<mir::scene::MockPromptSessionManager> the_mock_prompt_session_manager()
--    {
--        return mock_prompt_session_manager;
--    }
--
--private:
--    std::shared_ptr<StubPromptSessionManager> const mock_prompt_session_manager;
--};
--
--
--namespace { int argc = 0; char* argv[] = { nullptr }; }
--
--class FakeMirServer: private TestMirServerInit, public MirServer
--{
--public:
--    FakeMirServer(std::shared_ptr<StubPromptSessionManager> const& promptSessionManager)
--    : TestMirServerInit(promptSessionManager), MirServer(argc, argv, QSharedPointer<ScreensModel>())
--    {
--    }
--
--    using TestMirServerInit::the_mock_prompt_session_manager;
--};
--
  } // namespace qtmir
  namespace testing
@@ -119,12 +84,11 @@
  QtMirTest::QtMirTest()
      : promptSessionManager(std::make_shared<StubPromptSessionManager>())
--    , mirServer(QSharedPointer<MirServer>(new FakeMirServer(promptSessionManager)))
      , applicationManager(taskControllerSharedPointer,
                           QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
                           QSharedPointer<ProcInfo>(&procInfo,[](ProcInfo *){}),
                           QSharedPointer<MockSettings>(&settings,[](MockSettings *){}))
--    , sessionManager(mirServer, &applicationManager)
++    , sessionManager(promptSessionManager, &applicationManager)
      , surfaceManager(mirShell, &sessionManager)
+ {
+ }
 === modified file 'tests/framework/qtmir_test.h'
 --- tests/framework/qtmir_test.h	2016-05-06 08:28:44 +0000
 +++ tests/framework/qtmir_test.h	2016-06-01 09:31:31 +0000
@@ -30,7 +30,6 @@
  #include <Unity/Application/session_interface.h>
  #include <Unity/Application/sharedwakelock.h>
  #include <Unity/Application/proc_info.h>
--#include <mirserver.h>
  #include "mock_proc_info.h"
  #include "mock_mir_session.h"
@@ -69,7 +68,6 @@
      testing::NiceMock<MockSharedWakelock> sharedWakelock;
      testing::NiceMock<MockSettings> settings;
      std::shared_ptr<StubPromptSessionManager> promptSessionManager;
--    QSharedPointer<MirServer> mirServer;
      mir::shell::Shell *mirShell{nullptr};
      ApplicationManager applicationManager;
 === modified file 'tests/modules/Application/application_test.cpp'
 --- tests/modules/Application/application_test.cpp	2016-05-02 12:57:40 +0000
 +++ tests/modules/Application/application_test.cpp	2016-06-01 09:31:31 +0000
@@ -82,7 +82,7 @@
          const pid_t procId = 1234;
          auto mirSession = std::make_shared<NiceMock<mir::scene::MockSession>>(appId.toStdString(), procId);
--        Session* session = new Session(mirSession, mirServer->the_prompt_session_manager());
++        Session* session = new Session(mirSession, promptSessionManager);
          FakeTimer *fakeTimer(new FakeTimer(fakeTimeSource));
          session->setSuspendTimer(fakeTimer);
 === modified file 'tests/modules/SessionManager/session_test.cpp'
 --- tests/modules/SessionManager/session_test.cpp	2016-05-17 19:18:44 +0000
 +++ tests/modules/SessionManager/session_test.cpp	2016-06-01 09:31:31 +0000
@@ -52,7 +52,7 @@
      auto mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
--    auto session = std::make_shared<qtmir::Session>(mirSession, mirServer->the_prompt_session_manager());
++    auto session = std::make_shared<qtmir::Session>(mirSession, promptSessionManager);
      // On Starting as it has no surface.
      EXPECT_EQ(Session::Starting, session->state());
@@ -76,10 +76,10 @@
      std::shared_ptr<ms::Session> mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
--    Session session(mirSession, mirServer->the_prompt_session_manager());
--    Session session1(mirSession, mirServer->the_prompt_session_manager());
--    Session session2(mirSession, mirServer->the_prompt_session_manager());
--    Session session3(mirSession, mirServer->the_prompt_session_manager());
++    Session session(mirSession, promptSessionManager);
++    Session session1(mirSession, promptSessionManager);
++    Session session2(mirSession, promptSessionManager);
++    Session session3(mirSession, promptSessionManager);
      // add surfaces
      session.addChildSession(&session1);
@@ -101,10 +101,10 @@
      std::shared_ptr<ms::Session> mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
--    Session session(mirSession, mirServer->the_prompt_session_manager());
--    Session session1(mirSession, mirServer->the_prompt_session_manager());
--    Session session2(mirSession, mirServer->the_prompt_session_manager());
--    Session session3(mirSession, mirServer->the_prompt_session_manager());
++    Session session(mirSession, promptSessionManager);
++    Session session1(mirSession, promptSessionManager);
++    Session session2(mirSession, promptSessionManager);
++    Session session3(mirSession, promptSessionManager);
      // add surfaces
      session.insertChildSession(100, &session1); // test overflow
@@ -126,10 +126,10 @@
      std::shared_ptr<ms::Session> mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
--    Session session(mirSession, mirServer->the_prompt_session_manager());
--    Session session1(mirSession, mirServer->the_prompt_session_manager());
--    Session session2(mirSession, mirServer->the_prompt_session_manager());
--    Session session3(mirSession, mirServer->the_prompt_session_manager());
++    Session session(mirSession, promptSessionManager);
++    Session session1(mirSession, promptSessionManager);
++    Session session2(mirSession, promptSessionManager);
++    Session session3(mirSession, promptSessionManager);
      // add surfaces
      session.addChildSession(&session1);
@@ -156,10 +156,10 @@
      std::shared_ptr<ms::Session> mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
--    Session session(mirSession, mirServer->the_prompt_session_manager());
--    Session* session1 = new Session(mirSession, mirServer->the_prompt_session_manager());
--    Session* session2 = new Session(mirSession, mirServer->the_prompt_session_manager());
--    Session* session3 = new Session(mirSession, mirServer->the_prompt_session_manager());
++    Session session(mirSession, promptSessionManager);
++    Session* session1 = new Session(mirSession, promptSessionManager);
++    Session* session2 = new Session(mirSession, promptSessionManager);
++    Session* session3 = new Session(mirSession, promptSessionManager);
      // add surfaces
      session.addChildSession(session1);
@@ -188,10 +188,10 @@
      std::shared_ptr<ms::Session> mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
--    Session* session = new Session(mirSession, mirServer->the_prompt_session_manager());
--    Session* session1 = new Session(mirSession, mirServer->the_prompt_session_manager());
--    Session* session2 = new Session(mirSession, mirServer->the_prompt_session_manager());
--    Session* session3 = new Session(mirSession, mirServer->the_prompt_session_manager());
++    Session* session = new Session(mirSession, promptSessionManager);
++    Session* session1 = new Session(mirSession, promptSessionManager);
++    Session* session2 = new Session(mirSession, promptSessionManager);
++    Session* session3 = new Session(mirSession, promptSessionManager);
      // add children
      session->addChildSession(session1);
@@ -218,7 +218,7 @@
      auto mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
--    auto session = std::make_shared<qtmir::Session>(mirSession, mirServer->the_prompt_session_manager());
++    auto session = std::make_shared<qtmir::Session>(mirSession, promptSessionManager);
+     {
          FakeMirSurface *surface = new FakeMirSurface;
          session->registerSurface(surface);
@@ -294,7 +294,7 @@
      auto mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
--    auto session = std::make_shared<SessionTestClass>(mirSession, mirServer->the_prompt_session_manager());
++    auto session = std::make_shared<SessionTestClass>(mirSession, promptSessionManager);
+     {
          FakeMirSurface *surface = new FakeMirSurface;
          session->registerSurface(surface);