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

[Daniel d'Andrada]

Add MirSurfaceItem.fillMode and ensure items and buffer are in sync

Ensure that by the time we enter the phase of updating the scene graph, all qml items are up to date regarding the size of the buffer about to be rendered.

NB: This rendering scheme needs triple buffering to work.

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

https://code.launchpad.net/~dandrader/unity-api/surfaceItemFillMode2/+merge/278955
https://code.launchpad.net/~dandrader/unity8/surfaceItemFillMode/+merge/279010

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

Yes

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

Not applicable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:370
http://jenkins.qa.ubuntu.com/job/qtmir-ci/412/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/145/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Glad to have helped. This isn't the first time someone has told me I'm wrong and then they went ahead and copied my code :)

[Gerry Boland (gerboland)]

What's the use-case of this fillMode? The crop ability might have use in the spread? But it's not a proper solution for the stretched frames issue on rotation.

[Daniel d'Andrada (dandrader)]

On 18/09/15 08:02, Gerry Boland wrote:
> What's the use-case of this fillMode? The crop ability might have use in the spread? But it's not a proper solution for the stretched frames issue on rotation.

Resize untiy8-dash in desktop mode on a Nexus device and you'll see.

[Michael Zanetti (mzanetti)]

Code looks ok, but as noticed on the related unity8 branch, I'm not sure if this is the proper place to calculate the innerRect stuff. It has the effect that it makes window content and window decoration/shadow go out of sync.

review: Needs Information

[Daniel d'Andrada (dandrader)]

On 23/09/2015 07:32, Michael Zanetti wrote:
> Review: Needs Information
>
> Code looks ok, but as noticed on the related unity8 branch, I'm not sure if this is the proper place to calculate the innerRect stuff. It has the effect that it makes window content and window decoration/shadow go out of sync.

They're two separate things. fillMode is there to ensure that you never
see a stretched surface even if the MirSurfaceItem size doesn't match
it. See it as yet another MirSurface feature that shells (unity8) can
take and use it on their UI/interaction designs.

What unity8 *does with it* is another thing. That shadow "going out of
sync" is a crude implementation or that unity7 window resize mode where
the window is not resize live, but you drag a translucent orang bounding
rect of it and only on release does the window get committed to that
bounding rect size (or actually a hint for the possibility doing the same).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:389
http://jenkins.qa.ubuntu.com/job/qtmir-ci/517/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/213/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/213/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/250/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/250/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/95/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:391
http://jenkins.qa.ubuntu.com/job/qtmir-ci/523/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/219/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/219/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/256/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/256/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/101/console

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/qtmir/surfaceItemFillMode]

387. By Albert Astals Cid on 2015-10-21

Don't search for the element again

Approved by: Gerry Boland, PS Jenkins bot

388. By Daniel d'Andrada on 2015-10-21

Shell draws its own cursor using the new Cursor QML element
Approved by: Lukáš Tinkl, Gerry Boland

389. By Gerry Boland on 2015-10-21

Initial multimonitor support - react correctly to Mir DisplayConfiguration changes.

On Mir DisplayConfiguration changes, QtMir now correctly:
1. blocks Mir until it has stopped all renderers and has their GL contexts released
2. reads the new DisplayConfiguration, matches any existing ScreenWindows to new DisplayBuffers should they change (as Mir may destroy and create it on us)
3. restarts all renderers

This also solves shutdown crash issues due to raciness of mir destroying the GL context backing the shell's QWindow before its renderer had stopped.

Add Unity.Screens qml module to advertise current screen state to QML. Fixes: #1436735, #1488831, #1488863
Approved by: Daniel d'Andrada

390. By Michał Sawicz on 2015-10-21

MirSurfaceItem: Survive holding a surface with an empty texture

Survive having a surface whose texture holds no mir buffer at all.
Instead of crashing in such situation we simply don't render it.
Approved by: Gerry Boland

391. By Michał Sawicz on 2015-10-21

Improve multimonitor support

* Removed magic:
 - Don't automagically select the screen where a window will be show.
   Let shell decide.
 - Don't automagically focus a window. Let shell handle it.

* Let shell know when a screen is about to be removed so that it has
  the opportunity to move or destroy a window in it before it's too late.
  - Added QGuiApplication::onScreenAboutToBeRemoved

* Added logging to key events
Approved by: Michał Sawicz

392. By Alan Griffiths on 2015-10-21

Opaquify MirWindowManager to control visibility of upcoming Window Management work
Approved by: Gerry Boland, PS Jenkins bot

393. By Lukáš Tinkl on 2015-10-21

React to surface modifications (window caption)
Approved by: Daniel d'Andrada

394. By Nick Dedekind on 2015-10-21

Removed the manipulation of the CMAKE_INSTALL_PREFIX from debian/rules
Approved by: Gerry Boland

395. By Nick Dedekind on 2015-10-21

Added touch performance tracing and test.
Approved by: Gerry Boland

396. By Lukáš Tinkl on 2015-10-21

Implement support for mouse wheel events; correctly pass around buttons Fixes: #1497091
Approved by: Gerry Boland

397. By Gerry Boland on 2015-10-21

Workaround for AutoPilot input coordinate positioning being outside screen geometry

398. By CI Train Bot Account on 2015-10-21

Releasing 0.4.6+15.10.20151021-0ubuntu1

[Michael Zanetti (mzanetti)]

I've tested this and it works fine. Would prefer Gerry to have a look at the code as there is quite some buffer handling involved which I'm not too experienced with.

review: Approve (functional testing)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:392
http://jenkins.qa.ubuntu.com/job/qtmir-ci/530/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/226/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/226/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/263/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/263/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/108/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Remind me why we want to support Stretch?

[Daniel d'Andrada (dandrader)]

> Remind me why we want to support Stretch?

Stretch does sound like a bad name, but scaling is stretching while respecting the aspect ratio of the surface.

And we want scaling working to display window thumbnails in the alt-tab spread, for instance.

[lp:~dandrader/qtmir/surfaceItemFillMode]

399. By Michał Sawicz on 2015-11-02

Clean up packaging and fix autopkgtest on armhf
Approved by: Gerry Boland

400. By Michael Terry on 2015-11-02

Support new isTouchApp property to ApplicationInfoInterface and move lifecycle policy logic out of qtmir.

Now that qtmir won't decide policy for suspending anymore, we don't need all the lifecycleException handling in qtmir either. That can move to unity8.

But since the GSettings key for that was registered under the qtmir namespace (and there's no technical reason to migrate settings), I left the schema and classes dealing with GSettings alone, for future use.

401. By Nick Dedekind on 2015-11-02

Support server->client visibility change to stop rendering (lp:#1475678) Fixes: #1475678
Approved by: Daniel d'Andrada

402. By Alan Griffiths on 2015-11-02

Test harness for MirWindowManager (in preparation for more intelligent window management)
Approved by: Gerry Boland

403. By Nick Dedekind on 2015-11-02

Hand Qt millisecond timestamps rather than nanosecond. Fixes: #1510571, #1511076, #1511711
Approved by: Gerry Boland

404. By CI Train Bot Account on 2015-11-02

Releasing 0.4.6+16.04.20151102-0ubuntu1

405. By Nick Dedekind on 2015-11-10

Reverted occlusion detection (lp#1514556) Fixes: #1514556

406. By CI Train Bot Account on 2015-11-10

Releasing 0.4.6+16.04.20151110-0ubuntu1

407. By Gerry Boland on 2015-11-12

Fix armhf builds on Xenial by using -std=gnu99 instead of c99

Fixes this FTBFS on xenial:

In file included from /usr/include/lttng/tracepoint-rcu.h:26:0,
                 from /usr/include/lttng/tracepoint.h:29,
                 from /home/phablet/dev/projects/qtmir/qtmir/BUILD-xen/src/platforms/mirserver/tracepoints.h:10,
                 from /home/phablet/dev/projects/qtmir/qtmir/BUILD-xen/src/platforms/mirserver/tracepoints.c:7:
/usr/include/urcu/arch/generic.h: In function ‘caa_get_cycles’:
/usr/include/urcu/arch/generic.h:165:6: error: ‘CLOCK_MONOTONIC’ undeclared (first use in this function)
  if (caa_unlikely(clock_gettime(CLOCK_MONOTONIC, &ts)))
      ^
/usr/include/urcu/arch/generic.h:165:6: note: each undeclared identifier is reported only once for each function it appears in

Strictly should compile code with -std=gnu99 instead of -std=c99 to have the identifiers SIGEV_SIGNAL, sigeventStruct, and CLOCK_MONOTONIC available. These identifiers are declared when _POSIX_C_SOURCE is set to a value >= 199309L, which is the case with -std=gnu99. I could also have used -D_POSIX_C_SOURCE=199309L -std=c99 or have the macro defined in source code.

Did not impact wily as libuctu only started looking for CLOCK_MONOTONIC in Xenial release.
Approved by: Daniel d'Andrada

408. By CI Train Bot Account on 2015-11-12

Releasing 0.4.6+16.04.20151112-0ubuntu1

409. By Nick Dedekind on 2015-11-13

Update surface textures when dropping frames. Fixes: #1515356
Approved by: Gerry Boland

410. By CI Train Bot Account on 2015-11-13

Releasing 0.4.6+16.04.20151113-0ubuntu1

411. By Gerry Boland on 2015-11-19

Fix use of uninitialized variable
Approved by: Daniel d'Andrada, PS Jenkins bot

412. By Albert Astals Cid on 2015-11-19

Enable Efficient String Construction by default

See http://blog.qt.io/blog/2011/06/13/string-concatenation-with-qstringbuilder/
Approved by: Gerry Boland, PS Jenkins bot

413. By Michał Sawicz on 2015-11-19

Build with clang (tests/gmock fails and is unfixable on our side i'd say)
Approved by: Gerry Boland

414. By Gerry Boland on 2015-11-19

Use pid_t for PIDs.
Approved by: Daniel d'Andrada, PS Jenkins bot

415. By Loïc Molinari on 2015-11-19

Ensured Mir surface items with size less than or equal to zero are not rendered, as it's usually done for standard QtQuick items.
Approved by: Gerry Boland

416. By Nick Dedekind on 2015-11-19

Fix a crash when dropping a surface frame before Qt draws a surface item. Fixes: #1517139
Approved by: Gerry Boland

417. By CI Train Bot Account on 2015-11-19

Releasing 0.4.6+16.04.20151119-0ubuntu1

418. By Daniel d'Andrada on 2015-11-25

Implemented support for cursors set by client surfaces
Approved by: Lukáš Tinkl

419. By Gerry Boland on 2015-11-25

Manage frameSwapped signal/slot connection with MirSurface more strictly to avoid crash.

Direct Signal/slot connections across thread boundaries incur the same risks as any cross-thread calls. While connect/disconnect are thread safe methods, it is possible for a slot to be called while the slot owner is being deconstructed - and so not yet disconnected.

So watch for the Item's window change signal and disconnect signal immediately. Also move slot ownership to MirSurfaceItem to auto-disconnect more aggressively.
 Fixes: #1517571
Approved by: Daniel d'Andrada

420. By Daniel d'Andrada on 2015-11-25

Forward Mir mouse wheel events to the shell cursor Fixes: #1497091
Approved by: Lukáš Tinkl

421. By Daniel d'Andrada on 2015-11-25

Revert revision 415

The commit "Ensured Mir surface items with size less than or equal to zero are not rendered,
as it's usually done for standard QtQuick items." caused a regression.

MirSurface.size was being kept uninitialized, as QSize(-1,-1).

422. By CI Train Bot Account on 2015-11-25

Releasing 0.4.6+16.04.20151125-0ubuntu1

[Loïc Molinari (loic.molinari)]

Using polish() sounds like the right thing to do in order to correctly sync surface size and item size, no more temporary frame drawn with surface size different than item size. Emitting the item sizeChanged signal in the GUI thread right before the updatePaintNode() callback in the render thread doesn't imply 2 frames anymore when Unity requires a surface resize. It should also fix that [1].

Regarding the fill mode, I think we should expose the same enum names that the standard QtQuick Image uses with, for now, just the needed ones : Stretch and Pad. That would make things cleaner IMO, easier to understand for people used to that and would allow to add the PreserveAspectFit and PreserveAspectCrop (and maybe the alignment props) later if ever needed.

(Take my comments with a grain of salt because I'm not completely aware of the whole picture, but I'm taking the liberty of commenting on that because I've been working a bit on qtmir lately for the mutlibuffer stream thing and for the AA optimization which kinda touches the same code path ;) )

[1] https://code.launchpad.net/~dandrader/qtmir/revertRev415/+merge/278604

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:418
http://jenkins.qa.ubuntu.com/job/qtmir-ci/582/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/278/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/278/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/160/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/160/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:420
http://jenkins.qa.ubuntu.com/job/qtmir-ci/583/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/279/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/279/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/161/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/316/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/316/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/161/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:423
http://jenkins.qa.ubuntu.com/job/qtmir-ci/584/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/280/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/280/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/162/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/317/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/317/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/162/console

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/qtmir/surfaceItemFillMode]

423. By Timo Jyrinki on 2015-12-01

Rebuild against Qt 5.5.1.

424. By Daniel d'Andrada on 2015-12-04

merge lp:~nick-dedekind/qtmir/polite-close

425. By Daniel d'Andrada on 2015-12-04

Add MirSurfaceItem.fillMode

426. By Daniel d'Andrada on 2015-12-04

Fix bad merge of polite-close

Unmerged revisions

426. By Daniel d'Andrada on 2015-12-04

Fix bad merge of polite-close

425. By Daniel d'Andrada on 2015-12-04

Add MirSurfaceItem.fillMode

424. By Daniel d'Andrada on 2015-12-04

merge lp:~nick-dedekind/qtmir/polite-close

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-25 15:38:50 +0000
+++ CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -20,7 +20,7 @@
 set(CMAKE_AUTOMOC ON)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra -Werror")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -fno-strict-aliasing -Werror -Wextra")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fPIC -Wall -fno-strict-aliasing -Werror -Wextra")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
 
 
@@ -75,7 +75,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=11)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=12)
 
 include_directories(${APPLICATION_API_INCLUDE_DIRS})
 
@@ -84,8 +84,6 @@
 # Use the fast string builder
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 
-include_directories( ${APPLICATION_API_INCLUDE_DIRS} )
-
 # We expect this to be set via debian/rules for GLES builds
 if ("${USE_OPENGLES}" STREQUAL 1)
     message(STATUS "Qt5 determined to be compiled with GLES support")

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-01 14:14:00 +0000
+++ debian/changelog	2015-12-04 13:04:35 +0000
@@ -1,3 +1,10 @@
+qtmir (0.4.7) UNRELEASED; urgency=medium
+
+  * [ Nick Dedekind ]
+  * Request app closing rather than killing.
+
+ -- Nick Dedekind <[e-mail]>  Fri, 25 Sep 2015 09:33:39 +0100
+
 qtmir (0.4.6+16.04.20151125-0ubuntu2) xenial; urgency=medium
 
   * Rebuild against Qt 5.5.1.

=== modified file 'debian/control'
--- debian/control	2015-11-25 15:38:50 +0000
+++ debian/control	2015-12-04 13:04:35 +0000
@@ -22,7 +22,7 @@
                libubuntu-app-launch2-dev,
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
-               libunity-api-dev (>= 7.103),
+               libunity-api-dev (>= 7.104),
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,
@@ -93,7 +93,7 @@
 Conflicts: libqtmir,
            libunity-mir1,
 Provides: unity-application-impl,
-          unity-application-impl-11,
+          unity-application-impl-12,
 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/modules/Unity/Application/application.cpp'
--- src/modules/Unity/Application/application.cpp	2015-10-01 17:20:40 +0000
+++ src/modules/Unity/Application/application.cpp	2015-12-04 13:04:35 +0000
@@ -45,13 +45,14 @@
     , m_sharedWakelock(sharedWakelock)
     , m_desktopData(desktopFileReader)
     , m_pid(0)
-    , m_stage((m_desktopData->stageHint() == "SideStage") ? Application::SideStage : Application::MainStage)
+    , m_stage((desktopFileReader->stageHint() == "SideStage") ? Application::SideStage : Application::MainStage)
     , m_state(InternalState::Starting)
     , m_focused(false)
     , m_arguments(arguments)
     , m_session(nullptr)
     , m_requestedState(RequestedRunning)
     , m_processState(ProcessUnknown)
+    , m_closeTimer(0)
 {
     qCDebug(QTMIR_APPLICATIONS) << "Application::Application - appId=" << desktopFileReader->appId();
 
@@ -394,25 +395,22 @@
     return m_pid;
 }
 
-void Application::setPid(pid_t pid)
-{
-    m_pid = pid;
-}
-
 void Application::close()
 {
     qCDebug(QTMIR_APPLICATIONS) << "Application::close - appId=" << appId();
 
     switch (m_state) {
     case InternalState::Starting:
+        stop();
+        break;
     case InternalState::Running:
-        setInternalState(InternalState::Closing);
+        doClose();
         break;
     case InternalState::SuspendingWaitSession:
     case InternalState::SuspendingWaitProcess:
     case InternalState::Suspended:
         setRequestedState(RequestedRunning);
-        setInternalState(InternalState::Closing);
+        doClose();
         break;
     case InternalState::Closing:
         // already on the way
@@ -422,6 +420,22 @@
         // too late
         break;
     }
+
+}
+
+void Application::doClose()
+{
+    Q_ASSERT(m_closeTimer == 0);
+    Q_ASSERT(m_session != nullptr);
+
+    m_session->close();
+    m_closeTimer = startTimer(3000);
+    setInternalState(InternalState::Closing);
+}
+
+void Application::setPid(pid_t pid)
+{
+    m_pid = pid;
 }
 
 void Application::setArguments(const QStringList arguments)
@@ -603,6 +617,8 @@
 
 void Application::suspend()
 {
+    qCDebug(QTMIR_APPLICATIONS) << "Application::suspend - appId=" << appId();
+
     Q_ASSERT(m_state == InternalState::Running);
     Q_ASSERT(m_session != nullptr);
 
@@ -612,6 +628,8 @@
 
 void Application::resume()
 {
+    qCDebug(QTMIR_APPLICATIONS) << "Application::resume - appId=" << appId();
+
     if (m_state == InternalState::Suspended) {
         setInternalState(InternalState::Running);
         Q_EMIT resumeProcessRequested();
@@ -634,6 +652,21 @@
     Q_EMIT startProcessRequested();
 }
 
+void Application::stop()
+{
+    qCDebug(QTMIR_APPLICATIONS) << "Application::stop - appId=" << appId();
+
+    Q_EMIT stopProcessRequested();
+}
+
+void Application::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == m_closeTimer) {
+        m_closeTimer = 0;
+        stop();
+    }
+}
+
 bool Application::isTouchApp() const
 {
     return m_desktopData->isTouchApp();
@@ -704,7 +737,7 @@
              *  3. application is managed by upstart and is in foreground (i.e. has
              *     Running state), if Mir reports the application disconnects, it
              *     either crashed or stopped itself.
-             * 4. We're expecting the application to stop after a close request
+             *  4. We're expecting the application to stop after a close request
              */
             setInternalState(InternalState::Stopped);
         } else {

=== modified file 'src/modules/Unity/Application/application.h'
--- src/modules/Unity/Application/application.h	2015-11-17 14:16:22 +0000
+++ src/modules/Unity/Application/application.h	2015-12-04 13:04:35 +0000
@@ -137,6 +137,7 @@
     void sessionChanged(SessionInterface *session);
 
     void startProcessRequested();
+    void stopProcessRequested();
     void suspendProcessRequested();
     void resumeProcessRequested();
     void stopped();
@@ -146,6 +147,9 @@
 
     void respawn();
 
+protected:
+    void timerEvent(QTimerEvent *event);
+
 private:
 
     QString longAppId() const;
@@ -158,11 +162,13 @@
     void wipeQMLCache();
     void suspend();
     void resume();
+    void stop();
     QColor colorFromString(const QString &colorString, const char *colorName) const;
     static const char* internalStateToStr(InternalState state);
     void applyRequestedState();
     void applyRequestedRunning();
     void applyRequestedSuspended();
+    void doClose();
 
     QSharedPointer<SharedWakelock> m_sharedWakelock;
     DesktopFileReader* m_desktopData;
@@ -178,6 +184,7 @@
     SessionInterface *m_session;
     RequestedState m_requestedState;
     ProcessState m_processState;
+    int m_closeTimer;
 
     friend class ApplicationManager;
     friend class SessionManager;

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2015-11-17 14:16:22 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2015-12-04 13:04:35 +0000
@@ -353,6 +353,23 @@
         return nullptr;
     }
 
+    if (m_queuedStartApplications.contains(inputAppId)) {
+        qWarning() << "ApplicationManager::startApplication - application appId=" << appId << " is queued to start";
+        return nullptr;
+    } else {
+        application = findClosingApplication(inputAppId);
+        if (application) {
+            m_queuedStartApplications.append(inputAppId);
+            qWarning() << "ApplicationManager::startApplication - application appId=" << appId << " is closing. Queuing start";
+            connect(application, &QObject::destroyed, this, [this, application, inputAppId, flags, arguments]() {
+                m_queuedStartApplications.removeAll(inputAppId);
+                // start the app.
+                startApplication(inputAppId, flags, arguments);
+            }, Qt::QueuedConnection); // Queued so that we finish the app removal before starting again.
+            return nullptr;
+        }
+    }
+
     if (!m_taskController->start(appId, arguments)) {
         qWarning() << "Upstart failed to start application with appId" << appId;
         return nullptr;
@@ -438,17 +455,12 @@
     application->close();
     remove(application);
 
-    bool result = m_taskController->stop(application->longAppId());
-
-    if (!result && application->pid() > 0) {
-        qWarning() << "FAILED to ask Upstart to stop application with appId" << appId
-                   << "Sending SIGTERM to process:" << application->pid();
-        kill(application->pid(), SIGTERM);
-        result = true;
-    }
-
-    delete application;
-    return result;
+    connect(application, &QObject::destroyed, this, [this, application](QObject*) {
+        m_closingApplications.removeAll(application);
+    });
+    m_closingApplications.append(application);
+    application->close();
+    return true;
 }
 
 void ApplicationManager::onProcessFailed(const QString &appId, const bool duringStartup)
@@ -473,7 +485,11 @@
 {
     tracepoint(qtmir, onProcessStopped);
     qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::onProcessStopped - appId=" << appId;
+
     Application *application = findApplication(appId);
+    if (!application) {
+        application = findClosingApplication(appId);
+    }
 
     if (!application) {
         qDebug() << "ApplicationManager::onProcessStopped reports stop of appId=" << appId
@@ -729,6 +745,15 @@
             this, [=]() { m_taskController->start(appId, arguments); },
             Qt::QueuedConnection);
 
+    connect(application, &Application::stopProcessRequested, this, [=]() {
+        if (!m_taskController->stop(application->longAppId()) && application->pid() > 0) {
+            qWarning() << "FAILED to ask Upstart to stop application with appId" << appId
+                       << "Sending SIGTERM to process:" << appId;
+            kill(application->pid(), SIGTERM);
+            application->setProcessState(Application::ProcessStopped);
+        }
+    });
+
     connect(application, &Application::suspendProcessRequested, this, [=]() { m_taskController->suspend(longAppId); } );
     connect(application, &Application::resumeProcessRequested, this, [=]() { m_taskController->resume(longAppId); } );
 
@@ -753,7 +778,10 @@
     Q_ASSERT(application != nullptr);
     qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::remove - appId=" << application->appId();
 
-    application->disconnect(this);
+    disconnect(application, &Application::fullscreenChanged, this, 0);
+    disconnect(application, &Application::focusedChanged, this, 0);
+    disconnect(application, &Application::stateChanged, this, 0);
+    disconnect(application, &Application::stageChanged, this, 0);
 
     int i = m_applications.indexOf(application);
     if (i != -1) {
@@ -813,4 +841,16 @@
     return result;
 }
 
+Application *ApplicationManager::findClosingApplication(const QString &inputAppId) const
+{
+    const QString appId = toShortAppIdIfPossible(inputAppId);
+
+    for (Application *app : m_closingApplications) {
+        if (app->appId() == appId) {
+            return app;
+        }
+    }
+    return nullptr;
+}
+
 } // namespace qtmir

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2015-11-17 14:16:22 +0000
+++ src/modules/Unity/Application/application_manager.h	2015-12-04 13:04:35 +0000
@@ -149,6 +149,7 @@
     QString toString() const;
 
     Application* findApplicationWithPromptSession(const mir::scene::PromptSession* promptSession);
+    Application *findClosingApplication(const QString &inputAppId) const;
 
     QSharedPointer<MirServer> m_mirServer;
 
@@ -160,6 +161,8 @@
     QSharedPointer<ProcInfo> m_procInfo;
     QSharedPointer<SharedWakelock> m_sharedWakelock;
     QSharedPointer<SettingsInterface> m_settings;
+    QList<Application*> m_closingApplications;
+    QList<QString> m_queuedStartApplications;
     static ApplicationManager* the_application_manager;
 
     friend class Application;

=== modified file 'src/modules/Unity/Application/mirbuffersgtexture.cpp'
--- src/modules/Unity/Application/mirbuffersgtexture.cpp	2015-10-02 12:20:00 +0000
+++ src/modules/Unity/Application/mirbuffersgtexture.cpp	2015-12-04 13:04:35 +0000
@@ -21,6 +21,9 @@
 #include <mir/geometry/size.h>
 #include <mir/renderer/gl/texture_source.h>
 
+// mirserver
+#include <logging.h>
+
 namespace mg = mir::geometry;
 namespace mrg = mir::renderer::gl;
 
@@ -80,20 +83,25 @@
         return m_mirBuffer->pixel_format() == mir_pixel_format_abgr_8888
             || m_mirBuffer->pixel_format() == mir_pixel_format_argb_8888;
     } else {
+        qCWarning(QTMIR_SURFACES) << "MirBufferSGTexture: hasAlphaChannel() called but there's no mir buffer to query";
         return false;
     }
 }
 
 void MirBufferSGTexture::bind()
 {
-    Q_ASSERT(hasBuffer());
-    glBindTexture(GL_TEXTURE_2D, m_textureId);
-    updateBindOptions(true/* force */);
-
-    auto const texture_source =
-        dynamic_cast<mrg::TextureSource*>(m_mirBuffer->native_buffer_base());
-    if (!texture_source)
-        throw std::logic_error("Buffer does not support GL rendering");
-
-    texture_source->gl_bind_to_texture();
+    if (hasBuffer()) {
+        glBindTexture(GL_TEXTURE_2D, m_textureId);
+        updateBindOptions(true/* force */);
+
+        auto const texture_source =
+            dynamic_cast<mrg::TextureSource*>(m_mirBuffer->native_buffer_base());
+        if (!texture_source)
+            throw std::logic_error("Buffer does not support GL rendering");
+
+        texture_source->gl_bind_to_texture();
+    } else {
+        qCWarning(QTMIR_SURFACES) << "MirBufferSGTexture: bind() called but there's no mir buffer to bind to";
+        glBindTexture(GL_TEXTURE_2D, 0);
+    }
 }

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2015-11-25 15:38:39 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2015-12-04 13:04:35 +0000
@@ -25,6 +25,7 @@
 
 // Mir
 #include <mir/geometry/rectangle.h>
+#include <mir/graphics/buffer.h>
 #include <mir/events/event_builders.h>
 #include <mir/shell/shell.h>
 #include <mir_toolkit/event.h>
@@ -297,7 +298,7 @@
     int framesPending = m_surface->buffers_ready_for_compositor(userId);
     if (framesPending > 0) {
         m_textureUpdated = false;
-        
+
         locker.unlock();
         if (updateTexture()) {
             qCDebug(QTMIR_SURFACES).nospace() << "MirSurface[" << appId() << "]::dropPendingBuffer() dropped=1 left=" << framesPending-1;
@@ -355,39 +356,53 @@
         return texture->hasBuffer();
     }
 
-    const void* const userId = (void*)123;
-    auto renderables = m_surface->generate_renderables(userId);
-
-    if (renderables.size() > 0 &&
-            (m_surface->buffers_ready_for_compositor(userId) > 0 || !texture->hasBuffer())
-        ) {
+    if (m_pendingBuffer) {
         // Avoid holding two buffers for the compositor at the same time. Thus free the current
         // before acquiring the next
         texture->freeBuffer();
-        texture->setBuffer(renderables[0]->buffer());
+        texture->setBuffer(m_pendingBuffer);
+        m_pendingBuffer.reset();
         ++m_currentFrameNumber;
-
-        if (texture->textureSize() != m_size) {
-            m_size = texture->textureSize();
-            QMetaObject::invokeMethod(this, "emitSizeChanged", Qt::QueuedConnection);
+    }
+
+    m_textureUpdated = true;
+
+    return texture->hasBuffer();
+}
+
+void MirSurface::consumeBuffer()
+{
+    QMutexLocker locker(&m_mutex);
+    const void* const userId = (void*)123;
+    auto renderables = m_surface->generate_renderables(userId);
+
+    if (renderables.size() > 0 && m_surface->buffers_ready_for_compositor(userId) > 0) {
+        m_pendingBuffer = renderables[0]->buffer();
+
+        QSize size(m_pendingBuffer->size().width.as_int(),
+                   m_pendingBuffer->size().height.as_int());
+        if (size != m_size) {
+            m_size = size;
+            Q_EMIT sizeChanged(m_size);
         }
-
-        m_textureUpdated = true;
     }
 
     if (m_surface->buffers_ready_for_compositor(userId) > 0) {
         // restart the frame dropper to give MirSurfaceItems enough time to render the next frame.
-        // queued since the timer lives in a different thread
-        QMetaObject::invokeMethod(&m_frameDropperTimer, "start", Qt::QueuedConnection);
+        QMetaObject::invokeMethod(&m_frameDropperTimer, "start", Qt::AutoConnection);
     }
-
-    return texture->hasBuffer();
 }
 
 void MirSurface::onCompositorSwappedBuffers()
 {
     QMutexLocker locker(&m_mutex);
     m_textureUpdated = false;
+
+    if (m_texture && m_pendingBuffer) {
+        // No need to hold onto this buffer as it won't be used on the next frame.
+        MirBufferSGTexture *texture = static_cast<MirBufferSGTexture*>(m_texture.data());
+        texture->freeBuffer();
+    }
 }
 
 bool MirSurface::numBuffersReadyForCompositor()
@@ -420,6 +435,13 @@
     }
 }
 
+void MirSurface::close()
+{
+    if (m_surface) {
+        m_surface->request_client_surface_close();
+    }
+}
+
 void MirSurface::resize(int width, int height)
 {
     int mirWidth = m_surface->size().width.as_int();

=== modified file 'src/modules/Unity/Application/mirsurface.h'
--- src/modules/Unity/Application/mirsurface.h	2015-11-25 15:38:39 +0000
+++ src/modules/Unity/Application/mirsurface.h	2015-12-04 13:04:35 +0000
@@ -35,7 +35,10 @@
 #include <mir/scene/surface.h>
 #include <mir_toolkit/common.h>
 
-namespace mir { namespace shell { class Shell; }}
+namespace mir {
+    namespace shell { class Shell; }
+    namespace graphics { class Buffer; }
+}
 
 class SurfaceObserver;
 
@@ -89,6 +92,8 @@
     void unregisterView(qintptr viewId) override;
     void setViewVisibility(qintptr viewId, bool visible) override;
 
+    void consumeBuffer() override;
+
     // methods called from the rendering (scene graph) thread:
     QSharedPointer<QSGTexture> texture() override;
     QSGTexture *weakTexture() const override { return m_texture.data(); }
@@ -99,6 +104,8 @@
 
     void setFocus(bool focus) override;
 
+    void close() override;
+
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
     void mouseReleaseEvent(QMouseEvent *event) override;
@@ -120,7 +127,9 @@
     QCursor cursor() const override;
 
 public Q_SLOTS:
+    // methods called from the rendering (scene graph) thread:
     void onCompositorSwappedBuffers() override;
+    // end of methods called from the rendering (scene graph) thread
 
 private Q_SLOTS:
     void dropPendingBuffer();
@@ -163,6 +172,8 @@
     QSize m_size;
 
     QCursor m_cursor;
+
+    std::shared_ptr<mir::graphics::Buffer> m_pendingBuffer;
 };
 
 } // namespace qtmir

=== modified file 'src/modules/Unity/Application/mirsurfaceinterface.h'
--- src/modules/Unity/Application/mirsurfaceinterface.h	2015-11-25 15:38:39 +0000
+++ src/modules/Unity/Application/mirsurfaceinterface.h	2015-12-04 13:04:35 +0000
@@ -54,6 +54,8 @@
     virtual void unregisterView(qintptr viewId) = 0;
     virtual void setViewVisibility(qintptr viewId, bool visible) = 0;
 
+    virtual void consumeBuffer() = 0;
+
     // methods called from the rendering (scene graph) thread:
     virtual QSharedPointer<QSGTexture> texture() = 0;
     virtual QSGTexture *weakTexture() const = 0;
@@ -64,6 +66,8 @@
 
     virtual void setFocus(bool focus) = 0;
 
+    virtual void close() = 0;
+
     virtual void mousePressEvent(QMouseEvent *event) = 0;
     virtual void mouseMoveEvent(QMouseEvent *event) = 0;
     virtual void mouseReleaseEvent(QMouseEvent *event) = 0;
@@ -88,7 +92,9 @@
     void cursorChanged(const QCursor &cursor);
 
 public Q_SLOTS:
+    // methods called from the rendering (scene graph) thread:
     virtual void onCompositorSwappedBuffers() = 0;
+    // end of methods called from the rendering (scene graph) thread
 
 Q_SIGNALS:
     void firstFrameDrawn();

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
--- src/modules/Unity/Application/mirsurfaceitem.cpp	2015-11-25 15:38:54 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.cpp	2015-12-04 13:04:35 +0000
@@ -92,6 +92,7 @@
     , m_surfaceHeight(0)
     , m_orientationAngle(nullptr)
     , m_consumesInput(false)
+    , m_fillMode(Stretch)
 {
     qCDebug(QTMIR_SURFACES) << "MirSurfaceItem::MirSurfaceItem";
 
@@ -227,7 +228,7 @@
     }
 
     if (m_surface->numBuffersReadyForCompositor() > 0) {
-        QTimer::singleShot(0, this, SLOT(update()));
+        QTimer::singleShot(0, this, SLOT(polishAndUpdate()));
     }
 
     m_textureProvider->smooth = smooth();
@@ -240,15 +241,31 @@
         node->setMipmapFiltering(QSGTexture::None);
         node->setHorizontalWrapMode(QSGTexture::ClampToEdge);
         node->setVerticalWrapMode(QSGTexture::ClampToEdge);
-        node->setSubSourceRect(QRectF(0, 0, 1, 1));
     } else {
         if (!m_lastFrameNumberRendered  || (*m_lastFrameNumberRendered != m_surface->currentFrameNumber())) {
             node->markDirty(QSGNode::DirtyMaterial);
         }
     }
 
