Merge lp:~dandrader/qtmir/fake-apps into lp:qtmir

[Daniel d'Andrada]

Fake applications using internal mir clients when UNITY_TESTING is defined

Prereq-archive: ppa:ci-train-ppa-service/ubuntu/2457

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/unity-api/mirInputTweaks/+merge/316844
https://code.launchpad.net/~dandrader/unity8/testWithQtMir/+merge/316851

* 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?
N/A

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

FAILED: Continuous integration, rev:596
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/485/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4058/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4086
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3926/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3926/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3926/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3926/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3926/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3926/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:597
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/486/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4061/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4089
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3929/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3929/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3929/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3929/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3929/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3929/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

=== modified file 'src/common/windowcontrollerinterface.h'
+ virtual void modify(const miral::Window &window, miral::WindowSpecification) = 0;
This is opening large functionality to the shell, which makes me suspicious. Digging I see it only used by MirSurface::setMaximumWidth and friends, which are test-only.

I dislike that, as shell should not be updating MirAL's information on surface min/max/inc limits, instead it should be the client (like it will happen in reality).

Can you redo the min/max/inc limit setting to use the client api instead, and remove this change?

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
+ taskController.reset(fakeTaskController);
+ procInfo = fakeTaskController->procInfo();
reset too, for consistency

=== modified file 'src/modules/Unity/Application/application_manager.h'
+ SessionInterface *findSession(const mir::scene::Session* session) const;
+ Application* findApplicationWithSession(const std::shared_ptr<mir::scene::Session> &session);
so these you've made public, but are also just for test use. Do comment about that fact then, just to make it clear.

Also, we need to avoid exposing mirserver apis and use MirAL's api instead. So use miral::Application instead of std::shared_ptr<mir::scene::Session>. findSession doesn't need to take a raw pointer either. In fact, are both needed at all?

+ void onSessionStarting(SessionInterface *session);
is this fixing a bug? If so, would be good to separate that bug fix into a separate MP with a test.

I'll look at the Fake stuff last.

=== modified file 'src/modules/Unity/Application/mirsurface.h'
+ Q_PROPERTY(int width READ width NOTIFY widthChanged)
+ Q_PROPERTY(int height READ height NOTIFY heightChanged)
why? size() gives this info out, and a single change signal too. You know I disapprove of this.

+ // Whether there's a MirSurfaceItem with active focus displaying this surface.
+ // This information is useful in shell tests
+ Q_PROPERTY(bool activeFocus READ activeFocus NOTIFY activeFocusChanged)
+
+ // Whether the MirSurface is exposed (true) or occluded (false)
+ // This information is useful in shell tests
+ Q_PROPERTY(bool exposed READ exposed NOTIFY exposedChanged)
Can you expose the client API for these? Wiring it through shell, you're missing out on testing the Mir->client communication.

+ // Used only by shell tests
+ Q_INVOKABLE void setMinimumWidth(int);
+ Q_INVOKABLE void setMaximumWidth(int);
+ Q_INVOKABLE void setMinimumHeight(int);
+ Q_INVOKABLE void setMaximumHeight(int);
+ Q_INVOKABLE void setWidthIncrement(int);
+ Q_INVOKABLE void setHeightIncrement(int);
Yeah as I said above, I dislike these here.

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
What is going on here? What is this mouse & touch counting stuff for? Can't these things could be done in the client, and avoid the test code in the shell?

=== modified file 'src/modules/Unity/Application/session.cpp'
+ const bool focusedBefore = focused();
and on.

Are you fixing a bug here? Can you separate that out into a separate MP with a test?

+ for (int i = 0; i < m_closingSurfaces.count(); ++...

review: Needs Fixing

[Gerry Boland (gerboland)]

=== modified file 'src/platforms/mirserver/mirserverhooks.h'
+ mir::Server *server() const;
You need to justify this. Again it is exposing mir server api, which we're trying to avoid.

=== modified file 'src/platforms/mirserver/mirserverintegration.cpp'
-MirServerIntegration::MirServerIntegration(int &argc, char **argv)
+MirServerIntegration::MirServerIntegration()
Why?? This prevents Mir from processing any command line args. You really need to justify this reversal.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

On 09/02/2017 14:17, Gerry Boland wrote:
> === modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
> What is going on here? What is this mouse & touch counting stuff for? Can't these things could be done in the client, and avoid the test code in the shell?

That would be lovely. Any suggestions?

[Daniel d'Andrada (dandrader)]

On 09/02/2017 14:17, Gerry Boland wrote:
> + for (int i = 0; i < m_closingSurfaces.count(); ++i) {
> foreach nicer

That's debatable. I personally find Q_FOREACH to be an eyesore.

[Gerry Boland (gerboland)]

Instead of exporting the whole of MirServer through the QPA, would be cleaner if you could just expose the bare minimum api needed for the test bits

[Gerry Boland (gerboland)]

Can you also split the SessionManager->TaskController transition into a separate MP.

[Gerry Boland (gerboland)]

> On 09/02/2017 14:17, Gerry Boland wrote:
> > + for (int i = 0; i < m_closingSurfaces.count(); ++i) {
> > foreach nicer
>
> That's debatable. I personally find Q_FOREACH to be an eyesore.

I mis-spoke, I meant the C++11 ranged for is nicer.

[Gerry Boland (gerboland)]

> On 09/02/2017 14:17, Gerry Boland wrote:
> > === modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
> > What is going on here? What is this mouse & touch counting stuff for? Can't
> these things could be done in the client, and avoid the test code in the
> shell?
>
> That would be lovely. Any suggestions?

Well I see the fake MirClient::windowEvent receives input events, so that can keep a count. That does mean you need to expose the some test-only data about the mir client to the qmltest, but that should be possible. Quite probably a non-trivial amount of work.

I don't mind if the code isn't perfect first time, I understand that shortcuts need to be made for brevity. If you mention that limitations in the description and justify why, then I'll be happy and can review with that in mind. But if not, I will point them out and ask why.

[Gerry Boland (gerboland)]

=== added file 'src/modules/Unity/Application/fake/fakemaliit.cpp'
+ MirBufferStream* buffer_stream = mir_window_get_buffer_stream(window);
+ // TODO sometimes buffer_stream is nullptr
+ // (Only observed when creating a lot of clients at once)
Just FYI, this is a deprecated method. The null thing is weird, I'd suggest logging a bug but if it is to be deprecated anyway, not worth the trouble.

+ for (int i = 0; i < m_windows.count(); ++i) {
+ MirWindow *window = m_windows[i];
ranged for a little nicer! It's not an eyesore IMO

=== added file 'src/modules/Unity/Application/fake/fakeprompt.cpp'
+ MirClientEvent(MirWindow* window, const MirEvent *event, QEvent::Type type)
+ : QEvent(type), window(window), mirEvent(event) {
+ mirEvent = mir_event_ref(event);
you're setting mirEvent twice afaics.

[Daniel d'Andrada (dandrader)]

On 10/02/2017 11:53, Gerry Boland wrote:
> === added file 'src/modules/Unity/Application/fake/fakemaliit.cpp'
> + MirBufferStream* buffer_stream = mir_window_get_buffer_stream(window);
> + // TODO sometimes buffer_stream is nullptr
> + // (Only observed when creating a lot of clients at once)
> Just FYI, this is a deprecated method. The null thing is weird, I'd suggest logging a bug but if it is to be deprecated anyway, not worth the trouble.

That's copy-pasted code from alan_g in miral.

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

PASSED: Continuous integration, rev:599
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/490/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4075
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4103
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3943
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3943/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3943
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3943/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3943
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3943/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3943
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3943/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3943
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3943/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3943
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3943/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:600
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/492/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4079
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4107
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3947
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3947/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3947
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3947/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3947
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3947/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3947
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3947/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3947
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3947/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3947
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3947/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:601
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/495/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4086/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4114
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3954/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3954/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3954/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3954/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3954/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3954/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:602
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/496/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4090/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4118
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3958/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3958/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3958/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3958/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3958/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3958/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:603
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/497/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4093/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4121
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3961/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3961/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3961/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3961/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3961/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3961/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:604
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/498/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4095/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4123
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3963
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3963/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3963
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3963/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3963
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3963/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3963/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3963
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3963/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3963/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:605
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/500/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4098/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4126
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3966/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3966/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3966/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3966/console

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

On 09/02/2017 14:17, Gerry Boland wrote:
> Review: Needs Fixing
>
> === modified file 'src/common/windowcontrollerinterface.h'
> + virtual void modify(const miral::Window &window, miral::WindowSpecification) = 0;
> This is opening large functionality to the shell, which makes me suspicious. Digging I see it only used by MirSurface::setMaximumWidth and friends, which are test-only.
>
> I dislike that, as shell should not be updating MirAL's information on surface min/max/inc limits, instead it should be the client (like it will happen in reality).
>
> Can you redo the min/max/inc limit setting to use the client api instead, and remove this change?

Done.

> === modified file 'src/modules/Unity/Application/application_manager.cpp'
> + taskController.reset(fakeTaskController);
> + procInfo = fakeTaskController->procInfo();
> reset too, for consistency
>

Can't do that. fakeTaskController->procInfo() is a QSharedPointer.

> === modified file 'src/modules/Unity/Application/application_manager.h'
> + SessionInterface *findSession(const mir::scene::Session* session) const;
> + Application* findApplicationWithSession(const std::shared_ptr<mir::scene::Session> &session);
> so these you've made public, but are also just for test use. Do comment about that fact then, just to make it clear.

ApplicationManager::findSession() is used by SurfaceManager now that
SessionManager is gone and its responsibilities split between
TaskController (most of it), SurfaceManager (just a little bit) and
ApplicationManager (another tiny piece).
Made findApplicationWithSession() private (I think it was used from
outside earlier in the development but not anymore).

> Also, we need to avoid exposing mirserver apis and use MirAL's api instead. So use miral::Application instead of std::shared_ptr<mir::scene::Session>. findSession doesn't need to take a raw pointer either. In fact, are both needed at all?

findSession() is needed as explained above.

> + void onSessionStarting(SessionInterface *session);
> is this fixing a bug? If so, would be good to separate that bug fix into a separate MP with a test.

No. Again, it's because of the removal of SessionManager.

> === modified file 'src/modules/Unity/Application/mirsurface.h'
> + Q_PROPERTY(int width READ width NOTIFY widthChanged)
> + Q_PROPERTY(int height READ height NOTIFY heightChanged)
> why? size() gives this info out, and a single change signal too. You know I disapprove of this.

Because test code uses it. Easier to copy/paste that from the mock
Unity.Application than to change test code.

Anyway, removed.

> + // Whether there's a MirSurfaceItem with active focus displaying this surface.
> + // This information is useful in shell tests
> + Q_PROPERTY(bool activeFocus READ activeFocus NOTIFY activeFocusChanged)
> +
> + // Whether the MirSurface is exposed (true) or occluded (false)
> + // This information is useful in shell tests
> + Q_PROPERTY(bool exposed READ exposed NOTIFY exposedChanged)
> Can you expose the client API for these? Wiring it through shell, you're missing out on testing the Mir->client communication.

Done.

> + // Used only by shell tests
> + Q_INVOKA...

[Daniel d'Andrada (dandrader)]

On 10/02/2017 11:35, Gerry Boland wrote:
>> On 09/02/2017 14:17, Gerry Boland wrote:
>>> === modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
>>> What is going on here? What is this mouse & touch counting stuff for? Can't
>> these things could be done in the client, and avoid the test code in the
>> shell?
>>
>> That would be lovely. Any suggestions?
> Well I see the fake MirClient::windowEvent receives input events, so that can keep a count. That does mean you need to expose the some test-only data about the mir client to the qmltest, but that should be possible. Quite probably a non-trivial amount of work.

Done.

[Daniel d'Andrada (dandrader)]

On 09/02/2017 16:26, Gerry Boland wrote:
> Can you also split the SessionManager->TaskController transition into a separate MP.

Done:
https://code.launchpad.net/~dandrader/qtmir/byeSessionManager/+merge/317209

[Daniel d'Andrada (dandrader)]

On 09/02/2017 15:20, Gerry Boland wrote:
> Instead of exporting the whole of MirServer through the QPA, would be cleaner if you could just expose the bare minimum api needed for the test bits

Would it be ok if Unity.Application module got its hands on MirServer
via other means than Qt's NativeInterface? Is the problem that MirServer
is on the NativeInterface and so shell code could access it?

I'm a bit lost here. Not sure where you wanna get to and why. The
internal mir client code is really plain mir and miral has no part in it.

[Daniel d'Andrada (dandrader)]

On 09/02/2017 14:23, Gerry Boland wrote:
> === modified file 'src/platforms/mirserver/mirserverintegration.cpp'
> -MirServerIntegration::MirServerIntegration(int &argc, char **argv)
> +MirServerIntegration::MirServerIntegration()
> Why?? This prevents Mir from processing any command line args. You really need to justify this reversal.

Yes, I meant to ask about it but ended up forgetting to do so due to the
sea of code and multitude of weeks that took to me make these branches.

The problem is, if I recall correctly, that Mir is getting in the way
when qtmir is used in uqmlscene (make tryFoo) and qmltestrunner (make
testFoo). That was the simplest solution. Please advise.

[lp:~dandrader/qtmir/fake-apps]

596. By Albert Astals Cid on 2017-02-15

We're at provides 26 already

597. By Iain Lane on 2017-02-15

Releasing 0.5.1+17.04.20170206-0ubuntu2

598. By Alan Griffiths on 2017-02-15

Iteration 0 of miral::PersistDisplayConfig. This does nothing yet (and breaks nothing in the process). This MP creates a place (miral-prototypes) to build prototype miral features and sketches out what will need to be implemented for PersistDisplayConfig. (LP: #1644189)

Approved by: Nick Dedekind, Unity8 CI Bot

599. By Nick Dedekind on 2017-02-15

Added Extended Display Information Data (EDID) parsing.

Approved by: Gerry Boland, Unity8 CI Bot

600. By Gerry Boland on 2017-02-15

ScreenModel: Only expose windows on displays that are turned on

It seems the GL context Mir gives us for a display that is turned off is invalid. But there is no point rendering to a display that is turned off anyway. (LP: #1521403, #1638611, #1656250)

Approved by: Daniel d'Andrada, Unity8 CI Bot

601. By Gerry Boland on 2017-02-15

Restore lost LTTng tracepoints, and delete unused ones (LP: #1658084)

Approved by: Daniel d'Andrada, Unity8 CI Bot

602. By CI Train Bot Account on 2017-02-15

We're at provides 26 already (LP: #1662608)

Approved by: Gerry Boland

603. By Albert Astals Cid on 2017-02-15

Check we provide the same unity-application-impl that we require

Approved by: Gerry Boland, Lukáš Tinkl, Unity8 CI Bot

604. By Alan Griffiths on 2017-02-15

Identify the code that depends directly on mirserver-dev headers

Approved by: Lukáš Tinkl, Unity8 CI Bot

605. By Daniel d'Andrada on 2017-02-15

Resolve mir cursor names using mir symbols instead of plain strings

Since those names under the API symbols change regularly and should be considered opaque. (LP: #1662827)

Approved by: Albert Astals Cid, Unity8 CI Bot

606. By CI Train Bot Account on 2017-02-15

Releasing 0.5.1+17.04.20170215.1-0ubuntu1

[Daniel d'Andrada (dandrader)]

On 10/02/2017 11:53, Gerry Boland wrote:
> + for (int i = 0; i < m_windows.count(); ++i) {
> + MirWindow *window = m_windows[i];
> ranged for a little nicer! It's not an eyesore IMO

Done.

[lp:~dandrader/qtmir/fake-apps]

607. By Daniel d'Andrada on 2017-02-21

Some qtmir::Session fixes

- Emit Session::focusedChanged when adding an already focused window
- When session dies, besides killing all its surfaces, also kill its closing surfaces

608. By Daniel d'Andrada on 2017-02-21

Make TaskController absorb SessionManager

So that we can later on provide fake, internal, mir clients for tests
just by replacing the TaskController with a fake implementation.

609. By Daniel d'Andrada on 2017-02-21

Don't pass command line arguments to Mir

Those are application specific, as qtmir can be used by several different
executables (unity8, uqmlscene, qmltestrunner), each taking its own set of
comamnd line args.

Those executables (uqmlscene, qmltestrunner in particular) will quit when
seeing Mir arguments and vice-versa (Mir quits when seeing unrecognized args)

610. By Daniel d'Andrada on 2017-02-21

Fake applications using internal mir clients when UNITY_TESTING is defined

Unmerged revisions

610. By Daniel d'Andrada on 2017-02-21

Fake applications using internal mir clients when UNITY_TESTING is defined

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-02-02 09:17:48 +0000
+++ CMakeLists.txt	2017-02-14 10:17:32 +0000
@@ -23,8 +23,9 @@
 # add custom cmake modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
-# Instruct CMake to run moc automatically when needed.
+# Instruct CMake to run moc and rcc automatically when needed.
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra -Werror")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -fno-strict-aliasing -Werror -Wextra")
@@ -90,7 +91,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=26)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)
 pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
 pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)
 

=== modified file 'debian/control'
--- debian/control	2017-02-02 09:17:48 +0000
+++ debian/control	2017-02-14 10:17:32 +0000
@@ -25,7 +25,7 @@
                libubuntu-app-launch2-dev (>= 0.9),
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
-               libunity-api-dev (>= 8.2),
+               libunity-api-dev (>= 8.3),
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,
@@ -102,7 +102,7 @@
 Conflicts: libqtmir,
            libunity-mir1,
 Provides: unity-application-impl,
-          unity-application-impl-23,
+          unity-application-impl-27,
 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-12-01 11:45:31 +0000
+++ debian/gles-patches/convert-to-gles.patch	2017-02-14 10:17:32 +0000
@@ -84,7 +84,7 @@
 -Conflicts: libqtmir,
 -           libunity-mir1,
 -Provides: unity-application-impl,
--          unity-application-impl-23,
+-          unity-application-impl-27,
 -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 'src/common/debughelpers.cpp'
--- src/common/debughelpers.cpp	2017-01-18 21:24:15 +0000
+++ src/common/debughelpers.cpp	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical, Ltd.
+ * Copyright (C) 2013-2017 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
@@ -371,3 +371,49 @@
         return "???";
     }
 }
+
+const char* mirEventTypeToStr(MirEventType t)
+{
+    switch (t) {
+    case mir_event_type_key:
+        return "key";
+    case mir_event_type_motion:
+        return "motion";
+    case mir_event_type_window:
+        return "window";
+    case mir_event_type_resize:
+        return "resize";
+    case mir_event_type_prompt_session_state_change:
+        return "prompt_session_state_change";
+    case mir_event_type_orientation:
+        return "orientation";
+    case mir_event_type_close_window:
+        return "close_window";
+    case mir_event_type_input:
+        return "input";
+    case mir_event_type_keymap:
+        return "keymap";
+    case mir_event_type_window_output:
+        return "window_output";
+    case mir_event_type_input_device_state:
+        return "input_device_state";
+    case mir_event_type_window_placement:
+        return "window_placement";
+    default:
+        return "????";
+    }
+    Q_UNREACHABLE();
+}
+
+const char *mirLifecycleStateToStr(MirLifecycleState value)
+{
+    switch (value) {
+    case mir_lifecycle_state_will_suspend:
+        return "will_suspend";
+    case mir_lifecycle_state_resumed:
+        return "resumed";
+    case mir_lifecycle_connection_lost:
+        return "connection_lost";
+    }
+    Q_UNREACHABLE();
+}

=== modified file 'src/common/debughelpers.h'
--- src/common/debughelpers.h	2017-01-18 21:24:15 +0000
+++ src/common/debughelpers.h	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical, Ltd.
+ * Copyright (C) 2013-2017 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
@@ -28,11 +28,13 @@
 QString touchEventToString(const QTouchEvent *ev);
 
 QString mirSurfaceAttribAndValueToString(MirWindowAttrib attrib, int value);
+const char* mirEventTypeToStr(MirEventType t);
 const char *mirSurfaceTypeToStr(int value);
 const char *mirSurfaceStateToStr(int value);
 const char *mirSurfaceFocusStateToStr(int value);
 const char *mirSurfaceVisibilityToStr(int value);
 const char *mirMotionActionToStr(int value);
+const char *mirLifecycleStateToStr(MirLifecycleState value);
 
 const char *applicationStateToStr(int state);
 

=== modified file 'src/common/windowcontrollerinterface.h'
--- src/common/windowcontrollerinterface.h	2016-11-03 20:17:46 +0000
+++ src/common/windowcontrollerinterface.h	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Canonical, Ltd.
+ * Copyright (C) 2016-2017 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
@@ -18,6 +18,7 @@
 #define WINDOWCONTROLLERINTERFACE_H
 
 #include <miral/window.h>
+#include <miral/window_specification.h>
 
 #include <mir_toolkit/event.h>
 

=== modified file 'src/modules/Unity/Application/CMakeLists.txt'
--- src/modules/Unity/Application/CMakeLists.txt	2016-11-15 17:54:03 +0000
+++ src/modules/Unity/Application/CMakeLists.txt	2017-02-14 10:17:32 +0000
@@ -1,6 +1,7 @@
 include_directories(
     ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
     ${CMAKE_SOURCE_DIR}/src/common
+    fake
 )
 
 include_directories(
@@ -35,17 +36,23 @@
     ../../../common/abstractdbusservicemonitor.cpp
     ../../../common/debughelpers.cpp
     dbusfocusinfo.cpp
+    fake/faketaskcontroller.cpp
+    fake/fakeapplicationinfo.cpp
+    fake/fakemaliit.cpp
+    fake/fakemirclient.cpp
+    fake/fakeprompt.cpp
     plugin.cpp
     mirsurface.cpp
     mirsurfaceinterface.h
     mirsurfaceitem.cpp
     mirsurfacelistmodel.cpp
+    mirtestsingleton.cpp
     mirbuffersgtexture.cpp
     proc_info.cpp
     session.cpp
-    sessionmanager.cpp
     sharedwakelock.cpp
     surfacemanager.cpp
+    taskcontroller.cpp
     upstart/applicationinfo.cpp
     upstart/taskcontroller.cpp
     timer.cpp
@@ -66,6 +73,7 @@
     applicationinfo.h
     taskcontroller.h
     settings_interface.h
+    resources/surfaces.qrc
     )
 
 add_library(unityapplicationplugin SHARED

=== modified file 'src/modules/Unity/Application/application.cpp'
--- src/modules/Unity/Application/application.cpp	2017-02-02 09:36:07 +0000
+++ src/modules/Unity/Application/application.cpp	2017-02-14 10:17:32 +0000
@@ -392,7 +392,7 @@
         if (m_processState == ProcessRunning) {
             suspend();
         } else {
-            // we can't suspend it since we have no information on the app process
+            DEBUG_MSG << "() Can't suspend since we have no information on the app process";
             Q_ASSERT(m_processState == ProcessUnknown);
         }
         break;

=== modified file 'src/modules/Unity/Application/application.h'
--- src/modules/Unity/Application/application.h	2016-11-15 17:54:03 +0000
+++ src/modules/Unity/Application/application.h	2017-02-14 10:17:32 +0000
@@ -184,7 +184,6 @@
     ProxySurfaceListModel *m_proxyPromptSurfaceList;
 
     friend class ApplicationManager;
-    friend class SessionManager;
     friend class Session;
 };
 

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2017-02-02 09:36:07 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 Canonical, Ltd.
+ * Copyright (C) 2013-2017 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
@@ -24,12 +24,12 @@
 #include "sharedwakelock.h"
 #include "proc_info.h"
 #include "upstart/taskcontroller.h"
+#include "faketaskcontroller.h"
 #include "tracepoints.h" // generated from tracepoints.tp
 #include "settings.h"
 
 // mirserver
 #include "nativeinterface.h"
-#include "sessionauthorizer.h"
 #include "logging.h"
 
 //miral
@@ -73,28 +73,6 @@
     return appId;
 }
 
-void connectToSessionAuthorizer(ApplicationManager *manager, SessionAuthorizer *authorizer)
-{
-    QObject::connect(authorizer, &SessionAuthorizer::requestAuthorizationForSession,
-                     manager, &ApplicationManager::authorizeSession, Qt::BlockingQueuedConnection);
-}
-
-void connectToTaskController(ApplicationManager *manager, TaskController *controller)
-{
-    QObject::connect(controller, &TaskController::processStarting,
-                     manager, &ApplicationManager::onProcessStarting);
-    QObject::connect(controller, &TaskController::processStopped,
-                     manager, &ApplicationManager::onProcessStopped);
-    QObject::connect(controller, &TaskController::processSuspended,
-                     manager, &ApplicationManager::onProcessSuspended);
-    QObject::connect(controller, &TaskController::processFailed,
-                     manager, &ApplicationManager::onProcessFailed);
-    QObject::connect(controller, &TaskController::focusRequested,
-                     manager, &ApplicationManager::onFocusRequested);
-    QObject::connect(controller, &TaskController::resumeRequested,
-                     manager, &ApplicationManager::onResumeRequested);
-}
-
 } // namespace
 
 ApplicationManager* ApplicationManager::create()
@@ -107,10 +85,17 @@
         return nullptr;
     }
 
-    SessionAuthorizer *sessionAuthorizer = static_cast<SessionAuthorizer*>(nativeInterface->nativeResourceForIntegration("SessionAuthorizer"));
+    QSharedPointer<TaskController> taskController;
+    QSharedPointer<ProcInfo> procInfo;
+    if (qgetenv("UNITY_TESTING") == "1") {
+        auto *fakeTaskController = new FakeTaskController();
+        taskController.reset(fakeTaskController);
+        procInfo = fakeTaskController->procInfo();
+    } else {
+        taskController.reset(new upstart::TaskController());
+        procInfo.reset(new ProcInfo());
+    }
 
-    QSharedPointer<TaskController> taskController(new upstart::TaskController());
-    QSharedPointer<ProcInfo> procInfo(new ProcInfo());
     QSharedPointer<SharedWakelock> sharedWakelock(new SharedWakelock);
     QSharedPointer<Settings> settings(new Settings());
 
@@ -126,9 +111,6 @@
                                              settings
                                          );
 
-    connectToSessionAuthorizer(appManager, sessionAuthorizer);
-    connectToTaskController(appManager, taskController.data());
-
     // Emit signal to notify Upstart that Mir is ready to receive client connections
     // see http://upstart.ubuntu.com/cookbook/#expect-stop
     // FIXME: should not be qtmir's job, instead should notify the user of this library
@@ -166,6 +148,23 @@
 {
     qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::ApplicationManager (this=%p)" << this;
     setObjectName(QStringLiteral("qtmir::ApplicationManager"));
+
+    QObject::connect(m_taskController.data(), &TaskController::processStarting,
+                     this, &ApplicationManager::onProcessStarting);
+    QObject::connect(m_taskController.data(), &TaskController::processStopped,
+                     this, &ApplicationManager::onProcessStopped);
+    QObject::connect(m_taskController.data(), &TaskController::processSuspended,
+                     this, &ApplicationManager::onProcessSuspended);
+    QObject::connect(m_taskController.data(), &TaskController::processFailed,
+                     this, &ApplicationManager::onProcessFailed);
+    QObject::connect(m_taskController.data(), &TaskController::focusRequested,
+                     this, &ApplicationManager::onFocusRequested);
+    QObject::connect(m_taskController.data(), &TaskController::resumeRequested,
+                     this, &ApplicationManager::onResumeRequested);
+    QObject::connect(m_taskController.data(), &TaskController::authorizationRequestedForSession,
+                     this, &ApplicationManager::authorizeSession);
+    QObject::connect(m_taskController.data(), &TaskController::sessionStarting,
+                     this, &ApplicationManager::onSessionStarting);
 }
 
 ApplicationManager::~ApplicationManager()
@@ -580,14 +579,14 @@
 
     auto qtmirSurface = static_cast<qtmir::MirSurfaceInterface*>(surface);
 
-    return findApplicationWithPid(miral::pid_of(qtmirSurface->session()->session()));
+    return findApplicationWithPid(PidFetcher::pidOf(qtmirSurface->session()->session()));
 }
 
 Application* ApplicationManager::findApplicationWithSession(const std::shared_ptr<ms::Session> &session)
 {
     if (!session)
         return nullptr;
-    return findApplicationWithPid(miral::pid_of(session));
+    return findApplicationWithPid(PidFetcher::pidOf(session));
 }
 
 Application* ApplicationManager::findApplicationWithPid(const pid_t pid) const
@@ -596,7 +595,7 @@
         return nullptr;
 
     for (Application *app : m_applications) {
-        if (app->m_pid == pid) {
+        if (app->pid() == pid) {
             return app;
         }
     }
@@ -665,7 +664,6 @@
         application->deleteLater();
     });
 
-
     beginInsertRows(QModelIndex(), m_applications.count(), m_applications.count());
     m_applications.append(application);
     endInsertRows();
@@ -785,4 +783,18 @@
     return nullptr;
 }
 
+
+void ApplicationManager::onSessionStarting(SessionInterface *qmlSession)
+{
+    Application* application = findApplicationWithSession(qmlSession->session());
+    if (application && application->state() != Application::Running) {
+        application->setSession(qmlSession);
+    }
+}
+
+SessionInterface *ApplicationManager::findSession(const mir::scene::Session* session) const
+{
+    return m_taskController->findSession(session);
+}
+
 } // namespace qtmir

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2017-02-02 09:36:07 +0000
+++ src/modules/Unity/Application/application_manager.h	2017-02-14 10:17:32 +0000
@@ -94,6 +94,8 @@
     const QList<Application*> &list() const { return m_applications; }
     qtmir::Application* findApplicationWithPid(const pid_t pid) const;
 
+    SessionInterface *findSession(const mir::scene::Session* session) const;
+
 public Q_SLOTS:
     void authorizeSession(const pid_t pid, bool &authorized);
 
@@ -103,6 +105,7 @@
     void onProcessFailed(const QString& appId, TaskController::Error error);
     void onFocusRequested(const QString& appId);
     void onResumeRequested(const QString& appId);
+    void onSessionStarting(SessionInterface *session);
 
 Q_SIGNALS:
     void emptyChanged();
@@ -138,7 +141,6 @@
 
     friend class Application;
     friend class DBusWindowStack;
-    friend class SessionManager;
 };
 
 } // namespace qtmir

=== added directory 'src/modules/Unity/Application/fake'
=== added file 'src/modules/Unity/Application/fake/fakeapplicationinfo.cpp'
--- src/modules/Unity/Application/fake/fakeapplicationinfo.cpp	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/fake/fakeapplicationinfo.cpp	2017-02-14 10:17:32 +0000
@@ -0,0 +1,26 @@
+/*
+ * 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 "fakeapplicationinfo.h"
+
+using namespace qtmir;
+
+void FakeApplicationInfo::setIconId(const QString &iconId)
+{
+    m_icon = QString("qrc:///Unity/Application/icons/[e-mail]")
+            .arg(iconId);
+}

=== added file 'src/modules/Unity/Application/fake/fakeapplicationinfo.h'
--- src/modules/Unity/Application/fake/fakeapplicationinfo.h	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/fake/fakeapplicationinfo.h	2017-02-14 10:17:32 +0000
@@ -0,0 +1,93 @@
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef QTMIR_FAKE_APPLICATION_INFO_H
+#define QTMIR_FAKE_APPLICATION_INFO_H
+
+#include "applicationinfo.h"
+
+#include <mir_toolkit/common.h>
+
+namespace qtmir {
+
+class FakeApplicationInfo : public ApplicationInfo
+{
+    Q_OBJECT
+public:
+    FakeApplicationInfo(const QString &appId) { m_appId = appId; }
+
+    QString appId() const override { return m_appId; }
+
+    QString name() const override { return m_name; }
+    void setName(const QString &name) { m_name = name; }
+
+    QString comment() const override { return m_comment; }
+
+    QUrl icon() const override { return m_icon; }
+
+    QString splashTitle() const override { return m_splashTitle; }
+    QUrl splashImage() const override { return m_splashImage; }
+    bool splashShowHeader() const override { return m_splashShowHeader; }
+    QString splashColor() const override { return m_splashColor; }
+    QString splashColorHeader() const override { return m_splashColorHeader; }
+    QString splashColorFooter() const override { return m_splashColorFooter; }
+    Qt::ScreenOrientations supportedOrientations() const override { return m_supportedOrientations; }
+    bool rotatesWindowContents() const override { return m_rotatesWindowContents; }
+
+    void setIsTouchApp(bool value) { m_isTouchApp = value; }
+    bool isTouchApp() const override { return m_isTouchApp; }
+
+    void setScreenshotId(const QString &screenshotId) { m_screenshotId = screenshotId; }
+    QString screenshotId() const { return m_screenshotId; }
+
+    void setIconId(const QString &iconId);
+    void setSupportedOrientations(Qt::ScreenOrientations orientations) { m_supportedOrientations = orientations; }
+    void setRotatesWindowContents(bool value) { m_rotatesWindowContents = value; }
+
+    void setInitialWindowState(MirWindowState value) { m_initialWindowState = value; }
+    MirWindowState initialWindowState() const { return m_initialWindowState; }
+
+    // Window type to be used when creating top-level windows for this application
+    void setWindowType(MirWindowType value) { m_windowType = value; }
+    MirWindowType windowType() const { return m_windowType; }
+
+private:
+    QString m_appId;
+    QString m_name;
+    QString m_comment;
+    QUrl m_icon;
+    QString m_splashTitle;
+    QUrl m_splashImage;
+    bool m_splashShowHeader;
+    QString m_splashColor;
+    QString m_splashColorHeader;
+    QString m_splashColorFooter;
+    Qt::ScreenOrientations m_supportedOrientations{Qt::PortraitOrientation |
+            Qt::LandscapeOrientation |
+            Qt::InvertedPortraitOrientation |
+            Qt::InvertedLandscapeOrientation};
+    bool m_rotatesWindowContents{false};
+    bool m_isTouchApp{true};
+
+    QString m_screenshotId;
+    MirWindowState m_initialWindowState{mir_window_state_restored};
+    MirWindowType m_windowType{mir_window_type_normal};
+};
+
+} // namespace qtmir
+
+#endif // QTMIR_FAKE_APPLICATION_INFO_H

=== added file 'src/modules/Unity/Application/fake/fakemaliit.cpp'
--- src/modules/Unity/Application/fake/fakemaliit.cpp	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/fake/fakemaliit.cpp	2017-02-14 10:17:32 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2017 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 "fakemaliit.h"
+
+// Qt
+#include <QPainter>
+
+// mir
+#include <mir_toolkit/mir_buffer_stream.h>
+
+using namespace qtmir;
+
+/**************************************************************************************************
+ * FakeMaliitLauncher
+ *************************************************************************************************/
+
+FakeMaliitLauncher::FakeMaliitLauncher(QSharedPointer<FakeApplicationInfo> appInfo, pid_t pid, QObject *parent)
+    : FakeMirClientLauncher(appInfo, pid, parent)
+{
+}
+
+MirClient *FakeMaliitLauncher::createClient()
+{
+    return new Maliit(m_appInfo, m_connection);
+}
+
+/**************************************************************************************************
+ * Maliit
+ *************************************************************************************************/
+
+Maliit::Maliit(QSharedPointer<FakeApplicationInfo> appInfo, miral::toolkit::Connection conn)
+    : MirClient(appInfo, conn)
+{
+}
+
+QSize Maliit::update(MirWindow *window)
+{
+    MirBufferStream* buffer_stream = mir_window_get_buffer_stream(window);
+
+    // TODO sometimes buffer_stream is nullptr
+    // (Only observed when creating a lot of clients at once)
+    if (!buffer_stream)
+        return QSize();
+
+    MirGraphicsRegion region;
+    mir_buffer_stream_get_graphics_region(buffer_stream, &region);
+
+    Q_ASSERT(!m_screenshot.isNull());
+
+    QImage windowImage((uchar*)region.vaddr, region.width, region.height, QImage::Format_RGB32);
+    {
+        QPainter painter(&windowImage);
+
+        painter.fillRect(0, 0, windowImage.width(), windowImage.height()*0.6, Qt::transparent);
+        painter.drawImage(QRectF(0, windowImage.height()*0.6, windowImage.width(), windowImage.height()*0.4), m_screenshot);
+    }
+
+    mir_buffer_stream_swap_buffers_sync(buffer_stream);
+
+    return windowImage.size();
+}

=== added file 'src/modules/Unity/Application/fake/fakemaliit.h'
--- src/modules/Unity/Application/fake/fakemaliit.h	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/fake/fakemaliit.h	2017-02-14 10:17:32 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2017 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/>.
+ *
+ */
+
+#ifndef QTMIR_FAKE_MALIIT_H
+#define QTMIR_FAKE_MALIIT_H
+
+#include "fakemirclient.h"
+
+namespace qtmir {
+
+class Maliit : public MirClient
+{
+    Q_OBJECT
+
+public:
+    Maliit(QSharedPointer<FakeApplicationInfo> appInfo, miral::toolkit::Connection);
+
+private:
+    QSize update(MirWindow *window) override;
+};
+
+class FakeMaliitLauncher : public FakeMirClientLauncher
+{
+    Q_OBJECT
+public:
+    FakeMaliitLauncher(QSharedPointer<FakeApplicationInfo> appInfo, pid_t pid, QObject *parent = nullptr);
+private:
+    MirClient *createClient() override;
+};
+
+} // namespace qtmir
+
+#endif // QTMIR_FAKE_MALIIT_H

=== added file 'src/modules/Unity/Application/fake/fakemirclient.cpp'
--- src/modules/Unity/Application/fake/fakemirclient.cpp	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/fake/fakemirclient.cpp	2017-02-14 10:17:32 +0000
@@ -0,0 +1,685 @@
+/*
+ * Copyright (C) 2017 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 "fakemirclient.h"
+
+// src/common
+#include <debughelpers.h>
+
+#include <miral/toolkit/persistent_id.h>
+#include <miral/toolkit/window_spec.h>
+
+// std
+#include <atomic>
+#include <chrono>
+#include <mutex>
+#include <thread>
+
+// Qt
+#include <qpa/qplatformnativeinterface.h>
+#include <QGuiApplication>
+#include <QCoreApplication>
+#include <QEventLoop>
+#include <QPainter>
+
+// mir
+#include <mir/main_loop.h>
+#include <mir_toolkit/mir_buffer_stream.h>
+
+// qpa mirserver
+#include "logging.h"
+
+#include <QDebug>
+
+using namespace qtmir;
+using namespace miral::toolkit;
+using namespace std::chrono_literals;
+
+#define DEBUG_MSG qCDebug(QTMIR_FAKECLIENTS).nospace() << "MirClient["<< m_appInfo->appId() <<"]::" << __func__
+#define CRITICAL_MSG qCCritical(QTMIR_FAKECLIENTS).nospace() << "MirClient["<< m_appInfo->appId() <<"]::" << __func__
+
+class MirClientEvent : public QEvent
+{
+public:
+    MirClientEvent(MirWindow* window, const MirEvent *event, QEvent::Type type)
+        : QEvent(type), window(window), mirEvent(event) {
+        mirEvent = mir_event_ref(event);
+    }
+    ~MirClientEvent()
+    {
+        mir_event_unref(mirEvent);
+    }
+
+    MirWindow* window;
+    const MirEvent *mirEvent;
+};
+
+namespace {
+void lifecycleEventCallback(MirConnection* /*connection*/, MirLifecycleState state, void* context)
+{
+    static_cast<MirClient*>(context)->lifecycleEvent(state);
+}
+
+int mirClientEventType{0};
+void windowEventHandler(MirWindow* window, MirEvent const* event, void* context)
+{
+    if (mirClientEventType == 0) {
+        mirClientEventType = QEvent::registerEventType();
+    }
+    auto client = static_cast<MirClient*>(context);
+    QEvent *qtEvent = new MirClientEvent(window, event, static_cast<QEvent::Type>(mirClientEventType));
+    QCoreApplication::postEvent(client, qtEvent);
+}
+
+} // anonymous namespace
+
+
+/**************************************************************************************************
+ * FakeMirClientLauncher
+ *************************************************************************************************/
+
+FakeMirClientLauncher::FakeMirClientLauncher(QSharedPointer<FakeApplicationInfo> appInfo, pid_t pid, QObject *parent)
+    : QThread(parent)
+    , m_pid(pid)
+    , m_appInfo(appInfo)
+{
+    connect(this, &QThread::finished, this, [this]{ m_fd = mir::Fd(); });
+}
+
+void FakeMirClientLauncher::launch()
+{
+    auto nativeInterface = QGuiApplication::platformNativeInterface();
+    m_server = static_cast<mir::Server*>(nativeInterface->nativeResourceForIntegration("MirServer"));
+
+    m_server->the_main_loop()->enqueue(this, [this] { launchFromMirServerThread(); });
+}
+
+void FakeMirClientLauncher::launchFromMirServerThread()
+{
+    std::condition_variable condition;
+
+    m_fd = m_server->open_client_socket([this, &condition](std::shared_ptr<mir::frontend::Session> const& fSession)
+        {
+            std::lock_guard<decltype(m_mutex)> lock_guard{m_mutex};
+            m_session = std::dynamic_pointer_cast<mir::scene::Session>(fSession);
+            condition.notify_one();
+        });
+
+    char connect_string[64] = {0};
+    sprintf(connect_string, "fd://%d", m_fd.operator int());
+
+    m_connection = Connection{mir_connect_sync(connect_string, m_appInfo->appId().toLatin1().data())};
+
+    {
+        std::unique_lock<decltype(m_mutex)> lock{m_mutex};
+        condition.wait(lock, [&] { return !!m_session.lock(); });
+    }
+
+    start();
+}
+
+std::shared_ptr<mir::scene::Session> FakeMirClientLauncher::session()
+{
+    auto sharedPtr = m_session.lock();
+    return sharedPtr;
+}
+
+MirClient *FakeMirClientLauncher::createClient()
+{
+    return new MirClient(m_appInfo, m_connection);
+}
+
+void FakeMirClientLauncher::run()
+{
+    {
+        std::lock_guard<std::mutex> lock_guard{m_mutex};
+
+        m_client = createClient();
+        connect(m_client, &MirClient::willSuspend, this, &FakeMirClientLauncher::willSuspend);
+        connect(m_client, &MirClient::resumed, this, &FakeMirClientLauncher::resumed);
+        connect(m_client, &MirClient::windowCreated, this, &FakeMirClientLauncher::addWindowAttributes);
+        connect(m_client, &MirClient::windowAttributeChanged, this, &FakeMirClientLauncher::updateWindowAttribute);
+        connect(m_client, &MirClient::windowClosed, this, &FakeMirClientLauncher::removeWindowAttributes);
+        connect(m_client, &MirClient::touchPressed, this, &FakeMirClientLauncher::incrementTouchPressCount);
+        connect(m_client, &MirClient::touchReleased, this, &FakeMirClientLauncher::incrementTouchReleaseCount);
+        connect(m_client, &MirClient::mousePressed, this, &FakeMirClientLauncher::incrementMousePressCount);
+        connect(m_client, &MirClient::mouseReleased, this, &FakeMirClientLauncher::incrementMouseReleaseCount);
+
+        if (!m_manualWindowCreation) {
+            // wait a bit so that the splash screen has some time to shine
+            msleep(350);
+
+            m_client->createWindow();
+        }
+
+        // keep only one reference, in MirClient
+        m_connection.reset();
+    }
+
+
+    qCDebug(QTMIR_FAKECLIENTS).nospace() << "FakeMirClientLauncher::run[" << m_appInfo->appId() << "] entered loop.";
+    exec();
+    qCDebug(QTMIR_FAKECLIENTS).nospace() << "FakeMirClientLauncher::run[" << m_appInfo->appId() << "] exited loop.";
+
+    {
+        std::lock_guard<std::mutex> lock_guard{m_mutex};
+
+        delete m_client;
+        m_client = nullptr;
+    }
+}
+
+void FakeMirClientLauncher::createWindow()
+{
+    std::lock_guard<std::mutex> lock_guard{m_mutex};
+    QMetaObject::invokeMethod(m_client, "createWindow", Qt::AutoConnection);
+}
+
+void FakeMirClientLauncher::killWindow(const QString &persistentId)
+{
+    std::lock_guard<std::mutex> lock_guard{m_mutex};
+    QMetaObject::invokeMethod(m_client, "killWindow", Qt::AutoConnection, Q_ARG(QString, persistentId));
+}
+
+void FakeMirClientLauncher::setWindowInputBounds(const QString &persistentId, QRect rect)
+{
+    std::lock_guard<std::mutex> lock_guard{m_mutex};
+    QMetaObject::invokeMethod(m_client, "setWindowInputBounds", Qt::AutoConnection,
+            Q_ARG(QString, persistentId),
+            Q_ARG(QRect, rect));
+}
+
+void FakeMirClientLauncher::setWindowMinimumWidth(const QString &persistentId, int value)
+{
+    std::lock_guard<std::mutex> lock_guard{m_mutex};
+    QMetaObject::invokeMethod(m_client, "setWindowMinimumWidth", Qt::AutoConnection,
+            Q_ARG(QString, persistentId), Q_ARG(int, value));
+}
+
+void FakeMirClientLauncher::setWindowMaximumWidth(const QString &persistentId, int value)
+{
+    std::lock_guard<std::mutex> lock_guard{m_mutex};
+    QMetaObject::invokeMethod(m_client, "setWindowMaximumWidth", Qt::AutoConnection,
+            Q_ARG(QString, persistentId), Q_ARG(int, value));
+}
+
+void FakeMirClientLauncher::setWindowMinimumHeight(const QString &persistentId, int value)
+{
+    std::lock_guard<std::mutex> lock_guard{m_mutex};
+    QMetaObject::invokeMethod(m_client, "setWindowMinimumHeight", Qt::AutoConnection,
+            Q_ARG(QString, persistentId), Q_ARG(int, value));
+}
+
+void FakeMirClientLauncher::setWindowMaximumHeight(const QString &persistentId, int value)
+{
+    std::lock_guard<std::mutex> lock_guard{m_mutex};
+    QMetaObject::invokeMethod(m_client, "setWindowMaximumHeight", Qt::AutoConnection,
+            Q_ARG(QString, persistentId), Q_ARG(int, value));
+}
+
+void FakeMirClientLauncher::setWindowWidthIncrement(const QString &persistentId, int value)
+{
+    std::lock_guard<std::mutex> lock_guard{m_mutex};
+    QMetaObject::invokeMethod(m_client, "setWindowWidthIncrement", Qt::AutoConnection,
+            Q_ARG(QString, persistentId), Q_ARG(int, value));
+}
+
+void FakeMirClientLauncher::setWindowHeightIncrement(const QString &persistentId, int value)
+{
+    std::lock_guard<std::mutex> lock_guard{m_mutex};
+    QMetaObject::invokeMethod(m_client, "setWindowHeightIncrement", Qt::AutoConnection,
+            Q_ARG(QString, persistentId), Q_ARG(int, value));
+}
+
+void FakeMirClientLauncher::kill()
+{
+    m_killed = true;
+    quit();
+}
+
+const WindowAttributes *FakeMirClientLauncher::windowAttributes(const QString &persistentId) const
+{
+    auto iterator = m_windowAttributes.find(persistentId);
+    if (iterator == m_windowAttributes.end()) {
+        return nullptr;
+    } else {
+        return &(iterator.value());
+    }
+}
+
+void FakeMirClientLauncher::addWindowAttributes(QString persistentId, WindowAttributes windowAttributes)
+{
+    Q_ASSERT(!m_windowAttributes.contains(persistentId));
+    m_windowAttributes[persistentId] = windowAttributes;
+}
+
+void FakeMirClientLauncher::updateWindowAttribute(QString persistentId, MirWindowAttrib attribute, int value)
+{
+    Q_ASSERT(m_windowAttributes.contains(persistentId));
+
+    WindowAttributes &windowAttribs = m_windowAttributes[persistentId];
+
+    switch (attribute) {
+    case mir_window_attrib_focus:
+        windowAttribs.focusState = static_cast<MirWindowFocusState>(value);
+        break;
+    case mir_window_attrib_visibility:
+        windowAttribs.visibility = static_cast<MirWindowVisibility>(value);
+        break;
+    default:
+        // NOOP
+        break;
+    };
+}
+
+void FakeMirClientLauncher::incrementTouchPressCount(QString persistentId)
+{
+    Q_ASSERT(m_windowAttributes.contains(persistentId));
+    WindowAttributes &windowAttribs = m_windowAttributes[persistentId];
+    ++windowAttribs.touchPressCount;
+}
+
+void FakeMirClientLauncher::incrementTouchReleaseCount(QString persistentId)
+{
+    Q_ASSERT(m_windowAttributes.contains(persistentId));
+    WindowAttributes &windowAttribs = m_windowAttributes[persistentId];
+    ++windowAttribs.touchReleaseCount;
+}
+
+void FakeMirClientLauncher::incrementMousePressCount(QString persistentId)
+{
+    Q_ASSERT(m_windowAttributes.contains(persistentId));
+    WindowAttributes &windowAttribs = m_windowAttributes[persistentId];
+    ++windowAttribs.mousePressCount;
+}
+
+void FakeMirClientLauncher::incrementMouseReleaseCount(QString persistentId)
+{
+    Q_ASSERT(m_windowAttributes.contains(persistentId));
+    WindowAttributes &windowAttribs = m_windowAttributes[persistentId];
+    ++windowAttribs.mouseReleaseCount;
+}
+
+void FakeMirClientLauncher::removeWindowAttributes(QString persistentId)
+{
+    Q_ASSERT(m_windowAttributes.contains(persistentId));
+    m_windowAttributes.remove(persistentId);
+}
+
+/**************************************************************************************************
+ * MirClient
+ *************************************************************************************************/
+
+MirClient::MirClient(QSharedPointer<FakeApplicationInfo> appInfo, miral::toolkit::Connection connection)
+    : m_connection(connection)
+    , m_appInfo(appInfo)
+{
+    QString screenshotFileName;
+    if (m_appInfo->screenshotId().endsWith(".svg") || m_appInfo->screenshotId().endsWith(".png")) {
+        screenshotFileName = QString(":/Unity/Application/screenshots/%2")
+            .arg(m_appInfo->screenshotId());
+    } else {
+        screenshotFileName = QString(":/Unity/Application/screenshots/[e-mail]")
+            .arg(m_appInfo->screenshotId());
+    }
+
+    m_screenshot = QImage(screenshotFileName);
+
+    mir_connection_set_lifecycle_event_callback(connection, &lifecycleEventCallback, this);
+}
+
+QSize MirClient::update(MirWindow* window)
+{
+    MirBufferStream* buffer_stream = mir_window_get_buffer_stream(window);
+
+    // TODO sometimes buffer_stream is nullptr
+    // (Only observed when creating a lot of clients at once)
+    if (!buffer_stream)
+        return QSize();
+
+    MirGraphicsRegion region;
+    mir_buffer_stream_get_graphics_region(buffer_stream, &region);
+
+    QImage windowImage((uchar*)region.vaddr, region.width, region.height, QImage::Format_RGB32);
+    {
+        QPainter painter(&windowImage);
+        if (m_screenshot.isNull()) {
+            painter.fillRect(0, 0, windowImage.width(), windowImage.height(), Qt::magenta);
+        } else {
+            painter.drawImage(QRectF(0, 0, windowImage.width(), windowImage.height()), m_screenshot);
+        }
+    }
+
+    mir_buffer_stream_swap_buffers_sync(buffer_stream);
+
+    return windowImage.size();
+}
+
+void MirClient::resizeEvent(MirWindow* window, MirResizeEvent const *event)
+{
+    // TODO redraw until we get a frame with the size announced in this event
+
+    QSize targetSize(mir_resize_event_get_width(event), mir_resize_event_get_height(event));
+
+    QSize size = update(window);
+
+    int attempts = 1;
+    while (size != targetSize && attempts < 5) {
+        size = update(window);
+        ++attempts;
+    }
+}
+
+void MirClient::attributeChangeEvent(MirWindow *window, MirWindowEvent const *event)
+{
+    MirWindowAttrib attribute = mir_window_event_get_attribute(event);
+    int value = mir_window_event_get_attribute_value(event);
+
+    Q_EMIT windowAttributeChanged(idForWindow(window), attribute, value);
+}
+
+void MirClient::inputEvent(MirWindow* window, const MirInputEvent *event)
+{
+    switch (mir_input_event_get_type(event)) {
+    case mir_input_event_type_touch:
+        touchEvent(window, mir_input_event_get_touch_event(event));
+        break;
+    case mir_input_event_type_pointer:
+        pointerEvent(window, mir_input_event_get_pointer_event(event));
+        break;
+    default:
+        // don't care
+        break;
+    }
+}
+
+void MirClient::touchEvent(MirWindow* window, const MirTouchEvent *event)
+{
+
+    // Don't care about multi-touch
+    switch (mir_touch_event_action(event, 0)) {
+    case mir_touch_action_up:
+        Q_EMIT touchReleased(idForWindow(window));
+        break;
+    case mir_touch_action_down:
+        Q_EMIT touchPressed(idForWindow(window));
+        break;
+    default:
+        // don't care
+        break;
+    }
+}
+
+void MirClient::pointerEvent(MirWindow* window, const MirPointerEvent *event)
+{
+    bool isPressed = mir_pointer_event_button_state(event, mir_pointer_button_primary);
+
+    if (isPressed && !m_primaryButtonPressed) {
+        Q_EMIT mousePressed(idForWindow(window));
+    } else if (!isPressed && m_primaryButtonPressed) {
+        Q_EMIT mouseReleased(idForWindow(window));
+    }
+
+    m_primaryButtonPressed = isPressed;
+}
+
+void MirClient::windowEvent(MirWindow* window, MirEvent const* mirEvent)
+{
+    switch (mir_event_get_type(mirEvent))
+    {
+    case mir_event_type_input:
+        inputEvent(window, mir_event_get_input_event(mirEvent));
+        break;
+    case mir_event_type_resize:
+        resizeEvent(window, mir_event_get_resize_event(mirEvent));
+        break;
+    case mir_event_type_window:
+        attributeChangeEvent(window, mir_event_get_window_event(mirEvent));
+        break;
+    case mir_event_type_window_output:
+        break;
+    case mir_event_type_orientation:
+        break;
+    case mir_event_type_close_window:
+        closeWindow(window);
+        break;
+    default:
+        qDebug() << "MirClient::windowEvent unhandled event type: " << mirEventTypeToStr(mir_event_get_type(mirEvent));
+    }
+}
+
+void MirClient::customEvent(QEvent* event)
+{
+    auto mirClientEvent = static_cast<MirClientEvent*>(event);
+    windowEvent(mirClientEvent->window, mirClientEvent->mirEvent);
+}
+
+void MirClient::createWindow()
+{
+    ++m_windowCounter;
+
+    QString name = QString("%1 %2")
+        .arg(m_appInfo->name())
+        .arg(m_windowCounter);
+
+    MirWindowSpec *spec = mir_create_window_spec(m_connection);
+    mir_window_spec_set_type(spec, m_appInfo->windowType());
+    mir_window_spec_set_width(spec, 640);
+    mir_window_spec_set_height(spec, 480);
+    mir_window_spec_set_pixel_format(spec, mir_pixel_format_argb_8888);
+    mir_window_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+    mir_window_spec_set_name(spec, name.toLatin1().data());
+    mir_window_spec_set_event_handler(spec, &windowEventHandler, this /*context*/);
+    mir_window_spec_set_state(spec, m_appInfo->initialWindowState());
+
+    miral::toolkit::Window window{ mir_create_window_sync(spec) };
+    m_windows.append(window);
+
+    mir_window_spec_release(spec);
+    spec = nullptr;
+
+    Q_EMIT windowCreated(idForWindow(window), WindowAttributes(window));
+
+    // draw the first frame
+    update(window);
+}
+
+void MirClient::killWindow(const QString &requestedId)
+{
+    for (int i = 0; i < m_windows.count(); ++i) {
+        MirWindow *window = m_windows[i];
+        if (idForWindow(window) == requestedId) {
+            window = nullptr;
+            m_windows.removeAt(i);
+        }
+    }
+}
+
+QString MirClient::idForWindow(MirWindow* window)
+{
+    if (m_surfaceIds.contains(window)) {
+        return m_surfaceIds[window];
+    } else {
+        QString id(PersistentId(window).c_str());
+        m_surfaceIds[window] = id;
+        return id;
+    }
+}
+
+void MirClient::closeWindow(MirWindow *mirWindow)
+{
+    DEBUG_MSG << "(" << mirWindow << ")";
+
+    bool found = false;
+    for (int i = 0; i < m_windows.count() && !found; ++i) {
+        if (m_windows[i] == mirWindow) {
+            found = true;
+            DEBUG_MSG << "(" << mirWindow << ") - window removed";
+            m_windows.remove(i);
+        }
+    }
+
+    if (m_windows.isEmpty()) {
+        DEBUG_MSG << "(" << mirWindow << ") - quitting";
+        QThread::currentThread()->quit();
+    }
+}
+
+MirWindow *MirClient::findWindow(const QString &requestedId)
+{
+    for (int i = 0; i < m_windows.count(); ++i) {
+        MirWindow *window = m_windows[i];
+
+        if (idForWindow(window) == requestedId) {
+            return window;
+        }
+    }
+
+    return nullptr;
+}
+
+void MirClient::setWindowInputBounds(const QString &persistentId, QRect rect)
+{
+    MirWindow *window = findWindow(persistentId);
+    if (!window) {
+        CRITICAL_MSG << "(" << persistentId << ", " << rect << ") - did not find window";
+        return;
+    }
+
+    DEBUG_MSG << "(" << persistentId << ", " << rect << ")";
+
+    MirWindowSpec* spec = mir_create_window_spec(m_connection);
+
+    {
+        MirRectangle mirRect;
+        mirRect.left = rect.x();
+        mirRect.top = rect.y();
+        mirRect.width = rect.width();
+        mirRect.height = rect.height();
+
+        mir_window_spec_set_input_shape(spec, &mirRect, 1 /*n_rects*/);
+    }
+
+    mir_window_apply_spec(window, spec);
+    mir_window_spec_release(spec);
+}
+
+void MirClient::setWindowMinimumWidth(const QString &persistentId, int value)
+{
+    MirWindow *window = findWindow(persistentId);
+    if (!window) {
+        CRITICAL_MSG << "(" << persistentId << ", " << value << ") - did not find window";
+        return;
+    }
+
+    DEBUG_MSG << "(" << persistentId << ", " << value << ")";
+
+    MirWindowSpec* spec = mir_create_window_spec(m_connection);
+    mir_window_spec_set_min_width(spec, value);
+    mir_window_apply_spec(window, spec);
+    mir_window_spec_release(spec);
+}
+
+void MirClient::setWindowMaximumWidth(const QString &persistentId, int value)
+{
+    MirWindow *window = findWindow(persistentId);
+    if (!window) {
+        CRITICAL_MSG << "(" << persistentId << ", " << value << ") - did not find window";
+        return;
+    }
+
+    DEBUG_MSG << "(" << persistentId << ", " << value << ")";
+
+    MirWindowSpec* spec = mir_create_window_spec(m_connection);
+    mir_window_spec_set_max_width(spec, value);
+    mir_window_apply_spec(window, spec);
+    mir_window_spec_release(spec);
+}
+
+void MirClient::setWindowMinimumHeight(const QString &persistentId, int value)
+{
+    MirWindow *window = findWindow(persistentId);
+    if (!window) {
+        CRITICAL_MSG << "(" << persistentId << ", " << value << ") - did not find window";
+        return;
+    }
+
+    DEBUG_MSG << "(" << persistentId << ", " << value << ")";
+
+    MirWindowSpec* spec = mir_create_window_spec(m_connection);
+    mir_window_spec_set_min_height(spec, value);
+    mir_window_apply_spec(window, spec);
+    mir_window_spec_release(spec);
+}
+
+void MirClient::setWindowMaximumHeight(const QString &persistentId, int value)
+{
+    MirWindow *window = findWindow(persistentId);
+    if (!window) {
+        CRITICAL_MSG << "(" << persistentId << ", " << value << ") - did not find window";
+        return;
+    }
+
+    DEBUG_MSG << "(" << persistentId << ", " << value << ")";
+
+    MirWindowSpec* spec = mir_create_window_spec(m_connection);
+    mir_window_spec_set_max_height(spec, value);
+    mir_window_apply_spec(window, spec);
+    mir_window_spec_release(spec);
+}
+
+void MirClient::setWindowWidthIncrement(const QString &persistentId, int value)
+{
+    MirWindow *window = findWindow(persistentId);
+    if (!window) {
+        CRITICAL_MSG << "(" << persistentId << ", " << value << ") - did not find window";
+        return;
+    }
+
+    DEBUG_MSG << "(" << persistentId << ", " << value << ")";
+
+    MirWindowSpec* spec = mir_create_window_spec(m_connection);
+    mir_window_spec_set_width_increment(spec, value);
+    mir_window_apply_spec(window, spec);
+    mir_window_spec_release(spec);
+}
+
+void MirClient::setWindowHeightIncrement(const QString &persistentId, int value)
+{
+    MirWindow *window = findWindow(persistentId);
+    if (!window) {
+        CRITICAL_MSG << "(" << persistentId << ", " << value << ") - did not find window";
+        return;
+    }
+
+    DEBUG_MSG << "(" << persistentId << ", " << value << ")";
+
+    MirWindowSpec* spec = mir_create_window_spec(m_connection);
+    mir_window_spec_set_height_increment(spec, value);
+    mir_window_apply_spec(window, spec);
+    mir_window_spec_release(spec);
+}
+
+void MirClient::lifecycleEvent(MirLifecycleState state)
+{
+    DEBUG_MSG << "(" << mirLifecycleStateToStr(state) << ")";
+    if (state == mir_lifecycle_state_will_suspend) {
+        Q_EMIT willSuspend();
+    } else if (state == mir_lifecycle_state_resumed) {
+        Q_EMIT resumed();
+    }
+}

