Unity 8

Merge lp:~dandrader/unity8/testWithQtMir into lp:unity8

testWithQtMir
Merge into trunk

Proposed by Daniel d'Andrada on 2017-02-09

Status:	Work in progress
Proposed branch:	lp:~dandrader/unity8/testWithQtMir
Merge into:	lp:unity8
Diff against target:	8576 lines (+750/-5610) 76 files modified CMakeLists.txt (+1/-11) CODING (+8/-2) cmake/modules/QmlPlugins.cmake (+19/-13) cmake/modules/QmlTest.cmake (+7/-5) debian/control (+3/-8) debian/tests/control (+1/-0) debian/tests/qmluitests.sh (+6/-0) debian/unity8-tests.install (+0/-1) include/paths.h.in (+0/-10) plugins/Cursor/MousePointer.cpp (+9/-2) plugins/Cursor/MousePointer.h (+3/-2) src/Dash/main.cpp (+0/-20) src/MouseTouchAdaptor.cpp (+0/-419) src/MouseTouchAdaptor.h (+0/-72) src/ShellApplication.cpp (+2/-19) src/ShellApplication.h (+1/-9) src/UnityCommandLineParser.cpp (+0/-10) src/UnityCommandLineParser.h (+0/-8) tests/CMakeLists.txt (+15/-2) tests/autopilot/unity8/shell/tests/__init__.py (+0/-1) tests/mocks/Cursor/CMakeLists.txt (+34/-1) tests/mocks/Cursor/Cursor.qml (+0/-34) tests/mocks/Cursor/WindowedMousePointer.cpp (+62/-0) tests/mocks/Cursor/WindowedMousePointer.h (+35/-0) tests/mocks/Cursor/plugin.cpp (+43/-0) tests/mocks/Cursor/plugin.h (+33/-0) tests/mocks/Cursor/qmldir (+1/-0) tests/mocks/Unity/Application/ApplicationInfo.cpp (+0/-417) tests/mocks/Unity/Application/ApplicationInfo.h (+0/-162) tests/mocks/Unity/Application/ApplicationManager.cpp (+0/-557) tests/mocks/Unity/Application/ApplicationManager.h (+0/-122) tests/mocks/Unity/Application/CMakeLists.txt (+0/-35) tests/mocks/Unity/Application/MirMock.cpp (+0/-62) tests/mocks/Unity/Application/MirMock.h (+0/-43) tests/mocks/Unity/Application/MirSurface.cpp (+0/-550) tests/mocks/Unity/Application/MirSurface.h (+0/-232) tests/mocks/Unity/Application/MirSurfaceItem.cpp (+0/-415) tests/mocks/Unity/Application/MirSurfaceItem.h (+0/-138) tests/mocks/Unity/Application/MirSurfaceListModel.cpp (+0/-136) tests/mocks/Unity/Application/MirSurfaceListModel.h (+0/-56) tests/mocks/Unity/Application/ObjectListModel.h (+0/-108) tests/mocks/Unity/Application/SurfaceManager.cpp (+0/-281) tests/mocks/Unity/Application/SurfaceManager.h (+0/-116) tests/mocks/Unity/Application/VirtualKeyboard.cpp (+0/-58) tests/mocks/Unity/Application/VirtualKeyboard.h (+0/-37) tests/mocks/Unity/Application/plugin.cpp (+0/-68) tests/mocks/Unity/Application/plugin.h (+0/-31) tests/mocks/Unity/Application/qmldir (+0/-3) tests/mocks/Unity/Application/resources/MirSurfaceItem.qml (+0/-126) tests/mocks/Unity/Application/resources/VirtualKeyboard.qml (+0/-41) tests/mocks/Unity/Application/resources/screenshots/gmail-webapp.svg (+0/-343) tests/mocks/Unity/Application/resources/screenshots/ubuntu-weather-app.svg (+0/-201) tests/mocks/Unity/Application/resources/surfaces.qrc (+0/-23) tests/mocks/Unity/CMakeLists.txt (+0/-1) tests/qmltests/ApplicationMenuDataLoader.qml (+0/-1) tests/qmltests/ApplicationMenus/tst_MenuBar.qml (+0/-3) tests/qmltests/ApplicationMenus/tst_MenuPopup.qml (+1/-1) tests/qmltests/CMakeLists.txt (+8/-8) tests/qmltests/Panel/tst_ActiveCallHint.qml (+6/-10) tests/qmltests/Stage/ApplicationCheckBox.qml (+3/-3) tests/qmltests/Stage/tst_ApplicationWindow.qml (+113/-157) tests/qmltests/Stage/tst_DecoratedWindow.qml (+9/-2) tests/qmltests/Stage/tst_DesktopStage.qml (+40/-40) tests/qmltests/Stage/tst_PhoneStage.qml (+21/-33) tests/qmltests/Stage/tst_SurfaceContainer.qml (+26/-21) tests/qmltests/Stage/tst_TabletStage.qml (+50/-54) tests/qmltests/Tutorial/tst_Tutorial.qml (+2/-2) tests/qmltests/tst_OrientedShell.qml (+36/-86) tests/qmltests/tst_Shell.qml (+98/-124) tests/uqmlscene/CMakeLists.txt (+0/-6) tests/utils/modules/Unity/Test/CMakeLists.txt (+0/-8) tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml (+4/-4) tests/utils/modules/Unity/Test/StageTestCase.qml (+49/-0) tests/utils/modules/Unity/Test/UnityTestCase.qml (+0/-16) tests/utils/modules/Unity/Test/plugin.cpp (+1/-19) tools/scopetool.cpp (+0/-1)
To merge this branch:	bzr merge lp:~dandrader/unity8/testWithQtMir
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2017-02-23
Albert Astals Cid (community)		2017-02-09	Needs Fixing on 2017-02-21
Review via email: mp+316851@code.launchpad.net

Commit message

Use qtmir in qmltests instead of mocks

Description of the change

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

To select the resulution of the test window, use the MIR_SERVER_X11_DISPLAYS env var, like this:

$ MIR_SERVER_X11_DISPLAYS=1920x1080 make tryDesktopStage

For edge-push with the mouse, hold Shift while moving it across an edge.

Building it all in this silo: https://bileto.ubuntu.com/#/ticket/2457

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

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

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

* If you changed the UI, has there been a design review?
N/A

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2017-02-10:

Why the added -maxwarnings 0? Are we somehow more verbose than we where?

You forgot to remove these "mousetouch" instances
./tests/autopilot/unity8/shell/tests/__init__.py:152: '-mousetouch'
./src/Dash/main.cpp:51: QCommandLineOption mousetouchOption(QStringLiteral("mousetouch"),
./src/Dash/main.cpp:53: parser.addOption(mousetouchOption);

I'm not a fan of
m_testingMode = qEnvironmentVariableIsSet("UNITY_TESTING");
in production code, do you think that you can turn that into a static bool variable that is set to true somewhere else? Maybe in uqmlscene?

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2017-02-10:

A few tests failed here

xvfbtestActiveCallHint
Totals: 18 passed, 7 failed, 0 skipped, 0 blacklisted

xvfbtestTutorial
Totals: 26 passed, 2 failed, 0 skipped, 0 blacklisted

xvfbtestGreeterSessions
Totals: 7 passed, 1 failed, 0 skipped, 0 blacklisted

xvfbtestGreeterDBus
Totals: 5 passed, 7 failed, 0 skipped, 0 blacklisted

xvfbtestListViewWithPageHeaderSection
Totals: 64 passed, 6 failed, 0 skipped, 0 blacklisted

xvfbtestListViewWithPageHeader
Totals: 72 passed, 8 failed, 0 skipped, 0 blacklisted

And a few core dumped

xvfbtestVerticalJournal
xvfbtestOrganicGrid
xvfbtestHorizontalJournal

review: Needs Fixing

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-02-10:

On 10/02/2017 08:36, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> A few tests failed here
>
> xvfbtestActiveCallHint
> Totals: 18 passed, 7 failed, 0 skipped, 0 blacklisted
>
> xvfbtestTutorial
> Totals: 26 passed, 2 failed, 0 skipped, 0 blacklisted
>
> xvfbtestGreeterSessions
> Totals: 7 passed, 1 failed, 0 skipped, 0 blacklisted
>
> xvfbtestGreeterDBus
> Totals: 5 passed, 7 failed, 0 skipped, 0 blacklisted
>
> xvfbtestListViewWithPageHeaderSection
> Totals: 64 passed, 6 failed, 0 skipped, 0 blacklisted
>
> xvfbtestListViewWithPageHeader
> Totals: 72 passed, 8 failed, 0 skipped, 0 blacklisted
>
>
>
>
> And a few core dumped
>
> xvfbtestVerticalJournal
> xvfbtestOrganicGrid
> xvfbtestHorizontalJournal

All fixed. Thanks.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-02-10:

On 10/02/2017 06:56, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> Why the added -maxwarnings 0? Are we somehow more verbose than we where?

Not strictly related to the topic of this branch. But when you run big
tests like tst_Shell or tst_DesktopStage, at some point it stops logging
debug messages (considered warnings by qmltestrunner) and just logs the
test results instead. So it you get a failure in a late test, you're out
of luck as the log won't show you what was happening before the failure.
You will have to resort to running the test separately to ensure the
"max warnings" cap doesn't kick in.

And yes, the real mirserver logs more stuff than our (RIP) mock
Unity.Application module. Specially during start up, when it creates a
display, screen, etc.

>
>
> You forgot to remove these "mousetouch" instances
> ./tests/autopilot/unity8/shell/tests/__init__.py:152: '-mousetouch'
> ./src/Dash/main.cpp:51: QCommandLineOption mousetouchOption(QStringLiteral("mousetouch"),
> ./src/Dash/main.cpp:53: parser.addOption(mousetouchOption);

Fixed.

> I'm not a fan of
> m_testingMode = qEnvironmentVariableIsSet("UNITY_TESTING");
> in production code, do you think that you can turn that into a static bool variable that is set to true somewhere else? Maybe in uqmlscene?
>
>

Neither am I. But that was the cleanest solution I found. Another being
copy pasting the Cursor plugin into the test/mocks subdir and change the
code there. But that involves code duplication and is rather complicated.

I don't see how exactly to do that testing mode set from within
uqmlscene and have it accessible from a qml plugin. In any case, the
elephant in the room would remain as production code would still have a
if(){}else[} for running in production or in test mode, which is the
real problem.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2017-02-13:

> > I'm not a fan of
> > m_testingMode = qEnvironmentVariableIsSet("UNITY_TESTING");
> > in production code, do you think that you can turn that into a static bool variable that is set
> > to true somewhere else? Maybe in uqmlscene?
>

> Neither am I. But that was the cleanest solution I found. Another being
> copy pasting the Cursor plugin into the test/mocks subdir and change the
> code there. But that involves code duplication and is rather complicated.

What do you think about something like http://paste.ubuntu.com/23987714/

It's unfinished (needs copying of the "real" Cursor.qml to the "mock" path) but i think it could work and that way we would get rid of that envvar and the if, no?

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-02-13:

On 13/02/2017 08:08, Albert Astals Cid wrote:
>>> I'm not a fan of
>>> m_testingMode = qEnvironmentVariableIsSet("UNITY_TESTING");
>>> in production code, do you think that you can turn that into a static bool variable that is set
>>> to true somewhere else? Maybe in uqmlscene?
>> Neither am I. But that was the cleanest solution I found. Another being
>> copy pasting the Cursor plugin into the test/mocks subdir and change the
>> code there. But that involves code duplication and is rather complicated.
> What do you think about something like http://paste.ubuntu.com/23987714/
>
> It's unfinished (needs copying of the "real" Cursor.qml to the "mock" path) but i think it could work and that way we would get rid of that envvar and the if, no?

By the way, that env var is what qtmir checks to decide whether to
initialize into test mode (with fake, internal mir client, apps) or
normal mode.

Revision history for this message

Albert Astals Cid (aacid) wrote on 2017-02-13:

> By the way, that env var is what qtmir checks to decide whether to
> initialize into test mode (with fake, internal mir client, apps) or
> normal mode.

$ grep -R UNITY_TESTING
$

I don't see the envvar being used.

Revision history for this message

Albert Astals Cid (aacid) wrote on 2017-02-13:

Ah, you mean your proposed qtmir branch introduces the envvar use in qtmir, i also disagree with that use then :)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-02-13:

On 13/02/2017 08:46, Albert Astals Cid wrote:
>> By the way, that env var is what qtmir checks to decide whether to
>> initialize into test mode (with fake, internal mir client, apps) or
>> normal mode.
> $ grep -R UNITY_TESTING
> $
>
> I don't see the envvar being used.

Did you check lp:~dandrader/qtmir/fake-apps ?

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-13:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-13:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-13:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-13:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-14:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/testWithQtMir updated on 2017-02-15

2808. By Launchpad Translations on behalf of unity-team on 2017-02-15: Launchpad automatic translations update.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-02-16:

Ok, took the testing-related code out of the production Cursor plugin.
You should be happy now. :)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-16:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/testWithQtMir updated on 2017-02-16

2809. By Albert Astals Cid on 2017-02-16