-    node->setTargetRect(QRectF(0, 0, width(), height()));
-    node->setInnerTargetRect(QRectF(0, 0, width(), height()));
+    if (m_fillMode == PadOrCrop) {
+        const QSize &textureSize = m_textureProvider->texture()->textureSize();
+
+        QRectF targetRect;
+        targetRect.setWidth(qMin(width(), static_cast<qreal>(textureSize.width())));
+        targetRect.setHeight(qMin(height(), static_cast<qreal>(textureSize.height())));
+
+        qreal u = targetRect.width() / textureSize.width();
+        qreal v = targetRect.height() / textureSize.height();
+        node->setSubSourceRect(QRectF(0, 0, u, v));
+
+        node->setTargetRect(targetRect);
+        node->setInnerTargetRect(targetRect);
+    } else {
+        // Stretch
+        node->setSubSourceRect(QRectF(0, 0, 1, 1));
+        node->setTargetRect(QRectF(0, 0, width(), height()));
+        node->setInnerTargetRect(QRectF(0, 0, width(), height()));
+    }
 
     node->setFiltering(smooth() ? QSGTexture::Linear : QSGTexture::Nearest);
     node->setAntialiasing(antialiasing());
@@ -626,7 +643,7 @@
 
         // When a new mir frame gets posted we notify the QML engine that this item needs redrawing,
         // schedules call to updatePaintNode() from the rendering thread
-        connect(m_surface, &MirSurfaceInterface::framesPosted, this, &QQuickItem::update);
+        connect(m_surface, &MirSurfaceInterface::framesPosted, this, &MirSurfaceItem::polishAndUpdate);
 
         connect(m_surface, &MirSurfaceInterface::stateChanged, this, &MirSurfaceItem::surfaceStateChanged);
         connect(m_surface, &MirSurfaceInterface::liveChanged, this, &MirSurfaceItem::liveChanged);
@@ -730,6 +747,33 @@
     }
 }
 
+MirSurfaceItem::FillMode MirSurfaceItem::fillMode() const
+{
+    return m_fillMode;
+}
+
+void MirSurfaceItem::setFillMode(FillMode value)
+{
+    if (m_fillMode != value) {
+        m_fillMode = value;
+        Q_EMIT fillModeChanged(m_fillMode);
+    }
+}
+
+void MirSurfaceItem::polishAndUpdate()
+{
+    polish();
+    update();
+}
+
+void MirSurfaceItem::updatePolish()
+{
+    if (!m_surface || !m_surface->live()) {
+        return;
+    }
+    m_surface->consumeBuffer();
+}
+
 } // namespace qtmir
 
 #include "mirsurfaceitem.moc"

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.h'
--- src/modules/Unity/Application/mirsurfaceitem.h	2015-11-25 15:38:44 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.h	2015-12-04 13:04:35 +0000
@@ -68,6 +68,9 @@
     int surfaceHeight() const override;
     void setSurfaceHeight(int value) override;
 