=== added file 'src/modules/Unity/Application/fake/fakemirclient.h'
--- src/modules/Unity/Application/fake/fakemirclient.h	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/fake/fakemirclient.h	2017-02-14 10:17:32 +0000
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2017 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/>.
+ *
+ */
+
+#ifndef QTMIR_FAKE_MIR_CLIENT_H
+#define QTMIR_FAKE_MIR_CLIENT_H
+
+#include <QObject>
+#include <QSharedPointer>
+#include <QThread>
+
+#include <miral/toolkit/connection.h>
+#include <miral/toolkit/window.h>
+
+// Qt
+#include <QImage>
+#include <QMap>
+
+// mir
+#include <mir/fd.h>
+#include <mir/scene/session.h>
+#include <mir/server.h>
+#include <mir_toolkit/client_types.h>
+
+// std
+#include <condition_variable>
+
+// local
+#include "fakeapplicationinfo.h"
+#include "windowattributes.h"
+
+namespace qtmir {
+
+// lives in a separate thread
+class MirClient : public QObject
+{
+    Q_OBJECT
+
+public:
+    MirClient(QSharedPointer<FakeApplicationInfo> appInfo, miral::toolkit::Connection);
+
+    void customEvent(QEvent* event) override;
+
+Q_SIGNALS:
+    void willSuspend();
+    void resumed();
+
+    void windowCreated(QString persistentId, qtmir::WindowAttributes windowAttributes);
+    void windowAttributeChanged(QString persistentId, MirWindowAttrib attribute, int value);
+    void touchPressed(QString persistentId);
+    void touchReleased(QString persistentId);
+    void mousePressed(QString persistentId);
+    void mouseReleased(QString persistentId);
+    void windowClosed(QString persistentId);
+
+public Q_SLOTS:
+    void windowEvent(MirWindow* window, MirEvent const* event);
+    void createWindow();
+    void killWindow(const QString &persistentId);
+    void setWindowInputBounds(const QString &persistentId, QRect rect);
+    void setWindowMinimumWidth(const QString &persistentId, int value);
+    void setWindowMaximumWidth(const QString &persistentId, int value);
+    void setWindowMinimumHeight(const QString &persistentId, int value);
+    void setWindowMaximumHeight(const QString &persistentId, int value);
+    void setWindowWidthIncrement(const QString &persistentId, int value);
+    void setWindowHeightIncrement(const QString &persistentId, int value);
+
+    void lifecycleEvent(MirLifecycleState state);
+
+private:
+    virtual QSize update(MirWindow *window);
+    void closeWindow(MirWindow *window);
+    void resizeEvent(MirWindow *window, MirResizeEvent const*);
+    void attributeChangeEvent(MirWindow *window, MirWindowEvent const *event);
+    void inputEvent(MirWindow* window, const MirInputEvent *);
+    void touchEvent(MirWindow* window, const MirTouchEvent *);
+    void pointerEvent(MirWindow* window, const MirPointerEvent *);
+    MirWindow *findWindow(const QString &persistentId);
+    QString idForWindow(MirWindow*);
+
+    int m_windowCounter{0};
+    QMap<MirWindow*, QString> m_surfaceIds; // works around bug LP#1661704
+
+    bool m_primaryButtonPressed{false};
+
+protected:
+    miral::toolkit::Connection m_connection;
+    QVector<miral::toolkit::Window> m_windows;
+    QImage m_screenshot;
+    QSharedPointer<FakeApplicationInfo> m_appInfo;
+};
+
+// lives in Qt's main/gui thread
+class FakeMirClientLauncher : public QThread
+{
+    Q_OBJECT
+public:
+    FakeMirClientLauncher(QSharedPointer<FakeApplicationInfo> appInfo, pid_t pid, QObject *parent = nullptr);
+
+    void launch();
+
+    std::shared_ptr<mir::scene::Session> session();
+    pid_t pid() const { return m_pid; }
+    QSharedPointer<FakeApplicationInfo> appInfo() const { return m_appInfo; }
+
+    void createWindow();
+    void killWindow(const QString &persistentId);
+    void createPromptWindow();
+    void setWindowInputBounds(const QString &persistentId, QRect rect);
+    void setWindowMinimumWidth(const QString &persistentId, int value);
+    void setWindowMaximumWidth(const QString &persistentId, int value);
+    void setWindowMinimumHeight(const QString &persistentId, int value);
+    void setWindowMaximumHeight(const QString &persistentId, int value);
+    void setWindowWidthIncrement(const QString &persistentId, int value);
+    void setWindowHeightIncrement(const QString &persistentId, int value);
+    void setManualWindowCreation(bool value) { m_manualWindowCreation = value; }
+
+    const WindowAttributes *windowAttributes(const QString &persistentId) const;
+
+    void kill();
+    bool killed() const { return m_killed; }
+
+Q_SIGNALS:
+    void willSuspend();
+    void resumed();
+
+protected:
+    void run() override;
+
+private Q_SLOTS:
+    void addWindowAttributes(QString persistendId, WindowAttributes windowAttributes);
+    void updateWindowAttribute(QString persistentId, MirWindowAttrib attribute, int value);
+    void incrementTouchPressCount(QString persistentId);
+    void incrementTouchReleaseCount(QString persistentId);
+    void incrementMousePressCount(QString persistentId);
+    void incrementMouseReleaseCount(QString persistentId);
+    void removeWindowAttributes(QString persistendId);
+
+private:
+    // called from the fake mir client thread
+    virtual MirClient *createClient();
+
+    // Called from mir server thread
+    void launchFromMirServerThread();
+
+    mir::Server *m_server{nullptr};
+    std::weak_ptr<mir::scene::Session> m_session;
+    std::mutex mutable m_mutex;
+    mir::Fd m_fd; // gotta hold on to it otherwise connection will close
+    pid_t m_pid;
+    MirClient *m_client{nullptr};
+    bool m_manualWindowCreation{false};
+    bool m_killed{false};
+
+    // Key is persistent window id
+    QMap<QString, WindowAttributes> m_windowAttributes;
+protected:
+    QSharedPointer<FakeApplicationInfo> m_appInfo;
+    miral::toolkit::Connection m_connection;
+};
+
+} // namespace qtmir
+
+#endif // QTMIR_FAKE_MIR_CLIENT_H