Make menus items close the menu when clicking on them (LP: #1657082, #1657399)

Approved by: Daniel d'Andrada, Unity8 CI Bot

2810. By Albert Astals Cid on 2017-02-16

Clicking on an open menu closes it + test

Approved by: Michael Zanetti, Unity8 CI Bot

2811. By Albert Astals Cid on 2017-02-16

Make the menus and submenus do not go outside the screen when popping out

Approved by: Michael Zanetti, Unity8 CI Bot

2812. By Albert Astals Cid on 2017-02-16

Auto open submenus on hover (LP: #1657085)

Approved by: Michael Zanetti, Unity8 CI Bot

2813. By Albert Astals Cid on 2017-02-16

Make the double click on a menu not be maximize the window below (LP: #1657079)

Approved by: Michael Zanetti, Unity8 CI Bot

2814. By Albert Astals Cid on 2017-02-16

Make the MenuBar InverseMouseArea eat hover events when there's a popup open (LP: #1657763)

Approved by: Michael Zanetti, Unity8 CI Bot

2815. By Nick Dedekind on 2017-02-16

Added overflow support to application menus.
Hover timer for auto-scrolling menu popup overflow.

Approved by: Albert Astals Cid, Unity8 CI Bot

2816. By Nick Dedekind on 2017-02-16

Updated menu colors

Approved by: Lukáš Tinkl, Unity8 CI Bot

2817. By Albert Astals Cid on 2017-02-16

Make double click on the window decoration maximize

And fix test and add a new one (LP: #1657758)

Approved by: Daniel d'Andrada, Unity8 CI Bot

2818. By Lukáš Tinkl on 2017-02-16

Fixes for activating minimized windows and restoring fullscreen ones (LP: #1656808, #1658937, #1658938)

Approved by: Michael Zanetti, Unity8 CI Bot

2819. By Michael Zanetti on 2017-02-16

move right edge push area up some levels so it can be used on top of the indicators

Approved by: Lukáš Tinkl

2820. By Michael Zanetti on 2017-02-16

fix minimizing/restoring transitions (LP: #1658936)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2821. By Michael Zanetti on 2017-02-16

fix some glitches with spread positioning

There are some circumstances which can cause the spread to jump around
* If there are only 2 apps and alt+tab is used to open the spread, move to the first (currently focused one), then release, the next time the spread is invoked, tiles animated to the old position and then jumped to the initial position. Resetting the spread position when the spread is left, fixes that.
* If many apps are open and the first one is tabbed to, the flickable could be moved to negative content positions which again would cause a jump when then interacting with the finger or mouse to reposition the spread.

Approved by: Lukáš Tinkl, Unity8 CI Bot

2822. By Michael Zanetti on 2017-02-16

fix jumpy animation when closing an item from the spread

Approved by: Lukáš Tinkl, Unity8 CI Bot

2823. By Michael Zanetti on 2017-02-16

Show the wallpaper while the focused app is moving in staged mode (LP: #1648251)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2824. By Michael Zanetti on 2017-02-16

Update the tutorial to mention the app drawer instead of the dash on long left edge swipe (LP: #1658932)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2825. By Michael Zanetti on 2017-02-16

prevent hiding the launcher when the mouse hover event is eaten by the EdgePushArea (LP: #1657045)

Approved by: Albert Astals Cid, Unity8 CI Bot

2826. By Daniel d'Andrada on 2017-02-16

Consolidate launcher API checks

Approved by: Albert Astals Cid, Unity8 CI Bot

2827. By Michael Zanetti on 2017-02-16

properly invalidate the whole model

this fixes a crash in certain circumstances but makes things slower.
To compensate the slowness, turning off dynamic sorting/filtering
in the topmost proxy models seems to work fine. (LP: #1658190)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2828. By Albert Astals Cid on 2017-02-16

Eat hover events when the launcher quicklist is open

This way we don't change the mouse cursor wrongly to resize windows for example (LP: #1640776)

Approved by: Michael Zanetti, Unity8 CI Bot

2829. By Albert Astals Cid on 2017-02-16

Remove TODO now that we require Qt > 5.5

Approved by: Michał Sawicz, Unity8 CI Bot

2830. By Michael Zanetti on 2017-02-16

stabilize OrientedShell test (LP: #1658994)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2831. By Albert Astals Cid on 2017-02-16

Serialize two make targets that want to cp to the same target file

Whitout it, running
while [ true ]; do rm -f qmldir; make -j4 all; if [ $? -ne 0 ]; then break; fi; done
in builddir/tests/mocks/Unity eventually fails. (LP: #1660576)

Approved by: Michael Terry, Unity8 CI Bot

2832. By Albert Astals Cid on 2017-02-16

Remove variable that is always false (LP: #1585910)

Approved by: Michael Zanetti, Unity8 CI Bot

2833. By CI Train Bot Account on 2017-02-16

Releasing 8.15+17.04.20170216.1-0ubuntu1

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-16:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-16:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) on 2017-02-17:

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-02-21:

On 17/02/2017 10:51, Michał Sawicz wrote:
>
> Diff comments:
>
>> === modified file 'debian/tests/control'
>> --- debian/tests/control 2016-06-03 13:39:53 +0000
>> +++ debian/tests/control 2017-02-16 17:04:13 +0000
>> @@ -2,6 +2,7 @@
>> Restrictions: allow-stderr
>> Depends: dpkg-dev,
>> unity8-tests,
>> + mir-platform-graphics-mesa-x11
> This needs to be the meta package instead:
>
> mir-graphics-drivers-desktop

Done

lp:~dandrader/unity8/testWithQtMir updated on 2017-02-21

2834. By Daniel d'Andrada on 2017-02-21: Use qtmir in qmltests instead of mocks

Revision history for this message

Albert Astals Cid (aacid) wrote on 2017-02-21:

Contents conflict in tests/mocks/Unity/Application/SurfaceManager.cpp
1 conflicts encountered.

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-02-21:

On 21/02/2017 10:26, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> Contents conflict in tests/mocks/Unity/Application/SurfaceManager.cpp
> 1 conflicts encountered.

fixed

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-21:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/testWithQtMir updated on 2017-02-21

2835. By Daniel d'Andrada on 2017-02-21: Make tst_DecoratedWindow more reliable

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-21:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2017-02-21:

Looks good to me, only thing missing is CI/tests not being happy, after that i'll approve + top-approve

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-21:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/testWithQtMir updated on 2017-02-22

2836. By Daniel d'Andrada on 2017-02-22

Keep running some qml ui tests as regular client apps in the host system

A lot of the tests have no need to be run as a fully fledged mir server nor access Unity.Application

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-23:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/testWithQtMir updated on 2017-02-23

2837. By Daniel d'Andrada on 2017-02-23: WIP - Attempt to get tests to run in jenkins CI

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-23:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/testWithQtMir updated on 2017-02-23

2838. By Daniel d'Andrada on 2017-02-23: further investigation

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2017-03-24:

Moving to WiP until we can fix the problem with CI

Unmerged revisions

2838. By Daniel d'Andrada on 2017-02-23

further investigation

2837. By Daniel d'Andrada on 2017-02-23

WIP - Attempt to get tests to run in jenkins CI

2836. By Daniel d'Andrada on 2017-02-22

Keep running some qml ui tests as regular client apps in the host system

A lot of the tests have no need to be run as a fully fledged mir server nor access Unity.Application

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

Make tst_DecoratedWindow more reliable

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

Use qtmir in qmltests instead of mocks

Preview Diff

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

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2017-02-16 13:45:35 +0000
 +++ CMakeLists.txt	2017-02-23 19:04:58 +0000
@@ -70,7 +70,7 @@
  find_package(Qt5Concurrent 5.6 REQUIRED)
  find_package(Qt5Sql 5.6 REQUIRED)
--pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=26)
++pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)
  pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
  pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
  pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
@@ -158,16 +158,6 @@
      set(STDOUT_LOGGER "-o" "-,txt")
  endif()
--execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH OUTPUT_VARIABLE ARCH)
--if (NOT ARCH MATCHES "arm*")
--    set(ENABLE_TOUCH_EMULATION true)
--    add_definitions(-DUNITY8_ENABLE_TOUCH_EMULATION)
--    pkg_check_modules(MOUSETOUCHADAPTOR_LIBS REQUIRED x11 xcb xi)
--else()
--    set(ENABLE_TOUCH_EMULATION false)
--    message(STATUS "Touch emulation support disabled.")
--endif()
--
  # add subdirectories to build
  add_subdirectory(include)
  add_subdirectory(src)
 === modified file 'CODING'
 --- CODING	2016-10-13 11:02:11 +0000
 +++ CODING	2017-02-23 19:04:58 +0000
@@ -68,9 +68,9 @@
  ==========================
  Running unity8 on a device should be done using crossbuilder.
--Go to
++Go to
  * https://launchpad.net/crossbuilder and
--* https://wiki.ubuntu.com/Touch/Crossbuilder
++* https://wiki.ubuntu.com/Touch/Crossbuilder
  for more details on crossbuilder.
  unity8 will automatically restart on the phone once deployment
@@ -134,6 +134,12 @@
  $ make tryDragHandle
++To define the dimensions of the test window, use the MIR_SERVER_X11_DISPLAYS environment variable. Like this:
++
++$ MIR_SERVER_X11_DISPLAYS=1920x1080 make tryDragHandle
++
++To have the mouse bounded by shell screen limits when running, eg, "make tryShell", hold the Shift key.
++
  NB: Manual test or interation doesn't make sense for all components or classes,
  particularly the non-graphical ones. In such cases no "tryFoo" make target is
  provided.
 === modified file 'cmake/modules/QmlPlugins.cmake'
 --- cmake/modules/QmlPlugins.cmake	2015-04-29 21:55:29 +0000
 +++ cmake/modules/QmlPlugins.cmake	2017-02-23 19:04:58 +0000
@@ -27,7 +27,9 @@
  # Resource file names are matched against {*.{qml,js,jpg,png,sci,svg},qmldir}.
+ #
  # export_qmlfiles(plugin path
--#     [SEARCH_PATH path]      # Path to search for resources in (defaults to ${CMAKE_CURRENT_SOURCE_DIR})
++#     [SEARCH_PATH path]      # Path to search for resource files. Defaults to ${CMAKE_CURRENT_SOURCE_DIR}
++#     [GLOBBING_EXPRESSIONS]  # The globbing expressions used to find the files to be copied. If set,
++#                               overrides any given SEARCH_PATH.
  #     [BINARY_DIR path]
  #     [DESTINATION path]
  #     [TARGET_PREFIX string]  # Will be prefixed to the target name
@@ -38,8 +40,8 @@
  macro(export_qmlfiles PLUGIN PATH)
      set(single SEARCH_PATH BINARY_DIR DESTINATION TARGET_PREFIX)
--    cmake_parse_arguments(QMLFILES "" "${single}" "" ${ARGN})
--
++    cmake_parse_arguments(QMLFILES "" "${single}" "GLOBBING_EXPRESSIONS" ${ARGN})
++
      if(NOT QMLFILES_SEARCH_PATH)
          set(QMLFILES_SEARCH_PATH ${CMAKE_CURRENT_SOURCE_DIR})
      endif()
@@ -50,16 +52,20 @@
          set(qmlfiles_dir ${CMAKE_CURRENT_BINARY_DIR})
      endif()
--    file(GLOB QMLFILES
--        ${QMLFILES_SEARCH_PATH}/*.qml
--        ${QMLFILES_SEARCH_PATH}/*.js
--        ${QMLFILES_SEARCH_PATH}/*.jpg
--        ${QMLFILES_SEARCH_PATH}/*.png
--        ${QMLFILES_SEARCH_PATH}/*.sci
--        ${QMLFILES_SEARCH_PATH}/*.svg
--        ${QMLFILES_SEARCH_PATH}/*.qmltypes
--        ${QMLFILES_SEARCH_PATH}/qmldir
--    )
++    if(NOT QMLFILES_GLOBBING_EXPRESSIONS)
++        set(QMLFILES_GLOBBING_EXPRESSIONS
++            ${QMLFILES_SEARCH_PATH}/*.qml
++            ${QMLFILES_SEARCH_PATH}/*.js
++            ${QMLFILES_SEARCH_PATH}/*.jpg
++            ${QMLFILES_SEARCH_PATH}/*.png
++            ${QMLFILES_SEARCH_PATH}/*.sci
++            ${QMLFILES_SEARCH_PATH}/*.svg
++            ${QMLFILES_SEARCH_PATH}/*.qmltypes
++            ${QMLFILES_SEARCH_PATH}/qmldir
++        )
++    endif()
++
++    file(GLOB QMLFILES ${QMLFILES_GLOBBING_EXPRESSIONS})
      execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${qmlfiles_dir})
 === modified file 'cmake/modules/QmlTest.cmake'
 --- cmake/modules/QmlTest.cmake	2017-01-24 07:43:35 +0000
 +++ cmake/modules/QmlTest.cmake	2017-02-23 19:04:58 +0000
@@ -118,7 +118,7 @@
      add_executable_test(${COMPONENT_NAME} qmltestrunner
          ${ARGN}
--        ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
++        ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS} -maxwarnings 0
+     )
      if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml")
@@ -151,7 +151,7 @@
  endfunction()
--# add_executable_test(target component_name
++# add_executable_test(component_name target
  #     [...]                              # see doc for add_manual_qml_test for common arguments
  #     [ADD_TEST]                         # whether to add to the "test" target
  #     [ARG_PREFIX arg_prefix]            # prefix logging arguments with this string
@@ -189,10 +189,12 @@
              ${args}
+     )
++    set(common_qmltest_env QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT})
++
      add_qmltest_target(test${COMPONENT_NAME} ${TARGET}
          COMMAND ${qmltest_command}
          ${depends}
--        ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}
++        ENVIRONMENT ${common_qmltest_env}
          ${add_test}
          ${targets}
+     )
@@ -201,7 +203,7 @@
          add_qmltest_target(xvfbtest${COMPONENT_NAME} ${TARGET}
              COMMAND $<TARGET_FILE:xvfb-run> --server-args "-screen 0 1024x768x24" --auto-servernum ${qmltest_command}
              ${depends}
--            ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT} LD_PRELOAD=/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/mesa/libGL.so.1
++            ENVIRONMENT ${common_qmltest_env} LD_PRELOAD=/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/mesa/libGL.so.1
              TARGETS ${xvfb_targets}
+         )
      endif()
@@ -210,7 +212,7 @@
          add_qmltest_target(gdbtest${COMPONENT_NAME} ${TARGET}
              COMMAND $<TARGET_FILE:gdb> -ex run -args ${qmltest_command}
              ${depends}
--            ENVIRONMENT QML2_IMPORT_PATH=${imports} ${QMLTEST_ENVIRONMENT}
++            ENVIRONMENT ${common_qmltest_env}
+         )
      endif()
  endfunction()
 === modified file 'debian/control'
 --- debian/control	2017-02-06 09:11:56 +0000
 +++ debian/control	2017-02-23 19:04:58 +0000
@@ -38,13 +38,8 @@
                 libubuntugestures5-private-dev (>= 1.3.2030),
                 libudev-dev,
                 libudm-common-dev,
--               libunity-api-dev (>= 8.2),
++               libunity-api-dev (>= 8.4),
                 libusermetricsoutput1-dev,
--# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
--               libx11-dev[!arm64 !armhf],
--               libxcb1-dev[!arm64 !armhf],
--               libxi-dev[!arm64 !armhf],
--# End of X11 libs
                 pkg-config,
                 python3-all:any,
                 python3-setuptools,
@@ -162,7 +157,7 @@
           qttranslations5-l10n,
           ubuntu-thumbnailer-impl-0,
           ubuntu-wallpapers,
--         unity-application-impl-26,
++         unity-application-impl-27,
           unity-notifications-impl-3,
           unity-plugin-scopes | unity-scopes-impl,
           unity-scopes-impl-12,
@@ -212,7 +207,7 @@
           ${misc:Depends},
           ${shlibs:Depends},
  Provides: unity-application-impl,
--          unity-application-impl-26,
++          unity-application-impl-27,
            unity8-fake-env,
  Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1),
            unity8-fake-env,
 === modified file 'debian/tests/control'
 --- debian/tests/control	2016-06-03 13:39:53 +0000
 +++ debian/tests/control	2017-02-23 19:04:58 +0000
@@ -2,6 +2,7 @@
  Restrictions: allow-stderr
  Depends: dpkg-dev,
           unity8-tests,
++         mir-graphics-drivers-desktop
  Tests: autopilot.sh
  Restrictions: allow-stderr,
 === modified file 'debian/tests/qmluitests.sh'
 --- debian/tests/qmluitests.sh	2016-07-14 13:04:10 +0000
 +++ debian/tests/qmluitests.sh	2017-02-23 19:04:58 +0000
@@ -8,4 +8,10 @@
  export ARTIFACTS_DIR="${ADT_ARTIFACTS}"
++export MIR_SERVER_PLATFORM_GRAPHICS_LIB="/usr/lib/${DEB_HOST_MULTIARCH}/mir/server-platform/server-mesa-x11.so.12"
++
++echo "********* checking dri **********"
++ls /dev/dri
++echo "********* DONE checking dri **********"
++
  /usr/lib/$DEB_HOST_MULTIARCH/unity8/tests/scripts/xvfballtests.sh
 === modified file 'debian/unity8-tests.install'
 --- debian/unity8-tests.install	2016-04-22 20:01:26 +0000
 +++ debian/unity8-tests.install	2017-02-23 19:04:58 +0000
@@ -1,7 +1,6 @@
  data/unity-mock-indicator-service.conf usr/share/upstart/sessions/
  usr/bin/unity-mock-indicator-service
  usr/lib/*/unity8/qml/mocks
--usr/lib/*/unity8/qml/nonmirplugins
  usr/lib/*/unity8/qml/scopefakes
  usr/lib/*/unity8/qml/utils
  usr/lib/*/unity8/tests
 === modified file 'include/paths.h.in'
 --- include/paths.h.in	2016-12-06 20:16:56 +0000
 +++ include/paths.h.in	2017-02-23 19:04:58 +0000
@@ -103,16 +103,6 @@
      return paths;
+ }
--inline QStringList nonMirImportPaths() {
--    QStringList paths;
--    if (isRunningInstalled()) {
--        paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
--    } else {
--        paths << buildDirectory() + QStringLiteral("/nonmirplugins");
--    }
--    return paths;
--}
--
  inline QStringList fallbackImportPaths() {
      QStringList paths;
      if (isRunningInstalled()) {
 === modified file 'plugins/Cursor/MousePointer.cpp'
 --- plugins/Cursor/MousePointer.cpp	2016-09-07 08:36:59 +0000
 +++ plugins/Cursor/MousePointer.cpp	2017-02-23 19:04:58 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015-2016 Canonical, Ltd.
++ * Copyright (C) 2015-2017 Canonical, Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it under
   * the terms of the GNU Lesser General Public License version 3, as published by
@@ -33,9 +33,11 @@
+ {
+ }
--void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
++void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, QPointF position, Qt::MouseButtons buttons,
          Qt::KeyboardModifiers modifiers)
+ {
++    Q_UNUSED(position);
++
      if (!parentItem()) {
          return;
+     }
@@ -44,6 +46,11 @@
          Q_EMIT mouseMoved();
+     }
++    applyMouseMovement(timestamp, movement, buttons, modifiers);
++}
++
++void MousePointer::applyMouseMovement(ulong timestamp, QPointF movement, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers)
++{
      m_accumulatedMovement += movement;
      // don't apply the fractional part
      QPointF appliedMovement(int(m_accumulatedMovement.x()), int(m_accumulatedMovement.y()));
 === modified file 'plugins/Cursor/MousePointer.h'
 --- plugins/Cursor/MousePointer.h	2016-09-07 08:36:59 +0000
 +++ plugins/Cursor/MousePointer.h	2017-02-23 19:04:58 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015-2016 Canonical, Ltd.
++ * Copyright (C) 2015-2017 Canonical, Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it under
   * the terms of the GNU Lesser General Public License version 3, as published by
@@ -47,7 +47,7 @@
      void setTopBoundaryOffset(int topBoundaryOffset);
  public Q_SLOTS:
--    void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
++    void handleMouseEvent(ulong timestamp, QPointF movement, QPointF position, Qt::MouseButtons buttons,
              Qt::KeyboardModifiers modifiers) override;
      void handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers) override;
@@ -67,6 +67,7 @@
  protected:
      void itemChange(ItemChange change, const ItemChangeData &value) override;
++    void applyMouseMovement(ulong timestamp, QPointF movement, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
  private Q_SLOTS:
      void registerScreen(QScreen *screen);
 === modified file 'src/Dash/main.cpp'
 --- src/Dash/main.cpp	2016-10-27 00:05:28 +0000
 +++ src/Dash/main.cpp	2017-02-23 19:04:58 +0000
@@ -32,9 +32,6 @@
  #include <paths.h>
  #include "../qmldebuggerutils.h"
--#ifdef UNITY8_ENABLE_TOUCH_EMULATION
--    #include "../MouseTouchAdaptor.h"
--#endif
  #include "../CachingNetworkManagerFactory.h"
  #include "../UnixSignalHandler.h"
@@ -51,10 +48,6 @@
      parser.setApplicationDescription(QStringLiteral("Description: Unity 8 Shell Dash"));
      parser.addHelpOption();
--    QCommandLineOption mousetouchOption(QStringLiteral("mousetouch"),
--        QStringLiteral("Allow the mouse to provide touch input"));
--    parser.addOption(mousetouchOption);
--
      QCommandLineOption windowGeometryOption(QStringList() << QStringLiteral("windowgeometry"),
          QStringLiteral("Specify the window geometry as [<width>x<height>]"), QStringLiteral("windowgeometry"), QStringLiteral("1"));
      parser.addOption(windowGeometryOption);
@@ -92,15 +85,6 @@
      bindtextdomain("unity8", translationDirectory().toUtf8().data());
      textdomain("unity8");
--    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
--    // You will need this if you want to interact with touch-only components using a mouse
--    // Needed only when manually testing on a desktop.
--    MouseTouchAdaptor *mouseTouchAdaptor = 0;
--    if (parser.isSet(mousetouchOption)) {
--        mouseTouchAdaptor = MouseTouchAdaptor::instance();
--    }
--    #endif
--
      QQmlApplicationEngine *engine = new QQmlApplicationEngine(application);
      int initialWidth = -1;
@@ -136,10 +120,6 @@
      delete engine;
--    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
--    delete mouseTouchAdaptor;
--    #endif
--
      delete application;
      return result;
 === removed file 'src/MouseTouchAdaptor.cpp'
 --- src/MouseTouchAdaptor.cpp	2017-01-17 14:20:54 +0000
 +++ src/MouseTouchAdaptor.cpp	1970-01-01 00:00:00 +0000
@@ -1,419 +0,0 @@
--/*
-- * Copyright (C) 2013,2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
-- */
--
--
--/* Some parts of the code were copied from the XCB platform plugin of the Qt Toolkit,
-- * which is under the following license:
-- */
--
--/****************************************************************************
--**
--** Copyright (C) 2015 The Qt Company Ltd.
--** Contact: http://www.qt.io/licensing/
--**
--** This file is part of the .
--**
--** $QT_BEGIN_LICENSE:LGPL21$
--** Commercial License Usage
--** Licensees holding valid commercial Qt licenses may use this file in
--** accordance with the commercial license agreement provided with the
--** Software or, alternatively, in accordance with the terms contained in
--** a written agreement between you and The Qt Company. For licensing terms
--** and conditions see http://www.qt.io/terms-conditions. For further
--** information use the contact form at http://www.qt.io/contact-us.
--**
--** GNU Lesser General Public License Usage
--** Alternatively, this file may be used under the terms of the GNU Lesser
--** General Public License version 2.1 or version 3 as published by the Free
--** Software Foundation and appearing in the file LICENSE.LGPLv21 and
--** LICENSE.LGPLv3 included in the packaging of this file. Please review the
--** following information to ensure the GNU Lesser General Public License
--** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
--** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
--**
--** As a special exception, The Qt Company gives you certain additional
--** rights. These rights are described in The Qt Company LGPL Exception
--** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
--**
--** $QT_END_LICENSE$
--**
--****************************************************************************/
--
--#include "MouseTouchAdaptor.h"
--
--#include <qpa/qplatformnativeinterface.h>
--#include <qpa/qwindowsysteminterface.h>
--
--#include <QCoreApplication>
--#include <QMouseEvent>
--#include <QTest>
--
--#include <X11/extensions/XInput2.h>
--#include <X11/extensions/XI2proto.h>
--
--using QTest::QTouchEventSequence;
--
--namespace {
--MouseTouchAdaptor *g_instance = nullptr;
--
--const Qt::KeyboardModifiers TRI_PRESS_MODIFIER = Qt::ShiftModifier|Qt::ControlModifier|Qt::AltModifier;
--const Qt::KeyboardModifiers QUAD_PRESS_MODIFIER = TRI_PRESS_MODIFIER|Qt::MetaModifier;
--
--Qt::MouseButton translateMouseButton(xcb_button_t detail)
--{
--    switch (detail) {
--        case 1: return Qt::LeftButton;
--        case 2: return Qt::MidButton;
--        case 3: return Qt::RightButton;
--        // Button values 4-7 are Wheel events
--        default: return Qt::NoButton;
--    }
--}
--
--Qt::KeyboardModifiers translateMofidier(uint32_t mod)
--{
--    Qt::KeyboardModifiers qtMod = Qt::NoModifier;
--
--    if (mod & 0x01) qtMod |= Qt::ShiftModifier;
--    if (mod & 0x04) qtMod |= Qt::ControlModifier;
--    if (mod & 0x08) qtMod |= Qt::AltModifier;
--    if (mod & 0x40) qtMod |= Qt::MetaModifier;
--
--    return qtMod;
--}
--} // end of anonymous namespace
--
--MouseTouchAdaptor::MouseTouchAdaptor()
--    : QObject(nullptr)
--    , m_leftButtonIsPressed(false)
--    , m_triPressModifier(false)
--    , m_quadPressModifier(false)
--    , m_enabled(true)
--{
--    QCoreApplication::instance()->installNativeEventFilter(this);
--
--    m_touchDevice = new QTouchDevice;
--    m_touchDevice->setType(QTouchDevice::TouchScreen);
--    QWindowSystemInterface::registerTouchDevice(m_touchDevice);
--
--    fetchXInput2Info();
--}
--
--MouseTouchAdaptor::~MouseTouchAdaptor()
--{
--    g_instance = nullptr;
--}
--
--MouseTouchAdaptor* MouseTouchAdaptor::instance()
--{
--    if (!g_instance) {
--        g_instance = new MouseTouchAdaptor;
--    }
--
--    return g_instance;
--}
--
--void MouseTouchAdaptor::fetchXInput2Info()
--{
--    QPlatformNativeInterface *nativeInterface = qGuiApp->platformNativeInterface();
--    Display *xDisplay = static_cast<Display*>(nativeInterface->nativeResourceForIntegration("Display"));
--    if (xDisplay && XQueryExtension(xDisplay, "XInputExtension", &m_xiOpCode, &m_xiEventBase, &m_xiErrorBase)) {
--        int xiMajor = 2;
--        m_xi2Minor = 2; // try 2.2 first, needed for TouchBegin/Update/End
--        if (XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) == BadRequest) {
--            m_xi2Minor = 1; // for smooth scrolling 2.1 is enough
--            if (XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) == BadRequest) {
--                m_xi2Minor = 0; // for tablet support 2.0 is enough
--                m_xi2Enabled = XIQueryVersion(xDisplay, &xiMajor, &m_xi2Minor) != BadRequest;
--            } else
--                m_xi2Enabled = true;
--        } else {
--            m_xi2Enabled = true;
--        }
--    }
--}
--
--// Starting from the xcb version 1.9.3 struct xcb_ge_event_t has changed:
--// - "pad0" became "extension"
--// - "pad1" and "pad" became "pad0"
--// New and old version of this struct share the following fields:
--// NOTE: API might change again in the next release of xcb in which case this comment will
--// need to be updated to reflect the reality.
--typedef struct qt_xcb_ge_event_t {
--    uint8_t  response_type;
--    uint8_t  extension;
--    uint16_t sequence;
--    uint32_t length;
--    uint16_t event_type;
--} qt_xcb_ge_event_t;
--
--bool xi2PrepareXIGenericDeviceEvent(xcb_ge_event_t *ev, int opCode)
--{
--    qt_xcb_ge_event_t *event = (qt_xcb_ge_event_t *)ev;
--    // xGenericEvent has "extension" on the second byte, the same is true for xcb_ge_event_t starting from
--    // the xcb version 1.9.3, prior to that it was called "pad0".
--    if (event->extension == opCode) {
--        // xcb event structs contain stuff that wasn't on the wire, the full_sequence field
--        // adds an extra 4 bytes and generic events cookie data is on the wire right after the standard 32 bytes.
--        // Move this data back to have the same layout in memory as it was on the wire
--        // and allow casting, overwriting the full_sequence field.
--        memmove((char*) event + 32, (char*) event + 36, event->length * 4);
--        return true;
--    }
--    return false;
--}
--
--static inline qreal fixed1616ToReal(FP1616 val)
--{
--    return qreal(val) / 0x10000;
--}
--
--bool MouseTouchAdaptor::xi2HandleEvent(xcb_ge_event_t *event)
--{
--    if (!xi2PrepareXIGenericDeviceEvent(event, m_xiOpCode)) {
--        return false;
--    }
--
--    xXIGenericDeviceEvent *xiEvent = reinterpret_cast<xXIGenericDeviceEvent *>(event);
--    xXIDeviceEvent *xiDeviceEvent = 0;
--
--    switch (xiEvent->evtype) {
--    case XI_ButtonPress:
--    case XI_ButtonRelease:
--    case XI_Motion:
--        xiDeviceEvent = reinterpret_cast<xXIDeviceEvent *>(event);
--        break;
--    default:
--        break;
--    }
--
--    if (!xiDeviceEvent) {
--        return false;
--    }
--
--    switch (xiDeviceEvent->evtype) {
--    case XI_ButtonPress:
--        return handleButtonPress(
--                static_cast<WId>(xiDeviceEvent->event),
--                xiDeviceEvent->detail,
--                xiDeviceEvent->mods.base_mods,
--                fixed1616ToReal(xiDeviceEvent->event_x),
--                fixed1616ToReal(xiDeviceEvent->event_y));
--    case XI_ButtonRelease:
--        return handleButtonRelease(
--                static_cast<WId>(xiDeviceEvent->event),
--                xiDeviceEvent->detail,
--                    xiDeviceEvent->mods.base_mods,
--                fixed1616ToReal(xiDeviceEvent->event_x),
--                fixed1616ToReal(xiDeviceEvent->event_y));
--    case XI_Motion:
--        return handleMotionNotify(
--                static_cast<WId>(xiDeviceEvent->event),
--                xiDeviceEvent->mods.base_mods,
--                fixed1616ToReal(xiDeviceEvent->event_x),
--                fixed1616ToReal(xiDeviceEvent->event_y));
--        return true;
--    default:
--        return false;
--    }
--}
--
--
--bool MouseTouchAdaptor::nativeEventFilter(const QByteArray & eventType,
--                                          void * message, long * /*result*/)
--{
--    static int eventCount = 0;
--    eventCount++;
--    if (!m_enabled) {
--        return false;
--    }
--
--    if (eventType != "xcb_generic_event_t") {
--        // wrong backend.
--        qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");
--        return false;
--    }
--
--    xcb_generic_event_t *xcbEvent = static_cast<xcb_generic_event_t *>(message);
--
--    switch (xcbEvent->response_type & ~0x80) {
--        case XCB_BUTTON_PRESS: {
--            auto pressEvent = reinterpret_cast<xcb_button_press_event_t *>(xcbEvent);
--            return handleButtonPress(static_cast<WId>(pressEvent->event), pressEvent->detail, 0,
--                    pressEvent->event_x, pressEvent->event_y);
--        }
--        case XCB_BUTTON_RELEASE: {
--            auto releaseEvent = reinterpret_cast<xcb_button_release_event_t *>(xcbEvent);
--            return handleButtonRelease(static_cast<WId>(releaseEvent->event), releaseEvent->detail, 0,
--                    releaseEvent->event_x, releaseEvent->event_y);
--        }
--        case XCB_MOTION_NOTIFY: {
--            auto motionEvent = reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent);
--            return handleMotionNotify(static_cast<WId>(motionEvent->event), 0,
--                                      motionEvent->event_x, motionEvent->event_y);
--        }
--        case XCB_GE_GENERIC:
--            if (m_xi2Enabled) {
--                return xi2HandleEvent(reinterpret_cast<xcb_ge_event_t *>(xcbEvent));
--            } else {
--                return false;
--            }
--        default:
--            return false;
--    };
--}
--
--bool MouseTouchAdaptor::handleButtonPress(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y)
--{
--    Qt::MouseButton button = translateMouseButton(detail);
--    Qt::KeyboardModifiers qtMod = translateMofidier(modifiers);
--
--    // Just eat the event if it wasn't a left mouse press
--    if (button != Qt::LeftButton)
--        return true;
--
--    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
--
--    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
--
--    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
--                                                       false /* autoCommit */);
--    touchEvent.press(0 /* touchId */, windowPos);
--    if (qtMod == TRI_PRESS_MODIFIER) {
--        touchEvent.press(1, windowPos);
--        touchEvent.press(2, windowPos);
--        m_triPressModifier = true;
--    }
--    if (qtMod == QUAD_PRESS_MODIFIER) {
--        touchEvent.press(1, windowPos);
--        touchEvent.press(2, windowPos);
--        touchEvent.press(3, windowPos);
--        m_quadPressModifier = true;
--    }
--
--    touchEvent.commit(false /* processEvents */);
--
--    m_leftButtonIsPressed = true;
--    return true;
--}
--
--bool MouseTouchAdaptor::handleButtonRelease(WId windowId, uint32_t detail, uint32_t, int x, int y)
--{
--    Qt::MouseButton button = translateMouseButton(detail);
--
--    // Don't eat the event if it wasn't a left mouse press
--    if (button != Qt::LeftButton)
--        return false;
--
--    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
--
--    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
--
--    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
--                                                       false /* autoCommit */);
--    touchEvent.release(0 /* touchId */, windowPos);
--    if (m_triPressModifier) {
--        touchEvent.release(1, windowPos);
--        touchEvent.release(2, windowPos);
--    }
--    if (m_quadPressModifier) {
--        touchEvent.release(1, windowPos);
--        touchEvent.release(2, windowPos);
--        touchEvent.release(3, windowPos);
--    }
--    touchEvent.commit(false /* processEvents */);
--
--    m_leftButtonIsPressed = false;
--    m_triPressModifier = false;
--    m_quadPressModifier = false;
--    return true;
--}
--
--bool MouseTouchAdaptor::handleMotionNotify(WId windowId, uint32_t modifiers, int x, int y)
--{
--    if (!m_leftButtonIsPressed) {
--        return true;
--    }
--    Qt::KeyboardModifiers qtMod = translateMofidier(modifiers);
--
--    QWindow *targetWindow = findQWindowWithXWindowID(windowId);
--
--    QPoint windowPos(x / targetWindow->devicePixelRatio(), y / targetWindow->devicePixelRatio());
--
--    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
--                                                       false /* autoCommit */);
--    touchEvent.move(0 /* touchId */, windowPos);
--    if (m_triPressModifier) {
--        if (qtMod == TRI_PRESS_MODIFIER) {
--            touchEvent.move(1, windowPos);
--            touchEvent.move(2, windowPos);
--        } else {
--            // released modifiers
--            touchEvent.release(1, windowPos);
--            touchEvent.release(2, windowPos);
--            m_triPressModifier = false;
--        }
--    }
--    if (m_quadPressModifier) {
--        if (qtMod == QUAD_PRESS_MODIFIER) {
--            touchEvent.move(1, windowPos);
--            touchEvent.move(2, windowPos);
--            touchEvent.move(3, windowPos);
--        } else {
--            touchEvent.release(1, windowPos);
--            touchEvent.release(2, windowPos);
--            touchEvent.release(3, windowPos);
--            m_quadPressModifier = false;
--        }
--    }
--    touchEvent.commit(false /* processEvents */);
--
--    return true;
--}
--
--QWindow *MouseTouchAdaptor::findQWindowWithXWindowID(WId windowId)
--{
--    QWindowList windowList = QGuiApplication::topLevelWindows();
--    QWindow *foundWindow = nullptr;
--
--    int i = 0;
--    while (!foundWindow && i < windowList.count()) {
--        QWindow *window = windowList[i];
--        if (window->winId() == windowId) {
--            foundWindow = window;
--        } else {
--            ++i;
--        }
--    }
--
--    Q_ASSERT(foundWindow);
--    return foundWindow;
--}
--
--bool MouseTouchAdaptor::enabled() const
--{
--    return m_enabled;
--}
--
--void MouseTouchAdaptor::setEnabled(bool value)
--{
--    if (value != m_enabled) {
--        m_enabled = value;
--        Q_EMIT enabledChanged(value);
--    }
--}
 === removed file 'src/MouseTouchAdaptor.h'
 --- src/MouseTouchAdaptor.h	2017-01-17 14:20:54 +0000
 +++ src/MouseTouchAdaptor.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
--/*
-- * Copyright (C) 2013,2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>
-- */
--
--#ifndef MOUSE_TOUCH_ADAPTOR_H
--#define MOUSE_TOUCH_ADAPTOR_H
--
--#include <QtCore/QAbstractNativeEventFilter>
--#include <QWindow>
--
--#include <xcb/xcb.h>
--
--class QMouseEvent;
--class QTouchDevice;
--
--// Transforms QMouseEvents into single-finger QTouchEvents.
--class MouseTouchAdaptor : public QObject, public QAbstractNativeEventFilter {
--    Q_OBJECT
--public:
--    virtual ~MouseTouchAdaptor();
--
--    static MouseTouchAdaptor* instance();
--
--    // Filters mouse events and posts the equivalent QTouchEvents.
--    bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) override;
--
--    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
--
--    bool enabled() const;
--    void setEnabled(bool value);
--
--Q_SIGNALS:
--    void enabledChanged(bool value);
--
--private:
--    MouseTouchAdaptor();
--    void fetchXInput2Info();
--    bool xi2HandleEvent(xcb_ge_event_t *event);
--
--    bool handleButtonPress(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);
--    bool handleButtonRelease(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);
--    bool handleMotionNotify(WId windowId, uint32_t modifiers, int x, int y);
--    QWindow *findQWindowWithXWindowID(WId windowId);
--
--    QTouchDevice *m_touchDevice;
--    bool m_leftButtonIsPressed;
--    bool m_triPressModifier;
--    bool m_quadPressModifier;
--
--
--    bool m_enabled;
--
--    bool m_xi2Enabled{false};
--    int m_xi2Minor{-1};
--    int m_xiOpCode, m_xiEventBase, m_xiErrorBase;
--};
--
--#endif // MOUSE_TOUCH_ADAPTOR_H
 === modified file 'src/ShellApplication.cpp'
 --- src/ShellApplication.cpp	2017-01-10 14:46:22 +0000
 +++ src/ShellApplication.cpp	2017-02-23 19:04:58 +0000
@@ -40,7 +40,7 @@
      connect(this, &QGuiApplication::screenAdded, this, &ShellApplication::onScreenAdded);
--    setupQmlEngine(isMirServer);
++    setupQmlEngine();
      UnityCommandLineParser parser(*this);
@@ -86,15 +86,6 @@
          m_shellView->setFlags(Qt::FramelessWindowHint);
+     }
--
--    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
--    // You will need this if you want to interact with touch-only components using a mouse
--    // Needed only when manually testing on a desktop.
--    if (parser.hasMouseToTouch()) {
--        m_mouseTouchAdaptor = MouseTouchAdaptor::instance();
--    }
--    #endif
--
      new DebuggingController(this);
      // Some hard-coded policy for now.
@@ -144,25 +135,17 @@
      delete m_secondaryWindow;
      m_secondaryWindow = nullptr;
--    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
--    delete m_mouseTouchAdaptor;
--    m_mouseTouchAdaptor = nullptr;
--    #endif
--
      delete m_qmlEngine;
      m_qmlEngine = nullptr;
+ }
--void ShellApplication::setupQmlEngine(bool isMirServer)
++void ShellApplication::setupQmlEngine()
+ {
      m_qmlEngine = new QQmlEngine(this);
      m_qmlEngine->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
      prependImportPaths(m_qmlEngine, ::overrideImportPaths());
--    if (!isMirServer) {
--        prependImportPaths(m_qmlEngine, ::nonMirImportPaths());
--    }
      appendImportPaths(m_qmlEngine, ::fallbackImportPaths());
      m_qmlEngine->setNetworkAccessManagerFactory(new CachingNetworkManagerFactory);
 === modified file 'src/ShellApplication.h'
 --- src/ShellApplication.h	2015-12-16 13:58:39 +0000
 +++ src/ShellApplication.h	2017-02-23 19:04:58 +0000
@@ -24,10 +24,6 @@
  #include "ApplicationArguments.h"
--#ifdef UNITY8_ENABLE_TOUCH_EMULATION
--#include "MouseTouchAdaptor.h"
--#endif
--
  #include "SecondaryWindow.h"
  #include "ShellView.h"
@@ -47,16 +43,12 @@
      void onScreenAdded(QScreen*);
  private:
--    void setupQmlEngine(bool isMirServer);
++    void setupQmlEngine();
      QString m_deviceName;
      ApplicationArguments m_qmlArgs;
      ShellView *m_shellView{nullptr};
      SecondaryWindow *m_secondaryWindow{nullptr};
--    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
--    MouseTouchAdaptor *m_mouseTouchAdaptor{nullptr};
--    #endif
--
      QQmlEngine *m_qmlEngine{nullptr};
  };
 === modified file 'src/UnityCommandLineParser.cpp'
 --- src/UnityCommandLineParser.cpp	2015-12-16 13:58:39 +0000
 +++ src/UnityCommandLineParser.cpp	2017-02-23 19:04:58 +0000
@@ -37,12 +37,6 @@
          QStringLiteral("Run without window borders"));
      parser.addOption(framelessOption);
