Merge lp:~nick-dedekind/qtmir/persistent_surface_id into lp:qtmir

[Nick Dedekind]

Added implementation for MirSurfaceInterface::persistentId

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~unity-team/unity-api/persistent_surface_id/+merge/303552
https://code.launchpad.net/~nick-dedekind/unity8/persistent_surface_id/+merge/296994

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Requires mir 0.24

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:506
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/273/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1942/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1968
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1902
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1902
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1902
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1893/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1893/console

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

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:507
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/274/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1952/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1978
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1912
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1912
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1912
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1903/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1903/console

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Shouldn't you bump the required mir version to something higher than 0.22 as the needed API will land only in a later version?

review: Needs Information

[Daniel d'Andrada (dandrader)]

/home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp:218:59: error: 'const Width {aka const class mir::geometry::detail::IntWrapper<mir::geometry::WidthTag>}' has no member named 'as_float'
/home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp:219:61: error: 'const Height {aka const class mir::geometry::detail::IntWrapper<mir::geometry::HeightTag>}' has no member named 'as_float'

/home/dandrader/qtmir/persistent_surface_id/tests/framework/qtmir_test.cpp:168:92: required from here
/usr/include/c++/5/ext/new_allocator.h:120:4: error: invalid new-expression of abstract class type 'mir::scene::MockSession'

Getting some build failures. Maybe it needs to have some "mir-0.23 compatibility branch" as prereq...

[Nick Dedekind (nick-dedekind)]

> /home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp
> :218:59: error: 'const Width {aka const class
> mir::geometry::detail::IntWrapper<mir::geometry::WidthTag>}' has no member
> named 'as_float'
> /home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp
> :219:61: error: 'const Height {aka const class
> mir::geometry::detail::IntWrapper<mir::geometry::HeightTag>}' has no member
> named 'as_float'
>
> /home/dandrader/qtmir/persistent_surface_id/tests/framework/qtmir_test.cpp:168
> :92: required from here
> /usr/include/c++/5/ext/new_allocator.h:120:4: error: invalid new-expression of
> abstract class type 'mir::scene::MockSession'
>
> Getting some build failures. Maybe it needs to have some "mir-0.23
> compatibility branch" as prereq...

You building against trunk (aka 0.24)?

[Nick Dedekind (nick-dedekind)]

> >
> /home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp
> > :218:59: error: 'const Width {aka const class
> > mir::geometry::detail::IntWrapper<mir::geometry::WidthTag>}' has no member
> > named 'as_float'
> >
> /home/dandrader/qtmir/persistent_surface_id/src/platforms/mirserver/screen.cpp
> > :219:61: error: 'const Height {aka const class
> > mir::geometry::detail::IntWrapper<mir::geometry::HeightTag>}' has no member
> > named 'as_float'
> >
> >
> /home/dandrader/qtmir/persistent_surface_id/tests/framework/qtmir_test.cpp:168
> > :92: required from here
> > /usr/include/c++/5/ext/new_allocator.h:120:4: error: invalid new-expression
> of
> > abstract class type 'mir::scene::MockSession'
> >
> > Getting some build failures. Maybe it needs to have some "mir-0.23
> > compatibility branch" as prereq...
>
> You building against trunk (aka 0.24)?

Right, you're building against the prereq mir branch i guess. There's a compatibility branch for mir 0.24 which I've added (lp:~mir-team/qtmir/mir-0.24-compatibility). I need to resubmit this proposal with it as a prereq.

[Daniel d'Andrada (dandrader)]

On 13/06/2016 11:20, Nick Dedekind wrote:
> Right, you're building against the prereq mir branch i guess. There's a compatibility branch for mir 0.24 which I've added (lp:~mir-team/qtmir/mir-0.24-compatibility). I need to resubmit this proposal with it as a prereq.

I thought mir trunk would be 0.23, but ok.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:507
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/275/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1958/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1984
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1918
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1918
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1918
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1909/console

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

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

Annoyingly the changelog for mir/trunk hasn't been updated to 0.24 yet. So I need to wait until then before updating the mir requirement or it won't build.

[lp:~nick-dedekind/qtmir/persistent_surface_id]

508. By Nick Dedekind on 2016-06-14

merged with parent

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:508
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/276/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1960/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1986
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1920
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1920
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1920
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1911/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1911/console

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

silo 036 is about to land and it has lp:~kdub/qtmir/0.24-compatibility

Please rebase this branch on top of it as there are many conflicts.

review: Needs Fixing

Unmerged revisions

508. By Nick Dedekind on 2016-06-14

merged with parent

507. By Nick Dedekind on 2016-06-10

removed persistentId from log

506. By Nick Dedekind on 2016-06-09

gles

505. By Nick Dedekind on 2016-06-09

persistentId

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-18 20:56:14 +0000
+++ CMakeLists.txt	2016-06-14 08:51:40 +0000
@@ -76,7 +76,7 @@
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
 pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=17)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=18)
 
 include_directories(${APPLICATION_API_INCLUDE_DIRS})
 