+    FillMode fillMode() const override;
+    void setFillMode(FillMode value) override;
+
     ////////
     // QQuickItem
 
@@ -107,6 +110,8 @@
 
     void releaseResources() override;
 
+    void updatePolish() override;
+
 private Q_SLOTS:
     void scheduleMirSurfaceSizeUpdate();
     void updateMirSurfaceSize();
@@ -119,6 +124,8 @@
 
     void onWindowChanged(QQuickWindow *window);
 
+    void polishAndUpdate();
+
 private:
     void ensureTextureProvider();
 
@@ -168,6 +175,8 @@
     Mir::OrientationAngle *m_orientationAngle;
 
     bool m_consumesInput;
+
+    FillMode m_fillMode;
 };
 
 } // namespace qtmir

=== modified file 'src/modules/Unity/Application/session.cpp'
--- src/modules/Unity/Application/session.cpp	2015-08-31 09:51:28 +0000
+++ src/modules/Unity/Application/session.cpp	2015-12-04 13:04:35 +0000
@@ -40,6 +40,28 @@
 namespace qtmir
 {
 
+namespace {
+
+const char *sessionStateToString(SessionInterface::State state)
+{
+    switch (state) {
+    case SessionInterface::Starting:
+        return "starting";
+    case SessionInterface::Running:
+        return "running";
+    case SessionInterface::Suspending:
+        return "suspending";
+    case SessionInterface::Suspended:
+        return "suspended";
+    case SessionInterface::Stopped:
+        return "stopped";
+    default:
+        return "???";
+    }
+}
+
+}
+
 Session::Session(const std::shared_ptr<ms::Session>& session,
                  const std::shared_ptr<ms::PromptSessionManager>& promptSessionManager,
                  QObject *parent)
@@ -142,6 +164,9 @@
 
 void Session::setState(State state) {
     if (state != m_state) {
+        qCDebug(QTMIR_SESSIONS) << "Session::setState - session=" << name()
+            << "state=" << sessionStateToString(state);
+
         m_state = state;
         Q_EMIT stateChanged(m_state);
     }
@@ -232,7 +257,7 @@
 
 void Session::suspend()
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::suspend - session=" << this << "state=" << applicationStateToStr(m_state);
+    qCDebug(QTMIR_SESSIONS) << "Session::suspend - session=" << this << "state=" << sessionStateToString(m_state);
     if (m_state == Running) {
         session()->set_lifecycle_state(mir_lifecycle_state_will_suspend);
         m_suspendTimer->start(1500);
@@ -251,7 +276,7 @@
 
 void Session::resume()
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::resume - session=" << this << "state=" << applicationStateToStr(m_state);
+    qCDebug(QTMIR_SESSIONS) << "Session::resume - session=" << this << "state=" << sessionStateToString(m_state);
 
     if (m_state == Suspending || m_state == Suspended) {
         doResume();
@@ -281,9 +306,20 @@
     setState(Running);
 }
 
+void Session::close()
+{
+    qCDebug(QTMIR_SESSIONS) << "Session::close - " << name() << m_surface;
+    if (m_surface) {
+        m_surface->close();
+    }
+}
+
 void Session::stop()
 {
+    qCDebug(QTMIR_SESSIONS) << "Session::stop - " << name();
+
     if (m_state != Stopped) {
+
         stopPromptSessions();
         if (m_suspendTimer->isActive())
             m_suspendTimer->stop();
@@ -304,6 +340,8 @@
 void Session::setLive(const bool live)
 {
     if (m_live != live) {
+        qCDebug(QTMIR_SESSIONS) << "Session::setLive - " << name() << "live=" << live;
+
         m_live = live;
         Q_EMIT liveChanged(m_live);
         if (!live) {

=== modified file 'src/modules/Unity/Application/session.h'
--- src/modules/Unity/Application/session.h	2015-08-31 09:51:28 +0000
+++ src/modules/Unity/Application/session.h	2015-12-04 13:04:35 +0000
@@ -63,6 +63,7 @@
 
     void suspend() override;
     void resume() override;
+    void close() override;
     void stop() override;
 
     void addChildSession(SessionInterface* session) override;

=== modified file 'src/modules/Unity/Application/session_interface.h'
--- src/modules/Unity/Application/session_interface.h	2015-08-31 09:51:28 +0000
+++ src/modules/Unity/Application/session_interface.h	2015-12-04 13:04:35 +0000
@@ -80,6 +80,7 @@
     virtual void setApplication(unity::shell::application::ApplicationInfoInterface* item) = 0;
     virtual void suspend() = 0;
     virtual void resume() = 0;
+    virtual void close() = 0;
     virtual void stop() = 0;
 
     // For SessionManager use

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-12-03 08:56:35 +0000
+++ tests/CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -1,4 +1,5 @@
 find_package(GMock)
 
+add_subdirectory(framework)
 add_subdirectory(mirserver)
 add_subdirectory(modules)

=== removed directory 'tests/common'
=== renamed directory 'tests/modules/common' => 'tests/framework'
=== added file 'tests/framework/CMakeLists.txt'
--- tests/framework/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/framework/CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -0,0 +1,48 @@
+include_directories(
+    ${APPLICATION_API_INCLUDE_DIRS}
+    ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
+    ${CMAKE_SOURCE_DIR}/src/modules
+    ${MIRSERVER_INCLUDE_DIRS}
+    ${MIRRENDERERGLDEV_INCLUDE_DIRS}
+
+    ${Qt5Quick_INCLUDE_DIRS}
+    ${Qt5DBus_INCLUDE_DIRS}
+)
+
+set(QTMIR_TEST_PRIVATE_SRC
+    fake_desktopfilereader.cpp
+    fake_mirsurface.cpp
+    fake_session.cpp
+    mock_application_controller.cpp
+    mock_desktop_file_reader.cpp
+    mock_display.cpp
+    mock_display_configuration.cpp
+    mock_gl_display_buffer.cpp
+    mock_main_loop.cpp
+    mock_mir_session.cpp
+    mock_proc_info.cpp
+    mock_prompt_session.cpp
+    mock_prompt_session_manager.cpp
+    mock_renderable.cpp
+    mock_session.cpp
+    mock_settings.cpp
+    mock_shared_wakelock.cpp
+    mock_surface.cpp
+    stub_input_channel.cpp
+    stub_scene_surface.cpp
+    qtmir_test.cpp
+)
+
+add_library(qtmir-test-framework-static STATIC
+    ${QTMIR_TEST_PRIVATE_SRC}
+)
+
+target_link_libraries(
+    qtmir-test-framework-static
+
+    -L${CMAKE_BINARY_DIR}/tests/framework
+    qtmir-test-framework-static
+
+    ${GTEST_BOTH_LIBRARIES}
+    ${GMOCK_LIBRARIES}
+)

=== added file 'tests/framework/fake_desktopfilereader.cpp'
--- tests/framework/fake_desktopfilereader.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/fake_desktopfilereader.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,68 @@
+/*
+ * 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/>.
+ */
+
+#include "fake_desktopfilereader.h"
+
+namespace qtmir
+{
+
+FakeDesktopFileReader::FakeDesktopFileReader()
+	: DesktopFileReader()
+	, m_appId("foo-app")
+{
+}
+
+FakeDesktopFileReader::~FakeDesktopFileReader()
+{
+}
+
+QString FakeDesktopFileReader::file() const { return QString(); }
+
+QString FakeDesktopFileReader::appId() const { return m_appId; }
+
+QString FakeDesktopFileReader::name() const { return QString(); }
+
+QString FakeDesktopFileReader::comment() const { return QString(); }
+
+QString FakeDesktopFileReader::icon() const { return QString(); }
+
+QString FakeDesktopFileReader::exec() const { return QString(); }
+
+QString FakeDesktopFileReader::path() const { return QString(); }
+
+QString FakeDesktopFileReader::stageHint() const { return QString(); }
+
+QString FakeDesktopFileReader::splashTitle() const { return QString(); }
+
+QString FakeDesktopFileReader::splashImage() const { return QString(); }
+
+QString FakeDesktopFileReader::splashShowHeader() const { return QString(); }
+
+QString FakeDesktopFileReader::splashColor() const { return QString(); }
+
+QString FakeDesktopFileReader::splashColorHeader() const { return QString(); }
+
+QString FakeDesktopFileReader::splashColorFooter() const { return QString(); }
+
+Qt::ScreenOrientations FakeDesktopFileReader::supportedOrientations() const { return Qt::PortraitOrientation; }
+
+bool FakeDesktopFileReader::rotatesWindowContents() const { return false; }
+
+bool FakeDesktopFileReader::isTouchApp() const { return true; }
+
+bool FakeDesktopFileReader::loaded() const { return true; }
+
+} // namespace qtmir

=== modified file 'tests/framework/fake_desktopfilereader.h'
--- tests/modules/common/fake_desktopfilereader.h	2015-09-28 20:11:39 +0000
+++ tests/framework/fake_desktopfilereader.h	2015-12-04 13:04:35 +0000
@@ -17,33 +17,34 @@
 #ifndef FAKE_DESKTOPFILEREADER_H
 #define FAKE_DESKTOPFILEREADER_H
 
+#include <Unity/Application/desktopfilereader.h>
+
 namespace qtmir {
 
 class FakeDesktopFileReader : public qtmir::DesktopFileReader
 {
 public:
-    FakeDesktopFileReader() : DesktopFileReader()
-        , m_appId("foo-app")
-    {}
+    FakeDesktopFileReader();
+    virtual ~FakeDesktopFileReader();
 
-    QString file() const override { return QString(); }
-    QString appId() const override { return m_appId; }
-    QString name() const override { return QString(); }
-    QString comment() const override { return QString(); }
-    QString icon() const override { return QString(); }
-    QString exec() const override { return QString(); }
-    QString path() const override { return QString(); }
-    QString stageHint() const override { return QString(); }
-    QString splashTitle() const override { return QString(); }
-    QString splashImage() const override { return QString(); }
-    QString splashShowHeader() const override { return QString(); }
-    QString splashColor() const override { return QString(); }
-    QString splashColorHeader() const override { return QString(); }
-    QString splashColorFooter() const override { return QString(); }
-    Qt::ScreenOrientations supportedOrientations() const override { return Qt::PortraitOrientation; }
-    bool rotatesWindowContents() const override { return false; }
-    bool isTouchApp() const override { return true; }
-    bool loaded() const override { return true; }
+    QString file() const override;
+    QString appId() const override;
+    QString name() const override;
+    QString comment() const override;
+    QString icon() const override;
+    QString exec() const override;
+    QString path() const override;
+    QString stageHint() const override;
+    QString splashTitle() const override;
+    QString splashImage() const override;
+    QString splashShowHeader() const override;
+    QString splashColor() const override;
+    QString splashColorHeader() const override;
+    QString splashColorFooter() const override;
+    Qt::ScreenOrientations supportedOrientations() const override;
+    bool rotatesWindowContents() const override;
+    bool isTouchApp() const override;
+    bool loaded() const override;
 
     QString m_appId;
 };

=== renamed file 'tests/common/fake_displayconfigurationoutput.h' => 'tests/framework/fake_displayconfigurationoutput.h'
=== added file 'tests/framework/fake_mirsurface.cpp'
--- tests/framework/fake_mirsurface.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/fake_mirsurface.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,212 @@
+/*
+ * 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/>.
+ */
+
+#include "fake_mirsurface.h"
+
+namespace qtmir
+{
+
+FakeMirSurface::TouchEvent::TouchEvent(Qt::KeyboardModifiers mods,
+                                       const QList<QTouchEvent::TouchPoint> &points,
+                                       Qt::TouchPointStates states,
+                                       ulong timestamp)
+    : keyboardModifiers(mods)
+    , touchPoints(points)
+    , states(states)
+    , timestamp(timestamp)
+{
+}
+
+FakeMirSurface::TouchEvent::~TouchEvent()
+{
+}
+
+FakeMirSurface::FakeMirSurface(QObject *parent)
+    : MirSurfaceInterface(parent)
+    , m_isFirstFrameDrawn(false)
+    , m_isFrameDropperRunning(true)
+    , m_live(true)
+    , m_state(Mir::RestoredState)
+    , m_orientationAngle(Mir::Angle0)
+    , m_visible(true)
+    , m_focused(false)
+{
+}
+
+FakeMirSurface::~FakeMirSurface()
+{
+}
+
+Mir::Type FakeMirSurface::type() const { return Mir::NormalType; }
+
+QString FakeMirSurface::name() const { return QString("Fake MirSurface"); }
+
+QSize FakeMirSurface::size() const { return m_size; }
+
+void FakeMirSurface::resize(int width, int height)
+{
+    if (m_size.width() != width || m_size.height() != height) {
+        m_size.setWidth(width);
+        m_size.setHeight(height);
+        Q_EMIT sizeChanged(m_size);
+    }
+}
+
+void FakeMirSurface::resize(const QSize &size) { resize(size.width(), size.height()); }
+
+Mir::State FakeMirSurface::state() const { return m_state; }
+
+void FakeMirSurface::setState(Mir::State qmlState)
+{
+    if (qmlState != m_state) {
+        m_state = qmlState;
+        Q_EMIT stateChanged(m_state);
+    }
+}
+
+bool FakeMirSurface::live() const { return m_live; }
+
+bool FakeMirSurface::visible() const { return m_visible; }
+
+Mir::OrientationAngle FakeMirSurface::orientationAngle() const { return m_orientationAngle; }
+
+void FakeMirSurface::setOrientationAngle(Mir::OrientationAngle angle)
+{
+    if (m_orientationAngle != angle) {
+        m_orientationAngle = angle;
+        Q_EMIT orientationAngleChanged(m_orientationAngle);
+    }
+}
+
+bool FakeMirSurface::isFirstFrameDrawn() const
+{
+    return m_isFirstFrameDrawn;
+}
+
+void FakeMirSurface::stopFrameDropper()
+{
+    m_isFrameDropperRunning = false;
+}
+
+void FakeMirSurface::startFrameDropper()
+{
+    m_isFrameDropperRunning = true;
+}
+
+void FakeMirSurface::setLive(bool value)
+{
+    if (m_live != value) {
+        m_live = value;
+        Q_EMIT liveChanged(m_live);
+    }
+}
+
+void FakeMirSurface::setViewVisibility(qintptr viewId, bool visible) {
+    if (!m_views.contains(viewId)) return;
+
+    m_views[viewId] = visible;
+    updateVisibility();
+}
+
+bool FakeMirSurface::isBeingDisplayed() const { return !m_views.isEmpty(); }
+
+void FakeMirSurface::registerView(qintptr viewId)
+{
+    m_views.insert(viewId, false);
+    if (m_views.count() == 1) {
+        Q_EMIT isBeingDisplayedChanged();
+    }
+}
+
+void FakeMirSurface::unregisterView(qintptr viewId)
+{
+    m_views.remove(viewId);
+    if (m_views.count() == 0) {
+        Q_EMIT isBeingDisplayedChanged();
+    }
+    updateVisibility();
+}
+
+QSharedPointer<QSGTexture> FakeMirSurface::texture() { return QSharedPointer<QSGTexture>(); }
+
+QSGTexture *FakeMirSurface::weakTexture() const { return nullptr; }
+
+bool FakeMirSurface::updateTexture() { return true; }
+
+unsigned int FakeMirSurface::currentFrameNumber() const { return 0; }
+
+bool FakeMirSurface::numBuffersReadyForCompositor() { return 0; }
+
+void FakeMirSurface::setFocus(bool focus) { m_focused = focus; }
+
+void FakeMirSurface::mousePressEvent(QMouseEvent *) {}
+
+void FakeMirSurface::mouseMoveEvent(QMouseEvent *) {}
+
+void FakeMirSurface::mouseReleaseEvent(QMouseEvent *) {}
+
+void FakeMirSurface::hoverEnterEvent(QHoverEvent *) {}
+
+void FakeMirSurface::hoverLeaveEvent(QHoverEvent *) {}
+
+void FakeMirSurface::hoverMoveEvent(QHoverEvent *) {}
+
+void FakeMirSurface::wheelEvent(QWheelEvent *) {}
+
+void FakeMirSurface::keyPressEvent(QKeyEvent *) {}
+
+void FakeMirSurface::keyReleaseEvent(QKeyEvent *) {}
+
+void FakeMirSurface::touchEvent(Qt::KeyboardModifiers mods,
+                                const QList<QTouchEvent::TouchPoint> &points,
+                                Qt::TouchPointStates states,
+                                ulong timestamp)
+{
+    m_touchesReceived.append(TouchEvent(mods, points, states, timestamp));
+}
+
+QString FakeMirSurface::appId() const { return "foo-app"; }
+
+void FakeMirSurface::onCompositorSwappedBuffers() {}
+
+void FakeMirSurface::drawFirstFrame()
+{
+    if (!m_isFirstFrameDrawn) {
+        m_isFirstFrameDrawn = true;
+        Q_EMIT firstFrameDrawn();
+    }
+}
+
+bool FakeMirSurface::isFrameDropperRunning() const { return m_isFrameDropperRunning; }
+
+QList<FakeMirSurface::TouchEvent> &FakeMirSurface::touchesReceived() { return m_touchesReceived; }
+
+void FakeMirSurface::updateVisibility()
+{
+    bool newVisible = false;
+    QHashIterator<int, bool> i(m_views);
+    while (i.hasNext()) {
+        i.next();
+        newVisible |= i.value();
+    }
+
+    if (m_visible != newVisible) {
+        m_visible = newVisible;
+        Q_EMIT visibleChanged(newVisible);
+    }
+}
+
+} // namespace qtmir

=== modified file 'tests/framework/fake_mirsurface.h'
--- tests/modules/common/fake_mirsurface.h	2015-11-25 15:38:39 +0000
+++ tests/framework/fake_mirsurface.h	2015-12-04 13:04:35 +0000
@@ -36,11 +36,8 @@
         TouchEvent(Qt::KeyboardModifiers mods,
                 const QList<QTouchEvent::TouchPoint> &points,
                 Qt::TouchPointStates states,
-                ulong timestamp)
-            : keyboardModifiers(mods)
-            , touchPoints(points)
-            , states(states)
-            , timestamp(timestamp) {}
+                ulong timestamp);
+        virtual ~TouchEvent();
 
         Qt::KeyboardModifiers keyboardModifiers;
         QList<QTouchEvent::TouchPoint> touchPoints;
@@ -48,167 +45,89 @@
         ulong timestamp;
     };
 
-
-    FakeMirSurface(QObject *parent = nullptr)
-        : MirSurfaceInterface(parent)
-        , m_isFirstFrameDrawn(false)
-        , m_isFrameDropperRunning(true)
-        , m_live(true)
-        , m_state(Mir::RestoredState)
-        , m_orientationAngle(Mir::Angle0)
-        , m_visible(true)
-        , m_focused(false)
-    {}
+    FakeMirSurface(QObject *parent = nullptr);
+    virtual ~FakeMirSurface();
 
     ////
     // unity.shell.application.MirSurfaceInterface
-    Mir::Type type() const override { return Mir::NormalType; }
-
-    QString name() const override { return QString("Fake MirSurface"); }
-
-    QSize size() const override { return m_size; }
-
-    void resize(int width, int height) override {
-        if (m_size.width() != width || m_size.height() != height) {
-            m_size.setWidth(width);
-            m_size.setHeight(height);
-            Q_EMIT sizeChanged(m_size);
-        }
-    }
-    void resize(const QSize &size) override { resize(size.width(), size.height()); }
-
-    Mir::State state() const override { return m_state; }
-    void setState(Mir::State qmlState) override {
-        if (qmlState != m_state) {
-            m_state = qmlState;
-            Q_EMIT stateChanged(m_state);
-        }
-    }
-
-    bool live() const override { return m_live; }
-
-    bool visible() const override { return m_visible; }
-
-    Mir::OrientationAngle orientationAngle() const override { return m_orientationAngle; }
-    void setOrientationAngle(Mir::OrientationAngle angle) override {
-        if (m_orientationAngle != angle) {
-            m_orientationAngle = angle;
-            Q_EMIT orientationAngleChanged(m_orientationAngle);
-        }
-    }
+    Mir::Type type() const override;
+    QString name() const override;
+    QSize size() const override;
+    void resize(int width, int height) override;
+    void resize(const QSize &size) override;
+    Mir::State state() const override;
+    void setState(Mir::State qmlState) override;
+    bool live() const override;
+    bool visible() const override;
+    Mir::OrientationAngle orientationAngle() const override;
+    void setOrientationAngle(Mir::OrientationAngle angle) override;
 
     ////
     // qtmir.MirSurfaceInterface
 
-    bool isFirstFrameDrawn() const override {
-        return m_isFirstFrameDrawn;
-    }
-
-    void stopFrameDropper() override {
-        m_isFrameDropperRunning = false;
-    }
-    void startFrameDropper() override {
-        m_isFrameDropperRunning = true;
-    }
-
-    void setLive(bool value) override {
-        if (m_live != value) {
-            m_live = value;
-            Q_EMIT liveChanged(m_live);
-        }
-    }
-
-    void setViewVisibility(qintptr viewId, bool visible) override {
-        if (!m_views.contains(viewId)) return;
-
-        m_views[viewId] = visible;
-        updateVisibility();
-    }
-
-    bool isBeingDisplayed() const override { return !m_views.isEmpty(); }
-
-    void registerView(qintptr viewId) override {
-        m_views.insert(viewId, false);
-        if (m_views.count() == 1) {
-            Q_EMIT isBeingDisplayedChanged();
-        }
-    }
-
-    void unregisterView(qintptr viewId) override {
-        m_views.remove(viewId);
-        if (m_views.count() == 0) {
-            Q_EMIT isBeingDisplayedChanged();
-        }
-        updateVisibility();
-    }
+    bool isFirstFrameDrawn() const override;
+    void stopFrameDropper() override;
+    void startFrameDropper() override;
+    void setLive(bool value) override;
+    void setViewVisibility(qintptr viewId, bool visible) override;
+    bool isBeingDisplayed() const override;
+    void registerView(qintptr viewId) override;
+    void unregisterView(qintptr viewId) override;
+
+    void consumeBuffer() override {}
 
     // methods called from the rendering (scene graph) thread:
-    QSharedPointer<QSGTexture> texture() override { return QSharedPointer<QSGTexture>(); }
-    QSGTexture *weakTexture() const override { return nullptr; }
-    bool updateTexture() override { return true; }
-    unsigned int currentFrameNumber() const override { return 0; }
-    bool numBuffersReadyForCompositor() override { return 0; }
+    QSharedPointer<QSGTexture> texture() override;
+    QSGTexture *weakTexture() const override;
+    bool updateTexture() override;
+    unsigned int currentFrameNumber() const override;
+    bool numBuffersReadyForCompositor() override;
     // end of methods called from the rendering (scene graph) thread
 
-    void setFocus(bool focus) override { m_focused = focus; }
-
-    void mousePressEvent(QMouseEvent *) override {}
-    void mouseMoveEvent(QMouseEvent *) override {}
-    void mouseReleaseEvent(QMouseEvent *) override {}
-    void hoverEnterEvent(QHoverEvent *) override {}
-    void hoverLeaveEvent(QHoverEvent *) override {}
-    void hoverMoveEvent(QHoverEvent *) override {}
-    void wheelEvent(QWheelEvent *) override {}
-
-    void keyPressEvent(QKeyEvent *) override {}
-    void keyReleaseEvent(QKeyEvent *) override {}
+    void setFocus(bool focus) override;
+
+    void mousePressEvent(QMouseEvent *) override;
+    void mouseMoveEvent(QMouseEvent *) override;
+    void mouseReleaseEvent(QMouseEvent *) override;
+    void hoverEnterEvent(QHoverEvent *) override;
+    void hoverLeaveEvent(QHoverEvent *) override;
+    void hoverMoveEvent(QHoverEvent *) override;
+    void wheelEvent(QWheelEvent *) override;
+    void keyPressEvent(QKeyEvent *) override;
+    void keyReleaseEvent(QKeyEvent *) override;
 
     void touchEvent(Qt::KeyboardModifiers mods,
             const QList<QTouchEvent::TouchPoint> &points,
             Qt::TouchPointStates states,
-            ulong timestamp) override {
-        m_touchesReceived.append(TouchEvent(mods, points, states, timestamp));
+            ulong timestamp) override;
+
+    QString appId() const override;
+
+    void close() override {
+        Q_EMIT closeRequested();
     }
 
-    QString appId() const override { return "foo-app"; }
+Q_SIGNALS:
+    void closeRequested();
 
     QCursor cursor() const override { return QCursor(); }
 
 public Q_SLOTS:
-    void onCompositorSwappedBuffers() override {}
+    void onCompositorSwappedBuffers() override;
 
     ////
     // Test API from now on
 
 public:
 
-    void drawFirstFrame() {
-        if (!m_isFirstFrameDrawn) {
-            m_isFirstFrameDrawn = true;
-            Q_EMIT firstFrameDrawn();
-        }
-    }
-
-    bool isFrameDropperRunning() const {
-        return m_isFrameDropperRunning;
-    }
-
-    QList<TouchEvent> &touchesReceived() { return m_touchesReceived; }
+    void drawFirstFrame();
+
+    bool isFrameDropperRunning() const;
+
+    QList<TouchEvent> &touchesReceived();
 
 private:
-    void updateVisibility() {
-        bool newVisible = false;
-        QHashIterator<int, bool> i(m_views);
-        while (i.hasNext()) {
-            i.next();
-            newVisible |= i.value();
-        }
-
-        if (m_visible != newVisible) {
-            m_visible = newVisible;
-            Q_EMIT visibleChanged(newVisible);
-        }
-    }
+    void updateVisibility();
 
 
     bool m_isFirstFrameDrawn;

=== added file 'tests/framework/fake_session.cpp'
--- tests/framework/fake_session.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/fake_session.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,113 @@
+/*
+ * 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/>.
+ */
+
+#include "fake_session.h"
+
+namespace qtmir
+{
+
+FakeSession::FakeSession()
+    : SessionInterface(0)
+    , m_application(nullptr)
+    , m_state(Starting)
+{
+}
+
+FakeSession::~FakeSession()
+{
+}
+
+void FakeSession::release() {}
+
+QString FakeSession::name() const { return QString("foo-session"); }
+
+unity::shell::application::ApplicationInfoInterface *FakeSession::application() const { return m_application; }
+
+MirSurfaceInterface *FakeSession::surface() const { return nullptr; }
+
+SessionInterface *FakeSession::parentSession() const { return nullptr; }
+
+SessionModel *FakeSession::childSessions() const { return nullptr; }
+
+SessionInterface::State FakeSession::state() const { return m_state; }
+
+bool FakeSession::fullscreen() const { return false; }
+
+bool FakeSession::live() const { return true; }
+
+std::shared_ptr<mir::scene::Session> FakeSession::session() const { return nullptr; }
+
+void FakeSession::setSurface(MirSurfaceInterface *) {}
+
+void FakeSession::setApplication(unity::shell::application::ApplicationInfoInterface *app)
+{
+    if (m_application != app) {
+        m_application = app;
+        Q_EMIT applicationChanged(m_application);
+    }
+}
+
+void FakeSession::suspend()
+{
+    if (m_state == Running) {
+        setState(Suspending);
+    }
+}
+
+void FakeSession::resume()
+{
+    if (m_state == Suspending || m_state == Suspended) {
+        setState(Running);
+    }
+}
+
+void FakeSession::stop()
+{
+    setState(Stopped);
+}
+
+void FakeSession::addChildSession(SessionInterface *) {}
+
+void FakeSession::insertChildSession(uint, SessionInterface *) {}
+
+void FakeSession::removeChildSession(SessionInterface *) {}
+
+void FakeSession::foreachChildSession(std::function<void (SessionInterface *)>) const {}
+
+std::shared_ptr<mir::scene::PromptSession> FakeSession::activePromptSession() const
+{
+    return std::shared_ptr<mir::scene::PromptSession>();
+}
+
+void FakeSession::foreachPromptSession(std::function<void (const std::shared_ptr<mir::scene::PromptSession> &)>) const {}
+
+void FakeSession::setFullscreen(bool) {}
+
+void FakeSession::setLive(const bool) {}
+
+void FakeSession::appendPromptSession(const std::shared_ptr<mir::scene::PromptSession> &) {}
+
+void FakeSession::removePromptSession(const std::shared_ptr<mir::scene::PromptSession> &) {}
+
+void FakeSession::setState(SessionInterface::State state)
+{
+    if (m_state != state) {
+        m_state = state;
+        Q_EMIT stateChanged(m_state);
+    }
+}
+
+} // namespace qtmir

=== modified file 'tests/framework/fake_session.h'
--- tests/modules/common/fake_session.h	2015-10-20 09:57:17 +0000
+++ tests/framework/fake_session.h	2015-12-04 13:04:35 +0000
@@ -15,6 +15,7 @@
  */
 
 #include <Unity/Application/session_interface.h>
+#include <QDebug>
 
 #ifndef QTMIR_FAKE_SESSION_H
 #define QTMIR_FAKE_SESSION_H
@@ -26,78 +27,55 @@
     Q_OBJECT
 
 public:
-    FakeSession()
-        : SessionInterface(0)
-        , m_application(nullptr)
-        , m_state(Starting)
-    {
-    }
+    FakeSession();
+    virtual ~FakeSession();
 
     // For QML use
-    void release() override {}
-
-    QString name() const override { return QString("foo-session"); }
-    unity::shell::application::ApplicationInfoInterface* application() const override { return m_application; }
-    MirSurfaceInterface* surface() const override { return nullptr; }
-    SessionInterface* parentSession() const override { return nullptr; }
-    SessionModel* childSessions() const override { return nullptr; }
-    State state() const override { return m_state; }
-    bool fullscreen() const override { return false; }
-    bool live() const override { return true; }
-
-    std::shared_ptr<mir::scene::Session> session() const override { return nullptr; }
+    void release() override;
+
+    QString name() const override;
+    unity::shell::application::ApplicationInfoInterface* application() const override;
+    MirSurfaceInterface* surface() const override;
+    SessionInterface* parentSession() const override;
+    SessionModel* childSessions() const override;
+    State state() const override;
+    bool fullscreen() const override;
+    bool live() const override;
+
+    std::shared_ptr<mir::scene::Session> session() const override;
 
     // For MirSurfaceItem and MirSurfaceManager use
 
-    void setSurface(MirSurfaceInterface*) override {}
+    void setSurface(MirSurfaceInterface*) override;
 
     // For Application use
 
-    void setApplication(unity::shell::application::ApplicationInfoInterface* app) override {
-        if (m_application != app) {
-            m_application = app;
-            Q_EMIT applicationChanged(m_application);
-        }
-    }
-    void suspend() override {
-        if (m_state == Running) {
-            setState(Suspending);
-        }
-    }
-    void resume() override {
-        if (m_state == Suspending || m_state == Suspended) {
-            setState(Running);
-        }
-    }
-    void stop() override {
-        setState(Stopped);
+    void setApplication(unity::shell::application::ApplicationInfoInterface* app) override;
+    void suspend() override;
+    void resume() override;
+    void stop() override;
+
+    void close() override {
     }
 
     // For SessionManager use
 
-    void addChildSession(SessionInterface*) override {}
-    void insertChildSession(uint, SessionInterface*) override {}
-    void removeChildSession(SessionInterface*) override {}
-    void foreachChildSession(std::function<void(SessionInterface* session)>) const override {}
-
-    std::shared_ptr<mir::scene::PromptSession> activePromptSession() const override {
-        return std::shared_ptr<mir::scene::PromptSession>();
-    }
-    void foreachPromptSession(std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)>) const override {}
-
-    void setFullscreen(bool) override {}
-    void setLive(const bool) override {}
-    void appendPromptSession(const std::shared_ptr<mir::scene::PromptSession>&) override {}
-    void removePromptSession(const std::shared_ptr<mir::scene::PromptSession>&) override {}
+    void addChildSession(SessionInterface*) override;
+    void insertChildSession(uint, SessionInterface*) override;
+    void removeChildSession(SessionInterface*) override;
+    void foreachChildSession(std::function<void(SessionInterface* session)>) const override;
+
+    std::shared_ptr<mir::scene::PromptSession> activePromptSession() const override;
+    void foreachPromptSession(std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)>) const override;
+
+    void setFullscreen(bool) override;
+    void setLive(const bool) override;
+    void appendPromptSession(const std::shared_ptr<mir::scene::PromptSession>&) override;
+    void removePromptSession(const std::shared_ptr<mir::scene::PromptSession>&) override;
 
     // For tests
 
-    void setState(State state) {
-        if (m_state != state) {
-            m_state = state;
-            Q_EMIT stateChanged(m_state);
-        }
-    }
+    void setState(State state);
 
 private:
     unity::shell::application::ApplicationInfoInterface* m_application;

=== renamed file 'tests/common/gmock_fixes.h' => 'tests/framework/gmock_fixes.h'
=== added file 'tests/framework/mock_application_controller.cpp'
--- tests/framework/mock_application_controller.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_application_controller.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,129 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_application_controller.h"
+
+namespace qtmir
+{
+
+MockApplicationController::MockApplicationController()
+{
+    using namespace ::testing;
+    ON_CALL(*this, primaryPidForAppId(_))
+            .WillByDefault(
+                Invoke(this, &MockApplicationController::doPrimaryPidForAppId));
+
+    ON_CALL(*this, appIdHasProcessId(_, _))
+            .WillByDefault(
+                Invoke(this, &MockApplicationController::doAppIdHasProcessId));
+
+    ON_CALL(*this, findDesktopFileForAppId(_))
+            .WillByDefault(
+                Invoke(this, &MockApplicationController::doFindDesktopFileForAppId));
+
+    ON_CALL(*this, stopApplicationWithAppId(_))
+            .WillByDefault(
+                Invoke(this, &MockApplicationController::doStopApplicationWithAppId));
+
+    ON_CALL(*this, startApplicationWithAppIdAndArgs(_, _))
+            .WillByDefault(
+                Invoke(this, &MockApplicationController::doStartApplicationWithAppIdAndArgs));
+
+    ON_CALL(*this, pauseApplicationWithAppId(_))
+            .WillByDefault(
+                Invoke(this, &MockApplicationController::doPauseApplicationWithAppId));
+
+    ON_CALL(*this, resumeApplicationWithAppId(_))
+            .WillByDefault(
+                Invoke(this, &MockApplicationController::doResumeApplicationWithAppId));
+}
+
+MockApplicationController::~MockApplicationController()
+{
+
+}
+
+pid_t MockApplicationController::doPrimaryPidForAppId(const QString &appId)
+{
+    auto it = children.find(appId);
+    if (it == children.end())
+        return -1;
+
+    return it->pid();
+}
+
+
+bool MockApplicationController::doAppIdHasProcessId(pid_t pid, const QString &appId)
+{
+    auto it = children.find(appId);
+    if (it == children.end())
+        return -1;
+
+    return it->pid() == pid;
+}
+
+
+QFileInfo MockApplicationController::doFindDesktopFileForAppId(const QString &appId) const
+{
+    QString path = QString("/usr/share/applications/%1.desktop").arg(appId);
+    return QFileInfo(path);
+}
+
+
+bool MockApplicationController::doStopApplicationWithAppId(const QString &appId)
+{
+    Q_UNUSED(appId);
+
+    return false;
+}
+
+
+bool MockApplicationController::doStartApplicationWithAppIdAndArgs(const QString &appId, const QStringList &args)
+{
+    Q_UNUSED(args);
+
+    auto child = core::posix::fork([]()
+    {
+        while (true);
+
+        return core::posix::exit::Status::success;
+    }, core::posix::StandardStream::empty);
+
+    if (child.pid() > 0)
+    {
+        children.insert(appId, child);
+        return true;
+    }
+
+    return false;
+}
+
+
+bool MockApplicationController::doPauseApplicationWithAppId(const QString &appId)
+{
+    Q_UNUSED(appId);
+
+    return false;
+}
+
+bool MockApplicationController::doResumeApplicationWithAppId(const QString &appId)
+{
+    Q_UNUSED(appId);
+
+    return false;
+}
+
+} // namespace qtmir

=== modified file 'tests/framework/mock_application_controller.h'
--- tests/modules/common/mock_application_controller.h	2015-08-11 12:08:32 +0000
+++ tests/framework/mock_application_controller.h	2015-12-04 13:04:35 +0000
@@ -18,15 +18,19 @@
 #define MOCK_APPLICATION_CONTROLLER_H
 
 #include <Unity/Application/applicationcontroller.h>
+#include <QMap>
 
 #include <core/posix/fork.h>
 
 #include <gmock/gmock.h>
 
-namespace testing
+namespace qtmir
 {
 struct MockApplicationController : public qtmir::ApplicationController
 {
+    MockApplicationController();
+    virtual ~MockApplicationController();
+
     MOCK_METHOD1(primaryPidForAppId, pid_t(const QString& appId));
     MOCK_METHOD2(appIdHasProcessId, bool(pid_t, const QString&));
     MOCK_CONST_METHOD1(findDesktopFileForAppId, QFileInfo(const QString &appId));
@@ -36,105 +40,24 @@
     MOCK_METHOD1(pauseApplicationWithAppId, bool(const QString&));
     MOCK_METHOD1(resumeApplicationWithAppId, bool(const QString&));
 
-    MockApplicationController()
-    {
-        using namespace ::testing;
-        ON_CALL(*this, primaryPidForAppId(_))
-                .WillByDefault(
-                    Invoke(this, &MockApplicationController::doPrimaryPidForAppId));
-
-        ON_CALL(*this, appIdHasProcessId(_, _))
-                .WillByDefault(
-                    Invoke(this, &MockApplicationController::doAppIdHasProcessId));
-
-        ON_CALL(*this, findDesktopFileForAppId(_))
-                .WillByDefault(
-                    Invoke(this, &MockApplicationController::doFindDesktopFileForAppId));
-
-        ON_CALL(*this, stopApplicationWithAppId(_))
-                .WillByDefault(
-                    Invoke(this, &MockApplicationController::doStopApplicationWithAppId));
-
-        ON_CALL(*this, startApplicationWithAppIdAndArgs(_, _))
-                .WillByDefault(
-                    Invoke(this, &MockApplicationController::doStartApplicationWithAppIdAndArgs));
-
-        ON_CALL(*this, pauseApplicationWithAppId(_))
-                .WillByDefault(
-                    Invoke(this, &MockApplicationController::doPauseApplicationWithAppId));
-
-        ON_CALL(*this, resumeApplicationWithAppId(_))
-                .WillByDefault(
-                    Invoke(this, &MockApplicationController::doResumeApplicationWithAppId));
-    }
-
-    pid_t doPrimaryPidForAppId(const QString& appId)
-    {
-        auto it = children.find(appId);
-        if (it == children.end())
-            return -1;
-
-        return it->pid();
-    }
-
-    bool doAppIdHasProcessId(pid_t pid, const QString& appId)
-    {
-        auto it = children.find(appId);
-        if (it == children.end())
-            return -1;
-
-        return it->pid() == pid;
-    }
-
-    QFileInfo doFindDesktopFileForAppId(const QString& appId) const
-    {
-        QString path = QString("/usr/share/applications/%1.desktop").arg(appId);
-        return QFileInfo(path);
-    }
-
-    bool doStopApplicationWithAppId(const QString& appId)
-    {
-        Q_UNUSED(appId);
-
-        return false;
-    }
-
-    bool doStartApplicationWithAppIdAndArgs(const QString& appId, const QStringList& args)
-    {
-        Q_UNUSED(args);
-
-        auto child = core::posix::fork([]()
-        {
-            while (true);
-
-            return core::posix::exit::Status::success;
-        }, core::posix::StandardStream::empty);
-
-        if (child.pid() > 0)
-        {
-            children.insert(appId, child);
-            return true;
-        }
-
-        return false;
-    }
-
-    bool doPauseApplicationWithAppId(const QString& appId)
-    {
-        Q_UNUSED(appId);
-
-        return false;
-    }
-
-    bool doResumeApplicationWithAppId(const QString& appId)
-    {
-        Q_UNUSED(appId);
-
-        return false;
-    }
-
+    pid_t doPrimaryPidForAppId(const QString& appId);
+
+    bool doAppIdHasProcessId(pid_t pid, const QString& appId);
+
+    QFileInfo doFindDesktopFileForAppId(const QString& appId) const;
+
+    bool doStopApplicationWithAppId(const QString& appId);
+
+    bool doStartApplicationWithAppIdAndArgs(const QString& appId, const QStringList& args);
+
+    bool doPauseApplicationWithAppId(const QString& appId);
+
+    bool doResumeApplicationWithAppId(const QString& appId);
+
+private:
     QMap<QString, core::posix::ChildProcess> children;
 };
-} // namespace testing
+
+} // namespace qtmir
 
 #endif // MOCK_APPLICATION_CONTROLLER_H

=== added file 'tests/framework/mock_desktop_file_reader.cpp'
--- tests/framework/mock_desktop_file_reader.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_desktop_file_reader.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,117 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_desktop_file_reader.h"
+
+namespace qtmir
+{
+
+MockDesktopFileReader::MockDesktopFileReader(const QString &appId, const QFileInfo &fileInfo)
+    : DesktopFileReader(appId, fileInfo)
+{
+    using namespace ::testing;
+
+    ON_CALL(*this, file()).WillByDefault(Invoke(this, &MockDesktopFileReader::doFile));
+    ON_CALL(*this, appId()).WillByDefault(Invoke(this, &MockDesktopFileReader::doAppId));
+    ON_CALL(*this, name()).WillByDefault(Invoke(this, &MockDesktopFileReader::doName));
+    ON_CALL(*this, comment()).WillByDefault(Invoke(this, &MockDesktopFileReader::doComment));
+    ON_CALL(*this, icon()).WillByDefault(Invoke(this, &MockDesktopFileReader::doIcon));
+    ON_CALL(*this, exec()).WillByDefault(Invoke(this, &MockDesktopFileReader::doExec));
+    ON_CALL(*this, path()).WillByDefault(Invoke(this, &MockDesktopFileReader::doPath));
+    ON_CALL(*this, stageHint()).WillByDefault(Invoke(this, &MockDesktopFileReader::doStageHint));
+    ON_CALL(*this, isTouchApp()).WillByDefault(Invoke(this, &MockDesktopFileReader::doIsTouchApp));
+    ON_CALL(*this, loaded()).WillByDefault(Invoke(this, &MockDesktopFileReader::doLoaded));
+}
+
+MockDesktopFileReader::~MockDesktopFileReader()
+{
+}
+
+QString MockDesktopFileReader::doFile() const
+{
+    return DesktopFileReader::file();
+}
+
+QString MockDesktopFileReader::doAppId() const
+{
+    return DesktopFileReader::appId();
+}
+
+QString MockDesktopFileReader::doName() const
+{
+    return DesktopFileReader::name();
+}
+
+QString MockDesktopFileReader::doComment() const
+{
+    return DesktopFileReader::comment();
+}
+
+QString MockDesktopFileReader::doIcon() const
+{
+    return DesktopFileReader::icon();
+}
+
+QString MockDesktopFileReader::doExec() const
+{
+    return DesktopFileReader::exec();
+}
+
+QString MockDesktopFileReader::doPath() const
+{
+    return DesktopFileReader::path();
+}
+
+QString MockDesktopFileReader::doStageHint() const
+{
+    return DesktopFileReader::stageHint();
+}
+
+bool MockDesktopFileReader::doIsTouchApp() const
+{
+    return DesktopFileReader::isTouchApp();
+}
+
+bool MockDesktopFileReader::doLoaded() const
+{
+    return DesktopFileReader::loaded();
+}
+
+
+MockDesktopFileReaderFactory::MockDesktopFileReaderFactory()
+{
+    using namespace ::testing;
+    ON_CALL(*this, createInstance(_, _))
+            .WillByDefault(
+                Invoke(
+                    this,
+                    &MockDesktopFileReaderFactory::doCreateInstance));
+}
+
+MockDesktopFileReaderFactory::~MockDesktopFileReaderFactory()
+{
+}
+
+qtmir::DesktopFileReader *MockDesktopFileReaderFactory::doCreateInstance(const QString &appId, const QFileInfo &fi)
+{
+    using namespace ::testing;
+    auto instance = new NiceMock<MockDesktopFileReader>(appId, fi);
+    ON_CALL(*instance, loaded()).WillByDefault(Return(true));
+
+    return instance;
+}
+
+} // namespace qtmir

=== modified file 'tests/framework/mock_desktop_file_reader.h'
--- tests/modules/common/mock_desktop_file_reader.h	2015-09-29 18:27:27 +0000
+++ tests/framework/mock_desktop_file_reader.h	2015-12-04 13:04:35 +0000
@@ -21,26 +21,13 @@
 
 #include <gmock/gmock.h>
 
-namespace testing
+namespace qtmir
 {
+
 struct MockDesktopFileReader : public qtmir::DesktopFileReader
 {
-    MockDesktopFileReader(const QString &appId, const QFileInfo& fileInfo)
-        : DesktopFileReader(appId, fileInfo)
-    {
-        using namespace ::testing;
-
-        ON_CALL(*this, file()).WillByDefault(Invoke(this, &MockDesktopFileReader::doFile));
-        ON_CALL(*this, appId()).WillByDefault(Invoke(this, &MockDesktopFileReader::doAppId));
-        ON_CALL(*this, name()).WillByDefault(Invoke(this, &MockDesktopFileReader::doName));
-        ON_CALL(*this, comment()).WillByDefault(Invoke(this, &MockDesktopFileReader::doComment));
-        ON_CALL(*this, icon()).WillByDefault(Invoke(this, &MockDesktopFileReader::doIcon));
-        ON_CALL(*this, exec()).WillByDefault(Invoke(this, &MockDesktopFileReader::doExec));
-        ON_CALL(*this, path()).WillByDefault(Invoke(this, &MockDesktopFileReader::doPath));
-        ON_CALL(*this, stageHint()).WillByDefault(Invoke(this, &MockDesktopFileReader::doStageHint));
-        ON_CALL(*this, isTouchApp()).WillByDefault(Invoke(this, &MockDesktopFileReader::doIsTouchApp));
-        ON_CALL(*this, loaded()).WillByDefault(Invoke(this, &MockDesktopFileReader::doLoaded));
-    }
+    MockDesktopFileReader(const QString &appId, const QFileInfo& fileInfo);
+    virtual ~MockDesktopFileReader();
 
     MOCK_CONST_METHOD0(file, QString());
     MOCK_CONST_METHOD0(appId, QString ());
@@ -53,80 +40,28 @@
     MOCK_CONST_METHOD0(isTouchApp, bool());
     MOCK_CONST_METHOD0(loaded, bool());
 
-    QString doFile() const
-    {
-        return DesktopFileReader::file();
-    }
-
-    QString doAppId() const
-    {
-        return DesktopFileReader::appId();
-    }
-
-    QString doName() const
-    {
-        return DesktopFileReader::name();
-    }
-
-    QString doComment() const
-    {
-        return DesktopFileReader::comment();
-    }
-
-    QString doIcon() const
-    {
-        return DesktopFileReader::icon();
-    }
-
-    QString doExec() const
-    {
-        return DesktopFileReader::exec();
-    }
-
-    QString doPath() const
-    {
-        return DesktopFileReader::path();
-    }
-
-    QString doStageHint() const
-    {
-        return DesktopFileReader::stageHint();
-    }
-
-    bool doIsTouchApp() const
-    {
-        return DesktopFileReader::isTouchApp();
-    }
-
-    bool doLoaded() const
-    {
-        return DesktopFileReader::loaded();
-    }
+    QString doFile() const;
+    QString doAppId() const;
+    QString doName() const;
+    QString doComment() const;
+    QString doIcon() const;
+    QString doExec() const;
+    QString doPath() const;
+    QString doStageHint() const;
+    bool doIsTouchApp() const;
+    bool doLoaded() const;
 };
 
 struct MockDesktopFileReaderFactory : public qtmir::DesktopFileReader::Factory
 {
-    MockDesktopFileReaderFactory()
-    {
-        using namespace ::testing;
-        ON_CALL(*this, createInstance(_, _))
-                .WillByDefault(
-                    Invoke(
-                        this,
-                        &MockDesktopFileReaderFactory::doCreateInstance));
-    }
-
-    virtual qtmir::DesktopFileReader* doCreateInstance(const QString &appId, const QFileInfo &fi)
-    {
-        using namespace ::testing;
-        auto instance = new NiceMock<MockDesktopFileReader>(appId, fi);
-        ON_CALL(*instance, loaded()).WillByDefault(Return(true));
-
-        return instance;
-    }
+    MockDesktopFileReaderFactory();
+    virtual ~MockDesktopFileReaderFactory();
+
+    virtual qtmir::DesktopFileReader* doCreateInstance(const QString &appId, const QFileInfo &fi);
 
     MOCK_METHOD2(createInstance, qtmir::DesktopFileReader*(const QString &appId, const QFileInfo &fi));
 };
-}
+
+} // namespace qtmir
 
 #endif // MOCK_DESKTOP_FILE_READER_H

=== added file 'tests/framework/mock_display.cpp'
--- tests/framework/mock_display.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_display.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,35 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_display.h"
+#include <mir/graphics/event_handler_register.h>
+#include <mir/graphics/display_configuration.h>
+
+MockDisplaySyncGroup::MockDisplaySyncGroup()
+{
+}
+
+MockDisplaySyncGroup::~MockDisplaySyncGroup()
+{
+}
+
+MockDisplay::MockDisplay()
+{
+}
+
+MockDisplay::~MockDisplay()
+{
+}

=== renamed file 'tests/common/mock_display.h' => 'tests/framework/mock_display.h'
--- tests/common/mock_display.h	2015-08-20 10:16:54 +0000
+++ tests/framework/mock_display.h	2015-12-04 13:04:35 +0000
@@ -26,6 +26,9 @@
 class MockDisplaySyncGroup : public mir::graphics::DisplaySyncGroup
 {
 public:
+    MockDisplaySyncGroup();
+    virtual ~MockDisplaySyncGroup();
+
     MOCK_METHOD1(for_each_display_buffer, void(std::function<void(mir::graphics::DisplayBuffer&)> const& f));
     MOCK_METHOD0(post, void());
 };
@@ -33,6 +36,9 @@
 struct MockDisplay : public mir::graphics::Display
 {
 public:
+    MockDisplay();
+    virtual ~MockDisplay();
+
     MOCK_METHOD1(for_each_display_sync_group, void(std::function<void(mir::graphics::DisplaySyncGroup&)> const&));
     MOCK_CONST_METHOD0(configuration, std::unique_ptr<mir::graphics::DisplayConfiguration>());
     MOCK_METHOD1(configure, void(mir::graphics::DisplayConfiguration const&));
@@ -48,6 +54,4 @@
     MOCK_METHOD0(create_gl_context, std::unique_ptr<mir::graphics::GLContext>());
 };
 
-
-
 #endif // MOCKDISPLAY_H

=== added file 'tests/framework/mock_display_configuration.cpp'
--- tests/framework/mock_display_configuration.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_display_configuration.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,25 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_display_configuration.h"
+
+MockDisplayConfiguration::MockDisplayConfiguration()
+{
+}
+
+MockDisplayConfiguration::~MockDisplayConfiguration()
+{
+}

=== renamed file 'tests/common/mock_display_configuration.h' => 'tests/framework/mock_display_configuration.h'
--- tests/common/mock_display_configuration.h	2015-08-20 10:16:54 +0000
+++ tests/framework/mock_display_configuration.h	2015-12-04 13:04:35 +0000
@@ -25,6 +25,9 @@
 class MockDisplayConfiguration : public mir::graphics::DisplayConfiguration
 {
 public:
+	MockDisplayConfiguration();
+	virtual ~MockDisplayConfiguration();
+
     MOCK_CONST_METHOD1(for_each_card, void(std::function<void(mir::graphics::DisplayConfigurationCard const&)>));
 
     MOCK_CONST_METHOD1(for_each_output, void(std::function<void(mir::graphics::DisplayConfigurationOutput const&)>));
@@ -32,4 +35,5 @@
 
     MOCK_CONST_METHOD0(valid, bool());
 };
+
 #endif // MOCK_DISPLAY_CONFIGURATION_H

=== added file 'tests/framework/mock_gl_display_buffer.cpp'
--- tests/framework/mock_gl_display_buffer.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_gl_display_buffer.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_gl_display_buffer.h"
+
+MockGLDisplayBuffer::MockGLDisplayBuffer()
+{
+    using namespace testing;
+    ON_CALL(*this, view_area())
+        .WillByDefault(Return(mir::geometry::Rectangle{{0,0},{0,0}}));
+    ON_CALL(*this, native_display_buffer())
+        .WillByDefault(Return(dynamic_cast<mir::graphics::NativeDisplayBuffer*>(this)));
+}
+
+MockGLDisplayBuffer::~MockGLDisplayBuffer()
+{
+}

=== renamed file 'tests/common/mock_gl_display_buffer.h' => 'tests/framework/mock_gl_display_buffer.h'
--- tests/common/mock_gl_display_buffer.h	2015-10-14 23:14:48 +0000
+++ tests/framework/mock_gl_display_buffer.h	2015-12-04 13:04:35 +0000
@@ -27,14 +27,9 @@
                             public mir::graphics::NativeDisplayBuffer
 {
 public:
-    MockGLDisplayBuffer()
-    {
-        using namespace testing;
-        ON_CALL(*this, view_area())
-            .WillByDefault(Return(mir::geometry::Rectangle{{0,0},{0,0}}));
-        ON_CALL(*this, native_display_buffer())
-            .WillByDefault(Return(dynamic_cast<mir::graphics::NativeDisplayBuffer*>(this)));
-    }
+    MockGLDisplayBuffer();
+    virtual ~MockGLDisplayBuffer();
+
     MOCK_CONST_METHOD0(view_area, mir::geometry::Rectangle());
     MOCK_METHOD1(post_renderables_if_optimizable, bool(mir::graphics::RenderableList const&));
     MOCK_CONST_METHOD0(orientation, MirOrientation());
@@ -45,5 +40,4 @@
     MOCK_METHOD0(swap_buffers, void());
 };
 
-
 #endif // MOCK_GL_DISPLAY_BUFFER_H

=== added file 'tests/framework/mock_main_loop.cpp'
--- tests/framework/mock_main_loop.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_main_loop.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,28 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_main_loop.h"
+
+MockMainLoop::MockMainLoop()
+{
+}
+
+MockMainLoop::~MockMainLoop()
+{
+}
+
+void MockMainLoop::run() {}
+void MockMainLoop::stop() {}
\ No newline at end of file

=== renamed file 'tests/common/mock_main_loop.h' => 'tests/framework/mock_main_loop.h'
--- tests/common/mock_main_loop.h	2015-08-20 10:16:54 +0000
+++ tests/framework/mock_main_loop.h	2015-12-04 13:04:35 +0000
@@ -17,19 +17,17 @@
 #ifndef MOCKMAINLOOP_H
 #define MOCKMAINLOOP_H
 
-#include <gmock/gmock.h>
-
 #include <mir/main_loop.h>
-
-#include <memory>
+#include "gmock_fixes.h"
 
 class MockMainLoop : public mir::MainLoop
 {
 public:
-    ~MockMainLoop() noexcept {}
+    MockMainLoop();
+    ~MockMainLoop() noexcept;
 
-    void run() override {}
-    void stop() override {}
+    void run() override;
+    void stop() override;
 
     MOCK_METHOD2(register_signal_handler,
                  void(std::initializer_list<int>,
@@ -49,5 +47,4 @@
     MOCK_METHOD1(create_alarm, std::unique_ptr<mir::time::Alarm>(std::shared_ptr<mir::LockableCallback> const& callback));
 };
 
-
 #endif // MOCKMAINLOOP_H

=== added file 'tests/framework/mock_mir_session.cpp'
--- tests/framework/mock_mir_session.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_mir_session.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_mir_session.h"
+
+namespace mir
+{
+namespace scene
+{
+
+MockSession::MockSession()
+{
+}
+
+MockSession::MockSession(const std::string &sessionName, pid_t processId)
+    : m_sessionName(sessionName), m_sessionId(processId)
+{
+}
+
+MockSession::~MockSession()
+{
+}
+
+std::string MockSession::name() const
+{
+    return m_sessionName;
+}
+
+pid_t MockSession::process_id() const
+{
+    return m_sessionId;
+}
+
+void MockSession::resume_prompt_session() {}
+
+void MockSession::suspend_prompt_session() {}
+
+void MockSession::stop_prompt_session() {}
+
+void MockSession::start_prompt_session() {}
+
+std::shared_ptr<scene::Surface> MockSession::surface_after(const std::shared_ptr<scene::Surface> &) const
+{
+    return {};
+}
+
+void MockSession::configure_streams(scene::Surface &, const std::vector<mir::shell::StreamSpecification> &) {}
+
+} // namespace scene
+} // namespace mir

=== modified file 'tests/framework/mock_mir_session.h'
--- tests/modules/common/mock_mir_session.h	2015-10-07 14:38:44 +0000
+++ tests/framework/mock_mir_session.h	2015-12-04 13:04:35 +0000
@@ -29,20 +29,13 @@
 
 struct MockSession : public Session
 {
-    MockSession() {}
-    MockSession(std::string const& sessionName, pid_t processId)
-        : m_sessionName(sessionName), m_sessionId(processId)
-    {}
-
-    std::string name() const override
-    {
-        return m_sessionName;
-    }
-
-    pid_t process_id() const override
-    {
-        return m_sessionId;
-    }
+    MockSession();
+    MockSession(std::string const& sessionName, pid_t processId);
+    virtual ~MockSession();
+
+    std::string name() const override;
+
+    pid_t process_id() const override;
 
     MOCK_METHOD0(force_requests_to_complete, void());
 
@@ -62,16 +55,16 @@
     MOCK_METHOD1(send_display_config, void(graphics::DisplayConfiguration const&));
     MOCK_METHOD3(configure_surface, int(frontend::SurfaceId, MirSurfaceAttrib, int));
 
-    void start_prompt_session() override {};
-    void stop_prompt_session() override {};
-    void suspend_prompt_session() override {};
-    void resume_prompt_session() override {};
-    std::shared_ptr<Surface> surface_after(std::shared_ptr<Surface> const&) const override { return {}; }
+    void start_prompt_session() override;
+    void stop_prompt_session() override;
+    void suspend_prompt_session() override;
+    void resume_prompt_session() override;
+    std::shared_ptr<Surface> surface_after(std::shared_ptr<Surface> const&) const override;
 
     MOCK_CONST_METHOD1(get_buffer_stream, std::shared_ptr<frontend::BufferStream>(frontend::BufferStreamId));
     MOCK_METHOD1(destroy_buffer_stream, void(frontend::BufferStreamId));
     MOCK_METHOD1(create_buffer_stream, frontend::BufferStreamId(graphics::BufferProperties const&));
-    void configure_streams(Surface&, std::vector<shell::StreamSpecification> const&) override {};
+    void configure_streams(Surface&, std::vector<shell::StreamSpecification> const&) override;;
 
 private:
     std::string m_sessionName;

=== added file 'tests/framework/mock_proc_info.cpp'
--- tests/framework/mock_proc_info.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_proc_info.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,35 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_proc_info.h"
+
+namespace qtmir
+{
+
+MockProcInfo::MockProcInfo()
+{
+}
+
+MockProcInfo::~MockProcInfo()
+{
+}
+
+std::unique_ptr<qtmir::ProcInfo::CommandLine> MockProcInfo::commandLine(pid_t pid)
+{
+    return std::unique_ptr<CommandLine>(new CommandLine{command_line(pid)});
+}
+
+} // namespace qtmir

=== modified file 'tests/framework/mock_proc_info.h'
--- tests/modules/common/mock_proc_info.h	2015-10-08 11:20:30 +0000
+++ tests/framework/mock_proc_info.h	2015-12-04 13:04:35 +0000
@@ -21,16 +21,17 @@
 
 #include <gmock/gmock.h>
 
-namespace testing
-{
+namespace qtmir {
+
 struct MockProcInfo : public qtmir::ProcInfo
 {
+    MockProcInfo();
+    virtual ~MockProcInfo();
+
     MOCK_METHOD1(command_line, QByteArray(pid_t));
-    std::unique_ptr<CommandLine> commandLine(pid_t pid)
-    {
-      return std::unique_ptr<CommandLine>(new CommandLine{command_line(pid)});
-    }
+    std::unique_ptr<CommandLine> commandLine(pid_t pid);
 };
-}
+
+} // namespace qtmir
 
 #endif // MOCK_PROC_INFO_H

=== added file 'tests/framework/mock_prompt_session.cpp'
--- tests/framework/mock_prompt_session.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_prompt_session.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,33 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_prompt_session.h"
+
+namespace mir
+{
+namespace scene
+{
+
+MockPromptSession::MockPromptSession()
+{
+}
+
+MockPromptSession::~MockPromptSession()
+{
+}
+
+} // namespace scene
+} // namespace mir

=== modified file 'tests/framework/mock_prompt_session.h'
--- tests/modules/common/mock_prompt_session.h	2015-08-11 12:08:32 +0000
+++ tests/framework/mock_prompt_session.h	2015-12-04 13:04:35 +0000
@@ -26,6 +26,9 @@
 struct MockPromptSession : public PromptSession
 {
 public:
+    MockPromptSession();
+    virtual ~MockPromptSession();
+
     MOCK_METHOD1(start, void(std::shared_ptr<Session> const&));
     MOCK_METHOD1(stop, void(std::shared_ptr<Session> const&));
     MOCK_METHOD1(suspend, void(std::shared_ptr<Session> const&));

=== added file 'tests/framework/mock_prompt_session_manager.cpp'
--- tests/framework/mock_prompt_session_manager.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_prompt_session_manager.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,33 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_prompt_session_manager.h"
+
+namespace mir
+{
+namespace scene
+{
+
+MockPromptSessionManager::MockPromptSessionManager()
+{
+}
+
+MockPromptSessionManager::~MockPromptSessionManager()
+{
+}
+
+} // namespace scene
+} // namespace mir

=== modified file 'tests/framework/mock_prompt_session_manager.h'
--- tests/modules/common/mock_prompt_session_manager.h	2015-08-11 12:08:32 +0000
+++ tests/framework/mock_prompt_session_manager.h	2015-12-04 13:04:35 +0000
@@ -28,6 +28,9 @@
 class MockPromptSessionManager: public PromptSessionManager
 {
 public:
+    MockPromptSessionManager();
+    virtual ~MockPromptSessionManager();
+
     MOCK_CONST_METHOD2(start_prompt_session_for, std::shared_ptr<PromptSession>(std::shared_ptr<mir::scene::Session> const&,
         mir::scene::PromptSessionCreationParameters const&));
 

=== added file 'tests/framework/mock_renderable.cpp'
--- tests/framework/mock_renderable.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_renderable.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,33 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_renderable.h"
+
+namespace mir
+{
+namespace graphics
+{
+
+MockRenderable::MockRenderable()
+{
+}
+
+MockRenderable::~MockRenderable()
+{
+}
+
+} // namespace graphics
+} // namespace mir

=== modified file 'tests/framework/mock_renderable.h'
--- tests/modules/common/mock_renderable.h	2015-08-11 12:08:32 +0000
+++ tests/framework/mock_renderable.h	2015-12-04 13:04:35 +0000
@@ -25,7 +25,8 @@
 
 struct MockRenderable : public Renderable
 {
-    MockRenderable() {};
+    MockRenderable();
+    virtual ~MockRenderable();
 
     MOCK_CONST_METHOD0(id, ID());
     MOCK_CONST_METHOD0(buffer, std::shared_ptr<Buffer>());

=== added file 'tests/framework/mock_session.cpp'
--- tests/framework/mock_session.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_session.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,69 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_session.h"
+
+namespace qtmir
+{
+
+MockSession::MockSession()
+    : SessionInterface(0)
+{
+    m_state = Starting;
+    ON_CALL(*this, suspend()).WillByDefault(::testing::Invoke(this, &MockSession::doSuspend));
+    ON_CALL(*this, resume()).WillByDefault(::testing::Invoke(this, &MockSession::doResume));
+    ON_CALL(*this, stop()).WillByDefault(::testing::Invoke(this, &MockSession::doStop));
+    ON_CALL(*this, state()).WillByDefault(::testing::Invoke(this, &MockSession::doState));
+}
+
+MockSession::~MockSession()
+{
+
+}
+
+SessionInterface::State MockSession::doState() const
+{
+    return m_state;
+}
+
+void MockSession::doStop()
+{
+    setState(Stopped);
+}
+
+void MockSession::doResume()
+{
+    if (m_state == Suspending || m_state == Suspended) {
+        setState(Running);
+    }
+}
+
+void MockSession::doSuspend()
+{
+    if (m_state == Running) {
+        setState(Suspending);
+    }
+}
+
+void MockSession::setState(SessionInterface::State state)
+{
+    if (m_state != state) {
+        m_state = state;
+        Q_EMIT stateChanged(m_state);
+    }
+}
+
+} // namespace qtmir

=== modified file 'tests/framework/mock_session.h'
--- tests/modules/common/mock_session.h	2015-08-31 09:51:28 +0000
+++ tests/framework/mock_session.h	2015-12-04 13:04:35 +0000
@@ -24,13 +24,8 @@
 
 class MockSession : public SessionInterface {
 public:
-    MockSession() : SessionInterface(0) {
-        m_state = Starting;
-        ON_CALL(*this, suspend()).WillByDefault(::testing::Invoke(this, &MockSession::doSuspend));
-        ON_CALL(*this, resume()).WillByDefault(::testing::Invoke(this, &MockSession::doResume));
-        ON_CALL(*this, stop()).WillByDefault(::testing::Invoke(this, &MockSession::doStop));
-        ON_CALL(*this, state()).WillByDefault(::testing::Invoke(this, &MockSession::doState));
-    }
+    MockSession();
+    virtual ~MockSession();
 
     MOCK_METHOD0(release, void());
 
@@ -49,6 +44,7 @@
 
     MOCK_METHOD0(suspend, void());
     MOCK_METHOD0(resume, void());
+    MOCK_METHOD0(close, void());
     MOCK_METHOD0(stop, void());
 
     MOCK_METHOD1(addChildSession, void(SessionInterface* session));
@@ -63,29 +59,12 @@
 
     MOCK_CONST_METHOD0(childSessions, SessionModel*());
 
-    void setState(State state) {
-        if (m_state != state) {
-            m_state = state;
-            Q_EMIT stateChanged(m_state);
-        }
-    }
+    void setState(State state);
 
-    void doSuspend() {
-        if (m_state == Running) {
-            setState(Suspending);
-        }
-    }
-    void doResume() {
-        if (m_state == Suspending || m_state == Suspended) {
-            setState(Running);
-        }
-    }
-    void doStop() {
-        setState(Stopped);
-    }
-    State doState() const {
-        return m_state;
-    }
+    void doSuspend();
+    void doResume();
+    void doStop();
+    State doState() const;
 
 protected:
     MOCK_METHOD1(setFullscreen, void(bool fullscreen));
@@ -94,7 +73,6 @@
     MOCK_METHOD1(removePromptSession, void(const std::shared_ptr<mir::scene::PromptSession>& session));
 
 private:
-
     State m_state;
 };
 

=== added file 'tests/framework/mock_settings.cpp'
--- tests/framework/mock_settings.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_settings.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,40 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_settings.h"
+
+namespace qtmir
+{
+
+MockSettings::MockSettings()
+{
+    using namespace ::testing;
+
+    QVariantList lifecycleExemptAppIds;
+    lifecycleExemptAppIds << "com.ubuntu.music";
+    ON_CALL(*this, get(_))
+            .WillByDefault(
+                Return(lifecycleExemptAppIds));
+
+}
+
+MockSettings::~MockSettings()
+{
+
+}
+
+} // namespace qtmir
+

=== modified file 'tests/framework/mock_settings.h'
--- tests/modules/common/mock_settings.h	2015-03-24 23:38:33 +0000
+++ tests/framework/mock_settings.h	2015-12-04 13:04:35 +0000
@@ -18,24 +18,20 @@
 #define MOCK_SETTINGS_H
 
 #include <Unity/Application/settings_interface.h>
-
+#include <QVariant>
+ 
 #include <gmock/gmock.h>
 
-namespace testing
+namespace qtmir
 {
 struct MockSettings : public qtmir::SettingsInterface
 {
-    MockSettings()
-    {
-        QVariantList lifecycleExemptAppIds;
-        lifecycleExemptAppIds << "com.ubuntu.music";
-        ON_CALL(*this, get(_))
-                .WillByDefault(
-                    Return(lifecycleExemptAppIds));
+    MockSettings();
+    virtual ~MockSettings();
 
-    }
     MOCK_CONST_METHOD1(get, QVariant(const QString &));
 };
 
-} // namespace testing
+} // namespace qtmir
+
 #endif // MOCK_SETTINGS_H

=== added file 'tests/framework/mock_shared_wakelock.cpp'
--- tests/framework/mock_shared_wakelock.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_shared_wakelock.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,61 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_shared_wakelock.h"
+
+namespace qtmir
+{
+
+MockSharedWakelock::MockSharedWakelock(const QDBusConnection &)
+{
+    using namespace ::testing;
+
+    ON_CALL(*this, enabled()).WillByDefault(Invoke(this, &MockSharedWakelock::doEnabled));
+    ON_CALL(*this, acquire(_)).WillByDefault(Invoke(this, &MockSharedWakelock::doAcquire));
+    ON_CALL(*this, release(_)).WillByDefault(Invoke(this, &MockSharedWakelock::doRelease));
+}
+
+MockSharedWakelock::~MockSharedWakelock()
+{
+}
+
+void MockSharedWakelock::doRelease(const QObject *object)
+{
+    if (!m_owners.remove(object)) {
+        return;
+    }
+    if (m_owners.isEmpty()) {
+        Q_EMIT enabledChanged(false);
+    }
+}
+
+void MockSharedWakelock::doAcquire(const QObject *object)
+{
+    if (m_owners.contains(object)) {
+        return;
+    }
+    m_owners.insert(object);
+    if (m_owners.size() == 1) {
+        Q_EMIT enabledChanged(true);
+    }
+}
+
+bool MockSharedWakelock::doEnabled()
+{
+    return !m_owners.isEmpty();
+}
+
+} // namespace qtmir

=== modified file 'tests/framework/mock_shared_wakelock.h'
--- tests/modules/common/mock_shared_wakelock.h	2015-03-05 09:36:02 +0000
+++ tests/framework/mock_shared_wakelock.h	2015-12-04 13:04:35 +0000
@@ -21,51 +21,26 @@
 
 #include <gmock/gmock.h>
 
-namespace testing
+namespace qtmir
 {
 class MockSharedWakelock : public qtmir::SharedWakelock
 {
 public:
-    MockSharedWakelock(const QDBusConnection& /*connection*/= QDBusConnection::systemBus())
-    {
-        ON_CALL(*this, enabled()).WillByDefault(Invoke(this, &MockSharedWakelock::doEnabled));
-        ON_CALL(*this, acquire(_)).WillByDefault(Invoke(this, &MockSharedWakelock::doAcquire));
-        ON_CALL(*this, release(_)).WillByDefault(Invoke(this, &MockSharedWakelock::doRelease));
-    }
+    MockSharedWakelock(const QDBusConnection& /*connection*/= QDBusConnection::systemBus());
+    virtual ~MockSharedWakelock();
 
     MOCK_CONST_METHOD0(enabled, bool());
     MOCK_METHOD1(acquire, void(const QObject *));
     MOCK_METHOD1(release, void(const QObject *));
 
-    bool doEnabled()
-    {
-        return !m_owners.isEmpty();
-    }
-
-    void doAcquire(const QObject *object)
-    {
-        if (m_owners.contains(object)) {
-            return;
-        }
-        m_owners.insert(object);
-        if (m_owners.size() == 1) {
-            Q_EMIT enabledChanged(true);
-        }
-    }
-
-    void doRelease(const QObject *object)
-    {
-        if (!m_owners.remove(object)) {
-            return;
-        }
-        if (m_owners.isEmpty()) {
-            Q_EMIT enabledChanged(false);
-        }
-    }
+    bool doEnabled();
+    void doAcquire(const QObject *object);
+    void doRelease(const QObject *object);
 
 private:
     QSet<const QObject *> m_owners;
 };
 
-} // namespace testing
+} // namespace qtmir
+
 #endif // MOCK_SHARED_WAKELOCK_H

=== added file 'tests/framework/mock_surface.cpp'
--- tests/framework/mock_surface.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/mock_surface.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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/>.
+ */
+
+#include "mock_surface.h"
+
+namespace mir
+{
+namespace scene
+{
+
+MockSurface::MockSurface()
+{
+}
+
+MockSurface::~MockSurface()
+{
+}
+
+void MockSurface::rename(const std::string &) {}
+
+void MockSurface::set_keymap(const xkb_rule_names &) {}
+
+void MockSurface::consume(const MirEvent &event) { consume(&event); }
+
+} // namespace scene
+} // namespace mir

=== modified file 'tests/framework/mock_surface.h'
--- tests/modules/common/mock_surface.h	2015-08-11 12:08:32 +0000
+++ tests/framework/mock_surface.h	2015-12-04 13:04:35 +0000
@@ -28,7 +28,8 @@
 
 struct MockSurface : public mir::scene::Surface
 {
-    MockSurface() {}
+    MockSurface();
+    virtual ~MockSurface();
 
     MOCK_CONST_METHOD0(name, std::string());
     MOCK_CONST_METHOD0(client_size, geometry::Size());
@@ -62,15 +63,15 @@
     MOCK_METHOD1(set_reception_mode, void(input::InputReceptionMode mode));
     MOCK_METHOD0(request_client_surface_close, void());
     MOCK_CONST_METHOD1(buffers_ready_for_compositor, int(void const*));
-    void set_keymap(xkb_rule_names const &) override {}
-    void rename(std::string const&) override {}
+    void set_keymap(xkb_rule_names const &) override;
+    void rename(std::string const&) override;
     MOCK_METHOD1(set_streams, void(std::list<StreamInfo> const&));
 
     // from mir::input::surface
     MOCK_CONST_METHOD1(input_area_contains, bool(geometry::Point const& point));
     MOCK_CONST_METHOD0(reception_mode, input::InputReceptionMode());
     MOCK_METHOD1(consume, void(MirEvent const* event));
-    void consume(MirEvent const& event) override { consume(&event); }
+    void consume(MirEvent const& event) override;
 
     // from mir::frontend::surface
     MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());

=== modified file 'tests/framework/qtmir_test.cpp'
--- tests/modules/common/qtmir_test.cpp	2015-10-01 16:48:38 +0000
+++ tests/framework/qtmir_test.cpp	2015-12-04 13:04:35 +0000
@@ -18,7 +18,8 @@
 
 namespace qtmir {
 
-void PrintTo(const Application::InternalState& state, ::std::ostream* os) {
+void PrintTo(const Application::InternalState& state, ::std::ostream* os)
+{
     switch (state) {
     case Application::InternalState::Starting:
         *os << "Starting";
@@ -71,4 +72,100 @@
     }
 }
 
+// Initialization of mir::Server needed for by tests
+class TestMirServerInit : public virtual mir::Server
+{
+public:
+    TestMirServerInit(std::shared_ptr<StubPromptSessionManager> const& promptSessionManager)
+        : mock_prompt_session_manager(promptSessionManager)
+    {
+        override_the_prompt_session_manager(
+            [this]{ return the_mock_prompt_session_manager(); });
+    }
+
+    std::shared_ptr<mir::scene::MockPromptSessionManager> the_mock_prompt_session_manager()
+    {
+        return mock_prompt_session_manager;
+    }
+
+private:
+    std::shared_ptr<StubPromptSessionManager> const mock_prompt_session_manager;
+};
+
+
+namespace {  char const* argv[] = { nullptr }; }
+
+class FakeMirServer: private TestMirServerInit, public MirServer
+{
+public:
+    FakeMirServer(std::shared_ptr<StubPromptSessionManager> const& promptSessionManager)
+    : TestMirServerInit(promptSessionManager), MirServer(0, argv, QSharedPointer<ScreenController>())
+    {
+    }
+
+    using TestMirServerInit::the_mock_prompt_session_manager;
+};
+
 } // namespace qtmir
+
+namespace testing
+{
+
+QtMirTest::QtMirTest()
+    : promptSessionManager(std::make_shared<StubPromptSessionManager>())
+    , mirServer(QSharedPointer<MirServer>(new FakeMirServer(promptSessionManager)))
+    , taskController(QSharedPointer<TaskController>(
+                        new TaskController(
+                            nullptr,
+                            QSharedPointer<ApplicationController>(&appController, [](ApplicationController*){}))))
+    , applicationManager(mirServer,
+                         taskController,
+                         QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
+                         QSharedPointer<DesktopFileReader::Factory>(&desktopFileReaderFactory,[](DesktopFileReader::Factory*){}),
+                         QSharedPointer<ProcInfo>(&procInfo,[](ProcInfo *){}),
+                         QSharedPointer<MockSettings>(&settings,[](MockSettings *){}))
+    , sessionManager(mirServer, &applicationManager)
+    , surfaceManager(mirServer, mirShell, &sessionManager)
+{
+}
+
+QtMirTest::~QtMirTest()
+{
+
+}
+
+Application *QtMirTest::startApplication(pid_t procId, const QString &appId)
+{
+    using namespace testing;
+
+    ON_CALL(appController,appIdHasProcessId(procId, appId)).WillByDefault(Return(true));
+
+    // Set up Mocks & signal watcher
+    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
+    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
+    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
+
+    EXPECT_CALL(desktopFileReaderFactory, createInstance(appId, _))
+        .Times(1)
+        .WillOnce(Return(mockDesktopFileReader));
+
+    EXPECT_CALL(appController, startApplicationWithAppIdAndArgs(appId, _))
+        .Times(1)
+        .WillOnce(Return(true));
+
+    auto application = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
+    applicationManager.onProcessStarting(appId);
+
+    bool authed = false;
+    applicationManager.authorizeSession(procId, authed);
+    EXPECT_EQ(authed, true);
+
+    auto appSession = std::make_shared<mir::scene::MockSession>(appId.toStdString(), procId);
+    sessionManager.onSessionStarting(appSession);
+
+    Mock::VerifyAndClearExpectations(&appController);
+    Mock::VerifyAndClearExpectations(&desktopFileReaderFactory);
+    return application;
+}
+
+} // namespace testing

=== modified file 'tests/framework/qtmir_test.h'
--- tests/modules/common/qtmir_test.h	2015-11-19 12:56:02 +0000
+++ tests/framework/qtmir_test.h	2015-12-04 13:04:35 +0000
@@ -46,45 +46,12 @@
 
 namespace qtmir {
 
+typedef testing::NiceMock<mir::scene::MockPromptSessionManager> StubPromptSessionManager;
+
 // For better output in ASSERT_* and EXPECT_* error messages
 void PrintTo(const Application::InternalState& state, ::std::ostream* os);
 void PrintTo(const SessionInterface::State& state, ::std::ostream* os);
 
-// Initialization of mir::Server needed for by tests
-class TestMirServerInit : public virtual mir::Server
-{
-public:
-    TestMirServerInit()
-    {
-        override_the_prompt_session_manager(
-            [this]{ return the_mock_prompt_session_manager(); });
-    }
-
-    std::shared_ptr<mir::scene::MockPromptSessionManager> the_mock_prompt_session_manager()
-    {
-        return mock_prompt_session_manager;
-    }
-
-private:
-    typedef testing::NiceMock<mir::scene::MockPromptSessionManager> StubPromptSessionManager;
-    std::shared_ptr<StubPromptSessionManager> const mock_prompt_session_manager
-        {std::make_shared<StubPromptSessionManager>()};
-};
-
-
-namespace {  char const* argv[] = { nullptr }; }
-
-class FakeMirServer: private TestMirServerInit, public MirServer
-{
-public:
-    FakeMirServer()
-    : MirServer(0, argv, QSharedPointer<ScreenController>())
-    {
-    }
-
-    using TestMirServerInit::the_mock_prompt_session_manager;
-};
-
 } // namespace qtmir
 
 namespace testing {
@@ -92,77 +59,18 @@
 class QtMirTest : public ::testing::Test
 {
 public:
-    QtMirTest()
-        : mirServer{
-            QSharedPointer<FakeMirServer> (new FakeMirServer)
-        }
-        , taskController{
-              QSharedPointer<TaskController> (
-                  new TaskController(
-                      nullptr,
-                      QSharedPointer<ApplicationController>(
-                          &appController,
-                          [](ApplicationController*){})
-                  )
-              )
-        }
-        , applicationManager{
-            mirServer,
-            taskController,
-            QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
-            QSharedPointer<DesktopFileReader::Factory>(
-                &desktopFileReaderFactory,
-                [](DesktopFileReader::Factory*){}),
-            QSharedPointer<ProcInfo>(&procInfo,[](ProcInfo *){}),
-            QSharedPointer<MockSettings>(&settings,[](MockSettings *){})
-        }
-        , sessionManager{
-            mirServer,
-            &applicationManager,
-        }
-        , surfaceManager{
-            mirServer,
-            mirShell,
-            &sessionManager
-        }
-    {
-    }
-
-    Application* startApplication(pid_t procId, QString const& appId)
-    {
-        using namespace testing;
-
-        ON_CALL(appController,appIdHasProcessId(procId, appId)).WillByDefault(Return(true));
-
-        // Set up Mocks & signal watcher
-        auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-        ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-        ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-        ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
-        EXPECT_CALL(appController, startApplicationWithAppIdAndArgs(appId, _))
-                .Times(1)
-                .WillOnce(Return(true));
-
-        auto application = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
-        applicationManager.onProcessStarting(appId);
-
-        bool authed = false;
-        applicationManager.authorizeSession(procId, authed);
-        EXPECT_EQ(authed, true);
-
-        auto appSession = std::make_shared<mir::scene::MockSession>(appId.toStdString(), procId);
-        sessionManager.onSessionStarting(appSession);
-        return application;
-    }
-
-    testing::NiceMock<testing::MockApplicationController> appController;
-    testing::NiceMock<testing::MockProcInfo> procInfo;
-    testing::NiceMock<testing::MockDesktopFileReaderFactory> desktopFileReaderFactory;
-    testing::NiceMock<testing::MockSharedWakelock> sharedWakelock;
-    testing::NiceMock<testing::MockSettings> settings;
-    QSharedPointer<FakeMirServer> mirServer;
+    QtMirTest();
+    virtual ~QtMirTest();
+
+    Application* startApplication(pid_t procId, QString const& appId);
+
+    testing::NiceMock<MockApplicationController> appController;
+    testing::NiceMock<MockProcInfo> procInfo;
+    testing::NiceMock<MockDesktopFileReaderFactory> desktopFileReaderFactory;
+    testing::NiceMock<MockSharedWakelock> sharedWakelock;
+    testing::NiceMock<MockSettings> settings;
+    std::shared_ptr<StubPromptSessionManager> promptSessionManager;
+    QSharedPointer<MirServer> mirServer;
     MirShell *mirShell{nullptr};
     QSharedPointer<TaskController> taskController;
     ApplicationManager applicationManager;

=== added file 'tests/framework/stub_input_channel.cpp'
--- tests/framework/stub_input_channel.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/stub_input_channel.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,52 @@
+/*
+ * 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/>.
+ */
+
+#include "stub_input_channel.h"
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+StubInputChannel::StubInputChannel(int fd)
+    : input_fd(fd)
+{
+}
+
+StubInputChannel::StubInputChannel()
+    : StubInputChannel(0)
+{
+}
+
+StubInputChannel::~StubInputChannel()
+{
+}
+
+int StubInputChannel::client_fd() const
+{
+    return input_fd;
+}
+
+int StubInputChannel::server_fd() const
+{
+    return input_fd;
+}
+
+} // namespace doubles
+} // namespace test
+} // namespace mir

=== modified file 'tests/framework/stub_input_channel.h'
--- tests/modules/common/stub_input_channel.h	2015-08-11 12:08:32 +0000
+++ tests/framework/stub_input_channel.h	2015-12-04 13:04:35 +0000
@@ -28,24 +28,14 @@
 
 struct StubInputChannel : public input::InputChannel
 {
-    StubInputChannel(int fd)
-      : input_fd(fd)
-    {
-    }
-
-    StubInputChannel()
-     : StubInputChannel(0)
-    {
-    }
-
-    int client_fd() const override
-    {
-        return input_fd;
-    }
-    int server_fd() const override
-    {
-        return input_fd;
-    }
+    StubInputChannel(int fd);
+
+    StubInputChannel();
+
+    virtual ~StubInputChannel();
+
+    int client_fd() const override;
+    int server_fd() const override;
     int input_fd;
 };
 

=== added file 'tests/framework/stub_scene_surface.cpp'
--- tests/framework/stub_scene_surface.cpp	1970-01-01 00:00:00 +0000
+++ tests/framework/stub_scene_surface.cpp	2015-12-04 13:04:35 +0000
@@ -0,0 +1,103 @@
+/*
+ * 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/>.
+ */
+
+#include "stub_scene_surface.h"
+
+namespace mir
+{
+namespace test
+{
+namespace doubles
+{
+
+StubSceneSurface::StubSceneSurface(int fd)
+    : channel(std::make_shared<StubInputChannel>(fd)), fd(fd)
+{
+}
+
+StubSceneSurface::~StubSceneSurface()
+{
+}
+
+std::shared_ptr<mir::input::InputChannel> StubSceneSurface::input_channel() const
+{
+    return channel;
+}
+
+mir::input::InputReceptionMode StubSceneSurface::reception_mode() const
+{
+    return input_mode;
+}
+
+std::string StubSceneSurface::name() const { return {}; }
+
+mir::geometry::Point StubSceneSurface::top_left() const { return {}; }
+
+mir::geometry::Size StubSceneSurface::client_size() const { return {};}
+
+mir::geometry::Size StubSceneSurface::size() const { return {}; }
+
+mir::geometry::Rectangle StubSceneSurface::input_bounds() const { return {{},{}}; }
+
+bool StubSceneSurface::input_area_contains(mir::geometry::Point const&) const { return false; }
+
+mir::graphics::RenderableList StubSceneSurface::generate_renderables(mir::compositor::CompositorID) const { return {};}
+
+float StubSceneSurface::alpha() const { return 0.0f; }
+
+MirSurfaceType StubSceneSurface::type() const { return mir_surface_type_normal; }
+
+MirSurfaceState StubSceneSurface::state() const { return mir_surface_state_unknown; }
+
+void StubSceneSurface::hide() {}
+
+void StubSceneSurface::show() {}
+
+void StubSceneSurface::move_to(const mir::geometry::Point &) {}
+
+void StubSceneSurface::set_input_region(const std::vector<mir::geometry::Rectangle> &) {}
+
+void StubSceneSurface::resize(const mir::geometry::Size &) {}
+
+void StubSceneSurface::set_transformation(const glm::mat4 &) {}
+
+void StubSceneSurface::set_alpha(float) {}
+
+void StubSceneSurface::set_orientation(MirOrientation) {}
+
+void StubSceneSurface::add_observer(const std::shared_ptr<mir::scene::SurfaceObserver> &) {}
+
+void StubSceneSurface::remove_observer(const std::weak_ptr<mir::scene::SurfaceObserver> &) {}
+
+void StubSceneSurface::set_reception_mode(mir::input::InputReceptionMode mode) { input_mode = mode; }
+
+void StubSceneSurface::consume(const MirEvent &) {}
+
+void StubSceneSurface::set_cursor_image(const std::shared_ptr<mir::graphics::CursorImage> &) {}
+
+std::shared_ptr<mir::graphics::CursorImage> StubSceneSurface::cursor_image() const { return {}; }
+
+bool StubSceneSurface::supports_input() const { return true; }
+
+int StubSceneSurface::client_input_fd() const { return fd;}
+
+int StubSceneSurface::configure(MirSurfaceAttrib, int) { return 0; }
+
+int StubSceneSurface::query(MirSurfaceAttrib) const { return 0; }
+
+} // namespace doubles
+} // namespace test
+} // namespace mir

=== modified file 'tests/framework/stub_scene_surface.h'
--- tests/modules/common/stub_scene_surface.h	2015-09-30 09:27:52 +0000
+++ tests/framework/stub_scene_surface.h	2015-12-04 13:04:35 +0000
@@ -38,55 +38,47 @@
     int fd;
     mir::input::InputReceptionMode input_mode{mir::input::InputReceptionMode::normal};
 
-    StubSceneSurface(int fd)
-        : channel(std::make_shared<StubInputChannel>(fd)), fd(fd)
-    {
-    }
-
-    std::shared_ptr<mir::input::InputChannel> input_channel() const override
-    {
-        return channel;
-    }
-
-    mir::input::InputReceptionMode reception_mode() const override
-    {
-        return input_mode;
-    }
-
-    std::string name() const override { return {}; }
-    geometry::Point top_left() const override { return {}; }
-    geometry::Size client_size() const override { return {};}
-    geometry::Size size() const override { return {}; }
-    geometry::Rectangle input_bounds() const override { return {{},{}}; }
-    bool input_area_contains(mir::geometry::Point const&) const override { return false; }
-
-    graphics::RenderableList generate_renderables(compositor::CompositorID) const override { return {};}
-    float alpha() const override { return 0.0f;}
-    MirSurfaceType type() const override { return mir_surface_type_normal; }
-    MirSurfaceState state() const override { return mir_surface_state_unknown; }
-
-    void hide() override {}
-    void show() override {}
-    void move_to(geometry::Point const&) override {}
-    void set_input_region(std::vector<geometry::Rectangle> const&) override {}
-    void resize(geometry::Size const&) override {}
-    void set_transformation(glm::mat4 const&) override {}
-    void set_alpha(float) override {}
-    void set_orientation(MirOrientation) override {}
-
-    void add_observer(std::shared_ptr<scene::SurfaceObserver> const&) override {}
-    void remove_observer(std::weak_ptr<scene::SurfaceObserver> const&) override {}
-
-    void set_reception_mode(input::InputReceptionMode mode) override { input_mode = mode; }
-    void consume(MirEvent const&) override {}
-
-    void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& /* image */) override {}
-    std::shared_ptr<graphics::CursorImage> cursor_image() const override { return {}; }
-
-    bool supports_input() const override { return true;}
-    int client_input_fd() const override { return fd;}
-    int configure(MirSurfaceAttrib, int) override { return 0; }
-    int query(MirSurfaceAttrib) const override { return 0; }
+    StubSceneSurface(int fd);
+    virtual ~StubSceneSurface();
+
+    std::shared_ptr<mir::input::InputChannel> input_channel() const override;
+
+    mir::input::InputReceptionMode reception_mode() const override;
+
+    std::string name() const override;
+    geometry::Point top_left() const override;
+    geometry::Size client_size() const override;
+    geometry::Size size() const override;
+    geometry::Rectangle input_bounds() const override;
+    bool input_area_contains(mir::geometry::Point const&) const override;
+
+    graphics::RenderableList generate_renderables(compositor::CompositorID) const override;
+    float alpha() const override;
+    MirSurfaceType type() const override;
+    MirSurfaceState state() const override;
+
+    void hide() override;
+    void show() override;
+    void move_to(geometry::Point const&) override;
+    void set_input_region(std::vector<geometry::Rectangle> const&) override;
+    void resize(geometry::Size const&) override;
+    void set_transformation(glm::mat4 const&) override;
+    void set_alpha(float) override;
+    void set_orientation(MirOrientation) override;
+
+    void add_observer(std::shared_ptr<scene::SurfaceObserver> const&) override;
+    void remove_observer(std::weak_ptr<scene::SurfaceObserver> const&) override;
+
+    void set_reception_mode(input::InputReceptionMode mode) override;
+    void consume(MirEvent const&) override;
+
+    void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& /* image */) override;
+    std::shared_ptr<graphics::CursorImage> cursor_image() const override;
+
+    bool supports_input() const override;
+    int client_input_fd() const override;
+    int configure(MirSurfaceAttrib, int) override;
+    int query(MirSurfaceAttrib) const override;
 };
 
 }

=== modified file 'tests/mirserver/Screen/CMakeLists.txt'
--- tests/mirserver/Screen/CMakeLists.txt	2015-08-20 10:16:54 +0000
+++ tests/mirserver/Screen/CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -5,7 +5,7 @@
 )
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/tests/common
+  ${CMAKE_SOURCE_DIR}/tests/framework
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/src/common
   ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

=== modified file 'tests/mirserver/ScreenController/CMakeLists.txt'
--- tests/mirserver/ScreenController/CMakeLists.txt	2015-10-14 22:59:04 +0000
+++ tests/mirserver/ScreenController/CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -8,7 +8,7 @@
 )
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/tests/common
+  ${CMAKE_SOURCE_DIR}/tests/framework
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/src/common
   ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
@@ -22,6 +22,9 @@
   ScreenControllerTest
   qpa-mirserver
 
+  -L${CMAKE_BINARY_DIR}/tests/framework
+  qtmir-test-framework-static
+
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARIES}
 )