--    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
--    QCommandLineOption mousetouchOption(QStringLiteral("mousetouch"),
--        QStringLiteral("Allow the mouse to provide touch input"));
--    parser.addOption(mousetouchOption);
--    #endif
--
      QCommandLineOption windowGeometryOption(QStringList() << QStringLiteral("windowgeometry"),
              QStringLiteral("Specify the window geometry as [<width>x<height>]"), QStringLiteral("windowgeometry"), QStringLiteral("1"));
      parser.addOption(windowGeometryOption);
@@ -78,10 +72,6 @@
      m_hasTestability = parser.isSet(testabilityOption);
      m_hasFrameless = parser.isSet(framelessOption);
--    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
--    m_hasMouseToTouch = parser.isSet(mousetouchOption);
--    #endif
--
      m_hasFullscreen = parser.isSet(fullscreenOption);
      m_deviceName = parser.value(devicenameOption);
      resolveMode(parser, modeOption);
 === modified file 'src/UnityCommandLineParser.h'
 --- src/UnityCommandLineParser.h	2015-12-16 13:58:39 +0000
 +++ src/UnityCommandLineParser.h	2017-02-23 19:04:58 +0000
@@ -29,10 +29,6 @@
      bool hasTestability() const { return m_hasTestability; }
      bool hasFrameless() const { return m_hasFrameless; }
--    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
--    bool hasMouseToTouch() const { return m_hasMouseToTouch; }
--    #endif
--
      bool hasFullscreen() const { return m_hasFullscreen; }
      QString deviceName() const { return m_deviceName; }
      QString mode() const { return m_mode; }
@@ -48,10 +44,6 @@
      bool m_hasTestability;
      bool m_hasFrameless;
--    #ifdef UNITY8_ENABLE_TOUCH_EMULATION
--    bool m_hasMouseToTouch;
--    #endif
--
      bool m_hasFullscreen;
      QString m_deviceName;
      QString m_mode;
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2017-01-24 07:43:35 +0000
 +++ tests/CMakeLists.txt	2017-02-23 19:04:58 +0000
@@ -77,7 +77,7 @@
+     )
  endfunction()
--# add a graphical unit test
++# add a graphical unit test running as a regular GUI app
  function(add_unity8_uitest COMPONENT_NAME TARGET)
      unity8_parse_arguments(${ARGN})
      add_executable_test(${COMPONENT_NAME} ${TARGET}
@@ -103,7 +103,7 @@
+     )
  endfunction()
--# add a graphical qml test
++# add a graphical qml test running as a mir server
  function(add_unity8_qmltest PATH COMPONENT_NAME)
      unity8_parse_arguments(${ARGN})
      add_qml_test(${PATH} ${COMPONENT_NAME}
@@ -111,6 +111,19 @@
          TARGETS uitests
          ${U8TEST_ARGN}
          ENVIRONMENT ${environment}
++                    QT_QPA_PLATFORM=mirserver
++                    ${U8TEST_ENVIRONMENT}
++    )
++endfunction()
++
++# add a graphical qml test running as a regular application in the host system
++function(add_unity8_simpleqmltest PATH COMPONENT_NAME)
++    unity8_parse_arguments(${ARGN})
++    add_qml_test(${PATH} ${COMPONENT_NAME}
++        IMPORT_PATHS ${UNITY_IMPORT_PATHS}
++        TARGETS uitests
++        ${U8TEST_ARGN}
++        ENVIRONMENT ${environment}
                      ${U8TEST_ENVIRONMENT}
+     )
  endfunction()
 === modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
 --- tests/autopilot/unity8/shell/tests/__init__.py	2016-12-19 19:55:07 +0000
 +++ tests/autopilot/unity8/shell/tests/__init__.py	2017-02-23 19:04:58 +0000
@@ -149,7 +149,6 @@
                  '-windowgeometry',
                  geo_string,
                  '-frameless',
--                '-mousetouch'
+             ]
          return scale_divisor
 === modified file 'tests/mocks/Cursor/CMakeLists.txt'
 --- tests/mocks/Cursor/CMakeLists.txt	2016-12-06 20:16:56 +0000
 +++ tests/mocks/Cursor/CMakeLists.txt	2017-02-23 19:04:58 +0000
@@ -1,1 +1,34 @@
--add_unity8_mock(Cursor 1.1 Cursor)
++include_directories(
++    ${CMAKE_CURRENT_SOURCE_DIR}
++    ${CMAKE_SOURCE_DIR}/plugins/Cursor/3rd_party/xcursor
++    ${CMAKE_SOURCE_DIR}/plugins/Cursor/
++)
++
++include_directories(
++    SYSTEM
++    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
++)
++
++set(QMLPLUGIN_SRC
++    plugin.cpp
++    WindowedMousePointer.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Cursor/CursorImageInfo.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Cursor/CursorImageProvider.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Cursor/MousePointer.cpp
++    # We need to run moc on this header
++    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h
++    )
++
++add_library(WindowedCursor-qml SHARED ${QMLPLUGIN_SRC})
++
++target_link_libraries(WindowedCursor-qml
++    xcursorloader-static
++    ${QT5PLATFORM_SUPPORT_LDFLAGS}
++)
++
++qt5_use_modules(WindowedCursor-qml Qml Quick Svg)
++
++# It takes Cursor.qml directly from the production Cursor plugin. We use our own qmldir file though, hence
++# the custom globbing expression.
++add_unity8_mock(Cursor 1.1 Cursor
++    GLOBBING_EXPRESSIONS ${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${CMAKE_SOURCE_DIR}/plugins/Cursor/*.qml)
 === removed file 'tests/mocks/Cursor/Cursor.qml'
 --- tests/mocks/Cursor/Cursor.qml	2016-10-03 11:15:27 +0000
 +++ tests/mocks/Cursor/Cursor.qml	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
--/*
-- * Copyright (C) 2015-2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.4
--
--Item {
--    property int topBoundaryOffset // effectively panel height
--    property Item confiningItem
--
--    signal pushedLeftBoundary(real amount, int buttons)
--    signal pushedRightBoundary(real amount, int buttons)
--    signal pushedTopBoundary(real amount, int buttons)
--    signal pushedTopLeftCorner(real amount, int buttons)
--    signal pushedTopRightCorner(real amount, int buttons)
--    signal pushedBottomLeftCorner(real amount, int buttons)
--    signal pushedBottomRightCorner(real amount, int buttons)
--    signal pushStopped()
--    signal mouseMoved()
--
--    onMouseMoved: opacity = 1;
--}
 === added file 'tests/mocks/Cursor/WindowedMousePointer.cpp'
 --- tests/mocks/Cursor/WindowedMousePointer.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Cursor/WindowedMousePointer.cpp	2017-02-23 19:04:58 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright (C) 2017 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "WindowedMousePointer.h"
++
++// Qt
++#include <qpa/qwindowsysteminterface.h>
++#include <QQuickWindow>
++
++void WindowedMousePointer::handleMouseEvent(ulong timestamp, QPointF movement, QPointF position, Qt::MouseButtons buttons,
++        Qt::KeyboardModifiers modifiers)
++{
++    if (!parentItem()) {
++        return;
++    }
++
++    if (!movement.isNull()) {
++        Q_EMIT mouseMoved();
++    }
++
++    if (modifiers.testFlag(Qt::ShiftModifier)) {
++        // put it back within shell bounds
++        if (m_wasMatchingPosition) {
++            setX(qBound(0.0, x(), parentItem()->width() - 1));
++            setY(qBound(0.0, y(), parentItem()->height() - 1));
++        }
++
++        // Behave just like the real mouse in production which will do edge pushes, will be
++        // constrained to scene boundaries and obeys item confinement. Useful for testing such features.
++        applyMouseMovement(timestamp, movement, buttons, modifiers);
++
++        m_wasMatchingPosition = false;
++    } else {
++        // Blindly follow host mouse pointer. Can go outside shell item boundaries, which is needed to reach the test UI controls
++        // since they lie outside it.
++        // It's also more intuitive as the tester expects the shell mouse to be where the host mouse is no matter what.
++        matchMousePosition(timestamp, position, buttons, modifiers);
++    }
++
++}
++
++void WindowedMousePointer::matchMousePosition(ulong timestamp, QPointF position, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers)
++{
++    QPointF localPos = parentItem()->mapFromScene(position);
++    setX(localPos.x());
++    setY(localPos.y());
++    m_wasMatchingPosition = true;
++    QWindowSystemInterface::handleMouseEvent(window(), timestamp, position /*local*/, position /*global*/, buttons, modifiers);
++}
 === added file 'tests/mocks/Cursor/WindowedMousePointer.h'
 --- tests/mocks/Cursor/WindowedMousePointer.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Cursor/WindowedMousePointer.h	2017-02-23 19:04:58 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright (C) 2017 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef WINDOWED_MOUSE_POINTER_H