=== added file 'src/modules/Unity/Application/fake/fakeprompt.cpp'
--- src/modules/Unity/Application/fake/fakeprompt.cpp	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/fake/fakeprompt.cpp	2017-02-14 10:17:32 +0000
@@ -0,0 +1,320 @@
+/*
+ * Copyright (C) 2017 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 "fakeprompt.h"
+
+// Qt
+#include <qpa/qplatformnativeinterface.h>
+#include <QDebug>
+#include <QGuiApplication>
+#include <QPainter>
+
+// mir
+#include <mir/main_loop.h>
+
+#include <unistd.h> // for getpid()
+
+// mir
+#include <mir_toolkit/mir_buffer_stream.h>
+#include <mir_toolkit/mir_prompt_session.h>
+
+// miral
+#include <miral/toolkit/window_spec.h>
+
+using namespace qtmir;
+using namespace miral::toolkit;
+
+namespace {
+
+class MirClientEvent : public QEvent
+{
+public:
+    MirClientEvent(MirWindow* window, const MirEvent *event, QEvent::Type type)
+        : QEvent(type), window(window), mirEvent(event) {
+        mirEvent = mir_event_ref(event);
+    }
+    ~MirClientEvent()
+    {
+        mir_event_unref(mirEvent);
+    }
+
+    MirWindow* window;
+    const MirEvent *mirEvent;
+};
+
+int mirClientEventType{0};
+void windowEventHandler(MirWindow* window, MirEvent const* event, void* context)
+{
+    if (mirClientEventType == 0) {
+        mirClientEventType = QEvent::registerEventType();
+    }
+    auto client = static_cast<QObject*>(context);
+    QEvent *qtEvent = new MirClientEvent(window, event, static_cast<QEvent::Type>(mirClientEventType));
+    QCoreApplication::postEvent(client, qtEvent);
+}
+
+void mirPromptSessionStateChangeCallback(MirPromptSession* /*promptSession*/, MirPromptSessionState /*state*/, void* /*context*/)
+{
+}
+
+void mirClientFdCallback(MirPromptSession* /*promptSession*/, size_t count, int const* fds, void* context)
+{
+    Q_UNUSED(count); // in case of release builds, as Q_ASSERT won't be compiled
+    Q_ASSERT(count == 1);
+
+    auto fakePromptHelper = static_cast<FakePromptHelper*>(context);
+    QMetaObject::invokeMethod(fakePromptHelper->launcher(), "notifyPromptProviderFdReady", Qt::AutoConnection, Q_ARG(int, fds[0]));
+}
+
+} // anonymous namespace
+
+/**************************************************************************************************
+ * FakePromptHelperLauncher
+ *************************************************************************************************/
+
+FakePromptHelperLauncher::FakePromptHelperLauncher(pid_t pid, QObject *parent)
+    : QThread(parent)
+    , m_pid(pid)
+{
+    m_targetApplicationPid = getpid(); // shell's own pid, since we're only running in-process mir clients
+    m_sessionName = QString("prompt-helper-%1").arg((qintptr)this);
+    connect(this, &QThread::finished, this, [this]{ m_fd = mir::Fd(); deleteLater(); });
+}
+
+void FakePromptHelperLauncher::launch()
+{
+    auto nativeInterface = QGuiApplication::platformNativeInterface();
+    m_server = static_cast<mir::Server*>(nativeInterface->nativeResourceForIntegration("MirServer"));
+
+    m_server->the_main_loop()->enqueue(this, [this] { launchFromMirServerThread(); });
+}
+
+void FakePromptHelperLauncher::launchFromMirServerThread()
+{
+    m_fd = m_server->open_prompt_socket();
+
+    char connectString[64] = {0};
+    sprintf(connectString, "fd://%d", m_fd.operator int());
+
+    m_connection = Connection{mir_connect_sync(connectString, m_sessionName.toLatin1().data())};
+
+    start();
+}
+
+void FakePromptHelperLauncher::run()
+{
+    FakePromptHelper *promptHelper;
+    {
+        std::lock_guard<std::mutex> lockGuard{m_mutex};
+
+        promptHelper = new FakePromptHelper(m_targetApplicationPid, m_connection, this);
+
+        // keep only one reference, in MirClient
+        m_connection.reset();
+    }
+
+    exec();
+
+    {
+        std::lock_guard<std::mutex> lockGuard{m_mutex};
+
+        delete promptHelper;
+        promptHelper = nullptr;
+    }
+}
+
+void FakePromptHelperLauncher::notifyPromptProviderFdReady(int fd)
+{
+    Q_EMIT promptProviderFdReady(fd);
+}
+
+void FakePromptHelperLauncher::setProvider(FakePromptProviderLauncher *providerLauncher)
+{
+    Q_ASSERT(m_providerLauncher == nullptr);
+
+    m_providerLauncher = providerLauncher;
+
+    connect(m_providerLauncher, &QThread::finished, this, [this]() {
+        m_providerLauncher->deleteLater();
+        m_providerLauncher = nullptr;
+        quit();
+    });
+}
+
+/**************************************************************************************************
+ * FakePromptHelper
+ *************************************************************************************************/
+
+FakePromptHelper::FakePromptHelper(pid_t targetApplicationPid, miral::toolkit::Connection connection, QObject *launcher)
+    : m_connection(connection)
+    , m_launcher(launcher)
+{
+    m_promptSession = mir_connection_create_prompt_session_sync(m_connection, targetApplicationPid,
+            &mirPromptSessionStateChangeCallback, this);
+
+    mir_prompt_session_new_fds_for_prompt_providers(m_promptSession, 1 /* no_of_fds */, &mirClientFdCallback, this);
+}
+
+FakePromptHelper::~FakePromptHelper()
+{
+    mir_prompt_session_release_sync(m_promptSession);
+}
+
+/**************************************************************************************************
+ * FakePromptProviderLauncher
+ *************************************************************************************************/
+
+FakePromptProviderLauncher::FakePromptProviderLauncher(pid_t pid, int fd, QObject *parent)
+    : QThread(parent)
+    , m_fd(fd)
+    , m_pid(pid)
+{
+    m_sessionName = QString("prompt-provider-%1").arg((qintptr)this);
+    connect(this, &QThread::finished, this, [this]{ m_fd = mir::Fd(); });
+}
+
+void FakePromptProviderLauncher::launch()
+{
+    start();
+}
+
+void FakePromptProviderLauncher::run()
+{
+    {
+        char connectString[64] = {0};
+        sprintf(connectString, "fd://%d", m_fd.operator int());
+        m_connection = Connection{mir_connect_sync(connectString, m_sessionName.toLatin1().data())};
+    }
+
+    {
+        std::lock_guard<std::mutex> lockGuard{m_mutex};
+
+        m_promptProvider = new FakePromptProvider(m_connection);
+
+        // keep only one reference, in MirClient
+        m_connection.reset();
+    }
+
+    exec();
+
+    {
+        std::lock_guard<std::mutex> lockGuard{m_mutex};
+
+        delete m_promptProvider;
+        m_promptProvider = nullptr;
+    }
+}
+
+/**************************************************************************************************
+ * FakePromptProvider
+ *************************************************************************************************/
+
+FakePromptProvider::FakePromptProvider(miral::toolkit::Connection connection)
+    : m_connection(connection)
+{
+    createWindow();
+    update(m_windows[0]);
+}
+
+void FakePromptProvider::update(MirWindow* window)
+{
+    MirBufferStream* buffer_stream = mir_window_get_buffer_stream(window);
+
+    // TODO sometimes buffer_stream is nullptr
+    // (Only observed when creating a lot of clients at once)
+    if (!buffer_stream)
+        return;
+
+    MirGraphicsRegion region;
+    mir_buffer_stream_get_graphics_region(buffer_stream, &region);
+
+    QImage windowImage((uchar*)region.vaddr, region.width, region.height, QImage::Format_RGB32);
+    {
+        QRect windowRect(0, 0, windowImage.width(), windowImage.height());
+
+        QPainter painter(&windowImage);
+        painter.setBrush(QBrush(QColor(183,25,118)));
+        painter.drawRect(windowRect);
+
+        painter.setPen(QPen(QColor(0,0,0)));
+        painter.drawText(windowRect, Qt::AlignCenter, QString("Prompt\nWindow"));
+    }
+
+    mir_buffer_stream_swap_buffers_sync(buffer_stream);
+}
+
+void FakePromptProvider::windowEvent(MirWindow* window, MirEvent const* mirEvent)
+{
+    switch (mir_event_get_type(mirEvent))
+    {
+    case mir_event_type_input:
+        break;
+    case mir_event_type_resize:
+        update(window);
+        break;
+    case mir_event_type_window:
+        break;
+    case mir_event_type_window_output:
+        break;
+    case mir_event_type_orientation:
+        break;
+    case mir_event_type_close_window:
+        closeWindow(window);
+        break;
+    default:
+        qDebug() << "FakePromptProvider::windowEvent unhandled event type: %d" << static_cast<int>(mir_event_get_type(mirEvent));
+    }
+}
+
+void FakePromptProvider::customEvent(QEvent* event)
+{
+    auto mirClientEvent = static_cast<MirClientEvent*>(event);
+    windowEvent(mirClientEvent->window, mirClientEvent->mirEvent);
+}
+
+void FakePromptProvider::createWindow()
+{
+    ++m_windowCounter;
+
+    QString name = QString("%1 %2")
+        .arg("prompt provider")
+        .arg(m_windowCounter);
+
+    auto const spec = WindowSpec::for_normal_surface(
+        m_connection, 640, 480, mir_pixel_format_xrgb_8888)
+        .set_buffer_usage(mir_buffer_usage_software)
+        .set_type(mir_window_type_normal)
+        .set_name(name.toLatin1().data())
+        .set_event_handler(&windowEventHandler, this /*context*/);
+
+    m_windows.append(spec.create_surface());
+}
+
+void FakePromptProvider::closeWindow(MirWindow *mirWindow)
+{
+    bool found = false;
+    for (int i = 0; i < m_windows.count() && !found; ++i) {
+        if (m_windows[i] == mirWindow) {
+            found = true;
+            m_windows.remove(i);
+        }
+    }
+
+    if (m_windows.isEmpty()) {
+        QThread::currentThread()->quit();
+    }
+}