=== modified file 'tests/modules/Application/CMakeLists.txt'
--- tests/modules/Application/CMakeLists.txt	2015-08-19 20:17:56 +0000
+++ tests/modules/Application/CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -1,27 +1,33 @@
 set(
   APPLICATION_TEST_SOURCES
   application_test.cpp
-  ${CMAKE_SOURCE_DIR}/tests/modules/common/fake_session.h
-  ${CMAKE_SOURCE_DIR}/tests/modules/common/qtmir_test.cpp
 )
 
 include_directories(
-  ${APPLICATION_API_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/src/modules
-  ${CMAKE_SOURCE_DIR}/tests/modules/common
+  ${CMAKE_SOURCE_DIR}/tests/framework
   ${MIRSERVER_INCLUDE_DIRS}
+
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5GUI_INCLUDE_DIRS}
+  ${Qt5Quick_INCLUDE_DIRS}
+  ${Qt5DBus_INCLUDE_DIRS}
 )
 
 add_executable(application_test ${APPLICATION_TEST_SOURCES})
 
+add_dependencies(application_test qtmir-test-framework-static)
+
 target_link_libraries(
   application_test
 
+  Qt5::Test
+  
   unityapplicationplugin
-  qpa-mirserver
 
-  Qt5::Test
+  -L${CMAKE_BINARY_DIR}/tests/framework
+  qtmir-test-framework-static
 
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARIES}