++#define WINDOWED_MOUSE_POINTER_H
++
++// From the real Cursor plugin
++#include <MousePointer.h>
++
++class WindowedMousePointer : public MousePointer {
++    Q_OBJECT
++public:
++public Q_SLOTS:
++    void handleMouseEvent(ulong timestamp, QPointF movement, QPointF position, Qt::MouseButtons buttons,
++            Qt::KeyboardModifiers modifiers) override;
++private:
++    void matchMousePosition(ulong timestamp, QPointF position, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
++
++    bool m_wasMatchingPosition{false};
++};
++
++#endif // WINDOWED_MOUSE_POINTER_H
 === added file 'tests/mocks/Cursor/plugin.cpp'
 --- tests/mocks/Cursor/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Cursor/plugin.cpp	2017-02-23 19:04:58 +0000
@@ -0,0 +1,43 @@
++/*
++ * Copyright (C) 2017 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++// Qt
++#include <QtQml/qqml.h>
++#include <QQmlContext>
++
++// self
++#include "plugin.h"
++
++// from the real Cursor plugin
++#include <CursorImageInfo.h>
++#include <CursorImageProvider.h>
++
++// local
++#include "WindowedMousePointer.h"
++
++void WindowedCursorPlugin::registerTypes(const char *uri)
++{
++    Q_ASSERT(uri == QLatin1String("Cursor"));
++    qmlRegisterType<CursorImageInfo>(uri, 1, 1, "CursorImageInfo");
++    qmlRegisterType<WindowedMousePointer>(uri, 1, 1, "MousePointer");
++}
++
++void WindowedCursorPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
++{
++    QQmlExtensionPlugin::initializeEngine(engine, uri);
++
++    engine->addImageProvider(QStringLiteral("cursor"), new CursorImageProvider());
++}
 === added file 'tests/mocks/Cursor/plugin.h'
 --- tests/mocks/Cursor/plugin.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Cursor/plugin.h	2017-02-23 19:04:58 +0000
@@ -0,0 +1,33 @@
++/*
++ * Copyright (C) 2017 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef WINDOWED_CURSOR_PLUGIN_H
++#define WINDOWED_CURSOR_PLUGIN_H
++
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlExtensionPlugin>
++
++class WindowedCursorPlugin : public QQmlExtensionPlugin
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++
++public:
++    void registerTypes(const char *uri) override;
++    void initializeEngine(QQmlEngine *engine, const char *uri) override;
++};
++
++#endif // WINDOWED_CURSOR_PLUGIN_H
 === modified file 'tests/mocks/Cursor/qmldir'
 --- tests/mocks/Cursor/qmldir	2016-05-19 19:44:37 +0000
 +++ tests/mocks/Cursor/qmldir	2017-02-23 19:04:58 +0000
@@ -1,2 +1,3 @@
  module Cursor
++plugin WindowedCursor-qml
  Cursor 1.1 Cursor.qml
 === removed file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
 --- tests/mocks/Unity/Application/ApplicationInfo.cpp	2017-01-26 11:10:01 +0000
 +++ tests/mocks/Unity/Application/ApplicationInfo.cpp	1970-01-01 00:00:00 +0000
@@ -1,417 +0,0 @@
--/*
-- * Copyright (C) 2013-2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "ApplicationInfo.h"
--#include "MirSurface.h"
--#include "SurfaceManager.h"
--
--#include <paths.h>
--
--#include <QGuiApplication>
--#include <QQuickItem>
--#include <QQuickView>
--#include <QQmlComponent>
--
--#define APPLICATION_DEBUG 0
--
--#if APPLICATION_DEBUG
--#define DEBUG_MSG(params) qDebug().nospace() << "Application["<<appId()<<"]::" << __func__  << " " << params
--
--QString stateToStr(ApplicationInfo::State state)
--{
--    switch (state) {
--    case ApplicationInfo::Starting:
--        return "starting";
--    case ApplicationInfo::Running:
--        return "running";
--    case ApplicationInfo::Suspended:
--        return "suspended";
--    case ApplicationInfo::Stopped:
--        return "stopped";
--    default:
--        return "???";
--    };
--}
--
--#else
--#define DEBUG_MSG(params) ((void)0)
--#endif
--
--#define WARNING_MSG(params) qWarning().nospace() << "Application["<<appId()<<"]::" << __func__  << " " << params
--
--ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)
--    : ApplicationInfoInterface(appId, parent)
--    , m_appId(appId)
--    , m_surfaceList(new MirSurfaceListModel(this))
--    , m_promptSurfaceList(new MirSurfaceListModel(this))
--{
--    connect(m_surfaceList, &MirSurfaceListModel::countChanged,
--        this, &ApplicationInfo::onSurfaceCountChanged, Qt::QueuedConnection);
--
--    m_surfaceCreationTimer.setSingleShot(true);
--    m_surfaceCreationTimer.setInterval(500);
--    connect(&m_surfaceCreationTimer, &QTimer::timeout, this, &ApplicationInfo::createSurface);
--}
--
--ApplicationInfo::ApplicationInfo(QObject *parent)
--    : ApplicationInfo(QString(), parent)
--{
--}
--
--ApplicationInfo::~ApplicationInfo()
--{
--}
--
--void ApplicationInfo::createPromptSurface()
--{
--    if (state() == ApplicationInfo::Stopped) { return; }
--
--    auto surfaceManager = SurfaceManager::instance();
--    if (!surfaceManager) {
--        WARNING_MSG("No SurfaceManager");
--        return;
--    }
--
--    QStringList screenshotIds = {"gallery", "map", "facebook", "camera", "browser", "music", "twitter"};
--    int i = rand() % screenshotIds.count();
--
--    QUrl screenshotUrl = QString("qrc:///Unity/Application/screenshots/%1@12.png")
--            .arg(screenshotIds[i]);
--
--    auto surface = surfaceManager->createSurface(QString("prompt foo"),
--            Mir::NormalType,
--            Mir::RestoredState,
--            nullptr, /* parentSurface */
--            screenshotUrl);
--    surfaceManager->notifySurfaceCreated(surface);
--
--    m_promptSurfaceList->addSurface(surface);
--
--    surfaceManager->activate(surface);
--}
--
--void ApplicationInfo::createSurface()
--{
--    if (state() == ApplicationInfo::Stopped) { return; }
--
--    QString surfaceName = name() + "s window title";
--    if (m_surfaceList->count() > 0) {
--        surfaceName.append(QString(" %1").arg(m_surfaceList->count()+1));
--    }
--
--    auto surfaceManager = SurfaceManager::instance();
--    if (!surfaceManager) {
--        WARNING_MSG("No SurfaceManager");
--        return;
--    }
--
--    bool wasFocused = focused();
--
--    auto surface = surfaceManager->createSurface(surfaceName,
--           Mir::NormalType,
--           fullscreen() ? Mir::FullscreenState : Mir::RestoredState,
--           nullptr, /* parentSurface */
--           m_screenshotFileName,
--           m_qmlFilePath);
--
--    surface->setShellChrome(m_shellChrome);
--
--    m_surfaceList->addSurface(surface);
--
--    ++m_liveSurfaceCount;
--    connect(surface, &MirSurface::liveChanged, this, [this, surface](){
--        if (!surface->live()) {
--            --m_liveSurfaceCount;
--            if (m_liveSurfaceCount == 0) {
--                if (m_closingSurfaces.contains(surface)
--                        || (m_state == Running && m_requestedState == RequestedRunning)) {
--                    Q_EMIT closed();
--                }
--                setState(Stopped);
--            } else {
--                if (m_closingSurfaces.contains(surface) && m_requestedState == RequestedSuspended
--                        && m_closingSurfaces.count() == 1) {
--                    setState(Suspended);
--                }
--            }
--            m_closingSurfaces.removeAll(surface);
--        }
--    });
--    connect(surface, &MirSurface::closeRequested, this, [this, surface](){
--        m_closingSurfaces.append(surface);
--        if (m_state == Suspended) {
--            // resume to allow application to close its surface
--            setState(Running);
--        }
--    });
--    connect(surface, &MirSurfaceInterface::focusedChanged, this, [&](bool /*value*/) {
--        #if APPLICATION_DEBUG
--        qDebug().nospace() << "Application[" << appId() << "].focusedChanged(" << focused() << ")";
--        #endif
--        Q_EMIT focusedChanged(focused());
--    });
--
--    connect(surface, &MirSurface::focusRequested, this, &ApplicationInfo::focusRequested);
--
--    if (wasFocused != focused()) {
--        Q_EMIT focusedChanged(focused());
--    }
--
--    if (m_state == Starting) {
--        if (m_requestedState == RequestedRunning) {
--            setState(Running);
--        } else {
--            setState(Suspended);
--        }
--    }
--
--    surfaceManager->notifySurfaceCreated(surface);
--    surfaceManager->activate(surface);
--}
--
--void ApplicationInfo::setIconId(const QString &iconId)
--{
--    setIcon(QUrl(testDataDir() + "/graphics/applicationIcons/" + iconId + "@18.png"));
--}
--
--void ApplicationInfo::setScreenshotId(const QString &screenshotId)
--{
--    QString screenshotFileName;
--
--    if (screenshotId.endsWith(".svg")) {
--        screenshotFileName = QString("qrc:///Unity/Application/screenshots/%2")
--            .arg(screenshotId);
--    } else {
--        screenshotFileName = QString("qrc:///Unity/Application/screenshots/%2@12.png")
--            .arg(screenshotId);
--    }
--
--    if (screenshotFileName != m_screenshotFileName) {
--        m_screenshotFileName = screenshotFileName;
--    }
--}
--
--void ApplicationInfo::setQmlFilename(const QString &qmlFilename)
--{
--    m_qmlFilePath = QString("qrc:///Unity/Application/%1").arg(qmlFilename);
--}
--
--void ApplicationInfo::setName(const QString &value)
--{
--    if (value != m_name) {
--        m_name = value;
--        Q_EMIT nameChanged(value);
--    }
--}
--
--void ApplicationInfo::setIcon(const QUrl &value)
--{
--    if (value != m_icon) {
--        m_icon = value;
--        Q_EMIT iconChanged(value);
--    }
--}
--
--void ApplicationInfo::setState(State value)
--{
--    if (value != m_state) {
--        DEBUG_MSG(qPrintable(stateToStr(value)));
--        if (!m_manualSurfaceCreation && value == ApplicationInfo::Starting) {
--            Q_ASSERT(m_surfaceList->count() == 0);
--            m_surfaceCreationTimer.start();
--        } else if (value == ApplicationInfo::Stopped) {
--            m_surfaceCreationTimer.stop();
--            for (int i = 0; i < m_surfaceList->count(); ++i) {
--                MirSurface *surface = static_cast<MirSurface*>(m_surfaceList->get(i));
--                surface->setLive(false);
--            }
--            for (int i = 0; i < m_promptSurfaceList->count(); ++i) {
--                auto surface = static_cast<MirSurface*>(m_promptSurfaceList->get(i));
--                surface->setLive(false);
--            }
--        }
--
--        m_state = value;
--        Q_EMIT stateChanged(value);
--    }
--}
--
--void ApplicationInfo::close()
--{
--    DEBUG_MSG("");
--
--    if (m_surfaceList->count() > 0) {
--        for (int i = 0; i < m_surfaceList->count(); ++i) {
--            MirSurface *surface = static_cast<MirSurface*>(m_surfaceList->get(i));
--            surface->close();
--        }
--    } else {
--        setState(Stopped);
--        Q_EMIT closed();
--    }
--}
--
--void ApplicationInfo::setFullscreen(bool value)
--{
--    m_fullscreen = value;
--    if (m_surfaceList->rowCount() > 0) {
--        m_surfaceList->get(0)->requestState(Mir::FullscreenState);
--    }
--}
--
--bool ApplicationInfo::fullscreen() const
--{
--    if (m_surfaceList->rowCount() > 0) {
--        return m_surfaceList->get(0)->state() == Mir::FullscreenState;
--    } else {
--        return m_fullscreen;
--    }
--}
--
--void ApplicationInfo::setManualSurfaceCreation(bool value)
--{
--    if (value != m_manualSurfaceCreation) {
--        m_manualSurfaceCreation = value;
--        Q_EMIT manualSurfaceCreationChanged(value);
--
--        if (m_manualSurfaceCreation && m_surfaceCreationTimer.isActive()) {
--            m_surfaceCreationTimer.stop();
--        }
--    }
--}
--
--Qt::ScreenOrientations ApplicationInfo::supportedOrientations() const
--{
--    return m_supportedOrientations;
--}
--
--void ApplicationInfo::setSupportedOrientations(Qt::ScreenOrientations orientations)
--{
--    m_supportedOrientations = orientations;
--}
--
--bool ApplicationInfo::rotatesWindowContents() const
--{
--    return m_rotatesWindowContents;
--}
--
--void ApplicationInfo::setRotatesWindowContents(bool value)
--{
--    m_rotatesWindowContents = value;
--}
--
--ApplicationInfo::RequestedState ApplicationInfo::requestedState() const
--{
--    return m_requestedState;
--}
--
--void ApplicationInfo::setRequestedState(RequestedState value)
--{
--    if (m_requestedState == value) {
--        return;
--    }
--    DEBUG_MSG((value == RequestedRunning ? "RequestedRunning" : "RequestedSuspended") );
--
--    m_requestedState = value;
--    Q_EMIT requestedStateChanged(m_requestedState);
--
--    if (m_requestedState == RequestedRunning) {
--
--        if (m_state == Suspended) {
--            Q_ASSERT(m_liveSurfaceCount > 0);
--            setState(Running);
--        } else if (m_state == Stopped) {
--            Q_ASSERT(m_liveSurfaceCount == 0);
--            // it's restarting
--            setState(Starting);
--        }
--
--    } else if (m_requestedState == RequestedSuspended && m_state == Running
--            && m_closingSurfaces.isEmpty()) {
--        setState(Suspended);
--    }
--}
--
--bool ApplicationInfo::isTouchApp() const
--{
--    return m_isTouchApp;
--}
--
--void ApplicationInfo::setIsTouchApp(bool isTouchApp)
--{
--    m_isTouchApp = isTouchApp;
--}
--
--bool ApplicationInfo::exemptFromLifecycle() const
--{
--    return m_exemptFromLifecycle;
--}
--
--void ApplicationInfo::setExemptFromLifecycle(bool exemptFromLifecycle)
--{
--    if (m_exemptFromLifecycle != exemptFromLifecycle)
--    {
--        m_exemptFromLifecycle = exemptFromLifecycle;
--        Q_EMIT exemptFromLifecycleChanged(m_exemptFromLifecycle);
--    }
--}
--
--QSize ApplicationInfo::initialSurfaceSize() const
--{
--    return m_initialSurfaceSize;
--}
--
--void ApplicationInfo::setInitialSurfaceSize(const QSize &size)
--{
--    if (size != m_initialSurfaceSize) {
--        m_initialSurfaceSize = size;
--        Q_EMIT initialSurfaceSizeChanged(m_initialSurfaceSize);
--    }
--}
--
--void ApplicationInfo::setShellChrome(Mir::ShellChrome shellChrome)
--{
--    m_shellChrome = shellChrome;
--    if (m_surfaceList->rowCount() > 0) {
--        static_cast<MirSurface*>(m_surfaceList->get(0))->setShellChrome(shellChrome);
--    }
--}
--
--bool ApplicationInfo::focused() const
--{
--    bool someSurfaceHasFocus = false; // to be proven wrong
--    for (int i = 0; i < m_surfaceList->count() && !someSurfaceHasFocus; ++i) {
--        someSurfaceHasFocus = m_surfaceList->get(i)->focused();
--    }
--    return someSurfaceHasFocus;
--}
--
--void ApplicationInfo::onSurfaceCountChanged()
--{
--    if (m_surfaceList->count() == 0 && m_state == Running) {
--        setState(Stopped);
--    }
--}
--
--void ApplicationInfo::requestFocus()
--{
--    if (m_surfaceList->count() == 0) {
--        Q_EMIT focusRequested();
--    } else {
--        auto surface = static_cast<MirSurface*>(m_surfaceList->get(0));
--        surface->requestFocus();
--    }
--}
 === removed file 'tests/mocks/Unity/Application/ApplicationInfo.h'
 --- tests/mocks/Unity/Application/ApplicationInfo.h	2017-01-26 11:10:01 +0000
 +++ tests/mocks/Unity/Application/ApplicationInfo.h	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