=== added file 'src/modules/Unity/Application/fake/fakeprompt.h'
--- src/modules/Unity/Application/fake/fakeprompt.h	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/fake/fakeprompt.h	2017-02-14 10:17:32 +0000
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2017 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/>.
+ *
+ */
+
+#ifndef QTMIR_FAKE_PROMPT_H
+#define QTMIR_FAKE_PROMPT_H
+
+#include <QObject>
+#include <QSharedPointer>
+#include <QThread>
+
+#include <miral/toolkit/connection.h>
+#include <miral/toolkit/window.h>
+
+// Qt
+#include <QImage>
+
+// mir
+#include <mir/fd.h>
+#include <mir/scene/session.h>
+#include <mir/server.h>
+#include <mir_toolkit/client_types.h>
+
+// std
+#include <condition_variable>
+
+// local
+#include "fakeapplicationinfo.h"
+
+namespace qtmir {
+
+// lives in a separate thread
+class FakePromptProvider : public QObject
+{
+    Q_OBJECT
+
+public:
+    FakePromptProvider(miral::toolkit::Connection);
+
+    void customEvent(QEvent* event) override;
+
+public Q_SLOTS:
+    void windowEvent(MirWindow* window, MirEvent const* event);
+    void createWindow();
+
+private Q_SLOTS:
+    void update(MirWindow *window);
+
+private:
+    void closeWindow(MirWindow *window);
+
+    miral::toolkit::Connection m_connection;
+    QVector<miral::toolkit::Window> m_windows;
+
+    int m_windowCounter{0};
+};
+
+class FakePromptProviderLauncher : public QThread
+{
+    Q_OBJECT
+
+public:
+    FakePromptProviderLauncher(pid_t pid, int fd, QObject *parent = nullptr);
+
+    pid_t pid() const { return m_pid; }
+    QString sessionName() const { return m_sessionName; }
+    void launch();
+
+protected:
+    void run() override;
+
+private:
+    std::mutex mutable m_mutex;
+    miral::toolkit::Connection m_connection;
+    mir::Fd m_fd; // gotta hold on to it otherwise connection will close
+    pid_t m_pid;
+
+    FakePromptProvider *m_promptProvider{nullptr};
+    QString m_sessionName;
+};
+
+// lives in a separate thread
+class FakePromptHelper : public QObject
+{
+    Q_OBJECT
+
+public:
+    FakePromptHelper(pid_t targetApplicationPid, miral::toolkit::Connection, QObject *launcher);
+    virtual ~FakePromptHelper();
+
+    QObject *launcher() const { return m_launcher; }
+
+private:
+    miral::toolkit::Connection m_connection;
+    MirPromptSession *m_promptSession{nullptr};
+    QObject *m_launcher;
+};
+
+// lives in Qt's main/gui thread
+class FakePromptHelperLauncher : public QThread
+{
+    Q_OBJECT
+public:
+    FakePromptHelperLauncher(pid_t pid, QObject *parent = nullptr);
+
+    void launch();
+
+    pid_t pid() const { return m_pid; }
+
+    QString sessionName() const { return m_sessionName; }
+
+    void setProvider(FakePromptProviderLauncher *providerLauncher);
+    FakePromptProviderLauncher *provider() const { return m_providerLauncher; }
+
+public Q_SLOTS:
+    void notifyPromptProviderFdReady(int fd);
+
+Q_SIGNALS:
+    void promptProviderFdReady(int fd);
+
+protected:
+    void run() override;
+
+private:
+    // Called from mir server thread
+    void launchFromMirServerThread();
+
+    mir::Server *m_server{nullptr};
+    std::mutex mutable m_mutex;
+    miral::toolkit::Connection m_connection;
+    mir::Fd m_fd; // gotta hold on to it otherwise connection will close
+    pid_t m_pid;
+    QString m_sessionName;
+
+    FakePromptProviderLauncher *m_providerLauncher{nullptr};
+
+    pid_t m_targetApplicationPid;
+};
+
+} // namespace qtmir
+
+#endif // QTMIR_FAKE_PROMPT_H