=== modified file 'tests/modules/ApplicationManager/CMakeLists.txt'
--- tests/modules/ApplicationManager/CMakeLists.txt	2015-08-31 09:51:28 +0000
+++ tests/modules/ApplicationManager/CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -2,27 +2,29 @@
   APPLICATION_MANAGER_TEST_SOURCES
   application_manager_test.cpp
   ${CMAKE_SOURCE_DIR}/src/common/debughelpers.cpp
-  ${CMAKE_SOURCE_DIR}/tests/modules/common/qtmir_test.cpp
-  ../common/fake_mirsurface.h
 )
 
 include_directories(
   ${APPLICATION_API_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/src/modules
-  ${CMAKE_SOURCE_DIR}/tests/modules/common
+  ${CMAKE_SOURCE_DIR}/tests/framework
   ${MIRSERVER_INCLUDE_DIRS}
 )
 
 add_executable(applicationmanager_test ${APPLICATION_MANAGER_TEST_SOURCES})
 
+add_dependencies(applicationmanager_test qtmir-test-framework-static)
+
 target_link_libraries(
   applicationmanager_test
 
-  qpa-mirserver
+  Qt5::Test
+  
   unityapplicationplugin
 
-  Qt5::Test
+  -L${CMAKE_BINARY_DIR}/tests/framework
+  qtmir-test-framework-static
 
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARIES}

=== modified file 'tests/modules/ApplicationManager/application_manager_test.cpp'
--- tests/modules/ApplicationManager/application_manager_test.cpp	2015-11-17 14:16:22 +0000
+++ tests/modules/ApplicationManager/application_manager_test.cpp	2015-12-04 13:04:35 +0000
@@ -1870,3 +1870,158 @@
     EXPECT_EQ(0, applicationManager.count());
     EXPECT_TRUE(dir.exists());
 }