=== modified file 'debian/control'
--- debian/control	2016-06-14 08:51:40 +0000
+++ debian/control	2016-06-14 08:51:40 +0000
@@ -22,7 +22,7 @@
                libubuntu-app-launch2-dev (>= 0.9),
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
-               libunity-api-dev (>= 7.113),
+               libunity-api-dev (>= 7.114),
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,
@@ -93,7 +93,7 @@
 Conflicts: libqtmir,
            libunity-mir1,
 Provides: unity-application-impl,
-          unity-application-impl-17,
+          unity-application-impl-18,
 Description: Qt plugin for Unity specific Mir APIs
  QtMir provides Qt/QML bindings for Mir features that are exposed through the
  qtmir-desktop or qtmir-android QPA plugin such as Application management

=== modified file 'debian/gles-patches/convert-to-gles.patch'
--- debian/gles-patches/convert-to-gles.patch	2016-06-14 08:51:40 +0000
+++ debian/gles-patches/convert-to-gles.patch	2016-06-14 08:51:40 +0000
@@ -1,7 +1,7 @@
-Index: qtmir-0.24/debian/control
+Index: qtmir/debian/control
 ===================================================================
---- qtmir-0.24.orig/debian/control
-+++ qtmir-0.24/debian/control
+--- qtmir.orig/debian/control
++++ qtmir/debian/control
 @@ -1,4 +1,4 @@
 -Source: qtmir
 +Source: qtmir-gles
@@ -84,7 +84,7 @@
 -Conflicts: libqtmir,
 -           libunity-mir1,
 -Provides: unity-application-impl,
--          unity-application-impl-17,
+-          unity-application-impl-18,
 -Description: Qt plugin for Unity specific Mir APIs
 - QtMir provides Qt/QML bindings for Mir features that are exposed through the
 - qtmir-desktop or qtmir-android QPA plugin such as Application management
@@ -111,10 +111,10 @@
 - QtMir QPA.
 + This variant of the package is for Android-based phones and tablets (built
 + against the OpenGLES variant of qtbase).
-Index: qtmir-0.24/debian/rules
+Index: qtmir/debian/rules
 ===================================================================
---- qtmir-0.24.orig/debian/rules
-+++ qtmir-0.24/debian/rules
+--- qtmir.orig/debian/rules
++++ qtmir/debian/rules
 @@ -3,60 +3,28 @@
  
  export DPKG_GENSYMBOLS_CHECK_LEVEL=4

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2016-05-25 13:54:52 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2016-06-14 08:51:40 +0000
@@ -43,8 +43,8 @@
 
 using namespace qtmir;
 