=== added file 'src/modules/Unity/Application/fake/faketaskcontroller.cpp'
--- src/modules/Unity/Application/fake/faketaskcontroller.cpp	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/fake/faketaskcontroller.cpp	2017-02-14 10:17:32 +0000
@@ -0,0 +1,683 @@
+/*
+ * Copyright (C) 2017 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/>.
+ *
+ */
+
+// local
+#include "faketaskcontroller.h"
+#include "fakemaliit.h"
+#include "fakemirclient.h"
+#include "fakeprompt.h"
+#include "session.h"
+#include "mirsurface.h"
+#include "windowattributes.h"
+
+// mirserver
+#include <sessionauthorizer.h>
+
+// qt
+#include <QGuiApplication>
+#include <QTimer>
+#include <qpa/qplatformnativeinterface.h>
+
+// QPA mirserver
+#include <logging.h>
+#include <promptsession.h>
+
+#include <QDebug>
+#include <QMutexLocker>
+
+#define DEBUG_MSG qCDebug(QTMIR_SESSIONS).nospace() << "FakeTaskController::" << __func__
+#define WARNING_MSG qCWarning(QTMIR_SESSIONS).nospace() << "FakeTaskController::" << __func__
+
+using namespace qtmir;
+namespace unityapi = unity::shell::application;
+
+
+FakeTaskController *FakeTaskController::m_instance = nullptr;
+
+FakeTaskController::FakeTaskController()
+    : TaskController()
+    , m_maliitAppInfo(new FakeApplicationInfo("maliit-server"))
+    , m_procInfo(new FakeProcInfo)
+{
+    Q_ASSERT(m_instance == nullptr);
+    m_instance = this;
+
+    createAvailableApplications();
+
+    m_maliitAppInfo->setName("Maliit IM Server");
+    m_maliitAppInfo->setScreenshotId("vkb_portrait.png");
+    m_maliitAppInfo->setWindowType(mir_window_type_inputmethod);
+    m_maliitAppInfo->setInitialWindowState(mir_window_state_hidden);
+
+    m_procInfo->taskController = this;
+
+    qRegisterMetaType<qtmir::WindowAttributes>();
+}
+
+FakeTaskController::~FakeTaskController()
+{
+    Q_ASSERT(m_instance != nullptr);
+    m_instance = nullptr;
+}
+
+void FakeTaskController::createAvailableApplications()
+{
+    FakeApplicationInfo *application;
+
+    application = new FakeApplicationInfo("unity8-dash");
+    application->setName("Unity 8 Mock Dash");
+    application->setScreenshotId("unity8-dash");
+    application->setIconId("dash");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("dialer-app");
+    application->setName("Dialer");
+    application->setScreenshotId("dialer");
+    application->setIconId("dialer-app");
+    application->setSupportedOrientations(Qt::PortraitOrientation
+                                        | Qt::InvertedPortraitOrientation);
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("camera-app");
+    application->setName("Camera");
+    application->setScreenshotId("camera");
+    application->setIconId("camera");
+    application->setInitialWindowState(mir_window_state_fullscreen);
+    application->setSupportedOrientations(Qt::PortraitOrientation
+                                        | Qt::LandscapeOrientation
+                                        | Qt::InvertedPortraitOrientation
+                                        | Qt::InvertedLandscapeOrientation);
+    application->setRotatesWindowContents(true);
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("camera-app2");
+    application->setName("Camera2");
+    application->setScreenshotId("camera");
+    application->setIconId("camera");
+    application->setSupportedOrientations(Qt::PortraitOrientation
+                                        | Qt::LandscapeOrientation
+                                        | Qt::InvertedPortraitOrientation
+                                        | Qt::InvertedLandscapeOrientation);
+    application->setRotatesWindowContents(true);
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("gallery-app");
+    application->setName("Gallery");
+    application->setScreenshotId("gallery");
+    application->setIconId("gallery");
+    //application->setShellChrome(Mir::LowChrome);
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("facebook-webapp");
+    application->setName("Facebook");
+    application->setScreenshotId("facebook");
+    application->setIconId("facebook");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("webbrowser-app");
+    //application->setShellChrome(Mir::LowChrome);
+    application->setName("Browser");
+    application->setScreenshotId("browser");
+    application->setIconId("browser");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("twitter-webapp");
+    application->setName("Twitter");
+    application->setScreenshotId("twitter");
+    application->setIconId("twitter");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("map");
+    application->setName("Map");
+    application->setIconId("map");
+    application->setScreenshotId("map");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("gmail-webapp");
+    application->setName("GMail");
+    application->setIconId("gmail");
+    application->setScreenshotId("gmail-webapp.svg");
+    application->setSupportedOrientations(Qt::PortraitOrientation
+                                        | Qt::LandscapeOrientation
+                                        | Qt::InvertedPortraitOrientation
+                                        | Qt::InvertedLandscapeOrientation);
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("music-app");
+    application->setName("Music");
+    application->setIconId("soundcloud");
+    application->setScreenshotId("music");
+    application->setSupportedOrientations(Qt::PortraitOrientation
+                                        | Qt::LandscapeOrientation
+                                        | Qt::InvertedPortraitOrientation
+                                        | Qt::InvertedLandscapeOrientation);
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("ubuntu-weather-app");
+    application->setName("Weather");
+    application->setIconId("weather");
+    application->setScreenshotId("ubuntu-weather-app.svg");
+    application->setSupportedOrientations(Qt::LandscapeOrientation
+                                        | Qt::InvertedLandscapeOrientation);
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("notes-app");
+    application->setName("Notepad");
+    application->setIconId("notepad");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("calendar-app");
+    application->setName("Calendar");
+    application->setIconId("calendar");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("evernote");
+    application->setName("Evernote");
+    application->setIconId("evernote");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("pinterest");
+    application->setName("Pinterest");
+    application->setIconId("pinterest");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("soundcloud");
+    application->setName("SoundCloud");
+    application->setIconId("soundcloud");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("wikipedia");
+    application->setName("Wikipedia");
+    application->setIconId("wikipedia");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("youtube");
+    application->setName("YouTube");
+    application->setIconId("youtube");
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("libreoffice");
+    application->setName("LibreOffice");
+    application->setIconId("libreoffice");
+    application->setScreenshotId("libreoffice");
+    application->setIsTouchApp(false);
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+
+    application = new FakeApplicationInfo("primary-oriented-app");
+    application->setName("Primary Oriented");
+    application->setSupportedOrientations(Qt::PrimaryOrientation);
+    m_availableApplications.append(QSharedPointer<FakeApplicationInfo>(application));
+}
+
+bool FakeTaskController::appIdHasProcessId(const QString& appId, pid_t pid)
+{
+    if (m_runningClients.contains(appId)) {
+        return m_runningClients[appId]->pid() == pid;
+    } else {
+        return false;
+    }
+}
+
+bool FakeTaskController::stop(const QString& appId)
+{
+    QMutexLocker locker(&m_mutex);
+
+    DEBUG_MSG << "(" << appId << ")";
+
+    if (m_runningClients.contains(appId)) {
+        m_runningClients[appId]->quit();
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool FakeTaskController::start(const QString& appId, const QStringList& arguments)
+{
+    Q_UNUSED(arguments);
+    QMutexLocker locker(&m_mutex);
+
+    auto appInfo = qSharedPointerCast<FakeApplicationInfo>(getInfoForApp(appId));
+    if (!appInfo) {
+        return false;
+    }
+
+    auto *fakeMirClientLauncher = new FakeMirClientLauncher(appInfo, generatePid());
+    m_runningClients[appId] = fakeMirClientLauncher;
+
+    fakeMirClientLauncher->setManualWindowCreation(m_manualSurfaceCreation);
+
+    connect(fakeMirClientLauncher, &QThread::finished, this, [this, fakeMirClientLauncher]() {
+        QString appId = fakeMirClientLauncher->appInfo()->appId();
+        Q_ASSERT(m_runningClients.contains(appId));
+        m_runningClients.remove(appId);
+        if (fakeMirClientLauncher->killed()) {
+            Q_EMIT processFailed(appId, Error::APPLICATION_CRASHED);
+        }
+        Q_EMIT processStopped(appId);
+        delete fakeMirClientLauncher;
+    });
+
+    m_appIdLatestLaunch = appId;
+    fakeMirClientLauncher->launch();
+
+    // Do it separately, on the next event loop iteration, with a clean call stack.
+    QMetaObject::invokeMethod(this, "processStarting", Qt::QueuedConnection, Q_ARG(QString, appId));
+
+    return true;
+}
+
+bool FakeTaskController::suspend(const QString& appId)
+{
+    QTimer::singleShot(300, [this, appId] { Q_EMIT processSuspended(appId); });
+    return true;
+}
+
+bool FakeTaskController::resume(const QString& appId)
+{
+    Q_UNUSED(appId);
+    return true;
+}
+
+QSharedPointer<ApplicationInfo> FakeTaskController::getInfoForApp(const QString &appId) const
+{
+    for (int i = 0; i < m_availableApplications.count(); ++i) {
+        auto appInfo = m_availableApplications[i];
+        if (appInfo->appId() == appId) {
+            return appInfo;
+        }
+    }
+
+    return QSharedPointer<ApplicationInfo>();
+}
+
+QStringList FakeTaskController::availableApplications()
+{
+    QStringList result;
+    for (int i = 0; i < m_availableApplications.count(); ++i) {
+        result << m_availableApplications[i]->appId();
+    }
+    return result;
+}
+
+pid_t FakeTaskController::pidOf_impl(const miral::Application &application)
+{
+    QMutexLocker locker(&m_mutex);
+
+    const std::shared_ptr<mir::scene::Session> &session = application;
+
+    {
+        auto clientList = m_runningClients.values();
+        for (int i = 0; i < clientList.count(); ++i) {
+            auto *client = clientList[i];
+            if (client->session() == session) {
+                return client->pid();
+            }
+        }
+    }
+    {
+        auto promptList = m_runningPromptHelpers.values();
+        for (int i = 0; i < promptList.count(); ++i) {
+            auto *promptHelper = promptList[i];
+            if (promptHelper->sessionName() == session->name().c_str()) {
+                return promptHelper->pid();
+            }
+            auto *provider = promptHelper->provider();
+            if (provider && provider->sessionName() == session->name().c_str()) {
+                return provider->pid();
+            }
+        }
+    }
+
+    if (m_maliitLauncher && m_maliitLauncher->session() == session) {
+        return m_maliitLauncher->pid();
+    }
+
+    qFatal("FakeTaskController::pidOf_impl() - Did not find the requested session!");
+}
+
+pid_t FakeTaskController::generatePid()
+{
+    pid_t pid = m_nextPid;
+    m_nextPid = nextFreePid(nextPid(pid), pid);
+    return pid;
+}
+
+pid_t FakeTaskController::nextPid(pid_t pid) const
+{
+    if (pid == m_maxPid) {
+        return 1;
+    } else {
+        return pid + 1;
+    }
+}
+
+pid_t FakeTaskController::nextFreePid(pid_t candidatePid, const pid_t latestPid)
+{
+    pid_t firstCandidatePid = candidatePid;
+
+    while (isPidInUse(candidatePid) || candidatePid == latestPid) {
+        candidatePid = nextPid(candidatePid);
+
+        if (candidatePid == firstCandidatePid) {
+            qFatal("TopLevelWindowModel: run out of pids.");
+        }
+    }
+
+    return candidatePid;
+}
+
+bool FakeTaskController::isPidInUse(pid_t pid) const
+{
+    {
+        auto clientList = m_runningClients.values();
+        for (int i = 0; i < clientList.count(); ++i) {
+            auto *client = clientList[i];
+            if (client->pid() == pid) {
+                return true;
+            }
+        }
+    }
+    {
+        auto promptList = m_runningPromptHelpers.values();
+        for (int i = 0; i < promptList.count(); ++i) {
+            auto *prompt = promptList[i];
+            if (prompt->pid() == pid) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+void FakeTaskController::onAuthorizationForSessionRequested(const pid_t &, bool &authorized)
+{
+    // replace shell's own pid (because you know, we're running only internal clients) with a fake one
+    // from the session we most recently started (some assumptions going on, but should hold during tests).
+
+    if (m_runningClients.contains(m_appIdLatestLaunch)) {
+        Q_EMIT authorizationRequestedForSession(m_runningClients[m_appIdLatestLaunch]->pid(), authorized);
+    } else {
+        Q_ASSERT(m_maliitLauncher && m_maliitAppInfo->appId() == m_appIdLatestLaunch);
+        Q_EMIT authorizationRequestedForSession(m_maliitLauncher->pid(), authorized);
+    }
+}
+
+void FakeTaskController::createSurface(const QString &appId)
+{
+    QMutexLocker locker(&m_mutex);
+
+    DEBUG_MSG << "(" << appId << ")";
+    if (m_runningClients.contains(appId)) {
+        m_runningClients[appId]->createWindow();
+    } else {
+        qFatal("FakeTaskController::createSurface(%s) - no running client.", qPrintable(appId));
+    }
+}
+
+void FakeTaskController::killSurface(const QString & appId, unityapi::MirSurfaceInterface* surface)
+{
+    QMutexLocker locker(&m_mutex);
+    DEBUG_MSG << "("<< appId <<","<< surface <<")";
+
+    if (m_runningClients.contains(appId)) {
+        m_runningClients[appId]->killWindow(surface->persistentId());
+    }
+}
+
+void FakeTaskController::createPromptSurface(const QString &appId)
+{
+    QMutexLocker locker(&m_mutex);
+
+    if (!m_runningClients.contains(appId)) {
+        return;
+    }
+
+    m_appIdLatestPromptSurface = appId;
+    if (m_runningPromptHelpers.contains(appId)) {
+        // TODO
+    } else {
+        auto *promptHelperLauncher = new FakePromptHelperLauncher(generatePid(), this);
+
+        connect(promptHelperLauncher, &FakePromptHelperLauncher::promptProviderFdReady, this,
+                [this, promptHelperLauncher, appId](int fd) {
+            launchPromptProvider(promptHelperLauncher, fd);
+        });
+
+        connect(promptHelperLauncher, &QThread::finished, this,
+                [this, promptHelperLauncher, appId]() {
+            m_runningPromptHelpers.remove(appId);
+            promptHelperLauncher->deleteLater();
+        });
+
+        m_runningPromptHelpers[appId] = promptHelperLauncher;
+        promptHelperLauncher->launch();
+    }
+}
+
+void FakeTaskController::onPromptSessionStarting(const qtmir::PromptSession &promptSession)
+{
+    DEBUG_MSG << " - promptSession=" << promptSession.get();
+
+    Q_ASSERT(!m_appIdLatestPromptSurface.isEmpty());
+    Q_ASSERT(m_runningClients.contains(m_appIdLatestPromptSurface));
+
+    std::shared_ptr<mir::scene::Session> appSession = m_runningClients[m_appIdLatestPromptSurface]->session();
+    SessionInterface *qmlAppSession = findSession(appSession.get());
+    if (qmlAppSession) {
+        m_mirPromptToSessionHash[promptSession.get()] = qmlAppSession;
+        qmlAppSession->appendPromptSession(promptSession);
+    } else {
+        DEBUG_MSG << " - could not find app session for prompt session";
+    }
+}
+
+void FakeTaskController::launchPromptProvider(FakePromptHelperLauncher *promptHelperLauncher, int fd)
+{
+    auto *providerLauncher = new FakePromptProviderLauncher(generatePid(), fd);
+    promptHelperLauncher->setProvider(providerLauncher);
+    providerLauncher->launch();
+}
+
+void FakeTaskController::createInputMethodSurface()
+{
+    QMutexLocker locker(&m_mutex);
+
+    if (m_maliitLauncher) {
+        // already created
+        return;
+    }
+
+    m_maliitLauncher.reset(new FakeMaliitLauncher(m_maliitAppInfo, generatePid()));
+
+    connect(m_maliitLauncher.data(), &QThread::finished, this, [this]() {
+        delete m_maliitLauncher.take();
+    });
+
+    m_appIdLatestLaunch = m_maliitAppInfo->appId();
+    m_maliitLauncher->launch();
+}
+
+void FakeTaskController::stopInputMethod()
+{
+    QMutexLocker locker(&m_mutex);
+
+    if (m_maliitLauncher) {
+        m_maliitLauncher->quit();
+    }
+}
+
+bool FakeTaskController::isInputMethodRunning()
+{
+    return !m_maliitLauncher.isNull();
+}
+
+QSharedPointer<ProcInfo> FakeTaskController::procInfo()
+{
+    return m_procInfo;
+}
+
+std::unique_ptr<ProcInfo::CommandLine> FakeTaskController::commandLine(pid_t pid)
+{
+    if (m_maliitLauncher && m_maliitLauncher->pid() == pid) {
+        return std::unique_ptr<ProcInfo::CommandLine>(new ProcInfo::CommandLine{"maliit-server"});
+    } else {
+        return std::unique_ptr<ProcInfo::CommandLine>(new ProcInfo::CommandLine{"foo"});
+    }
+}
+
+void FakeTaskController::setSurfaceInputBounds(unityapi::MirSurfaceInterface *surfaceInterface, QRect rect)
+{
+    auto surface = static_cast<MirSurface*>(surfaceInterface);
+
+    DEBUG_MSG << "(" << surface << ", " << rect << ")";
+
+    pid_t pid = pidOf_impl(surface->session()->session());
+    FakeMirClientLauncher *clientLauncher = findClientWithPid(pid);
+    clientLauncher->setWindowInputBounds(surface->persistentId(), rect);
+}
+
+FakeMirClientLauncher *FakeTaskController::findClientWithPid(pid_t pid)
+{
+    QList<FakeMirClientLauncher*> clientList = m_runningClients.values();
+    for (int i = 0; i < clientList.size(); ++i) {
+        auto client = clientList[i];
+        if (client->pid() == pid) {
+            return client;
+        }
+    }
+
+    if (m_maliitLauncher && m_maliitLauncher->pid() == pid) {
+        return m_maliitLauncher.data();
+    }
+
+    return nullptr;
+}
+
+void FakeTaskController::setManualSurfaceCreation(bool value)
+{
+    if (value != m_manualSurfaceCreation) {
+        m_manualSurfaceCreation = value;
+        Q_EMIT manualSurfaceCreationChanged();
+    }
+}
+
+void FakeTaskController::killApplication(const QString &appId)
+{
+    QMutexLocker locker(&m_mutex);
+
+    DEBUG_MSG << "(" << appId << ")";
+
+    if (m_runningClients.contains(appId)) {
+        m_runningClients[appId]->kill();
+    }
+}
+
+bool FakeTaskController::isRunning(const QString &appId)
+{
+    return m_runningClients.contains(appId);
+}
+
+void FakeTaskController::killPrompts()
+{
+    auto promptList = m_runningPromptHelpers.values();
+    for (int i = 0; i < promptList.count(); ++i) {
+        auto *prompt = promptList[i];
+        if (prompt->provider()) {
+            prompt->provider()->quit();
+        }
+    }
+}
+
+bool FakeTaskController::promptsRunning()
+{
+    return !m_runningPromptHelpers.isEmpty();
+}
+
+void FakeTaskController::setSurfaceMinimumWidth(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    if (m_runningClients.contains(appId)) {
+        m_runningClients[appId]->setWindowMinimumWidth(surface->persistentId(), value);
+    }
+}
+
+void FakeTaskController::setSurfaceMaximumWidth(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    if (m_runningClients.contains(appId)) {
+        m_runningClients[appId]->setWindowMaximumWidth(surface->persistentId(), value);
+    }
+}
+
+void FakeTaskController::setSurfaceMinimumHeight(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    if (m_runningClients.contains(appId)) {
+        m_runningClients[appId]->setWindowMinimumHeight(surface->persistentId(), value);
+    }
+}
+
+void FakeTaskController::setSurfaceMaximumHeight(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    if (m_runningClients.contains(appId)) {
+        m_runningClients[appId]->setWindowMaximumHeight(surface->persistentId(), value);
+    }
+}
+
+void FakeTaskController::setSurfaceWidthIncrement(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    if (m_runningClients.contains(appId)) {
+        m_runningClients[appId]->setWindowWidthIncrement(surface->persistentId(), value);
+    }
+}
+
+void FakeTaskController::setSurfaceHeightIncrement(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    if (m_runningClients.contains(appId)) {
+        m_runningClients[appId]->setWindowHeightIncrement(surface->persistentId(), value);
+    }
+}
+
+const WindowAttributes *FakeTaskController::windowAttributes(const QString &appId, unity::shell::application::MirSurfaceInterface *surface)
+{
+    if (m_runningClients.contains(appId)) {
+        return m_runningClients[appId]->windowAttributes(surface->persistentId());
+    } else {
+        return nullptr;
+    }
+}
+
+const WindowAttributes *FakeTaskController::windowAttributes(unity::shell::application::MirSurfaceInterface *surface)
+{
+    const WindowAttributes *winAttribs = nullptr;
+
+    {
+        auto clientList = m_runningClients.values();
+        for (int i = 0; winAttribs == nullptr && i < clientList.count(); ++i) {
+            winAttribs = clientList[i]->windowAttributes(surface->persistentId());
+        }
+    }
+
+    if (winAttribs == nullptr && m_maliitLauncher) {
+        winAttribs = m_maliitLauncher->windowAttributes(surface->persistentId());
+    }
+
+    return winAttribs;
+}
+
+std::unique_ptr<ProcInfo::CommandLine> FakeProcInfo::commandLine(pid_t pid)
+{
+    return taskController->commandLine(pid);
+}

=== added file 'src/modules/Unity/Application/fake/faketaskcontroller.h'
--- src/modules/Unity/Application/fake/faketaskcontroller.h	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/fake/faketaskcontroller.h	2017-02-14 10:17:32 +0000
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2017 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/>.
+ *
+ */
+
+#ifndef QTMIR_FAKE_TASK_CONTROLLER_H
+#define QTMIR_FAKE_TASK_CONTROLLER_H
+
+#include "taskcontroller.h"
+#include "proc_info.h"
+
+#include "fakeapplicationinfo.h"
+
+#include <QMap>
+#include <QMutex>
+#include <QScopedPointer>
+#include <QSharedPointer>
+#include <QVector>
+
+namespace qtmir {
+
+class FakeMirClientLauncher;
+class FakePromptHelperLauncher;
+class WindowAttributes;
+
+class FakeTaskController;
+
+class FakeProcInfo : public ProcInfo {
+public:
+    std::unique_ptr<CommandLine> commandLine(pid_t pid) override;
+    FakeTaskController *taskController;
+};
+
+class FakeTaskController : public qtmir::TaskController
+{
+    Q_OBJECT
+public:
+    FakeTaskController();
+    ~FakeTaskController();
+
+    static FakeTaskController *instance() { return m_instance; }
+
+    bool appIdHasProcessId(const QString& appId, pid_t pid) override;
+
+    bool stop(const QString& appId) override;
+    bool start(const QString& appId, const QStringList& arguments) override;
+
+    bool suspend(const QString& appId) override;
+    bool resume(const QString& appId) override;
+
+    QSharedPointer<qtmir::ApplicationInfo> getInfoForApp(const QString &appId) const override;
+
+    QStringList availableApplications();
+    void createSurface(const QString &appId);
+    void killSurface(const QString &appId, unity::shell::application::MirSurfaceInterface*);
+    void createPromptSurface(const QString &appId);
+
+    void killApplication(const QString &appId);
+
+    void createInputMethodSurface();
+    void stopInputMethod();
+    bool isInputMethodRunning();
+    void setSurfaceInputBounds(unity::shell::application::MirSurfaceInterface*, QRect);
+
+    QSharedPointer<ProcInfo> procInfo();
+
+    std::unique_ptr<ProcInfo::CommandLine> commandLine(pid_t pid);
+
+    bool manualSurfaceCreation() const { return m_manualSurfaceCreation; };
+    void setManualSurfaceCreation(bool value);
+
+    bool isRunning(const QString &appId);
+
+    void killPrompts();
+    bool promptsRunning();
+
+    void setSurfaceMinimumWidth(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+    void setSurfaceMaximumWidth(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+    void setSurfaceMinimumHeight(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+    void setSurfaceMaximumHeight(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+    void setSurfaceWidthIncrement(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+    void setSurfaceHeightIncrement(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+
+    // returns the window attributes as seem on the client side
+    const WindowAttributes *windowAttributes(const QString &appId, unity::shell::application::MirSurfaceInterface*);
+    const WindowAttributes *windowAttributes(unity::shell::application::MirSurfaceInterface *surface);
+
+Q_SIGNALS:
+    void manualSurfaceCreationChanged();
+
+private Q_SLOTS:
+    void onAuthorizationForSessionRequested(const pid_t &pid, bool &authorized) override;
+    void onPromptSessionStarting(const PromptSession& promptSession) override;
+
+private:
+    // From PidFetcher
+    // NB: Can be called from either Qt gui or from some mir thread. Hence need for mutex.
+    pid_t pidOf_impl(const miral::Application &application) override;
+
+    FakeApplicationInfo *findAppInfo(const QString &appId);
+
+    void createAvailableApplications();
+
+    FakeMirClientLauncher *findClientWithPid(pid_t pid);
+
+    pid_t generatePid();
+    pid_t nextPid(pid_t pid) const;
+    pid_t nextFreePid(pid_t candidatePid, const pid_t latestPid);
+    bool isPidInUse(pid_t) const;
+
+    void launchPromptProvider(FakePromptHelperLauncher*, int fd);
+
+    // some arbitrary starting point and limit
+    pid_t m_nextPid{123};
+    static const pid_t m_maxPid{10000};
+
+
+    QVector< QSharedPointer<FakeApplicationInfo> > m_availableApplications;
+
+    // maps an appId to its running mir client
+    QMap<QString, FakeMirClientLauncher*> m_runningClients;
+    QString m_appIdLatestLaunch;
+
+    // maps an appId to its running prompt helper session
+    QMap<QString, FakePromptHelperLauncher*> m_runningPromptHelpers;
+
+    QString m_appIdLatestPromptSurface;
+
+    // Because of pidOf_impl()
+    QMutex m_mutex;
+
+    QSharedPointer<FakeApplicationInfo> m_maliitAppInfo;
+    QScopedPointer<FakeMirClientLauncher> m_maliitLauncher;
+
+    QSharedPointer<FakeProcInfo> m_procInfo;
+
+    static FakeTaskController *m_instance;
+
+    bool m_manualSurfaceCreation{false};
+};
+
+} // namespace qtmir
+
+#endif // QTMIR_FAKE_TASK_CONTROLLER_H
+

=== added file 'src/modules/Unity/Application/fake/windowattributes.h'
--- src/modules/Unity/Application/fake/windowattributes.h	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/fake/windowattributes.h	2017-02-14 10:17:32 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2017 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/>.
+ *
+ */
+
+#ifndef QTMIR_WINDOW_ATTRIBUTES
+#define QTMIR_WINDOW_ATTRIBUTES
+
+#include <mir_toolkit/mir_window.h>
+
+namespace qtmir {
+
+class WindowAttributes {
+public:
+    WindowAttributes() {}
+
+    WindowAttributes(MirWindow *mirWindow) {
+        visibility = mir_window_get_visibility(mirWindow);
+        focusState = mir_window_get_focus_state(mirWindow);
+    }
+
+    MirWindowVisibility visibility;
+    MirWindowFocusState focusState;
+
+    int touchPressCount{0};
+    int touchReleaseCount{0};
+    int mousePressCount{0};
+    int mouseReleaseCount{0};
+};
+
+} // namespace qtmir
+
+Q_DECLARE_METATYPE(qtmir::WindowAttributes)
+
+#endif // QTMIR_WINDOW_ATTRIBUTES

=== added file 'src/modules/Unity/Application/mirtestsingleton.cpp'
--- src/modules/Unity/Application/mirtestsingleton.cpp	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/mirtestsingleton.cpp	2017-02-14 10:17:32 +0000
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2017 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 "mirtestsingleton.h"
+
+#include "application.h"
+#include "faketaskcontroller.h"
+#include "mirsurface.h"
+#include "windowattributes.h"
+
+using namespace qtmir;
+
+MirTest *MirTest::m_instance = nullptr;
+
+MirTest::MirTest()
+{
+    Q_ASSERT(m_instance == nullptr);
+    m_instance = this;
+
+    connect(FakeTaskController::instance(), &FakeTaskController::manualSurfaceCreationChanged,
+            this, &MirTest::manualSurfaceCreationChanged);
+}
+
+MirTest::~MirTest()
+{
+    Q_ASSERT(m_instance != nullptr);
+    m_instance = nullptr;
+}
+
+void MirTest::createInputMethodSurface()
+{
+    FakeTaskController::instance()->createInputMethodSurface();
+}
+
+void MirTest::stopInputMethod()
+{
+    FakeTaskController::instance()->stopInputMethod();
+}
+
+bool MirTest::isInputMethodRunning()
+{
+    return FakeTaskController::instance()->isInputMethodRunning();
+}
+
+void MirTest::setSurfaceInputBounds(unity::shell::application::MirSurfaceInterface* surface, QRect rect)
+{
+    FakeTaskController::instance()->setSurfaceInputBounds(surface, rect);
+}
+
+void MirTest::createSurface(const QString &appId)
+{
+    FakeTaskController::instance()->createSurface(appId);
+}
+
+void MirTest::createPromptSurface(const QString &appId)
+{
+    FakeTaskController::instance()->createPromptSurface(appId);
+}
+
+bool MirTest::manualSurfaceCreation() const
+{
+    return FakeTaskController::instance()->manualSurfaceCreation();
+}
+
+void MirTest::setManualSurfaceCreation(bool value)
+{
+    FakeTaskController::instance()->setManualSurfaceCreation(value);
+}
+
+void MirTest::killSurface(const QString &appId, unity::shell::application::MirSurfaceInterface *surface)
+{
+    FakeTaskController::instance()->killSurface(appId, surface);
+}
+
+void MirTest::killApplication(const QString &appId)
+{
+    FakeTaskController::instance()->killApplication(appId);
+}
+
+auto MirTest::internalState(unity::shell::application::ApplicationInfoInterface *applicationInterface) -> ApplicationInternalState
+{
+    auto application = static_cast<Application*>(applicationInterface);
+    switch (application->internalState()) {
+    case Application::InternalState::Starting:
+        if (application->session() == nullptr) {
+            return StartingNoSession;
+        } else {
+            return StartingWithSession;
+        }
+    case Application::InternalState::Running:
+        return Running;
+    case Application::InternalState::RunningInBackground:
+        return RunningInBackground;
+    case Application::InternalState::SuspendingWaitSession:
+        return SuspendingWaitSession;
+    case Application::InternalState::SuspendingWaitProcess:
+        return SuspendingWaitProcess;
+    case Application::InternalState::Suspended:
+        return Suspended;
+    case Application::InternalState::Closing:
+        return Closing;
+    case Application::InternalState::StoppedResumable:
+        return StoppedResumable;
+    case Application::InternalState::Stopped:
+        return Stopped;
+    }
+    Q_UNREACHABLE();
+}
+
+QStringList MirTest::availableApplications()
+{
+    return FakeTaskController::instance()->availableApplications();
+}
+
+bool MirTest::isApplicationRunning(const QString &appId)
+{
+    return FakeTaskController::instance()->isRunning(appId);
+}
+
+void MirTest::killPrompts()
+{
+    FakeTaskController::instance()->killPrompts();
+}
+
+bool MirTest::promptsRunning()
+{
+    return FakeTaskController::instance()->promptsRunning();
+}
+
+void MirTest::setSurfaceMinimumWidth(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    FakeTaskController::instance()->setSurfaceMinimumWidth(appId, surface, value);
+}
+
+void MirTest::setSurfaceMaximumWidth(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    FakeTaskController::instance()->setSurfaceMaximumWidth(appId, surface, value);
+}
+
+void MirTest::setSurfaceMinimumHeight(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    FakeTaskController::instance()->setSurfaceMinimumHeight(appId, surface, value);
+}
+
+void MirTest::setSurfaceMaximumHeight(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    FakeTaskController::instance()->setSurfaceMaximumHeight(appId, surface, value);
+}
+
+void MirTest::setSurfaceWidthIncrement(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    FakeTaskController::instance()->setSurfaceWidthIncrement(appId, surface, value);
+}
+
+void MirTest::setSurfaceHeightIncrement(const QString &appId, unity::shell::application::MirSurfaceInterface *surface, int value)
+{
+    FakeTaskController::instance()->setSurfaceHeightIncrement(appId, surface, value);
+}
+
+bool MirTest::surfaceFocused(const QString &appId, unity::shell::application::MirSurfaceInterface *surface)
+{
+    const WindowAttributes *windowAttribs = FakeTaskController::instance()->windowAttributes(appId, surface);
+    Q_ASSERT(windowAttribs);
+    return windowAttribs->focusState == mir_window_focus_state_focused;
+}
+
+bool MirTest::surfaceExposed(const QString &appId, unity::shell::application::MirSurfaceInterface *surface)
+{
+    const WindowAttributes *windowAttribs = FakeTaskController::instance()->windowAttributes(appId, surface);
+    Q_ASSERT(windowAttribs);
+    return windowAttribs->visibility == mir_window_visibility_exposed;
+}
+
+bool MirTest::hasActiveFocus(unity::shell::application::MirSurfaceInterface *surfaceInterface)
+{
+    auto surface = static_cast<MirSurface*>(surfaceInterface);
+    return surface->activeFocus();
+}
+
+int MirTest::touchPressCount(unity::shell::application::MirSurfaceInterface *surface)
+{
+    return FakeTaskController::instance()->windowAttributes(surface)->touchPressCount;
+}
+
+int MirTest::touchReleaseCount(unity::shell::application::MirSurfaceInterface *surface)
+{
+    return FakeTaskController::instance()->windowAttributes(surface)->touchReleaseCount;
+}
+
+int MirTest::mousePressCount(unity::shell::application::MirSurfaceInterface *surface)
+{
+    return FakeTaskController::instance()->windowAttributes(surface)->mousePressCount;
+}
+
+int MirTest::mouseReleaseCount(unity::shell::application::MirSurfaceInterface *surface)
+{
+    return FakeTaskController::instance()->windowAttributes(surface)->mouseReleaseCount;
+}

=== added file 'src/modules/Unity/Application/mirtestsingleton.h'
--- src/modules/Unity/Application/mirtestsingleton.h	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/mirtestsingleton.h	2017-02-14 10:17:32 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2017 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/>.
+ */
+
+#ifndef QTMIR_MIRTEST_H
+#define QTMIR_MIRTEST_H
+
+#include <QObject>
+#include <QRect>
+
+namespace unity {
+    namespace shell {
+        namespace application {
+            class ApplicationInfoInterface;
+            class MirSurfaceInterface;
+        }
+    }
+}
+
+namespace qtmir {
+
+/*
+    Various tidbits useful for shell tests
+ */
+class MirTest : public QObject {
+    Q_OBJECT
+
+    Q_PROPERTY(bool manualSurfaceCreation READ manualSurfaceCreation WRITE setManualSurfaceCreation NOTIFY manualSurfaceCreationChanged)
+    Q_PROPERTY(QStringList availableApplications READ availableApplications NOTIFY availableApplicationsChanged)
+
+public:
+
+    enum ApplicationInternalState {
+        StartingNoSession,
+        StartingWithSession,
+        Running,
+        RunningInBackground,
+        SuspendingWaitSession,
+        SuspendingWaitProcess,
+        Suspended,
+        Closing,
+        StoppedResumable,
+        Stopped
+    };
+    Q_ENUM(ApplicationInternalState)
+
+
+    MirTest();
+    virtual ~MirTest();
+
+    static MirTest *instance() { return m_instance; }
+
+    Q_INVOKABLE void createInputMethodSurface();
+    Q_INVOKABLE void stopInputMethod();
+    Q_INVOKABLE bool isInputMethodRunning();
+
+    Q_INVOKABLE void setSurfaceInputBounds(unity::shell::application::MirSurfaceInterface*, QRect);
+
+    Q_INVOKABLE void createSurface(const QString &appId);
+
+    Q_INVOKABLE void createPromptSurface(const QString &appId);
+    Q_INVOKABLE void killPrompts();
+    Q_INVOKABLE bool promptsRunning();
+
+    bool manualSurfaceCreation() const;
+    void setManualSurfaceCreation(bool);
+
+    QStringList availableApplications();
+
+    Q_INVOKABLE void setSurfaceMinimumWidth(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+    Q_INVOKABLE void setSurfaceMaximumWidth(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+    Q_INVOKABLE void setSurfaceMinimumHeight(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+    Q_INVOKABLE void setSurfaceMaximumHeight(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+    Q_INVOKABLE void setSurfaceWidthIncrement(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+    Q_INVOKABLE void setSurfaceHeightIncrement(const QString &appId, unity::shell::application::MirSurfaceInterface*, int value);
+
+    Q_INVOKABLE bool hasActiveFocus(unity::shell::application::MirSurfaceInterface*); // server-side information
+
+    Q_INVOKABLE bool surfaceFocused(const QString &appId, unity::shell::application::MirSurfaceInterface*);
+    Q_INVOKABLE bool surfaceExposed(const QString &appId, unity::shell::application::MirSurfaceInterface*);
+    Q_INVOKABLE int touchPressCount(unity::shell::application::MirSurfaceInterface*);
+    Q_INVOKABLE int touchReleaseCount(unity::shell::application::MirSurfaceInterface*);
+    Q_INVOKABLE int mousePressCount(unity::shell::application::MirSurfaceInterface*);
+    Q_INVOKABLE int mouseReleaseCount(unity::shell::application::MirSurfaceInterface*);
+
+    Q_INVOKABLE void killSurface(const QString &appId, unity::shell::application::MirSurfaceInterface*);
+    Q_INVOKABLE void killApplication(const QString &appId);
+
+    Q_INVOKABLE ApplicationInternalState internalState(unity::shell::application::ApplicationInfoInterface *application);
+
+    // Tells whether the application process (in this case, thread) is still running.
+    Q_INVOKABLE bool isApplicationRunning(const QString &appId);
+
+Q_SIGNALS:
+    void manualSurfaceCreationChanged();
+    void availableApplicationsChanged();
+
+private:
+    static MirTest *m_instance;
+};
+
+} // namespace qtmir
+
+#endif // QTMIR_MIRTEST_H

=== modified file 'src/modules/Unity/Application/plugin.cpp'
--- src/modules/Unity/Application/plugin.cpp	2017-01-18 21:24:15 +0000
+++ src/modules/Unity/Application/plugin.cpp	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 Canonical, Ltd.
+ * Copyright (C) 2013-2017 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
@@ -23,6 +23,7 @@
 #include "mirsurfaceinterface.h"
 #include "mirsurfaceitem.h"
 #include "mirsurfacelistmodel.h"
+#include "mirtestsingleton.h"
 #include "windowmodel.h"
 #include "surfacemanager.h"
 
@@ -49,6 +50,11 @@
 QObject* mirSingleton(QQmlEngine* /*engine*/, QJSEngine* /*scriptEngine*/) {
     return qtmir::Mir::instance();
 }
+
+QObject* mirTestSingleton(QQmlEngine* /*engine*/, QJSEngine* /*scriptEngine*/) {
+    qtmir::ApplicationManager::singleton(); // make sure ApplicationManager (and hence TaskController) is created first
+    return new MirTest();
+}
 } // anonymous namespace
 
 class UnityApplicationPlugin : public QQmlExtensionPlugin {
@@ -82,6 +88,10 @@
         qmlRegisterType<qtmir::SurfaceManager>(uri, 0, 1, "SurfaceManager");
 
         qmlRegisterType<qtmir::WindowModel>(uri, 0, 1, "WindowModel");
+
+        if (qgetenv("UNITY_TESTING") == "1") {
+            qmlRegisterSingletonType<qtmir::MirTest>(uri, 0, 1, "MirTest", mirTestSingleton);
+        }
     }
 
     virtual void initializeEngine(QQmlEngine *engine, const char *uri)

=== added directory 'src/modules/Unity/Application/resources'
=== added directory 'src/modules/Unity/Application/resources/icons'
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/icons/[e-mail]'
Binary files src/modules/Unity/Application/resources/icons/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/icons/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added directory 'src/modules/Unity/Application/resources/screenshots'
=== added file 'src/modules/Unity/Application/resources/screenshots/[e-mail]'
Binary files src/modules/Unity/Application/resources/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/screenshots/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/screenshots/[e-mail]'
Binary files src/modules/Unity/Application/resources/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/screenshots/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/screenshots/[e-mail]'
Binary files src/modules/Unity/Application/resources/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/screenshots/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/screenshots/[e-mail]'
Binary files src/modules/Unity/Application/resources/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/screenshots/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/screenshots/[e-mail]'
Binary files src/modules/Unity/Application/resources/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/screenshots/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/screenshots/gmail-webapp.svg'
--- src/modules/Unity/Application/resources/screenshots/gmail-webapp.svg	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/resources/screenshots/gmail-webapp.svg	2017-02-14 10:17:32 +0000
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="768"
+   height="1280"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gmail-webapp.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="117.33439"
+     inkscape:cy="668.80479"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,227.63782)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2985"
+       width="769.73627"
+       height="1276.8328"
+       x="-2.0203052"
+       y="3.1671834"
+       transform="translate(0,-227.63782)" />
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3797"
+       width="773.77686"
+       height="129.29953"
+       x="-6.0609155"
+       y="-0.87342685"
+       transform="translate(0,-227.63782)" />
+    <text
+       xml:space="preserve"
+       style="font-size:72px;font-style:normal;font-weight:500;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium;font-stretch:normal;font-variant:normal"
+       x="20.203053"
+       y="-139.61781"
+       id="text3755"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3757"
+         x="20.203053"
+         y="-139.61781">GMail</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="14.142137"
+       y="-28.501045"
+       id="text3759"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3761"
+         x="14.142137"
+         y="-28.501045">Inbox</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:#8effff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-28.284271,-251.88148)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 14.142136,237.52257 729.330134,0"
+       id="path3769"
+       inkscape:connector-curvature="0"
+       transform="translate(0,-227.63782)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="167.68533"
+       y="78.575127"
+       id="text3771"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773"
+         x="167.68533"
+         y="78.575127">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="167.68532"
+       y="131.10306"
+       id="text3775"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777"
+         x="167.68532"
+         y="131.10306"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 13.13199,165.44825 729.33013,0"
+       id="path3769-2"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8eff58;fill-opacity:1;stroke:#000000;stroke-width:0.69999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765-3"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-26.263969,-93.102383)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="169.70564"
+       y="237.35422"
+       id="text3771-9"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773-7"
+         x="169.70564"
+         y="237.35422">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="169.70561"
+       y="289.88217"
+       id="text3775-1"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777-1"
+         x="169.70561"
+         y="289.88217"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.152292,324.22735 729.330128,0"
+       id="path3769-2-6"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8effff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765-7"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-28.284274,64.481414)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="167.68533"
+       y="394.93799"
+       id="text3771-92"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773-0"
+         x="167.68533"
+         y="394.93799">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="167.68532"
+       y="447.46594"
+       id="text3775-9"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777-8"
+         x="167.68532"
+         y="447.46594"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 13.131986,481.81114 729.330124,0"
+       id="path3769-2-3"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8ea2ff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765-2"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-26.263969,226.10582)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="169.70564"
+       y="556.56238"
+       id="text3771-1"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773-1"
+         x="169.70564"
+         y="556.56238">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="169.70563"
+       y="609.09033"
+       id="text3775-8"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777-85"
+         x="169.70563"
+         y="609.09033"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.152292,643.43555 729.330128,0"
+       id="path3769-2-1"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8effff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765-8"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-24.243664,391.77084)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="171.72594"
+       y="722.22742"
+       id="text3771-7"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773-6"
+         x="171.72594"
+         y="722.22742">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="171.72592"
+       y="774.75537"
+       id="text3775-5"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777-2"
+         x="171.72592"
+         y="774.75537"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 17.172597,809.10057 729.330133,0"
+       id="path3769-2-13"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#e44738;fill-opacity:1;stroke:#000000;stroke-width:0.69999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765-9"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-24.243664,557.43585)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="171.72594"
+       y="887.89246"
+       id="text3771-2"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773-8"
+         x="171.72594"
+         y="887.89246">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="171.72592"
+       y="940.42041"
+       id="text3775-3"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777-7"
+         x="171.72592"
+         y="940.42041"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 17.172597,974.76558 729.330123,0"
+       id="path3769-2-9"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3929"
+       sodipodi:cx="590.93921"
+       sodipodi:cy="-119.06127"
+       sodipodi:rx="33.335033"
+       sodipodi:ry="33.335033"
+       d="m 624.27424,-119.06127 a 33.335033,33.335033 0 1 1 -66.67006,0 33.335033,33.335033 0 1 1 66.67006,0 z"
+       transform="matrix(0.85096826,0,0,0.85096826,175.43863,-68.81729)" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3.40387297;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 692.92249,-145.20602 20.63059,24.06901 12.03451,-13.75372 -20.63059,-17.19215"
+       id="path3931"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

=== added file 'src/modules/Unity/Application/resources/screenshots/[e-mail]'
Binary files src/modules/Unity/Application/resources/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/screenshots/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/screenshots/[e-mail]'
Binary files src/modules/Unity/Application/resources/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/screenshots/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/screenshots/[e-mail]'
Binary files src/modules/Unity/Application/resources/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/screenshots/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/screenshots/[e-mail]'
Binary files src/modules/Unity/Application/resources/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/screenshots/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/screenshots/ubuntu-weather-app.svg'
--- src/modules/Unity/Application/resources/screenshots/ubuntu-weather-app.svg	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/resources/screenshots/ubuntu-weather-app.svg	2017-02-14 10:17:32 +0000
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="829"
+   height="480"
+   id="svg2740"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="ubuntu-weather-app.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2742">
+    <linearGradient
+       id="linearGradient3824">
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="0"
+         id="stop3826" />
+      <stop
+         style="stop-color:#23abff;stop-opacity:1;"
+         offset="1"
+         id="stop3828" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3824"
+       id="linearGradient3830"
+       x1="348.55862"
+       y1="343.23914"
+       x2="348.55862"
+       y2="-17.422215"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.82625984"
+     inkscape:cx="331.28234"
+     inkscape:cy="125.54212"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1145"
+     inkscape:window-height="847"
+     inkscape:window-x="268"
+     inkscape:window-y="63"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata2745">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-321.13452,-104.68346)">
+    <rect
+       style="fill:url(#linearGradient3830);fill-opacity:1;stroke:#000000;stroke-width:0.69999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2990"
+       width="832.66785"
+       height="480.47839"
+       x="-1.210273"
+       y="0.73188055"
+       transform="translate(321.13452,104.68346)" />
+    <path
+       d="m 310.66382,132.06057 c -1.82703,2.0443 -22.21039,-18.38308 -24.89334,-17.37811 -2.68295,1.00497 -6.73783,33.64192 -9.57527,34.01165 -2.83744,0.36973 -7.71546,-33.08881 -10.48084,-33.88783 -2.76539,-0.79903 -18.7793,19.34152 -21.17964,17.82892 -2.40034,-1.51259 5.69972,-26.09808 4.36486,-28.67057 -1.33487,-2.57249 -31.86305,-3.78032 -32.49182,-6.6501 -0.62876,-2.86978 27.66855,-10.399376 27.90248,-13.241764 0.23394,-2.842387 -18.99828,-18.90215 -17.89698,-21.393798 1.10131,-2.491647 26.85456,8.177399 28.59429,5.99159 1.73972,-2.185809 -3.39182,-29.683489 -0.75169,-30.507098 2.64013,-0.823608 18.50306,18.485327 21.32153,18.392972 2.81847,-0.09235 11.30312,-24.287685 14.18258,-23.722317 2.87947,0.565368 1.44329,25.667631 3.67226,27.34365 2.22897,1.676019 24.27161,-6.28288 25.90675,-4.004945 1.63514,2.277936 -12.63923,24.445025 -11.77955,27.07291 0.85968,2.627885 27.01183,5.1355 26.65457,7.852474 -0.35726,2.716973 -32.69913,3.875594 -34.04684,6.507203 -1.3477,2.631613 12.32368,32.410863 10.49665,34.455163 z"
+       id="path11949"
+       inkscape:flatsided="false"
+       inkscape:randomized="-0.092"
+       inkscape:rounded="0.1"
+       sodipodi:arg1="0.79570711"
+       sodipodi:arg2="1.144773"
+       sodipodi:cx="275.15002"
+       sodipodi:cy="88.090233"
+       sodipodi:r1="57.019234"
+       sodipodi:r2="32.818508"
+       sodipodi:sides="9"
+       sodipodi:type="star"
+       style="fill:#f5ff12;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2;marker:none;visibility:visible;display:inline;overflow:visible"
+       transform="matrix(2.527571,0,0,2.527571,85.214779,60.619097)" />
+    <path
+       d="m 194.51692,77.283737 c 0,20.659371 -17.86424,37.407103 -39.90091,37.407103 -22.03666,0 -39.90091,-16.747732 -39.90091,-37.407103 0,-20.659371 17.86425,-37.4071 39.90091,-37.4071 22.03667,0 39.90091,16.747729 39.90091,37.4071 z"
+       id="path11951"
+       sodipodi:cx="154.61601"
+       sodipodi:cy="77.283737"
+       sodipodi:rx="39.900909"
+       sodipodi:ry="37.407101"
+       sodipodi:type="arc"
+       style="fill:#f5ff12;fill-opacity:1;fill-rule:nonzero;stroke:#f5ff12;stroke-width:10.27388287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       transform="matrix(2.4568175,0,0,2.1990879,404.91256,120.05076)" />
+    <path
+       transform="matrix(3.2663208,0,0,3.4016021,515.92101,-254.59331)"
+       style="fill:#6798e9;fill-opacity:1;fill-rule:nonzero;stroke:#6798e9;stroke-width:7.30059433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0"
+       inkscape:original="M 110.53125 144.96875 C 100.76599 144.96875 92.384060 150.03292 88.281250 157.34375 C 86.642607 156.42892 84.835190 155.87500 82.906250 155.87500 C 77.073071 155.87500 72.219030 160.56753 70.718750 166.93750 C 68.157973 165.92533 65.180470 165.31250 62.000000 165.31250 C 52.458571 165.31250 44.718750 170.53296 44.718750 176.96875 C 44.718749 182.77816 51.066430 187.55402 59.312500 188.43750 C 58.942922 189.06456 58.656250 189.68551 58.656250 190.34375 C 58.656248 196.50568 75.538140 201.53125 96.343750 201.53125 C 117.14936 201.53125 134.03126 196.50568 134.03125 190.34375 C 134.03125 189.92916 133.77393 189.55916 133.62500 189.15625 C 134.53629 189.38287 135.43860 189.62500 136.43750 189.62500 C 142.00333 189.62501 146.53125 185.84318 146.53125 181.18750 C 146.53125 176.53182 142.00332 172.75000 136.43750 172.75000 C 135.75542 172.75000 135.17544 172.98560 134.53125 173.09375 C 135.09454 171.23218 135.46875 169.33268 135.46875 167.31250 C 135.46875 154.98864 124.31330 144.96875 110.53125 144.96875 z "
+       id="path11953"
+       d="m 110.53125,144.96875 c -9.76526,0 -18.14719,5.06417 -22.25,12.375 -1.638643,-0.91483 -3.44606,-1.46875 -5.375,-1.46875 -5.833179,0 -10.68722,4.69253 -12.1875,11.0625 -2.560777,-1.01217 -5.53828,-1.625 -8.71875,-1.625 -9.541429,0 -17.28125,5.22046 -17.28125,11.65625 -10e-7,5.80941 6.34768,10.58527 14.59375,11.46875 -0.369578,0.62706 -0.65625,1.24801 -0.65625,1.90625 -2e-6,6.16193 16.88189,11.1875 37.6875,11.1875 20.80561,0 37.68751,-5.02557 37.6875,-11.1875 0,-0.41459 -0.25732,-0.78459 -0.40625,-1.1875 0.91129,0.22662 1.8136,0.46875 2.8125,0.46875 5.56583,1e-5 10.09375,-3.78182 10.09375,-8.4375 0,-4.65568 -4.52793,-8.4375 -10.09375,-8.4375 -0.68208,0 -1.26206,0.2356 -1.90625,0.34375 0.56329,-1.86157 0.9375,-3.76107 0.9375,-5.78125 0,-12.32386 -11.15545,-22.34375 -24.9375,-22.34375 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#386195;fill-opacity:1;fill-rule:nonzero;stroke:#386195;stroke-width:24.07697487;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path11963"
+       d="m 975.70833,305.75079 c -17.87875,0 -33.1897,9.10731 -40.70137,22.18913 -3.00012,-1.63696 -6.34124,-2.6392 -9.87286,-2.6392 -10.67967,0 -19.5639,8.39604 -22.31073,19.7943 -4.6884,-1.81117 -10.09942,-2.93251 -15.92242,-2.93251 -17.46892,0 -31.65122,9.35352 -31.65122,20.86955 0,10.39528 11.61748,18.9466 26.71485,20.52749 -0.67665,1.12204 -1.20995,2.24338 -1.20995,3.42121 0,11.02604 30.92124,19.98985 69.01327,19.98985 38.09195,0 69.0132,-8.96381 69.0132,-19.98985 0,-0.74183 -0.5017,-1.42952 -0.7743,-2.15046 1.6684,0.40556 3.3496,0.83088 5.1784,0.83088 10.1902,0 18.439,-6.7716 18.439,-15.10234 0,-8.33078 -8.2488,-15.05348 -18.439,-15.05348 -1.2488,0 -2.3535,0.39297 -3.5329,0.58647 1.0312,-3.33102 1.7422,-6.7466 1.7422,-10.36143 0,-22.05212 -20.4533,-39.97961 -45.68617,-39.97961 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#6798e9;fill-opacity:1;fill-rule:nonzero;stroke:#6798e9;stroke-width:15.64964962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:nodetypes="cccc"
+       id="path11965"
+       d="m 717.80594,482.73655 c -32.27924,28.4432 5.62151,52.69793 20.03284,13.63938 l 11.08203,-36.22961 -31.11487,22.59023 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#6798e9;fill-opacity:1;fill-rule:nonzero;stroke:#6798e9;stroke-width:15.64964962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:nodetypes="cccc"
+       id="path11967"
+       d="m 799.47,485.76116 c -32.27925,28.4432 5.62151,52.69792 20.03284,13.63937 l 11.08202,-36.2296 -31.11486,22.59023 z" />
+    <text
+       xml:space="preserve"
+       style="font-size:32px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="68.985565"
+       y="92.712631"
+       id="text2992"
+       sodipodi:linespacing="125%"
+       transform="translate(321.13452,104.68346)"><tspan
+         sodipodi:role="line"
+         id="tspan2994"
+         x="68.985565"
+         y="92.712631" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:10px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="-202.1156"
+       y="155.64684"
+       id="text2996"
+       sodipodi:linespacing="125%"
+       transform="translate(321.13452,104.68346)"><tspan
+         sodipodi:role="line"
+         id="tspan2998"
+         x="-202.1156"
+         y="155.64684" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="342.91943"
+       y="155.03653"
+       id="text3000"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3002"
+         x="342.91943"
+         y="155.03653"
+         style="font-size:32px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium">Wheather App</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="460.31592"
+       y="358.3624"
+       id="text3004"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3006"
+         x="460.31592"
+         y="358.3624"
+         style="font-size:48px;fill:#ff0000;-inkscape-font-specification:Ubuntu;font-family:Ubuntu;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">22C</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="460.19751"
+       y="412.14325"
+       id="text3004-0"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3006-4"
+         x="460.19751"
+         y="412.14325"
+         style="font-size:48px;fill:#0000ff;-inkscape-font-specification:Ubuntu Medium;font-family:Ubuntu;font-weight:500;font-style:normal;font-stretch:normal;font-variant:normal">14C</tspan></text>
+  </g>
+</svg>

=== added file 'src/modules/Unity/Application/resources/screenshots/[e-mail]'
Binary files src/modules/Unity/Application/resources/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/screenshots/[e-mail]	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/screenshots/vkb_portrait.png'
Binary files src/modules/Unity/Application/resources/screenshots/vkb_portrait.png	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/screenshots/vkb_portrait.png	2017-02-14 10:17:32 +0000 differ
=== added file 'src/modules/Unity/Application/resources/surfaces.qrc'
--- src/modules/Unity/Application/resources/surfaces.qrc	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/resources/surfaces.qrc	2017-02-14 10:17:32 +0000
@@ -0,0 +1,39 @@
+<RCC>
+    <qresource prefix="/Unity/Application">
+        <file>vkb_portrait.png</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/gmail-webapp.svg</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/ubuntu-weather-app.svg</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/vkb_portrait.png</file>
+        <file>screenshots/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+        <file>icons/[e-mail]</file>
+    </qresource>
+</RCC>

=== added file 'src/modules/Unity/Application/resources/vkb_portrait.png'
Binary files src/modules/Unity/Application/resources/vkb_portrait.png	1970-01-01 00:00:00 +0000 and src/modules/Unity/Application/resources/vkb_portrait.png	2017-02-14 10:17:32 +0000 differ
=== modified file 'src/modules/Unity/Application/session.cpp'
--- src/modules/Unity/Application/session.cpp	2016-11-03 20:17:46 +0000
+++ src/modules/Unity/Application/session.cpp	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2016 Canonical, Ltd.
+ * Copyright (C) 2014-2017 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
@@ -215,6 +215,8 @@
 {
     DEBUG_MSG << "(surface=" << newSurface << ")";
 
+    const bool focusedBefore = focused();
+
     connect(newSurface, &MirSurfaceInterface::stateChanged,
         this, &Session::updateFullscreenProperty);
 
@@ -244,6 +246,11 @@
         setState(Running);
     }
 
+    const bool focusedNow = focused();
+    if (focusedNow != focusedBefore) {
+        Q_EMIT focusedChanged(focused());
+    }
+
     updateFullscreenProperty();
 }
 
@@ -389,6 +396,11 @@
                 surface->setLive(false);
             }
 
+            for (int i = 0; i < m_closingSurfaces.count(); ++i) {
+                auto surface = static_cast<MirSurfaceInterface*>(m_closingSurfaces[i]);
+                surface->setLive(false);
+            }
+
             deleteIfZombieAndEmpty();
         }
     }

=== modified file 'src/modules/Unity/Application/session_interface.h'
--- src/modules/Unity/Application/session_interface.h	2016-11-03 20:17:46 +0000
+++ src/modules/Unity/Application/session_interface.h	2017-02-14 10:17:32 +0000
@@ -99,7 +99,7 @@
 
     virtual pid_t pid() const = 0;
 
-    // For SessionManager use
+    // For TaskController use
 
     virtual void addChildSession(SessionInterface* session) = 0;
     virtual void insertChildSession(uint index, SessionInterface* session) = 0;

=== removed file 'src/modules/Unity/Application/sessionmanager.cpp'
--- src/modules/Unity/Application/sessionmanager.cpp	2016-11-03 20:17:46 +0000
+++ src/modules/Unity/Application/sessionmanager.cpp	1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2014-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/>.
- */
-
-// Qt
-#include <QGuiApplication>
-
-// local
-#include "application_manager.h"
-#include "debughelpers.h"
-#include "sessionmanager.h"
-
-// QPA mirserver
-#include "appnotifier.h"
-#include "logging.h"
-#include "nativeinterface.h"
-#include "promptsessionlistener.h"
-#include "promptsession.h"
-
-
-namespace qtmir {
-
-SessionManager *SessionManager::the_session_manager = nullptr;
-
-
-void connectToAppNotifier(SessionManager *manager, AppNotifier *appNotifier)
-{
-    QObject::connect(appNotifier, &AppNotifier::appAdded,
-                     manager, &SessionManager::onSessionStarting);
-    QObject::connect(appNotifier, &AppNotifier::appRemoved,
-                     manager, &SessionManager::onSessionStopping);
-}
-
-void connectToPromptSessionListener(SessionManager * manager, PromptSessionListener * listener)
-{
-    QObject::connect(listener, &PromptSessionListener::promptSessionStarting,
-                     manager, &SessionManager::onPromptSessionStarting);
-    QObject::connect(listener, &PromptSessionListener::promptSessionStopping,
-                     manager, &SessionManager::onPromptSessionStopping);
-    QObject::connect(listener, &PromptSessionListener::promptProviderAdded,
-                     manager, &SessionManager::onPromptProviderAdded);
-    QObject::connect(listener, &PromptSessionListener::promptProviderRemoved,
-                     manager, &SessionManager::onPromptProviderRemoved);
-}
-
-SessionManager* SessionManager::singleton()
-{
-    if (!the_session_manager) {
-
-        NativeInterface *nativeInterface = dynamic_cast<NativeInterface*>(QGuiApplication::platformNativeInterface());
-
-        if (!nativeInterface) {
-            qCritical("ERROR: Unity.Application QML plugin requires use of the 'mirserver' QPA plugin");
-            QGuiApplication::quit();
-            return nullptr;
-        }
-
-        auto appNotifier = static_cast<AppNotifier*>(nativeInterface->nativeResourceForIntegration("AppNotifier"));
-        PromptSessionListener *promptSessionListener = static_cast<PromptSessionListener*>(nativeInterface->nativeResourceForIntegration("PromptSessionListener"));
-
-        the_session_manager = new SessionManager(nativeInterface->thePromptSessionManager(), ApplicationManager::singleton());
-
-        connectToAppNotifier(the_session_manager, appNotifier);
-        connectToPromptSessionListener(the_session_manager, promptSessionListener);
-    }
-    return the_session_manager;
-}
-
-SessionManager::SessionManager(
-        const std::shared_ptr<qtmir::PromptSessionManager>& promptSessionManager,
-        ApplicationManager* applicationManager,
-        QObject *parent)
-    : SessionModel(parent)
-    , m_promptSessionManager(promptSessionManager)
-    , m_applicationManager(applicationManager)
-{
-    qCDebug(QTMIR_SESSIONS) << "SessionManager::SessionManager - this=" << this;
-    setObjectName(QStringLiteral("qtmir::SessionManager"));
-}
-
-SessionManager::~SessionManager()
-{
-    qCDebug(QTMIR_SESSIONS) << "SessionManager::~SessionManager - this=" << this;
-}
-
-SessionInterface *SessionManager::findSession(const mir::scene::Session* session) const
-{
-    if (!session) return nullptr;
-
-    for (SessionInterface* child : list()) {
-        if (child->session().get() == session)
-            return child;
-    }
-    return nullptr;
-}
-
-void SessionManager::onSessionStarting(const miral::ApplicationInfo &appInfo)
-{
-    qCDebug(QTMIR_SESSIONS) << "SessionManager::onSessionStarting - sessionName=" <<  appInfo.name().c_str();
-
-    const auto &session = appInfo.application();
-    Session* qmlSession = new Session(session, m_promptSessionManager);
-    insert(0, qmlSession);
-
-    Application* application = m_applicationManager->findApplicationWithSession(session);
-    if (application && application->state() != Application::Running) {
-        application->setSession(qmlSession);
-    }
-    // need to remove if we've destroyed outside
-    connect(qmlSession, &Session::destroyed, this, [&](QObject *item) {
-        auto sessionToRemove = static_cast<Session*>(item);
-        remove(sessionToRemove);
-    });
-
-    Q_EMIT sessionStarting(qmlSession);
-}
-
-void SessionManager::onSessionStopping(const miral::ApplicationInfo &appInfo)
-{
-    qCDebug(QTMIR_SESSIONS) << "SessionManager::onSessionStopping - sessionName=" << appInfo.name().c_str();
-
-    SessionInterface* qmlSession = findSession(appInfo.application().get());
-    if (!qmlSession) return;
-
-    remove(qmlSession);
-
-    qmlSession->setLive(false);
-    Q_EMIT sessionStopping(qmlSession);
-}
-
-void SessionManager::onPromptSessionStarting(const qtmir::PromptSession &promptSession)
-{
-    qCDebug(QTMIR_SESSIONS) << "SessionManager::onPromptSessionStarting - promptSession=" << promptSession.get();
-
-    std::shared_ptr<mir::scene::Session> appSession = m_promptSessionManager->applicationFor(promptSession);
-    SessionInterface *qmlAppSession = findSession(appSession.get());
-    if (qmlAppSession) {
-        m_mirPromptToSessionHash[promptSession.get()] = qmlAppSession;
-        qmlAppSession->appendPromptSession(promptSession);
-    } else {
-        qCDebug(QTMIR_SESSIONS) << "SessionManager::onPromptSessionStarting - could not find app session for prompt session";
-    }
-}
-
-void SessionManager::onPromptSessionStopping(const qtmir::PromptSession &promptSession)
-{
-    qCDebug(QTMIR_SESSIONS) << "SessionManager::onPromptSessionStopping - promptSession=" << promptSession.get();
-
-    for (SessionInterface *qmlSession : this->list()) {
-        qmlSession->removePromptSession(promptSession);
-    }
-    m_mirPromptToSessionHash.remove(promptSession.get());
-}
-
-void SessionManager::onPromptProviderAdded(const qtmir::PromptSession &promptSession,
-                                              const std::shared_ptr<mir::scene::Session> &promptProvider)
-{
-    qCDebug(QTMIR_SESSIONS) << "SessionManager::onPromptProviderAdded - promptSession=" << promptSession.get() << " promptProvider=" << promptProvider.get();
-
-    SessionInterface* qmlAppSession = m_mirPromptToSessionHash.value(promptSession.get(), nullptr);
-    if (!qmlAppSession) {
-        qCDebug(QTMIR_SESSIONS) << "SessionManager::onPromptProviderAdded - could not find session item for app session";
-        return;
-    }
-
-    SessionInterface* qmlPromptProvider = findSession(promptProvider.get());
-    if (!qmlPromptProvider) {
-        qCDebug(QTMIR_SESSIONS) << "SessionManager::onPromptProviderAdded - could not find session item for provider session";
-        return;
-    }
-
-    qmlAppSession->addChildSession(qmlPromptProvider);
-}
-
-void SessionManager::onPromptProviderRemoved(const qtmir::PromptSession &promptSession,
-                                                const std::shared_ptr<mir::scene::Session> &promptProvider)
-{
-    qCDebug(QTMIR_SESSIONS) << "SessionManager::onPromptProviderRemoved - promptSession=" << promptSession.get() << " promptProvider=" << promptProvider.get();
-
-    SessionInterface* qmlPromptProvider = findSession(promptProvider.get());
-    if (!qmlPromptProvider) {
-        qCDebug(QTMIR_SESSIONS) << "SessionManager::onPromptProviderAdded - could not find session item for provider session";
-        return;
-    }
-    qmlPromptProvider->setLive(false);
-}
-
-} // namespace qtmir

=== removed file 'src/modules/Unity/Application/sessionmanager.h'
--- src/modules/Unity/Application/sessionmanager.h	2016-11-03 20:17:46 +0000
+++ src/modules/Unity/Application/sessionmanager.h	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2014-2015 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/>.
- */
-
-#ifndef SESSIONMANAGER_H
-#define SESSIONMANAGER_H
-
-// std
-#include <memory>
-
-// Qt
-#include <QHash>
-#include <QSharedPointer>
-
-// Mir
-#include <mir_toolkit/common.h>
-
-// miral
-#include <miral/application_info.h>
-
-// local
-#include "session.h"
-#include "sessionmodel.h"
-
-namespace mir {
-    namespace scene {
-        class Session;
-        class PromptSession;
-    }
-}
-
-namespace qtmir {
-
-class Application;
-class ApplicationManager;
-
-class SessionManager : public SessionModel
-{
-    Q_OBJECT
-
-public:
-    explicit SessionManager(
-        const std::shared_ptr<PromptSessionManager>& promptSessionManager,
-        ApplicationManager* applicationManager,
-        QObject *parent = 0
-    );
-    ~SessionManager();
-
-    static SessionManager* singleton();
-
-    SessionInterface *findSession(const mir::scene::Session* session) const;
-
-Q_SIGNALS:
-    void sessionStarting(SessionInterface* session);
-    void sessionStopping(SessionInterface* session);
-
-public Q_SLOTS:
-    void onSessionStarting(const miral::ApplicationInfo &appInfo);
-    void onSessionStopping(const miral::ApplicationInfo &appInfo);
-
-    void onPromptSessionStarting(const PromptSession& promptSession);
-    void onPromptSessionStopping(const PromptSession& promptSession);
-    void onPromptProviderAdded(const qtmir::PromptSession &promptSession, const std::shared_ptr<mir::scene::Session> &);
-    void onPromptProviderRemoved(const qtmir::PromptSession &promptSession, const std::shared_ptr<mir::scene::Session> &);
-
-protected:
-
-private:
-    const std::shared_ptr<PromptSessionManager> m_promptSessionManager;
-    ApplicationManager* m_applicationManager;
-    static SessionManager *the_session_manager;
-
-    QHash<const mir::scene::PromptSession *, SessionInterface *> m_mirPromptToSessionHash;
-};
-
-} // namespace qtmir
-
-#endif // SESSIONMANAGER_H

=== modified file 'src/modules/Unity/Application/surfacemanager.cpp'
--- src/modules/Unity/Application/surfacemanager.cpp	2017-02-02 09:17:48 +0000
+++ src/modules/Unity/Application/surfacemanager.cpp	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Canonical, Ltd.
+ * Copyright (C) 2016,2017 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
@@ -17,7 +17,7 @@
 #include "surfacemanager.h"
 
 #include "mirsurface.h"
-#include "sessionmanager.h"
+#include "application_manager.h"
 
 // mirserver
 #include "nativeinterface.h"
@@ -54,8 +54,6 @@
 
     auto windowModel = static_cast<WindowModelNotifier*>(nativeInterface->nativeResourceForIntegration("WindowModelNotifier"));
     connectToWindowModelNotifier(windowModel);
-
-    m_sessionManager = SessionManager::singleton();
 }
 
 void SurfaceManager::connectToWindowModelNotifier(WindowModelNotifier *notifier)
@@ -99,7 +97,7 @@
     }
 
     auto mirSession = window.windowInfo.window().application();
-    SessionInterface* session = m_sessionManager->findSession(mirSession.get());
+    SessionInterface* session = ApplicationManager::singleton()->findSession(mirSession.get());
 
     MirSurface *parentSurface;
     {
@@ -122,6 +120,7 @@
 
 void SurfaceManager::onWindowRemoved(const miral::WindowInfo &windowInfo)
 {
+    DEBUG_MSG << "()";
     MirSurface *surface = find(windowInfo);
     forgetMirSurface(windowInfo.window());
     surface->setLive(false);

=== modified file 'src/modules/Unity/Application/surfacemanager.h'
--- src/modules/Unity/Application/surfacemanager.h	2017-02-02 09:17:48 +0000
+++ src/modules/Unity/Application/surfacemanager.h	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Canonical, Ltd.
+ * Copyright (C) 2016,2017 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
@@ -31,7 +31,6 @@
 namespace qtmir {
 
 class MirSurface;
-class SessionManager;
 class WindowControllerInterface;
 
 class SurfaceManager : public unity::shell::application::SurfaceManagerInterface
@@ -66,7 +65,6 @@
     QVector<MirSurface*> m_allSurfaces;
 
     WindowControllerInterface *m_windowController;
-    SessionManager* m_sessionManager;
 };
 
 } // namespace qtmir

=== added file 'src/modules/Unity/Application/taskcontroller.cpp'
--- src/modules/Unity/Application/taskcontroller.cpp	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/taskcontroller.cpp	2017-02-14 10:17:32 +0000
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2017 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/>.
+ */
+
+// local
+#include "taskcontroller.h"
+#include "session.h"
+
+#include <QGuiApplication>
+
+// QPA mirserver
+#include "logging.h"
+#include "nativeinterface.h"
+#include "promptsessionlistener.h"
+#include "promptsession.h"
+#include <sessionauthorizer.h>
+
+// common
+#include "appnotifier.h"
+
+#define DEBUG_MSG qCDebug(QTMIR_SESSIONS).nospace() << "TaskController::" << __func__
+
+using namespace qtmir;
+
+void TaskController::connectToAppNotifier(AppNotifier *appNotifier)
+{
+    QObject::connect(appNotifier, &AppNotifier::appAdded,
+                     this, &TaskController::onSessionStarting);
+    QObject::connect(appNotifier, &AppNotifier::appRemoved,
+                     this, &TaskController::onSessionStopping);
+}
+
+void TaskController::connectToPromptSessionListener(PromptSessionListener * listener)
+{
+    QObject::connect(listener, &PromptSessionListener::promptSessionStarting,
+                     this, &TaskController::onPromptSessionStarting);
+    QObject::connect(listener, &PromptSessionListener::promptSessionStopping,
+                     this, &TaskController::onPromptSessionStopping);
+    QObject::connect(listener, &PromptSessionListener::promptProviderAdded,
+                     this, &TaskController::onPromptProviderAdded);
+    QObject::connect(listener, &PromptSessionListener::promptProviderRemoved,
+                     this, &TaskController::onPromptProviderRemoved);
+}
+
+TaskController::TaskController(QObject *parent)
+    : QObject(parent)
+{
+    Q_ASSERT(PidFetcher::m_instance == nullptr);
+    PidFetcher::m_instance = this;
+
+    NativeInterface *nativeInterface = dynamic_cast<NativeInterface*>(QGuiApplication::platformNativeInterface());
+
+    if (!nativeInterface) {
+        qFatal("ERROR: Unity.Application QML plugin requires use of the 'mirserver' QPA plugin");
+    }
+
+    m_promptSessionManager = nativeInterface->thePromptSessionManager();
+
+    auto appNotifier = static_cast<AppNotifier*>(nativeInterface->nativeResourceForIntegration("AppNotifier"));
+    connectToAppNotifier(appNotifier);
+
+    auto promptSessionListener = static_cast<PromptSessionListener*>(nativeInterface->nativeResourceForIntegration("PromptSessionListener"));
+    connectToPromptSessionListener(promptSessionListener);
+
+    auto sessionAuthorizer = static_cast<SessionAuthorizer*>(nativeInterface->nativeResourceForIntegration("SessionAuthorizer"));
+    QObject::connect(sessionAuthorizer, &SessionAuthorizer::requestAuthorizationForSession,
+                     this, &TaskController::onAuthorizationForSessionRequested, Qt::BlockingQueuedConnection);
+}
+
+TaskController::TaskController(std::shared_ptr<PromptSessionManager> promptSessionManager, QObject *parent)
+    : QObject(parent)
+    , m_promptSessionManager(promptSessionManager)
+{
+    Q_ASSERT(PidFetcher::m_instance == nullptr);
+    PidFetcher::m_instance = this;
+}
+
+TaskController::~TaskController()
+{
+    Q_ASSERT(PidFetcher::m_instance != nullptr);
+    PidFetcher::m_instance = nullptr;
+}
+
+void TaskController::onSessionStarting(const miral::ApplicationInfo &appInfo)
+{
+    DEBUG_MSG << " - sessionName=" <<  appInfo.name().c_str();
+
+    const auto &session = appInfo.application();
+    Session* qmlSession = new Session(session, m_promptSessionManager);
+    m_sessionList.prepend(qmlSession);
+
+    // need to remove if we've destroyed outside
+    connect(qmlSession, &Session::destroyed, this, [&](QObject *item) {
+        auto sessionToRemove = static_cast<Session*>(item);
+        m_sessionList.removeAll(sessionToRemove);
+    });
+
+    Q_EMIT sessionStarting(qmlSession);
+}
+
+void TaskController::onSessionStopping(const miral::ApplicationInfo &appInfo)
+{
+    DEBUG_MSG << " - sessionName=" << appInfo.name().c_str();
+
+    SessionInterface* qmlSession = findSession(appInfo.application().get());
+    if (!qmlSession) return;
+
+    m_sessionList.removeAll(qmlSession);
+
+    qmlSession->setLive(false);
+}
+
+void TaskController::onPromptSessionStarting(const qtmir::PromptSession &promptSession)
+{
+    DEBUG_MSG << " - promptSession=" << promptSession.get();
+
+    std::shared_ptr<mir::scene::Session> appSession = m_promptSessionManager->applicationFor(promptSession);
+    SessionInterface *qmlAppSession = findSession(appSession.get());
+    if (qmlAppSession) {
+        m_mirPromptToSessionHash[promptSession.get()] = qmlAppSession;
+        qmlAppSession->appendPromptSession(promptSession);
+    } else {
+        DEBUG_MSG << " - could not find app session for prompt session";
+    }
+}
+
+void TaskController::onPromptSessionStopping(const qtmir::PromptSession &promptSession)
+{
+    DEBUG_MSG << " - promptSession=" << promptSession.get();
+
+    for (SessionInterface *qmlSession : m_sessionList) {
+        qmlSession->removePromptSession(promptSession);
+    }
+    m_mirPromptToSessionHash.remove(promptSession.get());
+}
+
+void TaskController::onPromptProviderAdded(const qtmir::PromptSession &promptSession,
+                                              const std::shared_ptr<mir::scene::Session> &promptProvider)
+{
+    DEBUG_MSG << " - promptSession=" << promptSession.get() << " promptProvider=" << promptProvider.get();
+
+    SessionInterface* qmlAppSession = m_mirPromptToSessionHash.value(promptSession.get(), nullptr);
+    if (!qmlAppSession) {
+        DEBUG_MSG << " - could not find session item for app session";
+        return;
+    }
+
+    SessionInterface* qmlPromptProvider = findSession(promptProvider.get());
+    if (!qmlPromptProvider) {
+        DEBUG_MSG << " - could not find session item for provider session";
+        return;
+    }
+
+    qmlAppSession->addChildSession(qmlPromptProvider);
+}
+
+void TaskController::onPromptProviderRemoved(const qtmir::PromptSession &promptSession,
+                                             const std::shared_ptr<mir::scene::Session> &promptProvider)
+{
+    DEBUG_MSG << " - promptSession=" << promptSession.get() << " promptProvider=" << promptProvider.get();
+
+    SessionInterface* qmlPromptProvider = findSession(promptProvider.get());
+    if (!qmlPromptProvider) {
+        DEBUG_MSG << " - could not find session item for provider session";
+        return;
+    }
+    qmlPromptProvider->setLive(false);
+}
+
+SessionInterface *TaskController::findSession(const mir::scene::Session* session) const
+{
+    if (!session) return nullptr;
+
+    Q_FOREACH(SessionInterface* child, m_sessionList) {
+        if (child->session().get() == session)
+            return child;
+    }
+    return nullptr;
+}
+
+void TaskController::onAuthorizationForSessionRequested(const pid_t &pid, bool &authorized)
+{
+    Q_EMIT authorizationRequestedForSession(pid, authorized);
+}

=== modified file 'src/modules/Unity/Application/taskcontroller.h'
--- src/modules/Unity/Application/taskcontroller.h	2016-04-22 14:03:26 +0000
+++ src/modules/Unity/Application/taskcontroller.h	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical, Ltd.
+ * Copyright (C) 2014-2017 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
@@ -23,12 +23,39 @@
 #include <QString>
 #include <QStringList>
 
+// miral
+#include <miral/application.h>
+#include <miral/application_info.h>
+
+// mirserver
+#include "promptsessionmanager.h"
+#include <pidfetcher.h>
+
+namespace mir {
+    namespace scene {
+        class Session;
+        class PromptSession;
+    }
+}
+
+namespace unity {
+    namespace shell {
+        namespace application {
+            class MirSurfaceInterface;
+        }
+    }
+}
+
+class PromptSessionListener;
+
 namespace qtmir
 {
 
+class AppNotifier;
 class ApplicationInfo;
+class SessionInterface;
 
-class TaskController : public QObject
+class TaskController : public QObject, PidFetcher
 {
     Q_OBJECT
 
@@ -39,8 +66,7 @@
         APPLICATION_FAILED_TO_START
     };
 
-    TaskController(const TaskController&) = delete;
-    virtual ~TaskController() = default;
+    virtual ~TaskController();
 
     TaskController& operator=(const TaskController&) = delete;
 
@@ -54,6 +80,14 @@
 
     virtual QSharedPointer<qtmir::ApplicationInfo> getInfoForApp(const QString &appId) const = 0;
 
+    // needed for injecting fake info when running a fake TaskController for testing
+    // While this class is not the best fit for them, it's good the have them all under the same interface
+private:
+    pid_t pidOf_impl(const miral::Application &application) override { return miral::pid_of(application); }
+public:
+
+    SessionInterface *findSession(const mir::scene::Session* session) const;
+
 Q_SIGNALS:
     void processStarting(const QString &appId);
     void applicationStarted(const QString &appId);
@@ -64,8 +98,32 @@
 
     void processFailed(const QString &appId, TaskController::Error error);
 
+    void authorizationRequestedForSession(const pid_t &pid, bool &authorized);
+
+    void sessionStarting(SessionInterface *session);
+
+public Q_SLOTS:
+    virtual void onSessionStarting(const miral::ApplicationInfo &appInfo);
+    virtual void onSessionStopping(const miral::ApplicationInfo &appInfo);
+
+    virtual void onPromptSessionStarting(const PromptSession& promptSession);
+    virtual void onPromptSessionStopping(const PromptSession& promptSession);
+    virtual void onPromptProviderAdded(const qtmir::PromptSession &promptSession, const std::shared_ptr<mir::scene::Session> &);
+    virtual void onPromptProviderRemoved(const qtmir::PromptSession &promptSession, const std::shared_ptr<mir::scene::Session> &);
+
+    virtual void onAuthorizationForSessionRequested(const pid_t &pid, bool &authorized);
+
 protected:
-    TaskController() = default;
+    TaskController(QObject *parent = nullptr);
+    TaskController(std::shared_ptr<PromptSessionManager>, QObject *parent = nullptr);
+
+    void connectToAppNotifier(AppNotifier *);
+    void connectToPromptSessionListener(PromptSessionListener *);
+
+    std::shared_ptr<PromptSessionManager> m_promptSessionManager;
+
+    QHash<const mir::scene::PromptSession *, SessionInterface *> m_mirPromptToSessionHash;
+    QList<SessionInterface*> m_sessionList;
 };
 
 } // namespace qtmir

=== modified file 'src/platforms/mirserver/CMakeLists.txt'
--- src/platforms/mirserver/CMakeLists.txt	2017-02-02 09:36:07 +0000
+++ src/platforms/mirserver/CMakeLists.txt	2017-02-14 10:17:32 +0000
@@ -61,6 +61,7 @@
     shelluuid.cpp
     ubuntutheme.cpp
     clipboard.cpp
+    initialsurfacesizes.cpp
     openglcontextfactory.cpp openglcontextfactory.h
     initialsurfacesizes.cpp initialsurfacesizes.h
     mircursorimages.cpp
@@ -70,6 +71,7 @@
     promptsessionlistener.cpp
     mirserverstatuslistener.cpp
     screenscontroller.cpp
+    pidfetcher.cpp pidfetcher.h
     nativeinterface.cpp
     qtcompositor.cpp
     services.cpp

=== removed file 'src/platforms/mirserver/argvHelper.h'
--- src/platforms/mirserver/argvHelper.h	2015-12-12 17:45:28 +0000
+++ src/platforms/mirserver/argvHelper.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2015 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/>.
- */
-
-#ifndef ARGVHELPER_P_H
-#define ARGVHELPER_P_H
-
-#include <cassert>
-
-namespace qtmir {
-
-// Function to edit argv to strip out unmatched entries of targetArray, so both arrays have identical contents
-// Note: Mir parses out arguments that it understands, but it also removes argv[0] (bug pad.lv/1511509)
-// so need to ensure argv[0] is the binary name as usual.
-void editArgvToMatch(int &argcToEdit, char** argvToEdit, int targetCount, const char* const targetArray[])
-{
-    // Make copy of the argv array of pointers, as we will be editing the original
-    const size_t arraySize = (argcToEdit + 1) * sizeof(char*);
-    char** argvCopy = static_cast<char**>(malloc(arraySize));
-    memcpy(argvCopy, argvToEdit, arraySize);
-
-    int k=1; // index of argv we want to edit - note we'll leave argv[0] alone
-    for (int i=0; i<targetCount; i++) { // taking each argument Mir did not parse out
-        for (int j=1; j<argcToEdit; j++) { // find pointer to same argument in argvCopy (leave arg[0] out)
-            if (strcmp(targetArray[i], argvCopy[j]) == 0) {
-                argvToEdit[k] = const_cast<char*>(argvCopy[j]); // edit argv to position that argument to match argv2.
-                k++;
-                break;
-            }
-        }
-    }
-    assert(k == targetCount+1);
-    argvToEdit[k] = nullptr;
-    free(argvCopy);
-    argcToEdit = targetCount+1; // now argv and targetArray should have list the same strings.
-}
-
-} // namespace qtmir
-
-#endif // ARGVHELPER_P_H

=== modified file 'src/platforms/mirserver/cursor.cpp'
--- src/platforms/mirserver/cursor.cpp	2016-11-03 20:17:46 +0000
+++ src/platforms/mirserver/cursor.cpp	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015,2017 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
@@ -98,7 +98,7 @@
     updateMousePointerCursorName();
 }
 
-bool Cursor::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
+bool Cursor::handleMouseEvent(ulong timestamp, QPointF movement, QPointF position, Qt::MouseButtons buttons,
         Qt::KeyboardModifiers modifiers)
 {
     QMutexLocker locker(&m_mutex);
@@ -111,6 +111,7 @@
     bool ok = QMetaObject::invokeMethod(m_mousePointer, "handleMouseEvent", Qt::AutoConnection,
         Q_ARG(ulong, timestamp),
         Q_ARG(QPointF, movement),
+        Q_ARG(QPointF, position),
         Q_ARG(Qt::MouseButtons, buttons),
         Q_ARG(Qt::KeyboardModifiers, modifiers));
 
@@ -136,7 +137,7 @@
         Q_ARG(Qt::KeyboardModifiers, modifiers));
 
     if (!ok) {
-        qCWarning(QTMIR_MIR_INPUT) << "Failed to invoke MousePointer::handleMouseEvent";
+        qCWarning(QTMIR_MIR_INPUT) << "Failed to invoke MousePointer::handleWheelEvent";
     }
 
     return ok;
@@ -155,7 +156,7 @@
     movement.setX(pos.x() - mouseScenePos.x());
     movement.setY(pos.y() - mouseScenePos.y());
 
-    m_mousePointer->handleMouseEvent(0 /*timestamp*/, movement, Qt::NoButton, Qt::NoModifier);
+    m_mousePointer->handleMouseEvent(0 /*timestamp*/, movement, pos, Qt::NoButton, Qt::NoModifier);
 }
 
 QPoint Cursor::pos() const

=== modified file 'src/platforms/mirserver/cursor.h'
--- src/platforms/mirserver/cursor.h	2016-06-06 19:25:20 +0000
+++ src/platforms/mirserver/cursor.h	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015,2017 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
@@ -33,7 +33,7 @@
     Cursor();
 
     // Called form Mir input thread
-    bool handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
+    bool handleMouseEvent(ulong timestamp, QPointF movement, QPointF position, Qt::MouseButtons buttons,
             Qt::KeyboardModifiers modifiers);
     bool handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers mods);
 

=== modified file 'src/platforms/mirserver/logging.cpp'
--- src/platforms/mirserver/logging.cpp	2016-09-29 15:46:59 +0000
+++ src/platforms/mirserver/logging.cpp	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Canonical, Ltd.
+ * Copyright (C) 2016,2017 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
@@ -26,3 +26,4 @@
 Q_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES, "qtmir.sensor")
 Q_LOGGING_CATEGORY(QTMIR_SCREENS, "qtmir.screens")
 Q_LOGGING_CATEGORY(QTMIR_DBUS, "qtmir.dbus", QtWarningMsg)
+Q_LOGGING_CATEGORY(QTMIR_FAKECLIENTS, "qtmir.fakeclients", QtDebugMsg)

=== modified file 'src/platforms/mirserver/logging.h'
--- src/platforms/mirserver/logging.h	2016-09-29 15:46:59 +0000
+++ src/platforms/mirserver/logging.h	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2017 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
@@ -28,5 +28,6 @@
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_CLIPBOARD)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_SCREENS)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_DBUS)
+Q_DECLARE_LOGGING_CATEGORY(QTMIR_FAKECLIENTS)
 
 #endif // UBUNTU_APPLICATION_PLUGIN_LOGGING_H

=== modified file 'src/platforms/mirserver/mirserverhooks.cpp'
--- src/platforms/mirserver/mirserverhooks.cpp	2017-01-03 20:59:50 +0000
+++ src/platforms/mirserver/mirserverhooks.cpp	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016 Canonical Ltd.
+ * Copyright © 2016-2017 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3,
@@ -77,6 +77,7 @@
     std::weak_ptr<mir::shell::DisplayConfigurationController> m_mirDisplayConfigurationController;
     std::weak_ptr<mir::scene::PromptSessionManager> m_mirPromptSessionManager;
     std::weak_ptr<mir::input::InputDeviceHub> m_inputDeviceHub;
+    mir::Server *m_server{nullptr};
 };
 
 qtmir::MirServerHooks::MirServerHooks() :