+
+/*
+ * Test that there is an attempt at polite exiting of the app by requesting closure of the surface.
+ */
+TEST_F(ApplicationManagerTests,requestSurfaceCloseOnStop)
+{
+    using namespace ::testing;
+
+    const QString appId("testAppId");
+    quint64 procId = 5551;
+    Application* app = startApplication(procId, appId);
+    std::shared_ptr<mir::scene::Session> session = app->session()->session();
+
+    FakeMirSurface *surface = new FakeMirSurface;
+    onSessionCreatedSurface(session.get(), surface);
+    surface->drawFirstFrame();
+
+    QSignalSpy spy(surface, SIGNAL(closeRequested()));
+
+    // Stop app
+    applicationManager.stopApplication(appId);
+
+    EXPECT_EQ(1, spy.count());
+}
+
+
+//  * Test that if there is no surface available to the app when it is stopped, that it is forced to close.
+TEST_F(ApplicationManagerTests,forceAppDeleteWhenRemovedWithMissingSurface)
+{
+    using namespace ::testing;
+
+    int argc = 0;
+    char* argv[0];
+    QCoreApplication qtApp(argc, argv); // app for deleteLater event
+
+    const QString appId("testAppId");
+    quint64 procId = 5551;
+    Application* app = startApplication(procId, appId);
+
+    QSignalSpy spy(app, SIGNAL(destroyed(QObject*)));
+    QObject::connect(app, &QObject::destroyed, app, [&qtApp](){ qtApp.quit(); });
+
+    // Stop app
+    applicationManager.stopApplication(appId);
+    qtApp.exec();
+    EXPECT_EQ(1, spy.count());
+}
+
+/*
+ * Test that if an application is started while it is still attempting to close, it is queued to start again.
+ */
+TEST_F(ApplicationManagerTests,applicationStartQueuedOnStartStopStart)
+{
+    using namespace ::testing;
+
+    int argc = 0;
+    char* argv[0];
+    QCoreApplication qtApp(argc, argv); // app for deleteLater event
+
+    const QString appId("testAppId");
+    quint64 procId = 5551;
+    Application* app = startApplication(procId, appId);
+    std::shared_ptr<mir::scene::Session> session = app->session()->session();
+
+    FakeMirSurface *surface = new FakeMirSurface;
+    onSessionCreatedSurface(session.get(), surface);
+    surface->drawFirstFrame();
+
+    EXPECT_EQ(Application::InternalState::Running, app->internalState());
+
+    // Stop app
+    applicationManager.stopApplication(appId);
+
+    EXPECT_EQ(Application::InternalState::Closing, app->internalState());
+
+    // // Set up Mocks & signal watcher
+    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
+    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
+    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
+    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
+
+    EXPECT_EQ(nullptr, applicationManager.startApplication(appId, ApplicationManager::NoFlag));
+
+    QSignalSpy spy(&applicationManager, SIGNAL(applicationAdded(const QString&)));
+    applicationManager.onProcessStopped(appId);
+
+    QObject::connect(&applicationManager, &ApplicationManager::applicationAdded,
+                     &applicationManager, [&qtApp, appId](const QString& startedApp) {
+        if (startedApp == appId) {
+            qtApp.quit();
+        }
+    });
+
+    qtApp.exec();
+    EXPECT_EQ(1, spy.count());
+}
+
+/*
+ * Test that there is an attempt at polite exiting of the app by requesting closure of the surface.
+ */
+TEST_F(ApplicationManagerTests,suspendedApplicationResumesClosesAndDeletes)
+{
+    using namespace ::testing;
+
+    const QString appId("testAppId");
+    quint64 procId = 5551;
+    Application* app = startApplication(procId, appId);
+    std::shared_ptr<mir::scene::Session> session = app->session()->session();
+
+    FakeMirSurface *surface = new FakeMirSurface;
+    onSessionCreatedSurface(session.get(), surface);
+    surface->drawFirstFrame();
+    EXPECT_EQ(Application::InternalState::Running, app->internalState());
+    EXPECT_EQ(SessionInterface::Running,  app->session()->state());
+
+    // Suspend the application.
+    suspend(app);
+    EXPECT_EQ(Application::InternalState::Suspended, app->internalState());
+
+    // Stop app
+    applicationManager.stopApplication(appId);
+    EXPECT_EQ(Application::InternalState::Closing, app->internalState());
+    EXPECT_EQ(SessionInterface::Running,  app->session()->state());
+}
+
+/*
+ * Test that a application which fails to close will eventually be forceable closed.
+ */
+TEST_F(ApplicationManagerTests,failedApplicationCloseEventualyDeletesApplication)
+{
+    using namespace ::testing;
+
+    int argc = 0;
+    char* argv[0];
+    QCoreApplication qtApp(argc, argv); // app for deleteLater event
+
+    const QString appId("testAppId");
+    quint64 procId = 5551;
+    Application* app = startApplication(procId, appId);
+    std::shared_ptr<mir::scene::Session> session = app->session()->session();
+
+    FakeMirSurface *surface = new FakeMirSurface;
+    onSessionCreatedSurface(session.get(), surface);
+    surface->drawFirstFrame();
+
+    EXPECT_EQ(Application::InternalState::Running, app->internalState());
+
+    QSignalSpy spy(app, SIGNAL(destroyed(QObject*)));
+    QObject::connect(app, &QObject::destroyed, app, [&qtApp](){ qtApp.quit(); });
+
+    // Stop app
+    applicationManager.stopApplication(appId);
+    qtApp.exec();
+    EXPECT_EQ(1, spy.count());
+}