--/*
-- * Copyright (C) 2013-2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef APPLICATION_H
--#define APPLICATION_H
--
--#include <QObject>
--
--class MirSurface;
--
--// unity-api
--#include <unity/shell/application/ApplicationInfoInterface.h>
--#include <unity/shell/application/Mir.h>
--
--#include "MirSurfaceListModel.h"
--
--#include <QList>
--#include <QTimer>
--#include <QUrl>
--
--using namespace unity::shell::application;
--
--class ApplicationInfo : public ApplicationInfoInterface {
--    Q_OBJECT
--
--    ////
--    // FIXME: Remove those
--    Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
--
--    // Only exists in this fake implementation
--
--    // whether the test code will explicitly control the creation of the application surface
--    Q_PROPERTY(bool manualSurfaceCreation READ manualSurfaceCreation WRITE setManualSurfaceCreation NOTIFY manualSurfaceCreationChanged)
--
--    Q_PROPERTY(QString screenshot READ screenshot CONSTANT)
--
--public:
--    ApplicationInfo(QObject *parent = nullptr);
--    ApplicationInfo(const QString &appId, QObject *parent = nullptr);
--    ~ApplicationInfo();
--
--    Q_INVOKABLE void createPromptSurface();
--
--    RequestedState requestedState() const override;
--    void setRequestedState(RequestedState) override;
--
--    void setIconId(const QString &iconId);
--    void setScreenshotId(const QString &screenshotId);
--    void setQmlFilename(const QString &);
--
--    void setAppId(const QString &value) { m_appId = value; }
--    QString appId() const override { return m_appId; }
--
--    void setName(const QString &value);
--    QString name() const override { return m_name; }
--
--    QString comment() const override { return QString(); }
--
--    QUrl icon() const override { return m_icon; }
--
--    Q_INVOKABLE void setState(State value);
--    State state() const override { return m_state; }
--
--    bool focused() const override;
--
--    QString splashTitle() const override { return QString(); }
--    QUrl splashImage() const override { return QUrl(); }
--    bool splashShowHeader() const override { return false; }
--    QColor splashColor() const override { return QColor(0,0,0,0); }
--    QColor splashColorHeader() const override { return QColor(0,0,0,0); }
--    QColor splashColorFooter() const override { return QColor(0,0,0,0); }
--
--    QString screenshot() const { return m_screenshotFileName; }
--
--    void setFullscreen(bool value);
--    bool fullscreen() const;
--
--    Qt::ScreenOrientations supportedOrientations() const override;
--    void setSupportedOrientations(Qt::ScreenOrientations orientations);
--
--    bool rotatesWindowContents() const override;
--    void setRotatesWindowContents(bool value);
--
--    bool manualSurfaceCreation() const { return m_manualSurfaceCreation; }
--    void setManualSurfaceCreation(bool value);
--
--    bool isTouchApp() const override;
--    void setIsTouchApp(bool isTouchApp); // only in mock
--
--    bool exemptFromLifecycle() const override;
--    void setExemptFromLifecycle(bool) override;
--
--    QSize initialSurfaceSize() const override;
--    void setInitialSurfaceSize(const QSize &size) override;
--
--    Q_INVOKABLE void setShellChrome(Mir::ShellChrome shellChrome);
--
--    MirSurfaceListInterface* surfaceList() const override { return m_surfaceList; }
--    MirSurfaceListInterface* promptSurfaceList() const override { return m_promptSurfaceList; }
--    int surfaceCount() const override { return m_surfaceList->count(); }
--
--    //////
--    // internal mock stuff
--    void close() override;
--    void requestFocus();
--
--Q_SIGNALS:
--    void fullscreenChanged(bool value);
--    void manualSurfaceCreationChanged(bool value);
--    void closed();
--
--public Q_SLOTS:
--    Q_INVOKABLE void createSurface();
--
--private Q_SLOTS:
--    void onSurfaceCountChanged();
--
--private:
--    void setIcon(const QUrl &value);
--
--    QString m_screenshotFileName;
--
--    QString m_appId;
--    QString m_name;
--    QUrl m_icon;
--    State m_state{Stopped};
--    bool m_fullscreen{false};
--    Qt::ScreenOrientations m_supportedOrientations{Qt::PortraitOrientation |
--            Qt::LandscapeOrientation |
--            Qt::InvertedPortraitOrientation |
--            Qt::InvertedLandscapeOrientation};
--    bool m_rotatesWindowContents{false};
--    RequestedState m_requestedState{RequestedRunning};
--    bool m_isTouchApp{true};
--    bool m_exemptFromLifecycle{false};
--    QSize m_initialSurfaceSize;
--    MirSurfaceListModel *m_surfaceList;
--    MirSurfaceListModel *m_promptSurfaceList;
--    int m_liveSurfaceCount{0};
--    QTimer m_surfaceCreationTimer;
--    QList<MirSurface*> m_closingSurfaces;
--    bool m_manualSurfaceCreation{false};
--    Mir::ShellChrome m_shellChrome{Mir::NormalChrome};
--    QUrl m_qmlFilePath;
--};
--
--Q_DECLARE_METATYPE(ApplicationInfo*)
--
--#endif  // APPLICATION_H
 === removed file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
 --- tests/mocks/Unity/Application/ApplicationManager.cpp	2017-01-26 11:10:01 +0000
 +++ tests/mocks/Unity/Application/ApplicationManager.cpp	1970-01-01 00:00:00 +0000
@@ -1,557 +0,0 @@
--/*
-- * Copyright (C) 2013-2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "ApplicationManager.h"
--#include "ApplicationInfo.h"
--#include "MirSurface.h"
--
--#include <paths.h>
--#include <csignal>
--
--#include <QDir>
--#include <QGuiApplication>
--#include <QQuickItem>
--#include <QQuickView>
--#include <QQmlComponent>
--#include <QTimer>
--#include <QDateTime>
--#include <QtDBus/QtDBus>
--
--#define APPLICATIONMANAGER_DEBUG 0
--
--#if APPLICATIONMANAGER_DEBUG
--#define DEBUG_MSG(params) qDebug().nospace() << "ApplicationManager::" << __func__  << " " << params
--#define XDEBUG_MSG(params) qDebug().nospace() << "ApplicationManager::" << params
--#else
--#define DEBUG_MSG(params) ((void)0)
--#define XDEBUG_MSG(params) ((void)0)
--#endif
--
--namespace unityapi = unity::shell::application;
--
--
--ApplicationManager::ApplicationManager(QObject *parent)
--    : ApplicationManagerInterface(parent)
--{
--    DEBUG_MSG("");
--
--    ApplicationManagerNotifier::instance()->setApplicationManager(this);
--
--    buildListOfAvailableApplications();
--
--    // Emit signal to notify Upstart that Mir is ready to receive client connections
--    // see http://upstart.ubuntu.com/cookbook/#expect-stop
--    // We do this because some autopilot tests actually use this mock Unity.Application module,
--    // so we have to mimic what the real ApplicationManager does in that regard.
--    if (qgetenv("UNITY_MIR_EMITS_SIGSTOP") == "1") {
--        raise(SIGSTOP);
--    }
--}
--
--ApplicationManager::~ApplicationManager()
--{
--    ApplicationManagerNotifier::instance()->setApplicationManager(nullptr);
--}
--
--int ApplicationManager::rowCount(const QModelIndex& parent) const {
--    return !parent.isValid() ? m_runningApplications.size() : 0;
--}
--
--QVariant ApplicationManager::data(const QModelIndex& index, int role) const {
--    if (index.row() < 0 || index.row() >= m_runningApplications.size())
--        return QVariant();
--
--    auto app = m_runningApplications.at(index.row());
--    switch(role) {
--    case RoleAppId:
--        return app->appId();
--    case RoleName:
--        return app->name();
--    case RoleComment:
--        return app->comment();
--    case RoleIcon:
--        return app->icon();
--    case RoleState:
--        return app->state();
--    case RoleFocused:
--        return app->focused();
--    case RoleIsTouchApp:
--        return app->isTouchApp();
--    case RoleExemptFromLifecycle:
--        return app->exemptFromLifecycle();
--    case RoleApplication:
--        return QVariant::fromValue(static_cast<unityapi::ApplicationInfoInterface*>(app));
--    default:
--        return QVariant();
--    }
--}
--
--ApplicationInfo *ApplicationManager::get(int row) const {
--    if (row < 0 || row >= m_runningApplications.size())
--        return nullptr;
--    return m_runningApplications.at(row);
--}
--
--ApplicationInfo *ApplicationManager::findApplication(const QString &appId) const {
--    for (ApplicationInfo *app : m_runningApplications) {
--        if (app->appId() == appId) {
--            return app;
--        }
--    }
--    return nullptr;
--}
--
--unityapi::ApplicationInfoInterface *ApplicationManager::findApplicationWithSurface(unityapi::MirSurfaceInterface* surface) const
--{
--    for (ApplicationInfo *app : m_runningApplications) {
--        auto surfaceList = static_cast<MirSurfaceListModel*>(app->surfaceList());
--        if (surfaceList->contains(static_cast<MirSurface*>(surface))) {
--            return app;
--        }
--    }
--    return nullptr;
--}
--
--QModelIndex ApplicationManager::findIndex(ApplicationInfo* application)
--{
--    for (int i = 0; i < m_runningApplications.size(); ++i) {
--        if (m_runningApplications.at(i) == application) {
--            return index(i);
--        }
--    }
--
--    return QModelIndex();
--}
--
--bool ApplicationManager::add(ApplicationInfo *application) {
--    if (!application || m_runningApplications.contains(application)) {
--        return false;
--    }
--    DEBUG_MSG(application->appId());
--
--    application->setState(ApplicationInfo::Starting);
--
--    beginInsertRows(QModelIndex(), m_runningApplications.size(), m_runningApplications.size());
--    m_runningApplications.append(application);
--
--    connect(application, &ApplicationInfo::focusedChanged, this, [application, this]() {
--        QModelIndex appIndex = findIndex(application);
--        if (!appIndex.isValid()) return;
--        Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleFocused);
--        XDEBUG_MSG("focusedApplicationId = " << focusedApplicationId());
--        Q_EMIT focusedApplicationIdChanged();
--        if (application->focused()) {
--            raiseApp(application->appId());
--        }
--    });
--    connect(application, &ApplicationInfo::stateChanged, this, [application, this]() {
--        QModelIndex appIndex = findIndex(application);
--        if (!appIndex.isValid()) return;
--        Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleState);
--    });
--
--    connect(application, &ApplicationInfo::closed, this, [application, this]() {
--        this->remove(application);
--    });
--    connect(application, &ApplicationInfo::focusRequested, this, [application, this]() {
--        Q_EMIT this->focusRequested(application->appId());
--    });
--
--    endInsertRows();
--    Q_EMIT countChanged();
--    if (count() == 1) Q_EMIT emptyChanged(isEmpty()); // was empty but not anymore
--
--    return true;
--}
--
--void ApplicationManager::remove(ApplicationInfo *application) {
--    int i = m_runningApplications.indexOf(application);
--    application->disconnect(this);
--    if (i != -1) {
--        DEBUG_MSG(application->appId());
--        Q_ASSERT(!m_modelBusy);
--        m_modelBusy = true;
--        beginRemoveRows(QModelIndex(), i, i);
--        m_runningApplications.removeAt(i);
--        endRemoveRows();
--        m_modelBusy = false;
--        Q_EMIT countChanged();
--        if (isEmpty()) Q_EMIT emptyChanged(isEmpty());
--        DEBUG_MSG(application->appId() << " after: " << qPrintable(toString()));
--    }
--}
--
--void ApplicationManager::raiseApp(const QString &appId)
--{
--
--    int index = -1;
--    for (int i = 0; i < m_runningApplications.count() && index == -1; ++i) {
--        if (m_runningApplications[i]->appId() == appId) {
--            index = i;
--        }
--    }
--
--    if (index >= 0) {
--        if (m_modelBusy) {
--            DEBUG_MSG(appId << " - model busy. Try again later.");
--            QMetaObject::invokeMethod(this, "raiseApp", Qt::QueuedConnection, Q_ARG(QString, appId));
--        } else {
--            DEBUG_MSG(appId);
--            move(index, 0);
--        }
--    }
--}
--
--void ApplicationManager::move(int from, int to) {
--    if (from == to) return;
--
--    if (from >= 0 && from < m_runningApplications.size() && to >= 0 && to < m_runningApplications.size()) {
--        QModelIndex parent;
--        Q_ASSERT(!m_modelBusy);
--        m_modelBusy = true;
--        /* When moving an item down, the destination index needs to be incremented
--         * by one, as explained in the documentation:
--         * http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
--        beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
--        m_runningApplications.move(from, to);
--        endMoveRows();
--        m_modelBusy = false;
--    }
--}
--
--ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
--                                              const QStringList &arguments)
--{
--    DEBUG_MSG(appId);
--    Q_UNUSED(arguments)
--
--    ApplicationInfo *application = findApplication(appId);
--    if (application) {
--        // the requested app is already running
--        return application;
--    } else {
--        application = add(appId);
--    }
--
--    // most likely not among the available ones
--    if (!application)
--        return nullptr;
--
--    return application;
--}
--
--ApplicationInfo* ApplicationManager::add(QString appId)
--{
--    ApplicationInfo *application = nullptr;
--
--    for (ApplicationInfo *availableApp : m_availableApplications) {
--        if (availableApp->appId() == appId) {
--            application = availableApp;
--            break;
--        }
--    }
--
--    if (application) {
--        if (!add(application)) {
--            application = nullptr;
--        }
--    }
--
--    return application;
--}
--
--bool ApplicationManager::stopApplication(const QString &appId)
--{
--    DEBUG_MSG(appId);
--    ApplicationInfo *application = findApplication(appId);
--    if (application == nullptr)
--        return false;
--
--    application->close();
--    return true;
--}
--
--QString ApplicationManager::focusedApplicationId() const {
--    for (ApplicationInfo *app : m_runningApplications) {
--        if (app->focused()) {
--            return app->appId();
--        }
--    }
--    return QString();
--}
--
--bool ApplicationManager::requestFocusApplication(const QString &appId)
--{
--    ApplicationInfo *application = findApplication(appId);
--    if (application == nullptr)
--        return false;
--
--    application->requestFocus();
--
--    return true;
--}
--
--void ApplicationManager::buildListOfAvailableApplications()
--{
--    /*
--        ATTENTION!
--        Be careful when changing application properties here as some qmltests
--        rely on them being the way it's specified here (e.g. that camera-app
--        is fullscreen, that twitter-webapp can rotate in all directions, etc)
--     */
--
--    ApplicationInfo *application;
--
--    application = new ApplicationInfo(this);
--    application->setAppId("unity8-dash");
--    application->setName("Unity 8 Mock Dash");
--    application->setScreenshotId("unity8-dash");
--    application->setIconId("dash");
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("dialer-app");
--    application->setName("Dialer");
--    application->setScreenshotId("dialer");
--    application->setIconId("dialer-app");
--    application->setSupportedOrientations(Qt::PortraitOrientation
--                                        | Qt::InvertedPortraitOrientation);
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("camera-app");
--    application->setName("Camera");
--    application->setScreenshotId("camera");
--    application->setIconId("camera");
--    application->setFullscreen(true);
--    application->setSupportedOrientations(Qt::PortraitOrientation
--                                        | Qt::LandscapeOrientation
--                                        | Qt::InvertedPortraitOrientation
--                                        | Qt::InvertedLandscapeOrientation);
--    application->setRotatesWindowContents(true);
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("camera-app2");
--    application->setName("Camera2");
--    application->setScreenshotId("camera");
--    application->setIconId("camera");
--    application->setSupportedOrientations(Qt::PortraitOrientation
--                                        | Qt::LandscapeOrientation
--                                        | Qt::InvertedPortraitOrientation
--                                        | Qt::InvertedLandscapeOrientation);
--    application->setRotatesWindowContents(true);
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("gallery-app");
--    application->setName("Gallery");
--    application->setScreenshotId("gallery");
--    application->setIconId("gallery");
--    application->setShellChrome(Mir::LowChrome);
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("facebook-webapp");
--    application->setName("Facebook");
--    application->setScreenshotId("facebook");
--    application->setIconId("facebook");
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("webbrowser-app");
--    application->setShellChrome(Mir::LowChrome);
--    application->setName("Browser");
--    application->setScreenshotId("browser");
--    application->setIconId("browser");
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("twitter-webapp");
--    application->setName("Twitter");
--    application->setScreenshotId("twitter");
--    application->setIconId("twitter");
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("map");
--    application->setName("Map");
--    application->setIconId("map");
--    application->setScreenshotId("map");
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("gmail-webapp");
--    application->setName("GMail");
--    application->setIconId("gmail");
--    application->setScreenshotId("gmail-webapp.svg");
--    application->setSupportedOrientations(Qt::PortraitOrientation
--                                        | Qt::LandscapeOrientation
--                                        | Qt::InvertedPortraitOrientation
--                                        | Qt::InvertedLandscapeOrientation);
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("music-app");
--    application->setName("Music");
--    application->setIconId("soundcloud");
--    application->setScreenshotId("music");
--    application->setSupportedOrientations(Qt::PortraitOrientation
--                                        | Qt::LandscapeOrientation
--                                        | Qt::InvertedPortraitOrientation
--                                        | Qt::InvertedLandscapeOrientation);
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("ubuntu-weather-app");
--    application->setName("Weather");
--    application->setIconId("weather");
--    application->setScreenshotId("ubuntu-weather-app.svg");
--    application->setSupportedOrientations(Qt::LandscapeOrientation
--                                        | Qt::InvertedLandscapeOrientation);
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("notes-app");
--    application->setName("Notepad");
--    application->setIconId("notepad");
--//    application->setStage(ApplicationInfoInterface::SideStage);
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("calendar-app");
--    application->setName("Calendar");
--    application->setIconId("calendar");
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("evernote");
--    application->setName("Evernote");
--    application->setIconId("evernote");
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("pinterest");
--    application->setName("Pinterest");
--    application->setIconId("pinterest");
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("soundcloud");
--    application->setName("SoundCloud");
--    application->setIconId("soundcloud");
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("wikipedia");
--    application->setName("Wikipedia");
--    application->setIconId("wikipedia");
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("youtube");
--    application->setName("YouTube");
--    application->setIconId("youtube");
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("libreoffice");
--    application->setName("LibreOffice");
--    application->setIconId("libreoffice");
--    application->setScreenshotId("libreoffice");
--    application->setIsTouchApp(false);
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("primary-oriented-app");
--    application->setName("Primary Oriented");
--    application->setSupportedOrientations(Qt::PrimaryOrientation);
--    m_availableApplications.append(application);
--
--    application = new ApplicationInfo(this);
--    application->setAppId("kate");
--    application->setName("Kate");
--    application->setIconId("libreoffice");
--    application->setScreenshotId("libreoffice");
--    application->setQmlFilename("Kate.qml");
--    application->setIsTouchApp(false);
--    m_availableApplications.append(application);
--}
--
--
--QStringList ApplicationManager::availableApplications()
--{
--    QStringList appIds;
--    Q_FOREACH(ApplicationInfo *app, m_availableApplications) {
--        appIds << app->appId();
--    }
--    return appIds;
--}
--
--bool ApplicationManager::isEmpty() const
--{
--    return m_runningApplications.isEmpty();
--}
--
--ApplicationInfo *ApplicationManager::findApplication(MirSurface* surface)
--{
--    for (ApplicationInfo *app : m_runningApplications) {
--        auto surfaceList = static_cast<MirSurfaceListModel*>(app->surfaceList());
--        if (surfaceList->contains(surface)) {
--            return app;
--        }
--    }
--    return nullptr;
--}
--
--QString ApplicationManager::toString()
--{
--    QString str;
--    for (int i = 0; i < m_runningApplications.count(); ++i) {
--        auto *application = m_runningApplications.at(i);
--
--        QString itemStr = QString("(index=%1,appId=%2)")
--            .arg(i)
--            .arg(application->appId());
--
--        if (i > 0) {
--            str.append(",");
--        }
--        str.append(itemStr);
--    }
--    return str;
--}
--
--///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--// ApplicationManagerNotifier
--
--ApplicationManagerNotifier *ApplicationManagerNotifier::m_instance = nullptr;
--
--ApplicationManagerNotifier *ApplicationManagerNotifier::instance()
--{
--    if (!m_instance) {
--        m_instance = new ApplicationManagerNotifier;
--    }
--    return m_instance;
--}
--
--void ApplicationManagerNotifier::setApplicationManager(ApplicationManager *appMan)
--{
--    if (appMan != m_applicationManager) {
--        m_applicationManager = appMan;
--        Q_EMIT applicationManagerChanged(m_applicationManager);
--    }
--}
 === removed file 'tests/mocks/Unity/Application/ApplicationManager.h'
 --- tests/mocks/Unity/Application/ApplicationManager.h	2016-12-07 11:19:17 +0000
 +++ tests/mocks/Unity/Application/ApplicationManager.h	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
--/*
-- * Copyright (C) 2013-2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef APPLICATION_MANAGER_H
--#define APPLICATION_MANAGER_H
--
--#include <QObject>
--#include <QList>
--#include <QStringList>
--#include <QTimer>
--#include "ApplicationInfo.h"
--
--// unity-api
--#include <unity/shell/application/ApplicationManagerInterface.h>
--
--namespace unity {
--    namespace shell {
--        namespace application {
--            class MirSurfaceInterface;
--        }
--    }
--}
--
--class QQuickItem;
--using namespace unity::shell::application;
--
--class ApplicationManager : public ApplicationManagerInterface {
--    Q_OBJECT
--
--    Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
--    Q_PROPERTY(QStringList availableApplications READ availableApplications NOTIFY availableApplicationsChanged)
--
-- public:
--    ApplicationManager(QObject *parent = nullptr);
--    virtual ~ApplicationManager();
--
--    // QAbstractItemModel methods.
--    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
--    QVariant data(const QModelIndex& index, int role) const override;
--
--    // ApplicationManagerInterface methods
--    Q_INVOKABLE ApplicationInfo *get(int index) const override;
--    Q_INVOKABLE ApplicationInfo *findApplication(const QString &appId) const override;
--    unity::shell::application::ApplicationInfoInterface *findApplicationWithSurface(unity::shell::application::MirSurfaceInterface* surface) const override;
--
--    Q_INVOKABLE void move(int from, int to);
--
--    // Application control methods
--    Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;
--    Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
--    Q_INVOKABLE bool stopApplication(const QString &appId) override;
--
--    QString focusedApplicationId() const override;
--
--    // Only for testing
--    QStringList availableApplications();
--    Q_INVOKABLE ApplicationInfo* add(QString appId);
--
--    QModelIndex findIndex(ApplicationInfo* application);
--
--    bool isEmpty() const;
--
-- Q_SIGNALS:
--    void focusRequested(const QString &appId);
--    void emptyChanged(bool empty);
--    void availableApplicationsChanged(QStringList list);
--
-- private Q_SLOTS:
--    void raiseApp(const QString &appId);
--
-- private:
--    bool add(ApplicationInfo *application);
--    void remove(ApplicationInfo* application);
--    void buildListOfAvailableApplications();
--    QString toString();
--    ApplicationInfo *findApplication(MirSurface* surface);
--    QList<ApplicationInfo*> m_runningApplications;
--    QList<ApplicationInfo*> m_availableApplications;
--    bool m_modelBusy{false};
--};
--
--/*
--    Lifecycle of the ApplicationManager instance belongs to the QML plugin.
--    So this guy here is used to notify other parts of the system when the plugin creates and destroys
--    the ApplicationManager.
--
--    Unlike ApplicationManager, we create ApplicationManagerNotifier whenever we want.
-- */
--class ApplicationManagerNotifier : public QObject {
--    Q_OBJECT
--public:
--    static ApplicationManagerNotifier *instance();
--
--    ApplicationManager *applicationManager() { return m_applicationManager; }
--
--Q_SIGNALS:
--    void applicationManagerChanged(ApplicationManager *applicationManager);
--
--private:
--    void setApplicationManager(ApplicationManager *);
--    static ApplicationManagerNotifier *m_instance;
--    ApplicationManager *m_applicationManager{nullptr};
--
--friend class ApplicationManager;
--};
--
--Q_DECLARE_METATYPE(ApplicationManager*)
--
--#endif  // APPLICATION_MANAGER_H
 === removed file 'tests/mocks/Unity/Application/CMakeLists.txt'
 --- tests/mocks/Unity/Application/CMakeLists.txt	2016-12-20 15:50:41 +0000
 +++ tests/mocks/Unity/Application/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