@@ -109,6 +110,8 @@
             self->m_mirPromptSessionManager = server.the_prompt_session_manager();
             self->m_inputDeviceHub = server.the_input_device_hub();
         });
+
+    self->m_server = &server;
 }
 
 PromptSessionListener *qtmir::MirServerHooks::promptSessionListener() const
@@ -143,6 +146,11 @@
     throw std::logic_error("No input device hub available. Server not running?");
 }
 
+mir::Server *qtmir::MirServerHooks::server() const
+{
+    return self->m_server;
+}
+
 QSharedPointer<ScreensController> qtmir::MirServerHooks::createScreensController(QSharedPointer<ScreensModel> const &screensModel) const
 {
     return QSharedPointer<ScreensController>(

=== modified file 'src/platforms/mirserver/mirserverhooks.h'
--- src/platforms/mirserver/mirserverhooks.h	2017-01-02 14:41:06 +0000
+++ src/platforms/mirserver/mirserverhooks.h	2017-02-14 10:17:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016 Canonical Ltd.
+ * Copyright © 2016-2017 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3,
@@ -44,6 +44,7 @@
     std::shared_ptr<mir::scene::PromptSessionManager> thePromptSessionManager() const;
     std::shared_ptr<mir::graphics::Display> theMirDisplay() const;
     std::shared_ptr<mir::input::InputDeviceHub> theInputDeviceHub() const;
+    mir::Server *server() const;
 
     QSharedPointer<ScreensController> createScreensController(QSharedPointer<ScreensModel> const &screensModel) const;
     void createInputDeviceObserver();

=== modified file 'src/platforms/mirserver/mirserverintegration.cpp'
--- src/platforms/mirserver/mirserverintegration.cpp	2016-11-03 20:17:46 +0000
+++ src/platforms/mirserver/mirserverintegration.cpp	2017-02-14 10:17:32 +0000
@@ -50,11 +50,11 @@
 namespace mg = mir::graphics;
 using qtmir::Clipboard;
 
-MirServerIntegration::MirServerIntegration(int &argc, char **argv)
+MirServerIntegration::MirServerIntegration()
     : m_accessibility(new QPlatformAccessibility())
     , m_fontDb(new QGenericUnixFontDatabase())
     , m_services(new Services)
-    , m_mirServer(new QMirServer(argc, argv))
+    , m_mirServer(new QMirServer)
     , m_nativeInterface(nullptr)
 {
     // For access to sensors, qtmir uses qtubuntu-sensors. qtubuntu-sensors reads the

=== modified file 'src/platforms/mirserver/mirserverintegration.h'
--- src/platforms/mirserver/mirserverintegration.h	2016-08-30 12:32:13 +0000
+++ src/platforms/mirserver/mirserverintegration.h	2017-02-14 10:17:32 +0000
@@ -27,7 +27,7 @@
 class MirServerIntegration : public QPlatformIntegration
 {
 public:
-    MirServerIntegration(int &argc, char **argv);
+    MirServerIntegration();
     ~MirServerIntegration();