=== modified file 'tests/modules/DesktopFileReader/CMakeLists.txt'
--- tests/modules/DesktopFileReader/CMakeLists.txt	2014-12-03 08:56:35 +0000
+++ tests/modules/DesktopFileReader/CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -7,8 +7,6 @@
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/modules
-  ${CMAKE_SOURCE_DIR}/tests/modules/common
-  ${MIRSERVER_INCLUDE_DIRS}
 )
 
 add_executable(desktop_file_reader_test ${DESKTOP_FILE_READER_TEST_SOURCES})
@@ -16,13 +14,9 @@
 target_link_libraries(
   desktop_file_reader_test
   
-  qpa-mirserver
   unityapplicationplugin
 
-  Qt5::Gui
-
   ${GTEST_BOTH_LIBRARIES}
-  ${GMOCK_LIBRARIES}
 )
 
 add_test(DesktopFileReader desktop_file_reader_test)

=== modified file 'tests/modules/SessionManager/CMakeLists.txt'
--- tests/modules/SessionManager/CMakeLists.txt	2015-08-31 09:51:28 +0000
+++ tests/modules/SessionManager/CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -3,28 +3,30 @@
   session_manager_test.cpp
   session_test.cpp
   ${CMAKE_SOURCE_DIR}/src/common/debughelpers.cpp