--set(FakeUnityApplicationQml_SOURCES
--    plugin.cpp
--    ApplicationInfo.cpp
--    ApplicationManager.cpp
--    MirSurface.cpp
--    MirSurfaceItem.cpp
--    MirSurfaceListModel.cpp
--    MirMock.cpp
--    ObjectListModel.h
--    SurfaceManager.cpp
--    VirtualKeyboard.cpp
--    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
--    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
--    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
--    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
--    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceItemInterface.h
--    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
--    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/SurfaceManagerInterface.h
--    resources/surfaces.qrc
--)
--
--add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
--
--add_library(NonMirUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
--set_target_properties(NonMirUnityApplicationQml PROPERTIES OUTPUT_NAME FakeUnityApplicationQml)
--
--qt5_use_modules(FakeUnityApplicationQml Core Quick DBus)
--qt5_use_modules(NonMirUnityApplicationQml Core Quick DBus)
--
--add_unity8_mock(Unity.Application 0.1 Unity/Application TARGETS FakeUnityApplicationQml)
--add_unity8_mock(Unity.Application 0.1 Unity/Application
--                PREFIX nonmirplugins
--                TARGETS NonMirUnityApplicationQml
--                BINARY_DIR ${CMAKE_BINARY_DIR}/nonmirplugins
--                NO_TYPES)
 === removed file 'tests/mocks/Unity/Application/MirMock.cpp'
 --- tests/mocks/Unity/Application/MirMock.cpp	2016-12-07 14:52:32 +0000
 +++ tests/mocks/Unity/Application/MirMock.cpp	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
--/*
-- * Copyright (C) 2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "MirMock.h"
--
--MirMock *MirMock::the_mir = nullptr;
--
--MirMock *MirMock::instance()
--{
--    return the_mir;
--}
--
--MirMock::MirMock()
--{
--    Q_ASSERT(the_mir == nullptr);
--    the_mir = this;
--}
--
--MirMock::~MirMock()
--{
--    Q_ASSERT(the_mir == this);
--    the_mir = nullptr;
--}
--
--void MirMock::setCursorName(const QString &cursorName)
--{
--    if (cursorName != m_cursorName) {
--        m_cursorName = cursorName;
--        Q_EMIT cursorNameChanged(m_cursorName);
--    }
--}
--
--QString MirMock::cursorName() const
--{
--    return m_cursorName;
--}
--
--QString MirMock::currentKeymap() const
--{
--    return m_keymap;
--}
--
--void MirMock::setCurrentKeymap(const QString &keymap)
--{
--    if (keymap != m_keymap) {
--        m_keymap = keymap;
--        Q_EMIT currentKeymapChanged(m_keymap);
--    }
--}
 === removed file 'tests/mocks/Unity/Application/MirMock.h'
 --- tests/mocks/Unity/Application/MirMock.h	2016-12-07 14:52:32 +0000
 +++ tests/mocks/Unity/Application/MirMock.h	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
--/*
-- * Copyright (C) 2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef MIR_MOCK_H
--#define MIR_MOCK_H
--
--#include <unity/shell/application/Mir.h>
--
--class MirMock : public ::Mir
--{
--    Q_OBJECT
--public:
--    explicit MirMock();
--    virtual ~MirMock();
--
--    static MirMock *instance();
--
--    void setCursorName(const QString &cursorName) override;
--    QString cursorName() const override;
--
--    QString currentKeymap() const override;
--    void setCurrentKeymap(const QString &keymap) override;
--
--private:
--    static MirMock *the_mir;
--    QString m_cursorName;
--    QString m_keymap;
--};
--
--#endif
 === removed file 'tests/mocks/Unity/Application/MirSurface.cpp'
 --- tests/mocks/Unity/Application/MirSurface.cpp	2017-01-26 11:10:01 +0000
 +++ tests/mocks/Unity/Application/MirSurface.cpp	1970-01-01 00:00:00 +0000
@@ -1,550 +0,0 @@
--/*
-- * Copyright (C) 2015-2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "MirSurface.h"
--
--#include <QDebug>
--#include <QQmlEngine>
--
--// local
--#include "SurfaceManager.h"
--
--#define MIRSURFACE_DEBUG 0
--
--#if MIRSURFACE_DEBUG
--#define DEBUG_MSG(params) qDebug().nospace() << "MirSurface[" << (void*)this << "," << m_name << "]::" << __func__  << " " << params
--#define XDEBUG_MSG(params) qDebug().nospace() << "MirSurface[" << (void*)this << "," << m_name << "]::" << params
--
--const char *stateToStr(Mir::State state)
--{
--    switch (state) {
--    case Mir::UnknownState:
--        return "unknown";
--    case Mir::RestoredState:
--        return "restored";
--    case Mir::MinimizedState:
--        return "minimized";
--    case Mir::MaximizedState:
--        return "maximized";
--    case Mir::VertMaximizedState:
--        return "vertMaximized";
--    case Mir::FullscreenState:
--        return "fullscreen";
--    case Mir::HorizMaximizedState:
--        return "horizMaximized";
--    case Mir::MaximizedLeftState:
--        return "maximizedLeft";
--    case Mir::MaximizedRightState:
--        return "maximizedRight";
--    case Mir::MaximizedTopLeftState:
--        return "maximizedTopLeft";
--    case Mir::MaximizedTopRightState:
--        return "maximizedTopRight";
--    case Mir::MaximizedBottomLeftState:
--        return "maximizedBottomLeft";
--    case Mir::MaximizedBottomRightState:
--        return "maximizedBottomRight";
--    case Mir::HiddenState:
--        return "hidden";
--    default:
--        return "???";
--    }
--}
--
--#else
--#define DEBUG_MSG(params) ((void)0)
--#define XDEBUG_MSG(params) ((void)0)
--#endif
--
--using namespace unity::shell::application;
--
--MirSurface::MirSurface(const QString& name,
--        Mir::Type type,
--        Mir::State state,
--        MirSurface *parentSurface,
--        const QUrl& screenshot,
--        const QUrl &qmlFilePath)
--    : unity::shell::application::MirSurfaceInterface(nullptr)
--    , m_name(name)
--    , m_type(type)
--    , m_state(state)
--    , m_orientationAngle(Mir::Angle0)
--    , m_screenshotUrl(screenshot)
--    , m_qmlFilePath(qmlFilePath)
--    , m_live(true)
--    , m_focused(false)
--    , m_activeFocus(false)
--    , m_width(-1)
--    , m_height(-1)
--    , m_slowToResize(false)
--    , m_shellChrome(Mir::NormalChrome)
--    , m_parentSurface(parentSurface)
--    , m_childSurfaceList(new MirSurfaceListModel(this))
--{
--    DEBUG_MSG("state=" << stateToStr(state));
--
--    QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
--
--    m_delayedResizeTimer.setInterval(600);
--    m_delayedResizeTimer.setSingleShot(true);
--    connect(&m_delayedResizeTimer, &QTimer::timeout, this, &MirSurface::applyDelayedResize);
--
--    m_zombieTimer.setInterval(100);
--    m_zombieTimer.setSingleShot(true);
--    connect(&m_zombieTimer, &QTimer::timeout, this, [this](){ this->setLive(false); });
--
--    updateInputBoundsAfterResize();
--}
--
--MirSurface::~MirSurface()
--{
--    DEBUG_MSG("");
--
--    // Early warning, while MirSurface methods can still be accessed.
--    Q_EMIT destroyed(this);
--}
--
--QString MirSurface::name() const
--{
--    return m_name;
--}
--
--QString MirSurface::persistentId() const
--{
--    return m_name+"Id";
--}
--
--Mir::Type MirSurface::type() const
--{
--    return m_type;
--}
--
--Mir::State MirSurface::state() const
--{
--    return m_state;
--}
--
--void MirSurface::requestState(Mir::State state)
--{
--    if (state == m_state) {
--        return;
--    }
--    DEBUG_MSG(stateToStr(state));
--    Q_EMIT stateRequested(state);
--}
--
--void MirSurface::setState(Mir::State state)
--{
--    if (state == m_state) {
--        return;
--    }
--    DEBUG_MSG(stateToStr(state));
--
--    bool oldVisible = visible();
--
--    m_state = state;
--    Q_EMIT stateChanged(state);
--
--    if (visible() != oldVisible) {
--        XDEBUG_MSG("visibleChanged("<<visible()<<")");
--        Q_EMIT visibleChanged(visible());
--    }
--}
--
--bool MirSurface::live() const
--{
--    return m_live;
--}
--
--bool MirSurface::visible() const
--{
--    return m_state != Mir::MinimizedState && m_state != Mir::HiddenState;
--}
--
--void MirSurface::setLive(bool live)
--{
--    if (live == m_live)
--        return;
--
--    DEBUG_MSG(live);
--    m_live = live;
--    Q_EMIT liveChanged(live);
--
--    if (!m_live && m_views.count() == 0) {
--        deleteLater();
--    }
--}
--
--QUrl MirSurface::qmlFilePath() const
--{
--    return m_qmlFilePath;
--}
--
--QUrl MirSurface::screenshotUrl() const
--{
--    return m_screenshotUrl;
--}
--
--void MirSurface::setScreenshotUrl(QUrl screenshotUrl)
--{
--    if (screenshotUrl == m_screenshotUrl)
--        return;
--
--    m_screenshotUrl = screenshotUrl;
--    Q_EMIT screenshotUrlChanged(screenshotUrl);
--}
--
--Mir::OrientationAngle MirSurface::orientationAngle() const
--{
--    return m_orientationAngle;
--}
--
--void MirSurface::setOrientationAngle(Mir::OrientationAngle angle)
--{
--    if (angle == m_orientationAngle)
--        return;
--
--    m_orientationAngle = angle;
--    Q_EMIT orientationAngleChanged(angle);
--}
--
--void MirSurface::setKeymap(const QString &value)
--{
--    if (value != m_keymap) {
--        DEBUG_MSG(value);
--        m_keymap = value;
--        Q_EMIT keymapChanged(m_keymap);
--    }
--}
--
--QString MirSurface::keymap() const
--{
--    return m_keymap;
--}
--
--Mir::ShellChrome MirSurface::shellChrome() const
--{
--    return m_shellChrome;
--}
--
--void MirSurface::setShellChrome(Mir::ShellChrome shellChrome)
--{
--    if (shellChrome == m_shellChrome)
--        return;
--
--    DEBUG_MSG(shellChrome);
--    m_shellChrome = shellChrome;
--    Q_EMIT shellChromeChanged(shellChrome);
--}
--
--void MirSurface::registerView(qintptr viewId)
--{
--    m_views.insert(viewId, MirSurface::View{false});
--    DEBUG_MSG(viewId << " after=" << m_views.count());
--}
--
--void MirSurface::unregisterView(qintptr viewId)
--{
--    m_views.remove(viewId);
--    DEBUG_MSG(viewId << " after=" << m_views.count() << " live=" << m_live);
--    if (!m_live && m_views.count() == 0) {
--        deleteLater();
--    }
--    updateExposure();
--}
--
--void MirSurface::setViewExposure(qintptr viewId, bool visible)
--{
--    if (!m_views.contains(viewId)) return;
--
--    m_views[viewId].visible = visible;
--    updateExposure();
--}
--
--void MirSurface::updateExposure()
--{
--    bool newExposure = false;
--    QHashIterator<qintptr, View> i(m_views);
--    while (i.hasNext()) {
--        i.next();
--        newExposure |= i.value().visible;
--    }
--
--    if (newExposure != m_exposed) {
--        m_exposed = newExposure;
--        DEBUG_MSG(m_exposed);
--        Q_EMIT exposedChanged(m_exposed);
--        updateInputBoundsAfterResize();
--    }
--}
--
--bool MirSurface::activeFocus() const
--{
--    return m_activeFocus;
--}
--
--void MirSurface::setActiveFocus(bool value)
--{
--    if (m_activeFocus == value)
--        return;
--
--    m_activeFocus = value;
--
--    Q_EMIT activeFocusChanged(value);
--
--    if (m_activeFocus && !m_focused) {
--        requestFocus();
--    }
--}
--
--int MirSurface::width() const
--{
--    return m_width;
--}
--
--int MirSurface::height() const
--{
--    return m_height;
--}
--
--void MirSurface::resize(int width, int height)
--{
--    if (m_slowToResize) {
--        if (!m_delayedResizeTimer.isActive()) {
--            m_delayedResize.setWidth(width);
--            m_delayedResize.setHeight(height);
--            m_delayedResizeTimer.start();
--        } else {
--            m_pendingResize.setWidth(width);
--            m_pendingResize.setHeight(height);
--        }
--    } else {
--        doResize(width, height);
--    }
--}
--
--void MirSurface::applyDelayedResize()
--{
--    doResize(m_delayedResize.width(), m_delayedResize.height());
--    m_delayedResize.setWidth(-1);
--    m_delayedResize.setHeight(-1);
--
--    if (m_pendingResize.isValid()) {
--        QSize size = m_pendingResize;
--        m_pendingResize.setWidth(-1);
--        m_pendingResize.setHeight(-1);
--        resize(size.width(), size.height());
--    }
--}
--
--void MirSurface::doResize(int width, int height)
--{
--    bool changed = false;
--
--    if (width != m_width) {
--        m_width = width;
--        Q_EMIT widthChanged();
--        changed = true;
--    }
--
--    if (m_height != height) {
--        m_height = height;
--        Q_EMIT heightChanged();
--        changed = true;
--    }
--
--    if (changed) {
--        XDEBUG_MSG("sizeChanged(width="<<width<<", height="<<height<<")");
--        Q_EMIT sizeChanged(QSize(width, height));
--    }
--
--    updateInputBoundsAfterResize();
--}
--
--void MirSurface::updateInputBoundsAfterResize()
--{
--    setInputBounds(QRect(0, 0, m_width, m_height));
--}
--
--bool MirSurface::isSlowToResize() const
--{
--    return m_slowToResize;
--}
--
--void MirSurface::setSlowToResize(bool value)
--{
--    if (m_slowToResize != value) {
--        DEBUG_MSG(value);
--        m_slowToResize = value;
--        Q_EMIT slowToResizeChanged();
--        if (!m_slowToResize && m_delayedResizeTimer.isActive()) {
--            m_delayedResizeTimer.stop();
--            applyDelayedResize();
--        }
--    }
--}
--
--void MirSurface::setMinimumWidth(int value)
--{
--    if (value != m_minimumWidth) {
--        m_minimumWidth = value;
--        Q_EMIT minimumWidthChanged(m_minimumWidth);
--    }
--}
--
--void MirSurface::setMaximumWidth(int value)
--{
--    if (value != m_maximumWidth) {
--        m_maximumWidth = value;
--        Q_EMIT maximumWidthChanged(m_maximumWidth);
--    }
--}
--
--void MirSurface::setMinimumHeight(int value)
--{
--    if (value != m_minimumHeight) {
--        m_minimumHeight = value;
--        Q_EMIT minimumHeightChanged(m_minimumHeight);
--    }
--}
--
--void MirSurface::setMaximumHeight(int value)
--{
--    if (value != m_maximumHeight) {
--        m_maximumHeight = value;
--        Q_EMIT maximumHeightChanged(m_maximumHeight);
--    }
--}
--
--void MirSurface::setWidthIncrement(int value)
--{
--    if (value != m_widthIncrement) {
--        m_widthIncrement = value;
--        Q_EMIT widthIncrementChanged(m_widthIncrement);
--    }
--}
--
--void MirSurface::setHeightIncrement(int value)
--{
--    if (value != m_heightIncrement) {
--        m_heightIncrement = value;
--        Q_EMIT heightIncrementChanged(m_heightIncrement);
--    }
--}
--
--void MirSurface::close()
--{
--    DEBUG_MSG("");
--    if (!m_zombieTimer.isActive()) {
--        m_zombieTimer.start();
--        Q_EMIT closeRequested();
--    }
--}
--
--void MirSurface::activate()
--{
--    DEBUG_MSG("");
--    SurfaceManager::instance()->activate(this);
--}
--
--void MirSurface::requestFocus()
--{
--    DEBUG_MSG("");
--    Q_EMIT focusRequested();
--}
--
--void MirSurface::setFocused(bool value)
--{
--    if (m_focused == value)
--        return;
--
--    DEBUG_MSG("(" << value << ")");
--
--    m_focused = value;
--    Q_EMIT focusedChanged(value);
--}
--
--bool MirSurface::focused() const
--{
--    return m_focused;
--}
--
--QRect MirSurface::inputBounds() const
--{
--    return m_inputBounds;
--}
--
--void MirSurface::setInputBounds(const QRect &boundsRect)
--{
--    if (boundsRect != m_inputBounds) {
--        m_inputBounds = boundsRect;
--        DEBUG_MSG("(" << m_inputBounds << ")");
--        Q_EMIT inputBoundsChanged(m_inputBounds);
--    }
--}
--
--void MirSurface::openMenu(qreal x, qreal y, qreal width, qreal height)
--{
--    auto *menu = SurfaceManager::instance()->createSurface("menu", Mir::MenuType, Mir::HiddenState,
--            this /* parentSurface */,
--            QUrl() /* screenshot */,
--            QUrl("qrc:///Unity/Application/KateMenu.qml"));
--
--    menu->setRequestedPosition(QPoint(x,y));
--    menu->resize(width, height);
--    menu->requestState(Mir::RestoredState);
--
--    SurfaceManager::instance()->notifySurfaceCreated(menu);
--}
--
--void MirSurface::openDialog(qreal x, qreal y, qreal width, qreal height)
--{
--    auto *dialog = SurfaceManager::instance()->createSurface("dialog", Mir::DialogType, Mir::HiddenState,
--            this /* parentSurface */,
--            QUrl() /* screenshot */,
--            QUrl("qrc:///Unity/Application/KateDialog.qml"));
--
--    dialog->setRequestedPosition(QPoint(x,y));
--    dialog->resize(width, height);
--    dialog->requestState(Mir::RestoredState);
--
--    SurfaceManager::instance()->notifySurfaceCreated(dialog);
--
--    dialog->requestFocus();
--}
--
--void MirSurface::setRequestedPosition(const QPoint &value)
--{
--    if (value != m_requestedPosition) {
--        m_requestedPosition = value;
--        Q_EMIT requestedPositionChanged(value);
--
--        // fake-miral: always comply
--        m_position = m_requestedPosition;
--        XDEBUG_MSG("positionChanged("<<m_position<<")");
--        Q_EMIT positionChanged(m_position);
--    }
--}
--
--MirSurfaceInterface* MirSurface::parentSurface() const
--{
--    return m_parentSurface;
--}
--
--MirSurfaceListInterface* MirSurface::childSurfaceList() const
--{
--    return m_childSurfaceList;
--}
 === removed file 'tests/mocks/Unity/Application/MirSurface.h'
 --- tests/mocks/Unity/Application/MirSurface.h	2017-01-26 11:10:01 +0000
 +++ tests/mocks/Unity/Application/MirSurface.h	1970-01-01 00:00:00 +0000