-#define DEBUG_MSG qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << (void*)this << "," << appId() <<"]::" << __func__
-#define WARNING_MSG qCWarning(QTMIR_SURFACES).nospace() << "MirSurface[" << (void*)this << "," << appId() <<"]::" << __func__
+#define DEBUG_MSG qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << (void*)this << "," << appId() << "]::" << __func__
+#define WARNING_MSG qCWarning(QTMIR_SURFACES).nospace() << "MirSurface[" << (void*)this << "," << appId() << "]::" << __func__
 
 namespace {
 
@@ -179,6 +179,7 @@
 } // namespace {
 
 MirSurface::MirSurface(std::shared_ptr<mir::scene::Surface> surface,
+        const QString& persistentId,
         SessionInterface* session,
         mir::shell::Shell* shell,
         std::shared_ptr<SurfaceObserver> observer,
@@ -187,6 +188,7 @@
     , m_surface(surface)
     , m_session(session)
     , m_shell(shell)
+    , m_persistentId(persistentId)
     , m_firstFrameDrawn(false)
     , m_orientationAngle(Mir::Angle0)
     , m_textureUpdated(false)
@@ -248,7 +250,7 @@
 
 MirSurface::~MirSurface()
 {
-    qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << (void*)this << "]::~MirSurface() viewCount=" << m_views.count();
+    DEBUG_MSG << "() viewCount=" << m_views.count();
 
     Q_ASSERT(m_views.isEmpty());
 
@@ -583,6 +585,11 @@
     return QString::fromStdString(m_surface->name());
 }
 
+QString MirSurface::persistentId() const
+{
+    return m_persistentId;
+}
+
 void MirSurface::setState(Mir::State qmlState)
 {
     int mirState;

=== modified file 'src/modules/Unity/Application/mirsurface.h'
--- src/modules/Unity/Application/mirsurface.h	2016-05-25 13:54:52 +0000
+++ src/modules/Unity/Application/mirsurface.h	2016-06-14 08:51:40 +0000
@@ -54,6 +54,7 @@
 
 public:
     MirSurface(std::shared_ptr<mir::scene::Surface> surface,
+            const QString& persistentId,
             SessionInterface* session,
             mir::shell::Shell *shell,
             std::shared_ptr<SurfaceObserver> observer,
@@ -67,6 +68,8 @@
 
     QString name() const override;
 
+    QString persistentId() const override;
+
     QSize size() const override;
     void resize(int width, int height) override;
     void resize(const QSize &size) override { resize(size.width(), size.height()); }
@@ -187,6 +190,7 @@
     std::shared_ptr<mir::scene::Surface> m_surface;
     QPointer<SessionInterface> m_session;
     mir::shell::Shell *const m_shell;
+    QString m_persistentId;
     bool m_firstFrameDrawn;
 
     //FIXME -  have to save the state as Mir has no getter for it (bug:1357429)

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
--- src/modules/Unity/Application/mirsurfacemanager.cpp	2016-05-06 08:41:15 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.cpp	2016-06-14 08:51:40 +0000
@@ -34,12 +34,15 @@
 #include "sessionlistener.h"
 #include "logging.h"
 #include "creationhints.h"
+#include "mirserver.h"
 
 // mir
 #include <mir/scene/surface.h>
+#include <mir/shell/persistent_surface_store.h>
 
 
 namespace ms = mir::scene;
+namespace msh = mir::shell;
 
 namespace qtmir {
 
@@ -69,7 +72,11 @@
         SessionListener *sessionListener = static_cast<SessionListener*>(nativeInterface->nativeResourceForIntegration("SessionListener"));
         mir::shell::Shell *shell = static_cast<mir::shell::Shell*>(nativeInterface->nativeResourceForIntegration("Shell"));
 
-        instance = new MirSurfaceManager(shell, SessionManager::singleton());
+
+        QSharedPointer<MirServer> mirServer = nativeInterface->mirServer().lock();
+        instance = new MirSurfaceManager(shell,
+                                         SessionManager::singleton(),
+                                         mirServer ? mirServer->the_persistent_surface_store() : nullptr);
 
         connectToSessionListener(instance, sessionListener);
     }
@@ -79,10 +86,12 @@
 MirSurfaceManager::MirSurfaceManager(
         mir::shell::Shell* shell,
         SessionManager* sessionManager,
+        std::shared_ptr<msh::PersistentSurfaceStore> surfaceStore,
         QObject* parent)
     : QObject(parent)
     , m_shell(shell)
     , m_sessionManager(sessionManager)
+    , m_surfaceStore(surfaceStore)
 {
     qCDebug(QTMIR_SURFACES) << "MirSurfaceManager::MirSurfaceManager - this=" << this;
     setObjectName("qtmir::SurfaceManager");
@@ -105,7 +114,12 @@
                             << "creationHints=" << creationHints.toString();
 
     SessionInterface* session = m_sessionManager->findSession(mirSession);
-    auto qmlSurface = new MirSurface(surface, session, m_shell, observer, creationHints);
+    auto qmlSurface = new MirSurface(surface,
+                                     QString::fromStdString(m_surfaceStore->id_for_surface(surface).serialize_to_string()),
+                                     session,
+                                     m_shell,
+                                     observer,
+                                     creationHints);
     {
         QMutexLocker lock(&m_mutex);
         m_mirSurfaceToQmlSurfaceHash.insert(surface.get(), qmlSurface);

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.h'
--- src/modules/Unity/Application/mirsurfacemanager.h	2016-05-06 08:28:44 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.h	2016-06-14 08:51:40 +0000
@@ -38,7 +38,10 @@
         class Session;
         class PromptSession;
     }
-    namespace shell { class Shell; }
+    namespace shell {
+        class Shell;
+        class PersistentSurfaceStore;
+    }
 }
 
 class SurfaceObserver;
@@ -58,6 +61,7 @@
     explicit MirSurfaceManager(
         mir::shell::Shell* shell,
         SessionManager* sessionManager,
+        std::shared_ptr<mir::shell::PersistentSurfaceStore> surfaceStore,
         QObject* parent = nullptr
     );
     ~MirSurfaceManager();
@@ -85,6 +89,7 @@
 private:
     mir::shell::Shell *const m_shell;
     SessionManager* m_sessionManager;
+    std::shared_ptr<mir::shell::PersistentSurfaceStore> m_surfaceStore;
     static MirSurfaceManager *instance;
     MirSurfaceInterface* m_inputMethodSurface = nullptr;
 };

=== modified file 'src/platforms/mirserver/mirserver.h'
--- src/platforms/mirserver/mirserver.h	2016-05-06 08:28:44 +0000
+++ src/platforms/mirserver/mirserver.h	2016-06-14 08:51:40 +0000
@@ -51,6 +51,7 @@
     using mir::Server::the_gl_config;
     using mir::Server::the_main_loop;
     using mir::Server::the_prompt_session_manager;
+    using mir::Server::the_persistent_surface_store;
 
     void stop();
 

=== modified file 'tests/framework/CMakeLists.txt'
--- tests/framework/CMakeLists.txt	2016-05-24 20:13:10 +0000
+++ tests/framework/CMakeLists.txt	2016-06-14 08:51:40 +0000
@@ -28,6 +28,7 @@
     mock_shared_wakelock.cpp
     mock_surface.cpp
     mock_task_controller.cpp
+    mock_persistent_surface_store.cpp
     stub_input_channel.cpp
     fake_surface.h
     qtmir_test.cpp

=== modified file 'tests/framework/fake_mirsurface.cpp'
--- tests/framework/fake_mirsurface.cpp	2016-05-24 20:13:10 +0000
+++ tests/framework/fake_mirsurface.cpp	2016-06-14 08:51:40 +0000
@@ -54,6 +54,8 @@
 
 QString FakeMirSurface::name() const { return QString("Fake MirSurface"); }
 
+QString FakeMirSurface::persistentId() const { return QString("FakeSurfaceId"); }
+
 QSize FakeMirSurface::size() const { return m_size; }
 
 void FakeMirSurface::resize(int width, int height)

=== modified file 'tests/framework/fake_mirsurface.h'
--- tests/framework/fake_mirsurface.h	2016-05-24 20:13:10 +0000
+++ tests/framework/fake_mirsurface.h	2016-06-14 08:51:40 +0000
@@ -53,6 +53,7 @@
     // unity.shell.application.MirSurfaceInterface
     Mir::Type type() const override;
     QString name() const override;
+    QString persistentId() const override;
     QSize size() const override;
     void resize(int width, int height) override;
     void resize(const QSize &size) override;

=== added file 'tests/framework/mock_persistent_surface_store.cpp'
--- tests/framework/mock_persistent_surface_store.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_persistent_surface_store.cpp	2016-06-14 08:51:40 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mock_persistent_surface_store.h"
+
+namespace mir
+{
+namespace shell
+{
+
+MockPersistentSurfaceStore::MockPersistentSurfaceStore()
+{
+
+}
+
+} // namespace shell
+} // namespace mir

=== added file 'tests/framework/mock_persistent_surface_store.h'
--- tests/framework/mock_persistent_surface_store.h	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_persistent_surface_store.h	2016-06-14 08:51:40 +0000
@@ -0,0 +1,24 @@
+#ifndef MOCKPERSISTENTSURFACESTORE_H
+#define MOCKPERSISTENTSURFACESTORE_H
+
+#include <mir/shell/persistent_surface_store.h>
+#include <gmock/gmock.h>
+
+namespace mir
+{
+namespace shell
+{
+
+class MockPersistentSurfaceStore : public PersistentSurfaceStore
+{
+public:
+    MockPersistentSurfaceStore();
+
+    MOCK_METHOD1(id_for_surface, Id(std::shared_ptr<scene::Surface> const& surface));
+    MOCK_CONST_METHOD1(surface_for_id, std::shared_ptr<scene::Surface>(Id const& id));
+};
+
+}
+}
+
+#endif // MOCKPERSISTENTSURFACESTORE_H

=== 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-14 08:51:40 +0000
@@ -82,11 +82,15 @@
 class TestMirServerInit : public virtual mir::Server
 {
 public:
-    TestMirServerInit(std::shared_ptr<StubPromptSessionManager> const& promptSessionManager)
+    TestMirServerInit(std::shared_ptr<StubPromptSessionManager> const& promptSessionManager,
+                      std::shared_ptr<StubPersistentSurfaceStore> const& persistentSurfaceStore)
         : mock_prompt_session_manager(promptSessionManager)
+        , mock_persistent_surface_store(persistentSurfaceStore)
     {
         override_the_prompt_session_manager(
             [this]{ return the_mock_prompt_session_manager(); });
+        override_the_persistent_surface_store(
+            [this]{ return the_mock_persistent_surface_store(); });
     }
 
     std::shared_ptr<mir::scene::MockPromptSessionManager> the_mock_prompt_session_manager()
@@ -94,8 +98,14 @@
         return mock_prompt_session_manager;
     }
 
+    std::shared_ptr<mir::shell::MockPersistentSurfaceStore> the_mock_persistent_surface_store()
+    {
+        return mock_persistent_surface_store;
+    }
+
 private:
     std::shared_ptr<StubPromptSessionManager> const mock_prompt_session_manager;
+    std::shared_ptr<StubPersistentSurfaceStore> const mock_persistent_surface_store;
 };
 
 
@@ -104,8 +114,10 @@
 class FakeMirServer: private TestMirServerInit, public MirServer
 {
 public:
-    FakeMirServer(std::shared_ptr<StubPromptSessionManager> const& promptSessionManager)
-    : TestMirServerInit(promptSessionManager), MirServer(argc, argv, QSharedPointer<ScreensModel>())
+    FakeMirServer(std::shared_ptr<StubPromptSessionManager> const& promptSessionManager,
+                  std::shared_ptr<StubPersistentSurfaceStore> const& persistentSurfaceStore)
+    : TestMirServerInit(promptSessionManager, persistentSurfaceStore)
+    , MirServer(argc, argv, QSharedPointer<ScreensModel>())
     {
     }
 
@@ -119,13 +131,14 @@
 
 QtMirTest::QtMirTest()
     : promptSessionManager(std::make_shared<StubPromptSessionManager>())
-    , mirServer(QSharedPointer<MirServer>(new FakeMirServer(promptSessionManager)))
+    , persistentSurfaceStore(std::make_shared<StubPersistentSurfaceStore>())
+    , mirServer(QSharedPointer<MirServer>(new FakeMirServer(promptSessionManager, persistentSurfaceStore)))
     , applicationManager(taskControllerSharedPointer,
                          QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
                          QSharedPointer<ProcInfo>(&procInfo,[](ProcInfo *){}),
                          QSharedPointer<MockSettings>(&settings,[](MockSettings *){}))
     , sessionManager(mirServer, &applicationManager)
-    , surfaceManager(mirShell, &sessionManager)
+    , surfaceManager(mirShell, &sessionManager, mirServer->the_persistent_surface_store())
 {
 }
 

=== 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-14 08:51:40 +0000
@@ -39,6 +39,7 @@
 #include "mock_shared_wakelock.h"
 #include "mock_settings.h"
 #include "mock_task_controller.h"
+#include "mock_persistent_surface_store.h"
 
 namespace ms = mir::scene;
 using namespace qtmir;
@@ -46,6 +47,7 @@
 namespace qtmir {
 
 typedef testing::NiceMock<mir::scene::MockPromptSessionManager> StubPromptSessionManager;
+typedef testing::NiceMock<mir::shell::MockPersistentSurfaceStore> StubPersistentSurfaceStore;
 
 // For better output in ASSERT_* and EXPECT_* error messages
 void PrintTo(const Application::InternalState& state, ::std::ostream* os);
@@ -69,6 +71,7 @@
     testing::NiceMock<MockSharedWakelock> sharedWakelock;
     testing::NiceMock<MockSettings> settings;
     std::shared_ptr<StubPromptSessionManager> promptSessionManager;
+    std::shared_ptr<StubPersistentSurfaceStore> persistentSurfaceStore;
     QSharedPointer<MirServer> mirServer;
 
     mir::shell::Shell *mirShell{nullptr};

=== modified file 'tests/modules/SurfaceManager/mirsurface_test.cpp'
--- tests/modules/SurfaceManager/mirsurface_test.cpp	2016-05-24 20:13:10 +0000
+++ tests/modules/SurfaceManager/mirsurface_test.cpp	2016-06-14 08:51:40 +0000
@@ -71,7 +71,7 @@
     EXPECT_CALL(*mockSurface.get(),buffers_ready_for_compositor(_))
         .WillRepeatedly(Return(1));
 
-    MirSurface *surface = new MirSurface(mockSurface, fakeSession, &m_mockShell, surfaceObserver, CreationHints());
+    MirSurface *surface = new MirSurface(mockSurface, "1234", fakeSession, &m_mockShell, surfaceObserver, CreationHints());
     surfaceObserver->frame_posted(1, mir::geometry::Size{1,1});
 
     QSignalSpy spyFrameDropped(surface, SIGNAL(frameDropped()));
@@ -92,7 +92,7 @@
     auto fakeSession = new FakeSession();
     auto mockSurface = std::make_shared<NiceMock<ms::MockSurface>>();
 
-    MirSurface *surface = new MirSurface(mockSurface, fakeSession, &m_mockShell, nullptr, CreationHints());
+    MirSurface *surface = new MirSurface(mockSurface, "1234", fakeSession, &m_mockShell, nullptr, CreationHints());
     bool surfaceDeleted = false;
     QObject::connect(surface, &QObject::destroyed, surface, [&surfaceDeleted](){ surfaceDeleted = true; });
 
@@ -123,7 +123,7 @@
     auto fakeSession = new FakeSession();
     auto mockSurface = std::make_shared<NiceMock<ms::MockSurface>>();
 
-    MirSurface *surface = new MirSurface(mockSurface, fakeSession, &m_mockShell, nullptr, CreationHints());
+    MirSurface *surface = new MirSurface(mockSurface, "1234", fakeSession, &m_mockShell, nullptr, CreationHints());
     bool surfaceDeleted = false;
     QObject::connect(surface, &QObject::destroyed, surface, [&surfaceDeleted](){ surfaceDeleted = true; });
 
@@ -161,7 +161,7 @@
 
     auto mockSurface = std::make_shared<NiceMock<ms::MockSurface>>();
 
-    MirSurface *surface = new MirSurface(mockSurface, fakeSession, &m_mockShell, nullptr, CreationHints());
+    MirSurface *surface = new MirSurface(mockSurface, "1234", fakeSession, &m_mockShell, nullptr, CreationHints());
     bool surfaceDeleted = false;
     QObject::connect(surface, &QObject::destroyed, surface, [&surfaceDeleted](){ surfaceDeleted = true; });
 

=== modified file 'tests/modules/SurfaceManager/mirsurfaceitem_test.cpp'
--- tests/modules/SurfaceManager/mirsurfaceitem_test.cpp	2016-05-24 20:13:10 +0000
+++ tests/modules/SurfaceManager/mirsurfaceitem_test.cpp	2016-06-14 08:51:40 +0000
@@ -174,7 +174,7 @@
     auto surfaceObserver = std::make_shared<SurfaceObserver>();
     mir::shell::MockShell mockShell;
 
-    MirSurface *surface = new MirSurface(mockSurface, fakeSession, &mockShell, surfaceObserver, CreationHints());
+    MirSurface *surface = new MirSurface(mockSurface, "1234", fakeSession, &mockShell, surfaceObserver, CreationHints());
 
     MirSurfaceItem *surfaceItem = new MirSurfaceItem;
     QQuickItemPrivate *surfaceItemPrivate = QQuickItemPrivate::get(surfaceItem);
@@ -230,7 +230,7 @@
     auto surfaceObserver = std::make_shared<SurfaceObserver>();
     mir::shell::MockShell mockShell;
 
-    MirSurface *surface = new MirSurface(mockSurface, fakeSession, &mockShell, surfaceObserver, CreationHints());
+    MirSurface *surface = new MirSurface(mockSurface, "1234", fakeSession, &mockShell, surfaceObserver, CreationHints());
 
     MirSurfaceItem *surfaceItem1 = new MirSurfaceItem;
     QQuickItemPrivate *surfaceItem1Private = QQuickItemPrivate::get(surfaceItem1);