-  ${CMAKE_SOURCE_DIR}/tests/modules/common/qtmir_test.cpp
-  ${CMAKE_SOURCE_DIR}/tests/modules/common/fake_mirsurface.h
 )
 
 include_directories(
   ${APPLICATION_API_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/src/modules
-  ${CMAKE_SOURCE_DIR}/tests/modules/common
+  ${CMAKE_SOURCE_DIR}/tests/framework
   ${MIRSERVER_INCLUDE_DIRS}
 )
 
 add_executable(sessionmanager_test ${SESSION_MANAGER_TEST_SOURCES})
 
+add_dependencies(sessionmanager_test qtmir-test-framework-static)
+
 target_link_libraries(
   sessionmanager_test
 
-  qpa-mirserver
   unityapplicationplugin
 
   Qt5::Test
 
+  -L${CMAKE_BINARY_DIR}/tests/framework
+  qtmir-test-framework-static
+
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARIES}
 )

=== modified file 'tests/modules/SessionManager/session_manager_test.cpp'
--- tests/modules/SessionManager/session_manager_test.cpp	2015-08-11 12:08:32 +0000
+++ tests/modules/SessionManager/session_manager_test.cpp	2015-12-04 13:04:35 +0000
@@ -60,7 +60,7 @@
     EXPECT_TRUE(qtmirAppSession != nullptr);
 
     auto promptSession = std::make_shared<ms::MockPromptSession>();
-    ON_CALL(*mirServer->the_mock_prompt_session_manager(), application_for(_)).WillByDefault(Return(mirAppSession));
+    ON_CALL(*promptSessionManager, application_for(_)).WillByDefault(Return(mirAppSession));
 
     sessionManager.onPromptSessionStarting(promptSession);
 
@@ -83,8 +83,8 @@
     SessionInterface* qtmirAppSession = sessionManager.findSession(mirAppSession.get());
     EXPECT_TRUE(qtmirAppSession != nullptr);
 
-    EXPECT_CALL(*mirServer->the_mock_prompt_session_manager(), application_for(_)).WillRepeatedly(Return(mirAppSession));
-    EXPECT_CALL(*mirServer->the_mock_prompt_session_manager(), helper_for(_)).WillRepeatedly(Return(nullptr));
+    EXPECT_CALL(*promptSessionManager, application_for(_)).WillRepeatedly(Return(mirAppSession));
+    EXPECT_CALL(*promptSessionManager, helper_for(_)).WillRepeatedly(Return(nullptr));
 
     std::shared_ptr<ms::PromptSession> mirPromptSession = std::make_shared<ms::MockPromptSession>();
 
@@ -93,7 +93,7 @@
     sessionManager.onSessionStarting(mirProviderSession);
     SessionInterface* qtmirProviderSession = sessionManager.findSession(mirProviderSession.get());
 
-    EXPECT_CALL(*mirServer->the_mock_prompt_session_manager(), for_each_provider_in(mirPromptSession,_)).WillRepeatedly(WithArgs<1>(Invoke(
+    EXPECT_CALL(*promptSessionManager, for_each_provider_in(mirPromptSession,_)).WillRepeatedly(WithArgs<1>(Invoke(
         [&](std::function<void(std::shared_ptr<ms::Session> const& prompt_provider)> const& f) {
             f(mirProviderSession);
         })));
@@ -109,7 +109,7 @@
 
     EXPECT_THAT(listChildSessions(qtmirAppSession), ElementsAre(qtmirProviderSession));
 
-    EXPECT_CALL(*mirServer->the_mock_prompt_session_manager(), for_each_provider_in(mirPromptSession,_)).WillRepeatedly(InvokeWithoutArgs([]{}));
+    EXPECT_CALL(*promptSessionManager, for_each_provider_in(mirPromptSession,_)).WillRepeatedly(InvokeWithoutArgs([]{}));
 
     EXPECT_EQ(qtmirProviderSession->live(), true);
     sessionManager.onPromptProviderRemoved(mirPromptSession.get(), mirProviderSession);

=== modified file 'tests/modules/SessionManager/session_test.cpp'
--- tests/modules/SessionManager/session_test.cpp	2015-10-08 11:20:30 +0000
+++ tests/modules/SessionManager/session_test.cpp	2015-12-04 13:04:35 +0000
@@ -236,7 +236,7 @@
     auto mirPromptSession = std::make_shared<ms::MockPromptSession>();
     session->appendPromptSession(mirPromptSession);
 
-    EXPECT_CALL(*mirServer->the_mock_prompt_session_manager(), suspend_prompt_session(_)).Times(1);
+    EXPECT_CALL(*promptSessionManager, suspend_prompt_session(_)).Times(1);
 
     EXPECT_CALL(*mirSession, set_lifecycle_state(mir_lifecycle_state_will_suspend));
     session->suspend();
@@ -244,7 +244,7 @@
     session->doSuspend();
     EXPECT_EQ(Session::Suspended, session->state());
 
-    Mock::VerifyAndClear(mirServer->the_mock_prompt_session_manager().get());
+    Mock::VerifyAndClear(promptSessionManager.get());
 }
 
 TEST_F(SessionTests, ResumePromptSessionWhenSessionResumes)
@@ -256,7 +256,7 @@
 
     auto mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
 
-    auto session = std::make_shared<qtmir::Session>(mirSession, mirServer->the_prompt_session_manager());
+    auto session = std::make_shared<qtmir::Session>(mirSession, promptSessionManager);
     {
         FakeMirSurface *surface = new FakeMirSurface;
         session->setSurface(surface);
@@ -273,11 +273,11 @@
     auto mirPromptSession = std::make_shared<ms::MockPromptSession>();
     session->appendPromptSession(mirPromptSession);
 
-    EXPECT_CALL(*mirServer->the_mock_prompt_session_manager(), resume_prompt_session(_)).Times(1);
+    EXPECT_CALL(*promptSessionManager, resume_prompt_session(_)).Times(1);
 
     EXPECT_CALL(*mirSession, set_lifecycle_state(mir_lifecycle_state_resumed));
     session->resume();
     EXPECT_EQ(Session::Running, session->state());
 
-    Mock::VerifyAndClear(mirServer->the_mock_prompt_session_manager().get());
+    Mock::VerifyAndClear(promptSessionManager.get());
 }

=== modified file 'tests/modules/SharedWakelock/CMakeLists.txt'
--- tests/modules/SharedWakelock/CMakeLists.txt	2015-03-04 23:32:28 +0000
+++ tests/modules/SharedWakelock/CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -5,7 +5,6 @@
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/modules
-  ${CMAKE_SOURCE_DIR}/tests/modules/common
   ${QTDBUSTEST_INCLUDE_DIRS}
   ${QTDBUSMOCK_INCLUDE_DIRS}
 )

=== modified file 'tests/modules/SurfaceManager/CMakeLists.txt'
--- tests/modules/SurfaceManager/CMakeLists.txt	2015-11-17 14:47:38 +0000
+++ tests/modules/SurfaceManager/CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -3,14 +3,12 @@
   mirsurfaceitem_test.cpp
   mirsurface_test.cpp
   ${CMAKE_SOURCE_DIR}/src/common/debughelpers.cpp
-  ${CMAKE_SOURCE_DIR}/tests/modules/common/fake_mirsurface.h
-  ${CMAKE_SOURCE_DIR}/tests/modules/common/fake_session.h
 )
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/modules
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
-  ${CMAKE_SOURCE_DIR}/tests/modules/common
+  ${CMAKE_SOURCE_DIR}/tests/framework
   ${MIRSERVER_INCLUDE_DIRS}
 )
 
@@ -19,11 +17,13 @@
 target_link_libraries(
   surfacemanager_test
 
-  qpa-mirserver
   unityapplicationplugin
 
   Qt5::Test
 
+  -L${CMAKE_BINARY_DIR}/tests/framework
+  qtmir-test-framework-static
+
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARIES}
 )

=== modified file 'tests/modules/SurfaceManager/mirsurfaceitem_test.cpp'
--- tests/modules/SurfaceManager/mirsurfaceitem_test.cpp	2015-11-25 15:38:39 +0000
+++ tests/modules/SurfaceManager/mirsurfaceitem_test.cpp	2015-12-04 13:04:35 +0000
@@ -24,7 +24,7 @@
 // the test subject
 #include <Unity/Application/mirsurfaceitem.h>
 
-// tests/modules/common
+// tests/framework
 #include <fake_mirsurface.h>
 
 using namespace qtmir;

=== modified file 'tests/modules/TaskController/CMakeLists.txt'
--- tests/modules/TaskController/CMakeLists.txt	2015-06-15 17:01:28 +0000
+++ tests/modules/TaskController/CMakeLists.txt	2015-12-04 13:04:35 +0000
@@ -7,18 +7,22 @@
 include_directories(
   ${APPLICATION_API_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/src/modules
-  ${CMAKE_SOURCE_DIR}/tests/modules/common
+  ${CMAKE_SOURCE_DIR}/tests/framework
   ${MIRSERVER_INCLUDE_DIRS}
 )
 
 add_executable(taskcontroller_test ${TASK_CONTROLLER_TEST_SOURCES})
 
+add_dependencies(taskcontroller_test qtmir-test-framework-static)
+
 target_link_libraries(
   taskcontroller_test
 
-  qpa-mirserver
   unityapplicationplugin
 
+  -L${CMAKE_BINARY_DIR}/tests/framework
+  qtmir-test-framework-static
+
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARIES}
 )