@@ -1,232 +0,0 @@
--/*
-- * Copyright (C) 2015-2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef MOCK_MIR_SURFACE_H
--#define MOCK_MIR_SURFACE_H
--
--#include <QObject>
--#include <QTimer>
--#include <QUrl>
--#include <QHash>
--
--// unity-api
--#include <unity/shell/application/MirSurfaceInterface.h>
--
--#include "MirSurfaceListModel.h"
--
--class MirSurface;
--
--class MirSurface : public unity::shell::application::MirSurfaceInterface
--{
--    Q_OBJECT
--
--    ////
--    // for use in qml tests
--    Q_PROPERTY(int width READ width NOTIFY widthChanged)
--    Q_PROPERTY(int height READ height NOTIFY heightChanged)
--    Q_PROPERTY(bool activeFocus READ activeFocus NOTIFY activeFocusChanged)
--    Q_PROPERTY(bool slowToResize READ isSlowToResize WRITE setSlowToResize NOTIFY slowToResizeChanged)
--    Q_PROPERTY(bool exposed READ exposed NOTIFY exposedChanged)
--
--public:
--    MirSurface(const QString& name,
--            Mir::Type type,
--            Mir::State state,
--            MirSurface *parentSurface,
--            const QUrl& screenshot,
--            const QUrl &qmlFilePath = QUrl());
--    virtual ~MirSurface();
--
--    ////
--    // unity.shell.application.MirSurface
--
--    Mir::Type type() const override;
--
--    QString name() const override;
--
--    QString persistentId() const override;
--
--    QPoint position() const override { return m_position; }
--
--    QSize size() const override { return QSize(width(),height()); }
--    void resize(int width, int height) override;
--    void resize(const QSize &size) override { resize(size.width(), size.height()); }
--
--
--    Mir::State state() const override;
--
--    bool live() const override;
--
--    bool visible() const override;
--
--    Mir::OrientationAngle orientationAngle() const override;
--    void setOrientationAngle(Mir::OrientationAngle) override;
--
--    int minimumWidth() const override { return m_minimumWidth; }
--    int minimumHeight() const override { return m_minimumHeight; }
--    int maximumWidth() const override { return m_maximumWidth; }
--    int maximumHeight() const override { return m_maximumHeight; }
--    int widthIncrement() const override { return m_widthIncrement; }
--    int heightIncrement() const override { return m_heightIncrement; }
--
--    void setKeymap(const QString &) override;
--    QString keymap() const override;
--
--    Mir::ShellChrome shellChrome() const override;
--
--    bool focused() const override;
--    QRect inputBounds() const override;
--
--    bool confinesMousePointer() const override { return false; }
--
--    QPoint requestedPosition() const override { return m_requestedPosition; }
--    void setRequestedPosition(const QPoint &) override;
--
--    unity::shell::application::MirSurfaceInterface* parentSurface() const override;
--    unity::shell::application::MirSurfaceListInterface* childSurfaceList() const override;
--
--    Q_INVOKABLE void close() override;
--    Q_INVOKABLE void activate() override;
--
--    ////
--    // API for tests
--
--    Q_INVOKABLE void requestFocus();
--    Q_INVOKABLE void setLive(bool live);
--    Q_INVOKABLE void setShellChrome(Mir::ShellChrome shellChrome);
--
--    int width() const;
--    int height() const;
--
--    bool isSlowToResize() const;
--    void setSlowToResize(bool value);
--
--    bool exposed() const { return m_exposed; }
--
--    Q_INVOKABLE void setMinimumWidth(int);
--    Q_INVOKABLE void setMaximumWidth(int);
--    Q_INVOKABLE void setMinimumHeight(int);
--    Q_INVOKABLE void setMaximumHeight(int);
--    Q_INVOKABLE void setWidthIncrement(int);
--    Q_INVOKABLE void setHeightIncrement(int);
--
--    Q_INVOKABLE virtual void setInputBounds(const QRect &boundsRect);
--
--    Q_INVOKABLE void openMenu(qreal x, qreal y, qreal width, qreal height);
--    Q_INVOKABLE void openDialog(qreal x, qreal y, qreal width, qreal height);
--
--    /////
--    // internal mock stuff
--
--    QUrl qmlFilePath() const;
--
--    QUrl screenshotUrl() const;
--    void setScreenshotUrl(QUrl);
--
--    bool activeFocus() const;
--    void setActiveFocus(bool);
--
--    void registerView(qintptr viewId);
--    void unregisterView(qintptr viewId);
--    void setViewExposure(qintptr viewId, bool visible);
--    int viewCount() const { return m_views.count(); }
--
--    void setFocused(bool value);
--
--    void setState(Mir::State state);
--
--    Mir::State previousState() const { return m_previousState; }
--    void setPreviousState(Mir::State state) { m_previousState = state; }
--
--public Q_SLOTS:
--    ////
--    // unity.shell.application.MirSurface
--    void requestState(Mir::State) override;
--
--Q_SIGNALS:
--    ////
--    // API for tests
--    void widthChanged();
--    void heightChanged();
--    void slowToResizeChanged();
--    void exposedChanged(bool exposed);
--
--    ////
--    // internal mock stuff
--    void screenshotUrlChanged(QUrl);
--    void activeFocusChanged(bool);
--    void closeRequested();
--    void stateRequested(Mir::State);
--
--protected:
--    virtual void updateInputBoundsAfterResize();
--
--private Q_SLOTS:
--    void applyDelayedResize();
--
--private:
--    void doResize(int width, int height);
--    void updateExposure();
--
--    const QString m_name;
--    const Mir::Type m_type;
--    Mir::State m_state;
--    Mir::State m_previousState{Mir::UnknownState};
--    Mir::OrientationAngle m_orientationAngle;
--
--    QUrl m_screenshotUrl;
--    QUrl m_qmlFilePath;
--    bool m_live;
--    bool m_focused;
--    bool m_activeFocus;
--    int m_width;
--    int m_height;
--
--    int m_minimumWidth{0};
--    int m_minimumHeight{0};
--    int m_maximumWidth{0};
--    int m_maximumHeight{0};
--    int m_widthIncrement{0};
--    int m_heightIncrement{0};
--
--    QString m_keymap;
--
--    bool m_slowToResize;
--    QTimer m_delayedResizeTimer;
--    QSize m_delayedResize;
--    QSize m_pendingResize;
--
--    Mir::ShellChrome m_shellChrome;
--
--    struct View {
--        bool visible;
--    };
--    QHash<qintptr, View> m_views;
--    bool m_exposed{false};
--
--    QTimer m_zombieTimer;
--
--    QRect m_inputBounds;
--
--    QPoint m_position;
--    QPoint m_requestedPosition;
--
--    unity::shell::application::MirSurfaceInterface* m_parentSurface;
--
--    MirSurfaceListModel *m_childSurfaceList;
--};
--
--#endif // MOCK_MIR_SURFACE_H
 === removed file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
 --- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2017-01-26 11:10:01 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	1970-01-01 00:00:00 +0000
@@ -1,415 +0,0 @@
--/*
-- * Copyright (C) 2014-2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "MirSurfaceItem.h"
--
--#include <paths.h>
--
--#include <QGuiApplication>
--#include <QQuickView>
--#include <QQmlContext>
--#include <QQmlProperty>
--#include <QQmlEngine>
--#include <QString>
--
--#include <QDebug>
--
--using namespace unity::shell::application;
--
--#define MIRSURFACEITEM_DEBUG 0
--
--#if MIRSURFACEITEM_DEBUG
--#define DEBUG_MSG(params) qDebug().nospace() << "MirSurfaceItem::" << __func__  << " " << params
--#else
--#define DEBUG_MSG(params) ((void)0)
--#endif
--
--MirSurfaceItem::MirSurfaceItem(QQuickItem *parent)
--    : MirSurfaceItemInterface(parent)
--    , m_qmlSurface(nullptr)
--    , m_qmlContentComponent(nullptr)
--    , m_qmlItem(nullptr)
--    , m_consumesInput(false)
--    , m_orientationAngle(nullptr)
--    , m_surfaceWidth(0)
--    , m_surfaceHeight(0)
--    , m_touchPressCount(0)
--    , m_touchReleaseCount(0)
--    , m_mousePressCount(0)
--    , m_mouseReleaseCount(0)
--{
--    DEBUG_MSG((void*)(this) << name());
--    setAcceptedMouseButtons(Qt::LeftButton | Qt::MiddleButton | Qt::RightButton |
--        Qt::ExtraButton1 | Qt::ExtraButton2 | Qt::ExtraButton3 | Qt::ExtraButton4 |
--        Qt::ExtraButton5 | Qt::ExtraButton6 | Qt::ExtraButton7 | Qt::ExtraButton8 |
--        Qt::ExtraButton9 | Qt::ExtraButton10 | Qt::ExtraButton11 |
--        Qt::ExtraButton12 | Qt::ExtraButton13);
--
--    connect(this, &QQuickItem::activeFocusChanged, this, &MirSurfaceItem::updateMirSurfaceActiveFocus);
--    connect(this, &QQuickItem::visibleChanged, this, &MirSurfaceItem::updateMirSurfaceExposure);
--
--    connect(this, &MirSurfaceItem::consumesInputChanged, this, [this]() {
--        updateMirSurfaceActiveFocus(hasActiveFocus());
--    });
--
--    // We're just clipping contents in the mock. The real QtMir would copy only relevant buffer instead
--    setClip(true);
--}
--
--MirSurfaceItem::~MirSurfaceItem()
--{
--    DEBUG_MSG((void*)(this) << name());
--    setSurface(nullptr);
--    delete m_orientationAngle;
--}
--
--void MirSurfaceItem::printComponentErrors()
--{
--    QList<QQmlError> errors = m_qmlContentComponent->errors();
--    for (int i = 0; i < errors.count(); ++i) {
--        qDebug() << errors[i];
--    }
--}
--
--Mir::Type MirSurfaceItem::type() const
--{
--    if (m_qmlSurface) {
--        return m_qmlSurface->type();
--    } else {
--        return Mir::UnknownType;
--    }
--}
--
--Mir::State MirSurfaceItem::surfaceState() const
--{
--    if (m_qmlSurface) {
--        return m_qmlSurface->state();
--    } else {
--        return Mir::UnknownState;
--    }
--}
--
--QString MirSurfaceItem::name() const
--{
--    if (m_qmlSurface) {
--        return m_qmlSurface->name();
--    } else {
--        return QString();
--    }
--}
--
--bool MirSurfaceItem::live() const
--{
--    if (m_qmlSurface) {
--        return m_qmlSurface->live();
--    } else {
--        return false;
--    }
--}
--
--Mir::ShellChrome MirSurfaceItem::shellChrome() const
--{
--    if (m_qmlSurface) {
--        return m_qmlSurface->shellChrome();
--    } else {
--        return Mir::NormalChrome;
--    }
--}
--
--Mir::OrientationAngle MirSurfaceItem::orientationAngle() const
--{
--    if (m_orientationAngle) {
--        Q_ASSERT(!m_qmlSurface);
--        return *m_orientationAngle;
--    } else if (m_qmlSurface) {
--        return m_qmlSurface->orientationAngle();
--    } else {
--        return Mir::Angle0;
--    }
--}
--
--void MirSurfaceItem::setOrientationAngle(Mir::OrientationAngle angle)
--{
--    DEBUG_MSG(angle);
--
--    if (m_qmlSurface) {
--        Q_ASSERT(!m_orientationAngle);
--        m_qmlSurface->setOrientationAngle(angle);
--    } else if (!m_orientationAngle) {
--        m_orientationAngle = new Mir::OrientationAngle;
--        *m_orientationAngle = angle;
--        Q_EMIT orientationAngleChanged(angle);
--    } else if (*m_orientationAngle != angle) {
--        *m_orientationAngle = angle;
--        Q_EMIT orientationAngleChanged(angle);
--    }
--
--    if (m_qmlItem) {
--        QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
--        if (orientationProp.isValid()) {
--            orientationProp.write(QVariant::fromValue(orientationAngle()));
--        }
--    }
--}
--
--void MirSurfaceItem::updateScreenshot(QUrl screenshotUrl)
--{
--    if (m_qmlItem) {
--        QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
--        if (screenshotSource.isValid()) {
--            screenshotSource.write(QVariant::fromValue(screenshotUrl));
--        }
--    }
--}
--
--void MirSurfaceItem::onComponentStatusChanged(QQmlComponent::Status status)
--{
--    if (status == QQmlComponent::Ready) {
--        createQmlContentItem();
--    }
--}
--
--void MirSurfaceItem::createQmlContentItem()
--{
--    DEBUG_MSG("");
--
--    m_qmlItem = qobject_cast<QQuickItem*>(m_qmlContentComponent->create());
--    m_qmlItem->setParentItem(this);
--
--    m_qmlItem->setWidth(m_surfaceWidth);
--    m_qmlItem->setHeight(m_surfaceHeight);
--
--    setImplicitWidth(m_qmlItem->implicitWidth());
--    setImplicitHeight(m_qmlItem->implicitHeight());
--
--    {
--        QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
--        if (screenshotSource.isValid()) {
--            screenshotSource.write(QVariant::fromValue(m_qmlSurface->screenshotUrl()));
--        }
--    }
--
--    {
--        QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
--        if (orientationProp.isValid()) {
--            orientationProp.write(QVariant::fromValue(orientationAngle()));
--        }
--    }
--
--    {
--        QQmlProperty surfaceProperty(m_qmlItem, "surface");
--        if (surfaceProperty.isValid()) {
--            surfaceProperty.write(QVariant::fromValue(m_qmlSurface));
--        }
--    }
--}
--
--void MirSurfaceItem::touchEvent(QTouchEvent * event)
--{
--    if (event->type() == QEvent::TouchBegin) {
--        m_touchTrail.clear();
--    }
--
--    if (event->touchPointStates() & Qt::TouchPointPressed) {
--        ++m_touchPressCount;
--        Q_EMIT touchPressCountChanged(m_touchPressCount);
--    } else if (event->touchPointStates() & Qt::TouchPointReleased) {
--        ++m_touchReleaseCount;
--        Q_EMIT touchReleaseCountChanged(m_touchReleaseCount);
--    }
--
--    Q_FOREACH(const QTouchEvent::TouchPoint &touchPoint, event->touchPoints()) {
--        QString id(touchPoint.id());
--        QVariantList list =  m_touchTrail[id].toList();
--        list.append(QVariant::fromValue(touchPoint.pos()));
--        if (list.count() > 100) list.pop_front();
--        m_touchTrail[id] = list;
--    }
--
--    if (m_qmlItem) {
--        QQmlProperty touchTrail(m_qmlItem, "touchTrail");
--        touchTrail.write(m_touchTrail);
--    }
--}
--
--void MirSurfaceItem::mousePressEvent(QMouseEvent * event)
--{
--    m_mousePressCount++;
--    Q_EMIT mousePressCountChanged(m_mousePressCount);
--    event->accept();
--}
--
--void MirSurfaceItem::mouseMoveEvent(QMouseEvent * event)
--{
--    event->accept();
--}
--
--void MirSurfaceItem::mouseReleaseEvent(QMouseEvent * event)
--{
--    m_mouseReleaseCount++;
--    Q_EMIT mouseReleaseCountChanged(m_mouseReleaseCount);
--    event->accept();
--}
--
--void MirSurfaceItem::setSurface(MirSurfaceInterface* surface)
--{
--    DEBUG_MSG("this=" << (void*)(this) << " name=" << name() << " surface=" << surface);
--
--    if (m_qmlSurface == surface) {
--        return;
--    }
--
--    if (m_qmlSurface) {
--        delete m_qmlItem;
--        m_qmlItem = nullptr;
--
--        delete m_qmlContentComponent;
--        m_qmlContentComponent = nullptr;
--
--        if (hasActiveFocus() && m_consumesInput && m_qmlSurface->live()) {
--            m_qmlSurface->setActiveFocus(false);
--        }
--
--        disconnect(m_qmlSurface, nullptr, this, nullptr);
--        m_qmlSurface->unregisterView((qintptr)this);
--    }
--
--    m_qmlSurface = static_cast<MirSurface*>(surface);
--
--    if (m_qmlSurface) {
--        m_qmlSurface->registerView((qintptr)this);
--
--        updateSurfaceSize();
--        updateMirSurfaceExposure();
--
--        if (m_orientationAngle) {
--            m_qmlSurface->setOrientationAngle(*m_orientationAngle);
--            connect(m_qmlSurface, &MirSurfaceInterface::orientationAngleChanged, this, &MirSurfaceItem::orientationAngleChanged);
--            delete m_orientationAngle;
--            m_orientationAngle = nullptr;
--        } else {
--            connect(m_qmlSurface, &MirSurfaceInterface::orientationAngleChanged, this, &MirSurfaceItem::orientationAngleChanged);
--            Q_EMIT orientationAngleChanged(m_qmlSurface->orientationAngle());
--        }
--
--        connect(m_qmlSurface, &MirSurface::screenshotUrlChanged, this, &MirSurfaceItem::updateScreenshot);
--        connect(m_qmlSurface, &MirSurface::liveChanged, this, &MirSurfaceItem::liveChanged);
--        connect(m_qmlSurface, &MirSurface::stateChanged, this, &MirSurfaceItem::surfaceStateChanged);
--
--        QUrl qmlComponentFilePath;
--        if (!m_qmlSurface->qmlFilePath().isEmpty()) {
--            qmlComponentFilePath = m_qmlSurface->qmlFilePath();
--        } else {
--            qmlComponentFilePath = QUrl("qrc:///Unity/Application/MirSurfaceItem.qml");
--        }
--
--        m_qmlContentComponent = new QQmlComponent(QQmlEngine::contextForObject(parent())->engine(), qmlComponentFilePath);
--
--        switch (m_qmlContentComponent->status()) {
--            case QQmlComponent::Ready:
--                createQmlContentItem();
--                break;
--            case QQmlComponent::Loading:
--                connect(m_qmlContentComponent, &QQmlComponent::statusChanged,
--                        this, &MirSurfaceItem::onComponentStatusChanged);
--                break;
--            case QQmlComponent::Error:
--                printComponentErrors();
--                qFatal("MirSurfaceItem: failed to create content component.");
--                break;
--            default:
--                qFatal("MirSurfaceItem: Unhandled component status");
--        }
--
--        if (m_consumesInput) {
--            m_qmlSurface->setActiveFocus(hasActiveFocus());
--        }
--    }
--
--    Q_EMIT surfaceChanged(m_qmlSurface);
--}
--
--
--void MirSurfaceItem::updateMirSurfaceActiveFocus(bool focused)
--{
--    if (m_qmlSurface && m_consumesInput && m_qmlSurface->live()) {
--        m_qmlSurface->setActiveFocus(focused);
--    }
--}
--
--void MirSurfaceItem::updateMirSurfaceExposure()
--{
--    if (!m_qmlSurface) return;
--
--    m_qmlSurface->setViewExposure((qintptr)this, isVisible());
--}
--
--void MirSurfaceItem::setConsumesInput(bool value)
--{
--    if (m_consumesInput != value) {
--        m_consumesInput = value;
--        Q_EMIT consumesInputChanged(value);
--    }
--}
--
--int MirSurfaceItem::surfaceWidth() const
--{
--    return m_surfaceWidth;
--}
--
--void MirSurfaceItem::setSurfaceWidth(int value)
--{
--//    qDebug() << "setSurfaceWidth called" << value;
--    if (value != -1 && m_surfaceWidth != value) {
--        m_surfaceWidth = value;
--        Q_EMIT surfaceWidthChanged(m_surfaceWidth);
--        updateSurfaceSize();
--    }
--}
--
--int MirSurfaceItem::surfaceHeight() const
--{
--    return m_surfaceHeight;
--}
--
--void MirSurfaceItem::setSurfaceHeight(int value)
--{
--    if (value != -1 && m_surfaceHeight != value) {
--        m_surfaceHeight = value;
--        Q_EMIT surfaceHeightChanged(m_surfaceHeight);
--        updateSurfaceSize();
--    }
--}
--
--void MirSurfaceItem::updateSurfaceSize()
--{
--    if (m_qmlSurface && m_surfaceWidth > 0 && m_surfaceHeight > 0) {
--        m_qmlSurface->resize(m_surfaceWidth, m_surfaceHeight);
--        if (m_qmlItem) {
--            m_qmlItem->setWidth(m_surfaceWidth);
--            m_qmlItem->setHeight(m_surfaceHeight);
--        }
--        setImplicitSize(m_surfaceWidth, m_surfaceHeight);
--    }
--}
--
--void MirSurfaceItem::setFillMode(FillMode value)
--{
--    if (value != m_fillMode) {
--        m_fillMode = value;
--        Q_EMIT fillModeChanged(m_fillMode);
--    }
--}
 === removed file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
 --- tests/mocks/Unity/Application/MirSurfaceItem.h	2016-11-30 19:24:02 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceItem.h	1970-01-01 00:00:00 +0000
@@ -1,138 +0,0 @@
--/*
-- * Copyright (C) 2014-2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef MIRSURFACEITEM_H
--#define MIRSURFACEITEM_H
--
--#include "MirSurface.h"
--
--#include <QQuickItem>
--#include <QUrl>
--
--// unity-api
--#include <unity/shell/application/MirSurfaceItemInterface.h>
--
--class MirSurfaceItem : public unity::shell::application::MirSurfaceItemInterface
--{
--    Q_OBJECT
--
--    ////
--    // for use in qml tests
--    Q_PROPERTY(int touchPressCount READ touchPressCount WRITE setTouchPressCount
--                                   NOTIFY touchPressCountChanged DESIGNABLE false)
--    Q_PROPERTY(int touchReleaseCount READ touchReleaseCount WRITE setTouchReleaseCount
--                                     NOTIFY touchReleaseCountChanged DESIGNABLE false)
--
--    Q_PROPERTY(int mousePressCount READ mousePressCount WRITE setMousePressCount
--                                   NOTIFY mousePressCountChanged)
--    Q_PROPERTY(int mouseReleaseCount READ mouseReleaseCount WRITE setMouseReleaseCount
--                                   NOTIFY mouseReleaseCountChanged)
--public:
--    explicit MirSurfaceItem(QQuickItem *parent = 0);
--    ~MirSurfaceItem();
--
--    Mir::Type type() const override;
--    QString name() const override;
--    bool live() const override;
--    Mir::ShellChrome shellChrome() const override;
--
--    Mir::State surfaceState() const override;
--
--    Mir::OrientationAngle orientationAngle() const override;
--    void setOrientationAngle(Mir::OrientationAngle angle) override;
--
--    unity::shell::application::MirSurfaceInterface* surface() const override { return m_qmlSurface; }
--    void setSurface(unity::shell::application::MirSurfaceInterface*) override;
--
--    bool consumesInput() const override { return m_consumesInput; }
--    void setConsumesInput(bool value) override;
--
--    int surfaceWidth() const override;
--    void setSurfaceWidth(int value) override;
--
--    int surfaceHeight() const override;
--    void setSurfaceHeight(int value) override;
--
--    FillMode fillMode() const override { return m_fillMode; }
--    void setFillMode(FillMode value) override;
--
--    /////
--    // For use in qml tests
--
--    void setLive(bool live);
--
--    int touchPressCount() const { return m_touchPressCount; }
--    void setTouchPressCount(int count) { m_touchPressCount = count; Q_EMIT touchPressCountChanged(count); }
--
--    int touchReleaseCount() const { return m_touchReleaseCount; }
--    void setTouchReleaseCount(int count) { m_touchReleaseCount = count; Q_EMIT touchReleaseCountChanged(count); }
--
--    int mousePressCount() const { return m_mousePressCount; }
--    void setMousePressCount(int count) { m_mousePressCount = count; Q_EMIT mousePressCountChanged(count); }
--
--    int mouseReleaseCount() const { return m_mouseReleaseCount; }
--    void setMouseReleaseCount(int count) { m_mouseReleaseCount = count; Q_EMIT mouseReleaseCountChanged(count); }
--
--Q_SIGNALS:
--    void touchPressCountChanged(int count);
--    void touchReleaseCountChanged(int count);
--    void mousePressCountChanged(int count);
--    void mouseReleaseCountChanged(int count);
--
--protected:
--    void touchEvent(QTouchEvent * event) override;
--    void mousePressEvent(QMouseEvent * event) override;
--    void mouseMoveEvent(QMouseEvent * event) override;
--    void mouseReleaseEvent(QMouseEvent * event) override;
--
--private Q_SLOTS:
--    void onComponentStatusChanged(QQmlComponent::Status status);
--    void updateScreenshot(QUrl screenshot);
--    void updateMirSurfaceExposure();
--    void updateMirSurfaceActiveFocus(bool focused);
--
--private:
--    void createQmlContentItem();
--    void printComponentErrors();
--    void updateSurfaceSize();
--
--    MirSurface* m_qmlSurface;
--
--    QQmlComponent *m_qmlContentComponent;
--    QQuickItem *m_qmlItem;
--
--    bool m_consumesInput;
--
--    Mir::OrientationAngle *m_orientationAngle;
--
--    int m_surfaceWidth;
--    int m_surfaceHeight;
--
--    int m_touchPressCount;
--    int m_touchReleaseCount;
--    int m_mousePressCount;
--    int m_mouseReleaseCount;
--    QVariantMap m_touchTrail;
--
--    FillMode m_fillMode{Stretch};
--
--    friend class SurfaceManager;
--};
--
--Q_DECLARE_METATYPE(MirSurfaceItem*)
--Q_DECLARE_METATYPE(QList<MirSurfaceItem*>)
--
--#endif // MIRSURFACEITEM_H
 === removed file 'tests/mocks/Unity/Application/MirSurfaceListModel.cpp'
 --- tests/mocks/Unity/Application/MirSurfaceListModel.cpp	2016-11-30 19:24:02 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceListModel.cpp	1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
--/*
-- * Copyright (C) 2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "MirSurfaceListModel.h"
--#include "ApplicationInfo.h"
--
--#include "MirSurface.h"
--
--#define MIRSURFACELISTMODEL_DEBUG 0
--
--#if MIRSURFACELISTMODEL_DEBUG
--#include <QDebug>
--#define DEBUG_MSG(params) qDebug().nospace() << "MirSurfaceListModel::" << __func__  <<  params
--#else
--#define DEBUG_MSG(params) ((void)0)
--#endif
--
--using namespace unity::shell::application;
--
--MirSurfaceListModel::MirSurfaceListModel(QObject *parent) :
--    MirSurfaceListInterface(parent)
--{
--}
--
--int MirSurfaceListModel::rowCount(const QModelIndex &parent) const
--{
--    return !parent.isValid() ? m_surfaceList.size() : 0;
--}
--
--QVariant MirSurfaceListModel::data(const QModelIndex& index, int role) const
--{
--    if (index.row() < 0 || index.row() >= m_surfaceList.size())
--        return QVariant();
--
--    if (role == SurfaceRole) {
--        MirSurface *surface = m_surfaceList.at(index.row());
--        return QVariant::fromValue(static_cast<unity::shell::application::MirSurfaceInterface*>(surface));
--    } else {
--        return QVariant();
--    }
--}
--
--void MirSurfaceListModel::raise(MirSurface *surface)
--{
--    DEBUG_MSG("(" << surface << ")");
--    int i = m_surfaceList.indexOf(surface);
--    if (i != -1) {
--        moveSurface(i, 0);
--    }
--}
--
--void MirSurfaceListModel::addSurface(MirSurface *surface)
--{
--    DEBUG_MSG("(" << surface << ")");
--    beginInsertRows(QModelIndex(), 0, 0);
--    m_surfaceList.prepend(surface);
--    connectSurface(surface);
--    endInsertRows();
--    Q_EMIT countChanged(m_surfaceList.count());
--    Q_EMIT firstChanged();
--}
--
--void MirSurfaceListModel::connectSurface(MirSurface *surface)
--{
--    connect(surface, &QObject::destroyed, this, [this, surface](){ this->removeSurface(surface); });
--    connect(surface, &MirSurfaceInterface::focusedChanged, this, [this, surface](bool surfaceFocused){
--        if (surfaceFocused) {
--            raise(surface);
--        }
--    });
--}
--
--void MirSurfaceListModel::removeSurface(MirSurface *surface)
--{
--    int i = m_surfaceList.indexOf(surface);
--    if (i != -1) {
--        beginRemoveRows(QModelIndex(), i, i);
--        m_surfaceList.removeAt(i);
--        endRemoveRows();
--        Q_EMIT countChanged(m_surfaceList.count());
--        if (m_surfaceList.count() == 0 || i == 0) {
--            Q_EMIT firstChanged();
--        }
--    }
--}
--
--void MirSurfaceListModel::moveSurface(int from, int to)
--{
--    if (from == to) return;
--
--    if (from >= 0 && from < m_surfaceList.size() && to >= 0 && to < m_surfaceList.size()) {
--        QModelIndex parent;
--        /* When moving an item down, the destination index needs to be incremented
--           by one, as explained in the documentation:
--           http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
--
--        beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
--        m_surfaceList.move(from, to);
--        endMoveRows();
--    }
--
--    if ((from == 0 || to == 0) && m_surfaceList.count() > 1) {
--        Q_EMIT firstChanged();
--    }
--}
--
--MirSurfaceInterface *MirSurfaceListModel::get(int index)
--{
--    if (index >=0 && index < m_surfaceList.count()) {
--        return m_surfaceList[index];
--    } else {
--        return nullptr;
--    }
--}
--
--const MirSurfaceInterface *MirSurfaceListModel::get(int index) const
--{
--    if (index >=0 && index < m_surfaceList.count()) {
--        return m_surfaceList.at(index);
--    } else {
--        return nullptr;
--    }
--}
 === removed file 'tests/mocks/Unity/Application/MirSurfaceListModel.h'
 --- tests/mocks/Unity/Application/MirSurfaceListModel.h	2017-01-26 11:10:01 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceListModel.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
--/*
-- * Copyright (C) 2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef MIRSURFACELISTMODEL_H
--#define MIRSURFACELISTMODEL_H
--
--// unity-api
--#include <unity/shell/application/MirSurfaceListInterface.h>
--
--#include <QAbstractListModel>
--#include <QList>
--
--class MirSurface;
--
--class MirSurfaceListModel : public unity::shell::application::MirSurfaceListInterface
--{
--    Q_OBJECT
--public:
--    explicit MirSurfaceListModel(QObject *parent = 0);
--
--    Q_INVOKABLE unity::shell::application::MirSurfaceInterface *get(int index) override;
--    const unity::shell::application::MirSurfaceInterface *get(int index) const;
--
--    // QAbstractItemModel methods
--    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
--    QVariant data(const QModelIndex& index, int role) const override;
--
--    void addSurface(MirSurface *surface);
--    void removeSurface(MirSurface *surface);
--
--    bool contains(MirSurface *surface) const { return m_surfaceList.contains(surface); }
--
--private:
--    void raise(MirSurface *surface);
--    void moveSurface(int from, int to);
--    void connectSurface(MirSurface *surface);
--
--    QList<MirSurface*> m_surfaceList;
--};
--
--Q_DECLARE_METATYPE(MirSurfaceListModel*)
--
--#endif // MIRSURFACELISTMODEL_H
 === removed file 'tests/mocks/Unity/Application/ObjectListModel.h'
 --- tests/mocks/Unity/Application/ObjectListModel.h	2016-04-04 13:37:49 +0000
 +++ tests/mocks/Unity/Application/ObjectListModel.h	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical, Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it under
-- * the terms of the GNU Lesser General Public License version 3, as published by
-- * the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef OBJECTLISTMODEL_H
--#define OBJECTLISTMODEL_H
--
--// Qt
--#include <QAbstractListModel>
--
--#include <QDebug>
--
--template<class TYPE>
--class ObjectListModel : public QAbstractListModel
--{
--public:
--    ObjectListModel(QObject *parent = 0)
--    : QAbstractListModel(parent)
--    {}
--
--    enum Roles {
--        RoleModelData = Qt::UserRole,
--    };
--
--    const QList<TYPE*>& list() const { return m_items; }
--    bool contains(TYPE* item) const { return m_items.contains(item); }
--
--    void insert(uint index, TYPE* item)
--    {
--        index = qMin(index, (uint)m_items.count());
--
--        int existingIndex = m_items.indexOf(item);
--        if (existingIndex != -1) {
--            move(existingIndex, qMin(index, (uint)(m_items.count()-1)));
--        } else {
--            beginInsertRows(QModelIndex(), index, index);
--            m_items.insert(index, item);
--            endInsertRows();
--        }
--    }
--
--    void remove(TYPE* item)
--    {
--        int existingIndex = m_items.indexOf(item);
--        if (existingIndex != -1) {
--            beginRemoveRows(QModelIndex(), existingIndex, existingIndex);
--            m_items.removeAt(existingIndex);
--            endRemoveRows();
--        }
--    }
--
--    // from QAbstractItemModel
--    int rowCount(const QModelIndex& = QModelIndex()) const override
--    {
--        return m_items.count();
--    }
--
--    QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override
--    {
--        if (index.row() >= 0 && index.row() < m_items.count()) {
--            if (role == RoleModelData) {
--                TYPE *item = m_items.at(index.row());
--                return QVariant::fromValue(item);
--            }
--        }
--        return QVariant();
--    }
--
--    QHash<int, QByteArray> roleNames() const override
--    {
--        QHash<int, QByteArray> roleNames;
--        roleNames.insert(RoleModelData, "modelData");
--        return roleNames;
--    }
--
--protected:
--    void move(int from, int to)
--    {
--        if (from == to) return;
--
--        if (from >= 0 && from < m_items.size() && to >= 0 && to < m_items.size()) {
--            QModelIndex parent;
--            /* When moving an item down, the destination index needs to be incremented
--               by one, as explained in the documentation:
--               http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
--
--            beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
--            m_items.move(from, to);
--            endMoveRows();
--        }
--    }
--
--    QList<TYPE*> m_items;
--};
--
--#endif // OBJECTLISTMODEL_H
 === removed file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
 --- tests/mocks/Unity/Application/SurfaceManager.cpp	2017-02-07 16:21:09 +0000
 +++ tests/mocks/Unity/Application/SurfaceManager.cpp	1970-01-01 00:00:00 +0000
@@ -1,281 +0,0 @@
--/*
-- * Copyright (C) 2014-2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "SurfaceManager.h"
--
--#include "ApplicationInfo.h"
--#include "VirtualKeyboard.h"
--
--#include <paths.h>
--
--#define SURFACEMANAGER_DEBUG 0
--
--#if SURFACEMANAGER_DEBUG
--#define DEBUG_MSG(params) qDebug().nospace() << "SurfaceManager[" << (void*)this << "]::" << __func__  << params
--#else
--#define DEBUG_MSG(params) ((void)0)
--#endif
--
--namespace unityapi = unity::shell::application;
--
--SurfaceManager *SurfaceManager::m_instance = nullptr;
--
--SurfaceManager *SurfaceManager::instance()
--{
--    return m_instance;
--}
--
--SurfaceManager::SurfaceManager(QObject *)
--{
--    DEBUG_MSG("");
--
--    Q_ASSERT(m_instance == nullptr);
--    m_instance = this;
--}
--
--SurfaceManager::~SurfaceManager()
--{
--    DEBUG_MSG("");
--
--    if (m_virtualKeyboard) {
--        m_virtualKeyboard->setLive(false);
--    }
--
--    Q_ASSERT(m_instance == this);
--    m_instance = nullptr;
--}
--
--MirSurface *SurfaceManager::createSurface(const QString& name,
--                                          Mir::Type type,
--                                          Mir::State state,
--                                          MirSurface *parentSurface,
--                                          const QUrl &screenshot,
--                                          const QUrl &qmlFilePath)
--{
--    MirSurface* surface = new MirSurface(name, type, state, parentSurface, screenshot, qmlFilePath);
--    registerSurface(surface);
--    if (parentSurface) {
--        static_cast<MirSurfaceListModel*>(parentSurface->childSurfaceList())->addSurface(surface);
--    }
--    return surface;
--}
--
--void SurfaceManager::registerSurface(MirSurface *surface)
--{
--    m_surfaces.prepend(surface);
--
--    if (!surface->parentSurface()) {
--        surface->setMinimumWidth(m_newSurfaceMinimumWidth);
--        surface->setMaximumWidth(m_newSurfaceMaximumWidth);
--        surface->setMinimumHeight(m_newSurfaceMinimumHeight);
--        surface->setMaximumHeight(m_newSurfaceMaximumHeight);
--        surface->setWidthIncrement(m_newSurfaceWidthIncrement);
--        surface->setHeightIncrement(m_newSurfaceHeightIncrement);
--    }
--
--    connect(surface, &MirSurface::stateRequested, this, [=](Mir::State state) {
--        this->onStateRequested(surface, state);
--    });
--
--    const QString persistentId = surface->persistentId();
--    connect(surface, &QObject::destroyed, this, [=]() {
--        this->onSurfaceDestroyed(surface, persistentId);
--    });
--
--}
--
--void SurfaceManager::notifySurfaceCreated(unityapi::MirSurfaceInterface *surface)
--{
--    Q_EMIT surfaceCreated(surface);
--}
--
--void SurfaceManager::setNewSurfaceMinimumWidth(int value)
--{
--    if (m_newSurfaceMinimumWidth != value) {
--        m_newSurfaceMinimumWidth = value;
--        Q_EMIT newSurfaceMinimumWidthChanged(m_newSurfaceMinimumWidth);
--    }
--}
--
--void SurfaceManager::setNewSurfaceMaximumWidth(int value)
--{
--    if (m_newSurfaceMaximumWidth != value) {
--        m_newSurfaceMaximumWidth = value;
--        Q_EMIT newSurfaceMaximumWidthChanged(m_newSurfaceMaximumWidth);
--    }
--}
--
--void SurfaceManager::setNewSurfaceMinimumHeight(int value)
--{
--    if (m_newSurfaceMinimumHeight != value) {
--        m_newSurfaceMinimumHeight = value;
--        Q_EMIT newSurfaceMinimumHeightChanged(m_newSurfaceMinimumHeight);
--    }
--}
--
--void SurfaceManager::setNewSurfaceMaximumHeight(int value)
--{
--    if (m_newSurfaceMaximumHeight != value) {
--        m_newSurfaceMaximumHeight = value;
--        Q_EMIT newSurfaceMaximumHeightChanged(m_newSurfaceMaximumHeight);
--    }
--}
--
--void SurfaceManager::setNewSurfaceWidthIncrement(int value)
--{
--    if (m_newSurfaceWidthIncrement != value) {
--        m_newSurfaceWidthIncrement = value;
--        Q_EMIT newSurfaceWidthIncrementChanged(m_newSurfaceWidthIncrement);
--    }
--}
--
--void SurfaceManager::setNewSurfaceHeightIncrement(int value)
--{
--    if (m_newSurfaceHeightIncrement != value) {
--        m_newSurfaceHeightIncrement = value;
--        Q_EMIT newSurfaceHeightIncrementChanged(m_newSurfaceHeightIncrement);
--    }
--}
--
--void SurfaceManager::raise(unityapi::MirSurfaceInterface *surface)
--{
--    if (m_underModification)
--        return;
--
--    DEBUG_MSG("("<<surface<<") started");
--    Q_EMIT modificationsStarted();
--    m_underModification = true;
--
--    doRaise(surface);
--
--    m_underModification = false;
--    Q_EMIT modificationsEnded();
--    DEBUG_MSG("("<<surface<<") ended");
--}
--
--void SurfaceManager::doRaise(unityapi::MirSurfaceInterface *apiSurface)
--{
--    auto surface = static_cast<MirSurface*>(apiSurface);
--    int index = m_surfaces.indexOf(surface);
--    Q_ASSERT(index != -1);
--    m_surfaces.move(index, 0);
--
--    Q_EMIT surfacesRaised({surface});
--}
--
--void SurfaceManager::activate(unityapi::MirSurfaceInterface *apiSurface)
--{
--    auto surface = static_cast<MirSurface*>(apiSurface);
--
--    if (surface == m_focusedSurface) {
--        return;
--    }
--
--    Q_ASSERT(!m_underModification);
--
--    DEBUG_MSG("("<<surface<<") started");
--    Q_EMIT modificationsStarted();
--    m_underModification = true;
--    if (m_focusedSurface) {
--        m_focusedSurface->setFocused(false);
--    }
--    if (surface) {
--        if (surface->state() == Mir::HiddenState || surface->state() == Mir::MinimizedState) {
--            if (surface->previousState() != Mir::UnknownState) {
--                surface->setState(surface->previousState());
--            } else {
--                surface->setState(Mir::RestoredState);
--            }
--        }
--        surface->setFocused(true);
--        doRaise(surface);
--    }
--    m_focusedSurface = surface;
--    m_underModification = false;
--    Q_EMIT modificationsEnded();
--    DEBUG_MSG("("<<surface<<") ended");
--}
--
--void SurfaceManager::onStateRequested(MirSurface *surface, Mir::State state)
--{
--    DEBUG_MSG("("<<surface<<","<<state<<") started");
--    Q_EMIT modificationsStarted();
--    m_underModification = true;
--
--    surface->setPreviousState(surface->state());
--    surface->setState(state);
--
--    if ((state == Mir::MinimizedState || state == Mir::HiddenState) && surface->focused()) {
--        Q_ASSERT(m_focusedSurface == surface);
--        surface->setFocused(false);
--        m_focusedSurface = nullptr;
--        focusFirstAvailableSurface();
--    }
--
--    m_underModification = false;
--    Q_EMIT modificationsEnded();
--    DEBUG_MSG("("<<surface<<","<<state<<") ended");
--}
--
--void SurfaceManager::onSurfaceDestroyed(MirSurface *surface, const QString& persistentId)
--{
--    m_surfaces.removeAll(surface);
--    if (m_focusedSurface == surface) {
--        m_focusedSurface = nullptr;
--
--        Q_EMIT modificationsStarted();
--        m_underModification = true;
--
--        focusFirstAvailableSurface();
--
--        m_underModification = false;
--        Q_EMIT modificationsEnded();
--    }
--    Q_EMIT surfaceDestroyed(persistentId);
--}
--
--void SurfaceManager::focusFirstAvailableSurface()
--{
--    MirSurface *chosenSurface = nullptr;
--    for (int i = 0; i < m_surfaces.count() && !chosenSurface; ++i) {
--        auto *surface = m_surfaces[i];
--        if (surface->state() != Mir::HiddenState && surface->state() != Mir::MinimizedState) {
--            chosenSurface = surface;
--        }
--    }
--
--    if (!chosenSurface) {
--        return;
--    }
--
--    if (m_focusedSurface) {
--        m_focusedSurface->setFocused(false);
--    }
--
--    chosenSurface->setFocused(true);
--    doRaise(chosenSurface);
--
--    m_focusedSurface = chosenSurface;
--}
--
--void SurfaceManager::createInputMethodSurface()
--{
--    if (!m_virtualKeyboard) {
--        m_virtualKeyboard = new VirtualKeyboard;
--        registerSurface(m_virtualKeyboard);
--        Q_EMIT surfaceCreated(m_virtualKeyboard);
--    }
--}
 === removed file 'tests/mocks/Unity/Application/SurfaceManager.h'
 --- tests/mocks/Unity/Application/SurfaceManager.h	2017-01-26 11:10:01 +0000
 +++ tests/mocks/Unity/Application/SurfaceManager.h	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
--/*
-- * Copyright (C) 2014-2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef SURFACEMANAGER_H
--#define SURFACEMANAGER_H
--
--#include <QObject>
--
--#include <unity/shell/application/SurfaceManagerInterface.h>
--
--#include "MirSurface.h"
--#include "VirtualKeyboard.h"
--
--class ApplicationInfo;
--
--class SurfaceManager : public unity::shell::application::SurfaceManagerInterface
--{
--    Q_OBJECT
--    Q_PROPERTY(int newSurfaceMinimumWidth READ newSurfaceMinimumWidth WRITE setNewSurfaceMinimumWidth NOTIFY newSurfaceMinimumWidthChanged)
--    Q_PROPERTY(int newSurfaceMaximumWidth READ newSurfaceMaximumWidth WRITE setNewSurfaceMaximumWidth NOTIFY newSurfaceMaximumWidthChanged)
--    Q_PROPERTY(int newSurfaceMinimumHeight READ newSurfaceMinimumHeight WRITE setNewSurfaceMinimumHeight NOTIFY newSurfaceMinimumHeightChanged)
--    Q_PROPERTY(int newSurfaceMaximumHeight READ newSurfaceMaximumHeight WRITE setNewSurfaceMaximumHeight NOTIFY newSurfaceMaximumHeightChanged)
--    Q_PROPERTY(int newSurfaceWidthIncrement READ newSurfaceWidthIncrement WRITE setNewSurfaceWidthIncrement NOTIFY newSurfaceWidthIncrementChanged)
--    Q_PROPERTY(int newSurfaceHeightIncrement READ newSurfaceHeightIncrement WRITE setNewSurfaceHeightIncrement NOTIFY newSurfaceHeightIncrementChanged)
--
--public:
--    explicit SurfaceManager(QObject *parent = 0);
--    virtual ~SurfaceManager();
--
--    static SurfaceManager *instance();
--
--    // SurfaceManagerInterface
--    void raise(unity::shell::application::MirSurfaceInterface *surface) override;
--    void activate(unity::shell::application::MirSurfaceInterface *surface) override;
--
--    Q_INVOKABLE MirSurface* createSurface(const QString& name,
--                                  Mir::Type type,
--                                  Mir::State state,
--                                  MirSurface *parentSurface,
--                                  const QUrl &screenshot,
--                                  const QUrl &qmlFilePath = QUrl());
--
--
--    void notifySurfaceCreated(unity::shell::application::MirSurfaceInterface *);
--
--    int newSurfaceMinimumWidth() const { return m_newSurfaceMinimumWidth; }
--    void setNewSurfaceMinimumWidth(int value);
--
--    int newSurfaceMaximumWidth() const { return m_newSurfaceMaximumWidth; }
--    void setNewSurfaceMaximumWidth(int value);
--
--    int newSurfaceMinimumHeight() const { return m_newSurfaceMinimumHeight; }
--    void setNewSurfaceMinimumHeight(int value);
--
--    int newSurfaceMaximumHeight() const { return m_newSurfaceMaximumHeight; }
--    void setNewSurfaceMaximumHeight(int value);
--
--    int newSurfaceWidthIncrement() const { return m_newSurfaceWidthIncrement; }
--    void setNewSurfaceWidthIncrement(int);
--
--    int newSurfaceHeightIncrement() const { return m_newSurfaceHeightIncrement; }
--    void setNewSurfaceHeightIncrement(int);
--
--public Q_SLOTS:
--    void createInputMethodSurface();
--
--Q_SIGNALS:
--    void surfaceDestroyed(const QString& persistentSurfaceId);
--
--    void newSurfaceMinimumWidthChanged(int value);
--    void newSurfaceMaximumWidthChanged(int value);
--    void newSurfaceMinimumHeightChanged(int value);
--    void newSurfaceMaximumHeightChanged(int value);
--    void newSurfaceWidthIncrementChanged(int value);
--    void newSurfaceHeightIncrementChanged(int value);
--
--private Q_SLOTS:
--    void onStateRequested(MirSurface *surface, Mir::State state);
--    void onSurfaceDestroyed(MirSurface *surface, const QString& persistentId);
--
--private:
--    void doRaise(unity::shell::application::MirSurfaceInterface *surface);
--    void focusFirstAvailableSurface();
--    void registerSurface(MirSurface *surface);
--
--    static SurfaceManager *m_instance;
--
--    int m_newSurfaceMinimumWidth{0};
--    int m_newSurfaceMaximumWidth{0};
--    int m_newSurfaceMinimumHeight{0};
--    int m_newSurfaceMaximumHeight{0};
--    int m_newSurfaceWidthIncrement{1};
--    int m_newSurfaceHeightIncrement{1};
--
--    MirSurface *m_focusedSurface{nullptr};
--    bool m_underModification{false};
--
--    QList<MirSurface*> m_surfaces;
--
--    VirtualKeyboard *m_virtualKeyboard{nullptr};
--};
--
--#endif // SURFACEMANAGER_H
 === removed file 'tests/mocks/Unity/Application/VirtualKeyboard.cpp'
 --- tests/mocks/Unity/Application/VirtualKeyboard.cpp	2017-01-26 11:10:01 +0000
 +++ tests/mocks/Unity/Application/VirtualKeyboard.cpp	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
--/*
-- * Copyright (C) 2015,2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "VirtualKeyboard.h"
--
--#include <paths.h>
--
--#include <QString>
--
--#include <QDebug>
--
--VirtualKeyboard::VirtualKeyboard()
--    : MirSurface("input-method",
--                 Mir::InputMethodType,
--                 Mir::MinimizedState,
--                 nullptr, /* parentSurface */
--                 QUrl("qrc:///Unity/Application/vkb_portrait.png"),
--                 QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))
--{
--}
--
--VirtualKeyboard::~VirtualKeyboard()
--{
--}
--
--void VirtualKeyboard::updateInputBoundsAfterResize()
--{
--    int width = this->width();
--
--    int height = 0;
--    if (visible()) {
--        if (this->width() > this->height()) {
--            // landscape
--            height = this->height() * 0.4;
--        } else {
--            // portrait
--            height = this->width() * 0.6;
--        }
--    }
--
--    int x = 0;
--    int y = this->height() - height;
--
--    setInputBounds(QRect(x, y, width, height));
--}
 === removed file 'tests/mocks/Unity/Application/VirtualKeyboard.h'
 --- tests/mocks/Unity/Application/VirtualKeyboard.h	2016-06-30 13:51:32 +0000
 +++ tests/mocks/Unity/Application/VirtualKeyboard.h	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
--/*
-- * Copyright (C) 2015,2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef VIRTUALKEYBOARD_H
--#define VIRTUALKEYBOARD_H
--
--#include "MirSurface.h"
--
--#include <QQuickItem>
--
--class VirtualKeyboard : public MirSurface
--{
--    Q_OBJECT
--public:
--    explicit VirtualKeyboard();
--    ~VirtualKeyboard();
--
--protected:
--    void updateInputBoundsAfterResize() override;
--};
--
--Q_DECLARE_METATYPE(VirtualKeyboard*)
--
--#endif // VIRTUALKEYBOARD_H
 === removed file 'tests/mocks/Unity/Application/plugin.cpp'
 --- tests/mocks/Unity/Application/plugin.cpp	2016-12-01 11:38:26 +0000
 +++ tests/mocks/Unity/Application/plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
--/*
-- * Copyright (C) 2013-2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "plugin.h"
--#include "ApplicationInfo.h"
--#include "ApplicationManager.h"
--#include "MirMock.h"