Unity 8

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

unifyLightDMMocks
Merge into trunk

Proposed by Daniel d'Andrada on 2014-12-12

Status:	Merged
Approved by:	Michael Terry on 2015-01-23
Approved revision:	1568
Merged at revision:	1586
Proposed branch:	lp:~dandrader/unity8/unifyLightDMMocks
Merge into:	lp:unity8
Diff against target:	3381 lines (+1695/-953) 64 files modified plugins/LightDM/CMakeLists.txt (+3/-3) plugins/LightDM/Greeter.cpp (+1/-19) plugins/LightDM/Greeter.h (+1/-1) plugins/LightDM/GreeterPrivate.h (+39/-0) plugins/LightDM/liblightdm/CMakeLists.txt (+37/-0) plugins/LightDM/liblightdm/Greeter.cpp (+184/-0) plugins/LightDM/liblightdm/Greeter.h (+112/-0) plugins/LightDM/liblightdm/GreeterPrivate.cpp (+281/-0) plugins/LightDM/liblightdm/GreeterPrivate.h (+51/-0) plugins/LightDM/liblightdm/UsersModel.cpp (+123/-0) plugins/LightDM/liblightdm/UsersModel.h (+66/-0) plugins/LightDM/liblightdm/UsersModelPrivate.cpp (+41/-0) plugins/LightDM/liblightdm/UsersModelPrivate.h (+59/-0) plugins/Lights/CMakeLists.txt (+0/-2) plugins/Powerd/CMakeLists.txt (+0/-2) plugins/Unity/Launcher/CMakeLists.txt (+0/-1) plugins/Unity/Session/CMakeLists.txt (+0/-2) plugins/Utils/CMakeLists.txt (+0/-3) run.sh (+3/-26) tests/autopilot/unity8/shell/__init__.py (+0/-13) tests/autopilot/unity8/shell/tests/__init__.py (+8/-11) tests/autopilot/unity8/shell/tests/test_edges_demo.py (+0/-1) tests/autopilot/unity8/shell/tests/test_lock_screen.py (+6/-5) tests/mocks/LightDM/CMakeLists.txt (+8/-9) tests/mocks/LightDM/MockGreeter.cpp (+35/-0) tests/mocks/LightDM/MockGreeter.h (+37/-0) tests/mocks/LightDM/MockUsersModel.cpp (+39/-0) tests/mocks/LightDM/MockUsersModel.h (+37/-0) tests/mocks/LightDM/QLightDM/Greeter (+17/-0) tests/mocks/LightDM/QLightDM/UsersModel (+17/-0) tests/mocks/LightDM/demo/CMakeLists.txt (+0/-37) tests/mocks/LightDM/demo/GreeterPrivate.cpp (+0/-281) tests/mocks/LightDM/demo/UsersModelPrivate.cpp (+0/-41) tests/mocks/LightDM/full/CMakeLists.txt (+0/-18) tests/mocks/LightDM/full/GreeterPrivate.cpp (+0/-98) tests/mocks/LightDM/full/UsersModelPrivate.cpp (+0/-52) tests/mocks/LightDM/liblightdm/CMakeLists.txt (+18/-0) tests/mocks/LightDM/liblightdm/Greeter.cpp (+18/-3) tests/mocks/LightDM/liblightdm/Greeter.h (+7/-0) tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp (+132/-0) tests/mocks/LightDM/liblightdm/GreeterPrivate.h (+5/-3) tests/mocks/LightDM/liblightdm/UsersModel.cpp (+17/-0) tests/mocks/LightDM/liblightdm/UsersModel.h (+10/-3) tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp (+104/-0) tests/mocks/LightDM/liblightdm/UsersModelPrivate.h (+7/-3) tests/mocks/LightDM/plugin.cpp (+68/-0) tests/mocks/LightDM/plugin.h (+32/-0) tests/mocks/LightDM/single-passphrase/CMakeLists.txt (+0/-19) tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp (+0/-46) tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp (+0/-33) tests/mocks/LightDM/single-pin/CMakeLists.txt (+0/-19) tests/mocks/LightDM/single-pin/GreeterPrivate.cpp (+0/-46) tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp (+0/-33) tests/mocks/LightDM/single/CMakeLists.txt (+0/-18) tests/mocks/LightDM/single/GreeterPrivate.cpp (+0/-46) tests/mocks/LightDM/single/UsersModelPrivate.cpp (+0/-33) tests/plugins/LightDM/CMakeLists.txt (+3/-3) tests/plugins/LightDM/greeter.qml (+5/-0) tests/qmltests/CMakeLists.txt (+19/-19) tests/qmltests/Greeter/tst_Infographics.qml (+10/-0) tests/qmltests/Greeter/tst_MultiGreeter.qml (+11/-0) tests/qmltests/tst_Shell.qml (+8/-1) tests/qmltests/tst_ShellWithPin.qml (+8/-0) tests/qmltests/tst_TabletShell.qml (+8/-0)
To merge this branch:	bzr merge lp:~dandrader/unity8/unifyLightDMMocks
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Terry		2014-12-12	Approve on 2015-01-23
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-01-22
Review via email: mp+244593@code.launchpad.net

Commit Message

Unify all liblightdm mocks

Benefits:
- Cleaner tests/qmltests/CMakeLists.txt
- Ability change LightDM fake behavior at runtime, which
  makes it possible to merge several tests, reducing code duplication,
  such as tst_Shell, tst_TabletShell and tst_ShellWithPin.
- Ability to make building of tests optional, as the demo version
  of lightdm mock has been moved into plugins/LightDM, removing
  the dependency between producition code and test code

Description of the Change

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

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

* Did you make sure that your branch does not contain spurious tags?
Yes.

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

* If you changed the UI, has there been a design review?
Not applicable.

Michael Terry (mterry) wrote on 2014-12-12:

Seems mostly good, thanks man!

The demo plugin shares a lot of code with the liblightdm mock. Any chance they could actually share the file? Like have the mock version subclass the demo version or something?

Also, we've been meaning to rename the demo plugin because we are actually using it in producton now. Maybe something that sounds a little more robust than demo? (though it does still hold some demo code)

lp:~dandrader/unity8/unifyLightDMMocks updated on 2014-12-15

1503. By Launchpad Translations on behalf of unity-team on 2014-12-13: Launchpad automatic translations update.
1504. By Launchpad Translations on behalf of unity-team on 2014-12-14: Launchpad automatic translations update.
1505. By Launchpad Translations on behalf of unity-team on 2014-12-15: Launchpad automatic translations update.

PS Jenkins bot (ps-jenkins) wrote on 2014-12-15:

FAILED: Continuous integration, rev:1501
http://jenkins.qa.ubuntu.com/job/unity8-ci/5040/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/555/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/204/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/205/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/205/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/553/console

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2014-12-15:

> The demo plugin shares a lot of code with the liblightdm mock. Any chance
> they could actually share the file? Like have the mock version subclass the
> demo version or something?

I spent two miserable days trying to do it. It creates a horrible entanglement. Could we please avoid this?

lp:~dandrader/unity8/unifyLightDMMocks updated on 2014-12-16

1506. By Albert Astals Cid on 2014-12-15

Rework how we set the ranges so we get some more asynchronousity from item views Fixes: #1384374
Approved by: Andrea Cimitan

1507. By Daniel d'Andrada on 2014-12-15

Refactor Dialogs.qml to use proper in-scene dialogs

Proper in-scene dialogs keep its Loader as parent and
therefore carry on all its transformations, following its
rotation, etc.

It needs Dialog from ubuntu-ui-toolkit to comply with the
reparentToRootItem property.
Approved by: Michał Sawicz, Ying-Chun Liu

1508. By Daniel d'Andrada on 2014-12-15

Make Greeter nicely handle being resized

- Introduced support for bidirectional DragHandles
- Refactored greeter to use a bidirectional DragHandle
- Added code to ensure Greeter retains its relative positioning when Shell is resized
Approved by: Michael Terry

1509. By Albert Astals Cid on 2014-12-15

clickscope is back to being unfavoritable Fixes: #1400762
Approved by: Michał Sawicz

1510. By Albert Astals Cid on 2014-12-15

Fix clicking on the manage dash list after having moved the current scope

Comes with a test for that and for a other manage dash scope move situation
And removes unused code from the test
Approved by: Michael Zanetti

1511. By Albert Astals Cid on 2014-12-15

ScopesList: Use the default scope style for the header

1512. By Albert Astals Cid on 2014-12-15

Make the drag range be a multiple of the drag "rate" value. Workarounds https://bugs.launchpad.net/mir/+bug/1399690

Also small fixlet to make _get_scope_loader faster
Approved by: Michał Sawicz

1513. By Gerry Boland on 2014-12-15

MockAppMan: emit SIGSTOP so AP test apps are run Fixes: #1394208

1514. By CI Train Bot Account on 2014-12-15

Releasing 8.02+15.04.20141215.3-0ubuntu1

1515. By Launchpad Translations on behalf of unity-team on 2014-12-16

Launchpad automatic translations update.

1516. By Albert Astals Cid on 2014-12-16

Need to wait until loaded is true to use the count property
Approved by: Michael Zanetti

1517. By Albert Astals Cid on 2014-12-16

Manage Dash: Ellide properly

Approved by: Pawel Stolowski

1518. By CI Train Bot Account on 2014-12-16

Releasing 8.02+15.04.20141216.1-0ubuntu1

Michael Terry (mterry) wrote on 2014-12-16:

> I spent two miserable days trying to do it. It creates a horrible entanglement. Could we please avoid this?

OK, but can you at least add giant warnings at the top of the file that if you change one, you ought to change the other?

PS Jenkins bot (ps-jenkins) wrote on 2014-12-16:

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2014-12-16:

On 16/12/14 12:18, Michael Terry wrote:
>> I spent two miserable days trying to do it. It creates a horrible entanglement. Could we please avoid this?
> OK, but can you at least add giant warnings at the top of the file that if you change one, you ought to change the other?

Sure. done.

Michael Terry (mterry) wrote on 2014-12-16:

Running ./run.sh -f gives:

file:///home/mike/Work/code/unity8/unifyLightDMMocks/qml/Shell.qml:30:1: plugin cannot be loaded for module "LightDM": Cannot load library /home/mike/Work/code/unity8/unifyLightDMMocks/builddir/tests/mocks/LightDM/libMockLightDM-qml.so: (liblightdm-qt5-2.so: cannot open shared object file: No such file or directory)
import LightDM 0.1 as LightDM
^

PS Jenkins bot (ps-jenkins) wrote on 2014-12-16:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/unifyLightDMMocks updated on 2015-01-10

1519. By Launchpad Translations on behalf of unity-team on 2014-12-17

Launchpad automatic translations update.

1520. By Launchpad Translations on behalf of unity-team on 2014-12-21

Launchpad automatic translations update.

1521. By Launchpad Translations on behalf of unity-team on 2014-12-22

Launchpad automatic translations update.

1522. By Launchpad Translations on behalf of unity-team on 2014-12-27

Launchpad automatic translations update.

1523. By Launchpad Translations on behalf of unity-team on 2014-12-28

Launchpad automatic translations update.

1524. By Launchpad Translations on behalf of unity-team on 2015-01-08

Launchpad automatic translations update.

1525. By Albert Astals Cid on 2015-01-09

Fix going to scopes when the Manage Dash is open Fixes: #1403464
Approved by: Michael Zanetti, PS Jenkins bot

1526. By Albert Astals Cid on 2015-01-09

QSortFilterProxyModelQML -> UnitySortFilterProxyModelQML

Someone copied the class to the sdk (but with less features...) so we better rename, class and qml name collisions are not cool Fixes: #1403758
Approved by: Michael Zanetti, PS Jenkins bot

1527. By Albert Astals Cid on 2015-01-09

Clip the Scopes List header

Now that we have a background since we use a default ScopeStyle we need to clip the "upper/search" part of the header Fixes: #1407620
Approved by: Andrea Cimitan, PS Jenkins bot

1528. By Albert Astals Cid on 2015-01-09

Fix ScopesList not being under finger

Do not take into the account the initial distance that took the movement to be accepted to calculate the position Fixes: #1403045
Approved by: Andrea Cimitan, PS Jenkins bot

1529. By Martin Pitt on 2015-01-09

tests: Fix Notify.Notification.add_action invocation to work also with unpatched libnotify API. Fixes: #1223401
Approved by: Michał Sawicz, PS Jenkins bot

1530. By Albert Astals Cid on 2015-01-09

Make waitForRendering with no item fail instead of crash
Approved by: Michał Sawicz, PS Jenkins bot

1531. By Albert Astals Cid on 2015-01-09

Disable Dash horizontal scroll while Navigation InverseMouseArea is pressed Fixes: #1403048
Approved by: Andrea Cimitan

1532. By Michał Sawicz on 2015-01-09

We don't need the SIGSTOP in main() any more.
Approved by: Michael Zanetti

1533. By dobey on 2015-01-09

Depend on :native version of g++ to allow cross-compiling to work. Fixes: #1353855
Approved by: Michał Sawicz, PS Jenkins bot

1534. By Nick Dedekind on 2015-01-09

Unhook Lights interface from indicator widgets Fixes: #1385331
Approved by: Albert Astals Cid

1535. By Michael Terry on 2015-01-09

Don't block handling power events on loading the greeter's qml and the background image.

During power button press, we call greeter.showNow(), which was taking so long to return that we couldn't handle the power button release for a few seconds. Which meant that the shutdown dialog thought it would be a good time to appear.

The easiest fix is to delay calling showNow until after we finish handling the event. Fixes: #1383277
Approved by: Daniel d'Andrada, PS Jenkins bot

1536. By Michael Terry on 2015-01-09

Show OSK above the wizard. Fixes: #1401213
Approved by: Andrea Cimitan, PS Jenkins bot

1537. By Leo Arias on 2015-01-09

Added an autopilot test for the edges demo.
Approved by: PS Jenkins bot, Albert Astals Cid

1538. By Michael Terry on 2015-01-09

Unify the name of the Greeter DBus test, make it use our standard binary test macro (which also nicely exports xml results), and make the test a little more robust against timing issues.
Approved by: PS Jenkins bot, Albert Astals Cid

1539. By Michael Terry on 2015-01-09

Add a test to make sure the shell always starts disabled until it is enabled by a complete PAM interaction.
Approved by: Michał Sawicz

1540. By Albert Astals Cid on 2015-01-09

Test: Make sure the mouse area is enabled before clicking into it

Despite the name swipeToCloseEnabled controls the enabled property of the whole mouse area
of the spread delegate so it needs to be true (animations & movement finished) before we can click on it

Approved by: Michał Sawicz

1541. By Albert Astals Cid on 2015-01-09

Test: We actually need to click on the customBackButton and not on backButton

Approved by: Michał Sawicz

1542. By Albert Astals Cid on 2015-01-09

Test: By default mouseX act on the middle

Saves us lots of typing, tests are easier to read and workarounds problems that sometimes happen if we end up with 0, 0 as mouse coordinates because the precission of some geometry goes crazy and since we're clicking on 0x0 after lots transformations of pos into pos into pos we end up clicking outside the item by a very small number

Approved by: Michał Sawicz

1543. By CI Train Bot Account on 2015-01-09

Releasing 8.02+15.04.20150109.2-0ubuntu1

1544. By Launchpad Translations on behalf of unity-team on 2015-01-10

Launchpad automatic translations update.

Albert Astals Cid (aacid) wrote on 2015-01-12:

Text conflict in tests/mocks/LightDM/CMakeLists.txt
Text conflict in tests/plugins/LightDM/CMakeLists.txt
2 conflicts encountered.

lp:~dandrader/unity8/unifyLightDMMocks updated on 2015-01-20

1545. By Leo Arias on 2015-01-13

Added an autopilot test for the edges demo.
Approved by: PS Jenkins bot, Albert Astals Cid

1546. By Gerry Boland on 2015-01-13

DashCommunicator: replace QDBusInterface with a non-blocking simplification which does not introspect the service on creation Fixes: #1403508
Approved by: Michael Zanetti

1547. By Albert Astals Cid on 2015-01-13

Don't show the manage dash pull up arrow on temp scopes Fixes: #1401869
Approved by: Michael Zanetti

1548. By Albert Astals Cid on 2015-01-13

Remove hack, newer Qt already support keyClick(char)

Approved by: Michael Zanetti, PS Jenkins bot

1549. By Albert Astals Cid on 2015-01-13

Tests: Add Qt 5.5 removal TODOs

Approved by: Michał Sawicz

1550. By Michael Zanetti on 2015-01-13

patch debian/control file before using it to make it work with mk-build-deps
Approved by: Michał Sawicz

1551. By Albert Astals Cid on 2015-01-13

Make sure we use fPIC when compiling files for the static library too

Fixes compilation in ARM + Qt 5.4 Fixes: #1409235
Approved by: Michał Sawicz, Dmitry Shachnev

1552. By Albert Astals Cid on 2015-01-13

Make sure changing a scope doesn't trigger creation/destruction of delegates until it's finished
Fixes: #1410122
Approved by: Michał Sawicz

1553. By Andrea Cimitan on 2015-01-13

support background on horizontal cards with summary Fixes: #1393008
Approved by: Michał Sawicz

1554. By CI Train Bot Account on 2015-01-13

Releasing 8.02+15.04.20150113.1-0ubuntu1

1555. By CI Train Bot Account on 2015-01-14

Resync trunk

1556. By Launchpad Translations on behalf of unity-team on 2015-01-15

Launchpad automatic translations update.

1557. By Launchpad Translations on behalf of unity-team on 2015-01-16

Launchpad automatic translations update.

1558. By Launchpad Translations on behalf of unity-team on 2015-01-17

Launchpad automatic translations update.

1559. By Launchpad Translations on behalf of unity-team on 2015-01-18

Launchpad automatic translations update.

1560. By Launchpad Translations on behalf of unity-team on 2015-01-19

Launchpad automatic translations update.

1561. By Daniel d'Andrada on 2015-01-20

Unify all liblightdm mocks

1562. By Daniel d'Andrada on 2015-01-20

Update run.sh

Daniel d'Andrada (dandrader) wrote on 2015-01-20:

> Running ./run.sh -f gives:
>
> file:///home/mike/Work/code/unity8/unifyLightDMMocks/qml/Shell.qml:30:1:
> plugin cannot be loaded for module "LightDM": Cannot load library
> /home/mike/Work/code/unity8/unifyLightDMMocks/builddir/tests/mocks/LightDM
> /libMockLightDM-qml.so: (liblightdm-qt5-2.so: cannot open shared object file:
> No such file or directory)
> import LightDM 0.1 as LightDM
> ^

Fixed.

Daniel d'Andrada (dandrader) wrote on 2015-01-20:

> Text conflict in tests/mocks/LightDM/CMakeLists.txt
> Text conflict in tests/plugins/LightDM/CMakeLists.txt
> 2 conflicts encountered.

Fixed.

lp:~dandrader/unity8/unifyLightDMMocks updated on 2015-01-20

1563. By Daniel d'Andrada on 2015-01-20: Further clean up of run.sh

PS Jenkins bot (ps-jenkins) wrote on 2015-01-20:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-01-20:

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/unifyLightDMMocks updated on 2015-01-20

1564. By Daniel d'Andrada on 2015-01-20: Init mockMode

Michael Terry (mterry) wrote on 2015-01-20:

OK, seems good now, assuming Jenkins approves. Thanks man!

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-01-20:

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2015-01-20:

A lot of autopilot tests are failing with errors like:

RuntimeError: LightDM mock 'single-pin' does not exist at path '/usr/lib/arm-linux-gnueabihf/unity8/qml/mocks/LightDM/single-pin'.

RuntimeError: LightDM mock 'single' does not exist at path '/usr/lib/arm-linux-gnueabihf/unity8/qml/mocks/LightDM/single'.

Some other autopilot tests are failing for presumably other reasons (indicators). The qmluitests failures are in DashContent and also seem unrelated.

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-01-21:

> A lot of autopilot tests are failing with errors like:
>
> RuntimeError: LightDM mock 'single-pin' does not exist at path '/usr/lib/arm-
> linux-gnueabihf/unity8/qml/mocks/LightDM/single-pin'.
>
> RuntimeError: LightDM mock 'single' does not exist at path '/usr/lib/arm-
> linux-gnueabihf/unity8/qml/mocks/LightDM/single'.

Oh, thanks for pointing that out. I forgot to check if the autopilot tests were using those libs.

> The qmluitests failures are in DashContent and also seem
> unrelated.

Yes, Dash has some known unstable tests at the moment. tsdgeos has a branch to make them more reliable.

lp:~dandrader/unity8/unifyLightDMMocks updated on 2015-01-21

1565. By Daniel d'Andrada on 2015-01-21: Enable specifying liblightdm mock mode via env var
1566. By Daniel d'Andrada on 2015-01-21: Update autopilot tests

PS Jenkins bot (ps-jenkins) wrote on 2015-01-21:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-01-22:

Text conflict in tests/mocks/LightDM/CMakeLists.txt
Text conflict in tests/plugins/LightDM/CMakeLists.txt
Text conflict in tests/qmltests/CMakeLists.txt
3 conflicts encountered.

lp:~dandrader/unity8/unifyLightDMMocks updated on 2015-01-22

1567. By Daniel d'Andrada on 2015-01-22

Merge trunk

[ Michael Terry ]
* Don't show any power dialogs while the screen is off. This is a
  band-aid to avoid the symptom, while we still investigate the source
  of why the screen doesn't turn on (and why we seem to not handle the
  power-button-release event). (LP: #1409003, #1410830)
* Don't refocus the dialer-app when a call is started by the user.
  Because of how qtmir works, this would cause the dialer-app to
  unfocus momentarily, causing interface oddities for the user. (LP:
  #1413065)
[ CI Train Bot ]
* Resync trunk
[ Albert Astals Cid ]
* Build with ninja
* Fixes for Table Preview Widget (LP: #1410420)
[ Michael Zanetti ]
* Add support for earpiece media buttons (LP: #1398427)
* Add a WindowMoveResizeArea and tests for it

Daniel d'Andrada (dandrader) wrote on 2015-01-22:

On 22/01/15 06:39, Albert Astals Cid wrote:
> Text conflict in tests/mocks/LightDM/CMakeLists.txt
> Text conflict in tests/plugins/LightDM/CMakeLists.txt
> Text conflict in tests/qmltests/CMakeLists.txt
> 3 conflicts encountered.
Fixed

PS Jenkins bot (ps-jenkins) wrote on 2015-01-22:

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2015-01-22:

unity8.application_lifecycle.tests.test_application_lifecycle.ApplicationLifecycleTests.test_greeter_hides_on_app_focus is failing, but doesn't on trunk for me. Might be due to these changes.

lp:~dandrader/unity8/unifyLightDMMocks updated on 2015-01-22

1568. By Daniel d'Andrada on 2015-01-22: Just to trigger a new build in Jenkins

PS Jenkins bot (ps-jenkins) wrote on 2015-01-22:

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2015-01-23:

> unity8.application_lifecycle.tests.test_application_lifecycle.ApplicationLifec
> ycleTests.test_greeter_hides_on_app_focus is failing, but doesn't on trunk for
> me. Might be due to these changes.

That test no longer fails in the latest Jenkins run. I just triggered a rebuild. No code changes. So this is an unstable test.

/me does the happy dance.

Michael Terry (mterry) wrote on 2015-01-23:

Just because it's an unstable test doesn't mean it's not your fault. :) But I agree that your changes would be more likely to reliably break a test than cause it to be flaky.

OK, I'll approve the branch.

review: Approve

Albert Astals Cid (aacid) wrote on 2015-01-27:

Text conflict in run.sh
Text conflict in tests/mocks/LightDM/CMakeLists.txt
Text conflict in tests/plugins/LightDM/CMakeLists.txt
3 conflicts encountered.

lp:~dandrader/unity8/unifyLightDMMocks updated on 2015-01-27

1569. By Daniel d'Andrada on 2015-01-27

Merge trunk

[ Sebastien Bacher ]
* Set text hint property for the messaging menus inline reply widget
  (LP: #1389234)
[ Ying-Chun Liu ]
* Added an initial set of autopilot tests for the display indicator.
[ Nick Dedekind ]
* Removed filtering the indicator model by visibility.
[ Michael Zanetti ]
* fixes left edge drag when in spread
[ Albert Astals Cid ]
* Fix ninja build in a different way The previous one was adding rpath
  to some .so that broke our tests that use LD_LIBRARY_PATH to change
  which one is picked up
[ Leo Arias ]
* Added an initial set of autopilot tests for the display indicator.

Daniel d'Andrada (dandrader) wrote on 2015-01-27:

> Text conflict in run.sh
> Text conflict in tests/mocks/LightDM/CMakeLists.txt
> Text conflict in tests/plugins/LightDM/CMakeLists.txt
> 3 conflicts encountered.

Solved.

lp:~dandrader/unity8/unifyLightDMMocks updated on 2015-02-03

1570. By Daniel d'Andrada on 2015-02-03

include(FindPkgConfig) only once, in the root CMakeLists.txt

In order to fix cross compilation

Patch by Saviq

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/LightDM/CMakeLists.txt'
 --- plugins/LightDM/CMakeLists.txt	2014-12-19 14:51:35 +0000
 +++ plugins/LightDM/CMakeLists.txt	2015-02-03 12:18:40 +0000
@@ -1,9 +1,9 @@
--# Dependencies
--include(FindPkgConfig)
  pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
  # TODO: Once we split out a separate greeter process, uncomment these lines
  #pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)
++add_subdirectory(liblightdm)
++
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_BINARY_DIR}
@@ -28,7 +28,7 @@
+     )
  target_link_libraries(LightDM-qml
--    MockLightDM-demo
++    integratedLightDM
      unity8-private
  # TODO: Once we split out a separate greeter process, uncomment these lines
  #    ${LIBLIGHTDM_LDFLAGS}
 === modified file 'plugins/LightDM/Greeter.cpp'
 --- plugins/LightDM/Greeter.cpp	2014-10-09 14:53:00 +0000
 +++ plugins/LightDM/Greeter.cpp	2015-02-03 12:18:40 +0000
@@ -17,26 +17,8 @@
   */
  #include "Greeter.h"
++#include "GreeterPrivate.h"
  #include <libintl.h>
--#include <QLightDM/Greeter>
--
--class GreeterPrivate
--{
--public:
--    explicit GreeterPrivate(Greeter *parent);
--
--    QLightDM::Greeter *m_greeter;
--    bool m_active;
--    bool wasPrompted;
--    bool promptless;
--
--protected:
--    Greeter * const q_ptr;
--
--private:
--    Q_DECLARE_PUBLIC(Greeter)
--};
--
  GreeterPrivate::GreeterPrivate(Greeter* parent)
    : m_greeter(new QLightDM::Greeter(parent)),
 === modified file 'plugins/LightDM/Greeter.h'
 --- plugins/LightDM/Greeter.h	2014-10-09 14:53:00 +0000
 +++ plugins/LightDM/Greeter.h	2015-02-03 12:18:40 +0000
@@ -68,7 +68,7 @@
      // should switch to this user if possible.
      void requestAuthenticationUser(const QString &user);
--private:
++protected:
      GreeterPrivate * const d_ptr;
      Q_DECLARE_PRIVATE(Greeter)
 === added file 'plugins/LightDM/GreeterPrivate.h'
 --- plugins/LightDM/GreeterPrivate.h	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/GreeterPrivate.h	2015-02-03 12:18:40 +0000
@@ -0,0 +1,39 @@
++/*
++ * Copyright (C) 2014 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 UNITY_GREETER_PRIVATE_H
++#define UNITY_GREETER_PRIVATE_H
++
++#include <QLightDM/Greeter>
++
++class GreeterPrivate
++{
++public:
++    explicit GreeterPrivate(Greeter *parent);
++
++    QLightDM::Greeter *m_greeter;
++    bool m_active;
++    bool wasPrompted;
++    bool promptless;
++
++protected:
++    Greeter * const q_ptr;
++
++private:
++    Q_DECLARE_PUBLIC(Greeter)
++};
++
++#endif // UNITY_GREETER_PRIVATE_H
 === added directory 'plugins/LightDM/liblightdm'
 === added file 'plugins/LightDM/liblightdm/CMakeLists.txt'
 --- plugins/LightDM/liblightdm/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/liblightdm/CMakeLists.txt	2015-02-03 12:18:40 +0000
@@ -0,0 +1,37 @@
++pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
++
++set(LibLightDM_SOURCES
++    Greeter.cpp
++    UsersModel.cpp
++    GreeterPrivate.cpp
++    UsersModelPrivate.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
++    )
++
++add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})
++add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
++
++include_directories(
++    ${CMAKE_CURRENT_BINARY_DIR}
++    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
++)
++
++target_link_libraries(integratedLightDM
++    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
++    -lpam
++)
++target_link_libraries(MockLightDM-demo-shared
++    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
++    -lpam
++)
++
++qt5_use_modules(integratedLightDM Concurrent Gui)
++qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
++
++set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)
++set_target_properties(MockLightDM-demo-shared PROPERTIES
++                      OUTPUT_NAME lightdm-qt5-2)
++
++install(TARGETS MockLightDM-demo-shared
++    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/demo
++    )
 === added file 'plugins/LightDM/liblightdm/Greeter.cpp'
 --- plugins/LightDM/liblightdm/Greeter.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/liblightdm/Greeter.cpp	2015-02-03 12:18:40 +0000
@@ -0,0 +1,184 @@
++/*
++ * Copyright (C) 2013 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/>.
++ *
++ * Author: Michael Terry <michael.terry@canonical.com>
++ */
++
++
++/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
++ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
++ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
++ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
++
++
++#include "Greeter.h"
++#include "GreeterPrivate.h"
++#include <QtCore/QCoreApplication>
++#include <QTimer>
++
++namespace QLightDM
++{
++
++Greeter::Greeter(QObject *parent)
++  : QObject(parent),
++    d_ptr(new GreeterPrivate(this))
++{
++}
++
++Greeter::~Greeter()
++{
++}
++
++QString Greeter::authenticationUser() const
++{
++    Q_D(const Greeter);
++    return d->authenticationUser;
++}
++
++bool Greeter::hasGuestAccountHint() const
++{
++    return true;
++}
++
++QString Greeter::getHint(const QString &name) const
++{
++    Q_UNUSED(name)
++    return "";
++}
++
++QString Greeter::defaultSessionHint() const
++{
++    return "ubuntu";
++}
++
++bool Greeter::hideUsersHint() const
++{
++    return false;
++}
++
++bool Greeter::showManualLoginHint() const
++{
++    return true;
++}
++
++bool Greeter::showRemoteLoginHint() const
++{
++    return true;
++}
++
++bool Greeter::lockHint () const
++{
++    return false;
++}
++
++QString Greeter::selectUserHint() const
++{
++    return "";
++}
++
++bool Greeter::selectGuestHint() const
++{
++    return false;
++}
++
++QString Greeter::autologinUserHint() const
++{
++    return "";
++}
++
++bool Greeter::autologinGuestHint() const
++{
++    return false;
++}
++
++int Greeter::autologinTimeoutHint() const
++{
++    return 0;
++}
++
++bool Greeter::inAuthentication() const
++{
++    return false;
++}
++
++QString Greeter::hostname() const
++{
++    return "hostname1";
++}
++
++bool Greeter::isAuthenticated() const
++{
++    Q_D(const Greeter);
++    return d->authenticated;
++}
++
++bool Greeter::connectSync()
++{
++    return true;
++}
++
++void Greeter::authenticate(const QString &username)
++{
++    Q_D(Greeter);
++
++    d->authenticated = false;
++    d->authenticationUser = username;
++    d->handleAuthenticate();
++}
++
++void Greeter::authenticateAsGuest()
++{}
++
++void Greeter::authenticateAutologin()
++{}
++
++void Greeter::authenticateRemote(const QString &session, const QString &username)
++{
++    Q_UNUSED(session)
++    Q_UNUSED(username)
++}
++
++void Greeter::cancelAuthentication()
++{}
++
++void Greeter::setLanguage (const QString &language)
++{
++    Q_UNUSED(language)
++}
++
++bool Greeter::startSessionSync(const QString &session)
++{
++    Q_UNUSED(session)
++    return true;
++}
++
++void Greeter::respond(const QString &response)
++{
++    Q_D(Greeter);
++
++    d->handleRespond(response);
++}
++
++void Greeter::sendAuthenticationComplete()
++{
++    if (qgetenv("UNITY_TESTING").isEmpty()) {
++        // simulate PAM's delay
++        QTimer::singleShot(1000, this, SIGNAL(authenticationComplete()));
++    } else {
++        Q_EMIT authenticationComplete();
++    }
++}
++
++}
 === added file 'plugins/LightDM/liblightdm/Greeter.h'
 --- plugins/LightDM/liblightdm/Greeter.h	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/liblightdm/Greeter.h	2015-02-03 12:18:40 +0000
@@ -0,0 +1,112 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2010-2011 David Edmundson.
++ * Copyright (C) 2010-2011 Robert Ancell
++ *
++ * 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/>.
++ *
++ * Author: David Edmundson <kde@davidedmundson.co.uk>
++ */
++
++#ifndef UNITY_MOCK_GREETER_H
++#define UNITY_MOCK_GREETER_H
++
++#include <QtCore/QObject>
++#include <QtCore/QVariant>
++
++/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
++ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
++ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
++ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
++
++namespace QLightDM
++{
++    class GreeterPrivate;
++
++class Q_DECL_EXPORT Greeter : public QObject
++{
++    Q_OBJECT
++
++    Q_PROPERTY(bool authenticated READ isAuthenticated ) //NOTFIY authenticationComplete
++    Q_PROPERTY(QString authenticationUser READ authenticationUser )
++    Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)
++    Q_PROPERTY(QString selectUser READ selectUserHint CONSTANT)
++    Q_PROPERTY(bool selectGuest READ selectGuestHint CONSTANT)
++
++    Q_PROPERTY(QString hostname READ hostname CONSTANT)
++    Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
++    Q_PROPERTY(bool locked READ lockHint CONSTANT)
++
++    Q_PROPERTY(QString hostname READ hostname CONSTANT)
++
++    Q_ENUMS(PromptType MessageType)
++
++public:
++    enum PromptType {
++        PromptTypeQuestion,
++        PromptTypeSecret
++    };
++
++    enum MessageType {
++        MessageTypeInfo,
++        MessageTypeError
++    };
++
++    explicit Greeter(QObject* parent=0);
++    virtual ~Greeter();
++
++    QString getHint(const QString &name) const;
++    QString defaultSessionHint() const;
++    bool hideUsersHint() const;
++    bool showManualLoginHint() const;
++    bool showRemoteLoginHint() const;
++    bool lockHint () const;
++    bool hasGuestAccountHint() const;
++    QString selectUserHint() const;
++    bool selectGuestHint() const;
++    QString autologinUserHint() const;
++    bool autologinGuestHint() const;
++    int autologinTimeoutHint() const;
++
++    bool inAuthentication() const;
++    bool isAuthenticated() const;
++    QString authenticationUser() const;
++    QString hostname() const;
++
++public Q_SLOTS:
++    bool connectSync();
++    void authenticate(const QString &username=QString());
++    void authenticateAsGuest();
++    void authenticateAutologin();
++    void authenticateRemote(const QString &session=QString(), const QString &username=QString());
++    void respond(const QString &response);
++    void cancelAuthentication();
++    void setLanguage (const QString &language);
++    bool startSessionSync(const QString &session=QString());
++
++Q_SIGNALS:
++    void showMessage(QString text, QLightDM::Greeter::MessageType type);
++    void showPrompt(QString text, QLightDM::Greeter::PromptType type);
++    void authenticationComplete();
++    void autologinTimerExpired();
++
++protected:
++    void sendAuthenticationComplete();
++
++private:
++    GreeterPrivate *d_ptr;
++    Q_DECLARE_PRIVATE(Greeter)
++};
++}
++
++#endif // UNITY_MOCK_GREETER_H
 === added file 'plugins/LightDM/liblightdm/GreeterPrivate.cpp'
 --- plugins/LightDM/liblightdm/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/liblightdm/GreeterPrivate.cpp	2015-02-03 12:18:40 +0000
@@ -0,0 +1,281 @@
++/*
++ * Copyright (C) 2013 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/>.
++ *
++ * Author: Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "Greeter.h"
++#include "GreeterPrivate.h"
++#include <QFuture>
++#include <QFutureInterface>
++#include <QFutureWatcher>
++#include <QQueue>
++#include <QtConcurrent>
++#include <QVector>
++#include <security/pam_appl.h>
++
++namespace QLightDM
++{
++
++class GreeterImpl : public QObject
++{
++    Q_OBJECT
++
++    struct AppData
++    {
++        GreeterImpl *impl;
++        pam_handle *handle;
++    };
++
++    typedef QFutureInterface<QString> ResponseFuture;
++
++public:
++    explicit GreeterImpl(Greeter *parent, GreeterPrivate *greeterPrivate)
++        : QObject(parent),
++          greeter(parent),
++          greeterPrivate(greeterPrivate),
++          pamHandle(nullptr)
++    {
++        qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");
++
++        connect(&futureWatcher, SIGNAL(finished()),
++                this, SLOT(finishPam()));
++        connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),
++                this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
++        // This next connect is how we pass ResponseFutures between threads
++        connect(this, SIGNAL(showPrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
++                this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
++    }
++
++    ~GreeterImpl()
++    {
++        cancelPam();
++    }
++
++    void start(QString username)
++    {
++        // Clear out any existing PAM interactions first
++        cancelPam();
++
++        AppData *appData = new AppData();
++        appData->impl = this;
++
++        // Now actually start a new conversation with PAM
++        pam_conv conversation;
++        conversation.conv = converseWithPam;
++        conversation.appdata_ptr = static_cast<void*>(appData);
++
++        if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {
++            appData->handle = pamHandle;
++            futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));
++        } else {
++            delete appData;
++            greeterPrivate->authenticated = false;
++            Q_EMIT greeter->showMessage("Internal error: could not start PAM authentication", QLightDM::Greeter::MessageTypeError);
++            Q_EMIT greeter->authenticationComplete();
++        }
++    }
++
++    static int authenticateWithPam(pam_handle* pamHandle)
++    {
++        int pamStatus = pam_authenticate(pamHandle, 0);
++        if (pamStatus == PAM_SUCCESS) {
++            pamStatus = pam_acct_mgmt(pamHandle, 0);
++        }
++        if (pamStatus == PAM_NEW_AUTHTOK_REQD) {
++            pamStatus = pam_chauthtok(pamHandle, PAM_CHANGE_EXPIRED_AUTHTOK);
++        }
++        if (pamStatus == PAM_SUCCESS) {
++            pam_setcred(pamHandle, PAM_REINITIALIZE_CRED);
++        }
++        return pamStatus;
++    }
++
++    static int converseWithPam(int num_msg, const pam_message** msg,
++                               pam_response** resp, void* appdata_ptr)
++    {
++        if (num_msg <= 0)
++            return PAM_CONV_ERR;
++
++        auto* tmp_response = static_cast<pam_response*>(calloc(num_msg, sizeof(pam_response)));
++        if (!tmp_response)
++            return PAM_CONV_ERR;
++
++        AppData *appData = static_cast<AppData*>(appdata_ptr);
++        GreeterImpl *impl = appData->impl;
++        pam_handle *handle = appData->handle;
++
++        int count;
++        QVector<ResponseFuture> responses;
++
++        for (count = 0; count < num_msg; ++count)
++        {
++            switch (msg[count]->msg_style)
++            {
++            case PAM_PROMPT_ECHO_ON:
++            {
++                QString message(msg[count]->msg);
++                responses.append(ResponseFuture());
++                responses.last().reportStarted();
++                Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeQuestion, responses.last());
++                break;
++            }
++            case PAM_PROMPT_ECHO_OFF:
++            {
++                QString message(msg[count]->msg);
++                responses.append(ResponseFuture());
++                responses.last().reportStarted();
++                Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeSecret, responses.last());
++                break;
++            }
++            case PAM_TEXT_INFO:
++            {
++                QString message(msg[count]->msg);
++                Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeInfo);
++                break;
++            }
++            default:
++            {
++                QString message(msg[count]->msg);
++                Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeError);
++                break;
++            }
++            }
++        }
++
++        int i = 0;
++        bool raise_error = false;
++
++        for (auto &response : responses)
++        {
++            pam_response* resp_item = &tmp_response[i++];
++            resp_item->resp_retcode = 0;
++            resp_item->resp = strdup(response.future().result().toUtf8());
++
++            if (!resp_item->resp)
++            {
++                raise_error = true;
++                break;
++            }
++        }
++
++        delete appData;
++
++        if (raise_error)
++        {
++            for (int i = 0; i < count; ++i)
++                free(tmp_response[i].resp);
++
++            free(tmp_response);
++            return PAM_CONV_ERR;
++        }
++        else
++        {
++            *resp = tmp_response;
++            return PAM_SUCCESS;
++        }
++    }
++
++public Q_SLOTS:
++    bool respond(QString response)
++    {
++        if (!futures.isEmpty()) {
++            futures.dequeue().reportFinished(&response);
++            return true;
++        } else {
++            return false;
++        }
++    }
++
++Q_SIGNALS:
++    void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);
++    void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);
++
++private Q_SLOTS:
++    void finishPam()
++    {
++        if (pamHandle == nullptr) {
++            return;
++        }
++
++        int pamStatus = futureWatcher.result();
++
++        pam_end(pamHandle, pamStatus);
++        pamHandle = nullptr;
++
++        greeterPrivate->authenticated = (pamStatus == PAM_SUCCESS);
++        Q_EMIT greeter->authenticationComplete();
++    }
++
++    void handleMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type)
++    {
++        if (handle != pamHandle)
++            return;
++
++        Q_EMIT greeter->showMessage(text, type);
++    }
++
++    void handlePrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture future)
++    {
++        if (handle != pamHandle) {
++            future.reportResult(QString());
++            future.reportFinished();
++            return;
++        }
++
++        futures.enqueue(future);
++        Q_EMIT greeter->showPrompt(text, type);
++    }
++
++private:
++    void cancelPam()
++    {
++        // Unfortunately we can't simply cancel our QFuture because QtConcurrent::run doesn't support cancel
++        if (pamHandle != nullptr) {
++            pam_handle *handle = pamHandle;
++            pamHandle = nullptr; // to disable normal finishPam() handling
++            while (respond(QString())); // clear our local queue of QFutures
++            pam_end(handle, PAM_CONV_ERR);
++        }
++    }
++
++    Greeter *greeter;
++    GreeterPrivate *greeterPrivate;
++    pam_handle* pamHandle;
++    QFutureWatcher<int> futureWatcher;
++    QQueue<ResponseFuture> futures;
++};
++
++GreeterPrivate::GreeterPrivate(Greeter* parent)
++  : authenticated(false),
++    authenticationUser(),
++    m_impl(new GreeterImpl(parent, this)),
++    q_ptr(parent)
++{
++}
++
++void GreeterPrivate::handleAuthenticate()
++{
++    m_impl->start(authenticationUser);
++}
++
++void GreeterPrivate::handleRespond(const QString &response)
++{
++    m_impl->respond(response);
++}
++
++}
++
++#include "GreeterPrivate.moc"
 === added file 'plugins/LightDM/liblightdm/GreeterPrivate.h'
 --- plugins/LightDM/liblightdm/GreeterPrivate.h	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/liblightdm/GreeterPrivate.h	2015-02-03 12:18:40 +0000
@@ -0,0 +1,51 @@
++/*
++ * Copyright (C) 2013 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/>.
++ *
++ * Author: Michael Terry <michael.terry@canonical.com>
++ */
++
++#ifndef UNITY_MOCK_GREETER_PRIVATE_H
++#define UNITY_MOCK_GREETER_PRIVATE_H
++
++#include <QtCore/QObject>
++
++namespace QLightDM
++{
++class Greeter;
++class GreeterImpl;
++
++class GreeterPrivate
++{
++public:
++    explicit GreeterPrivate(Greeter* parent=0);
++    virtual ~GreeterPrivate() = default;
++
++    // These variables may not be used by all subclasses, that's no problem
++    bool authenticated;
++    QString authenticationUser;
++
++    void handleAuthenticate();
++    void handleRespond(const QString &response);
++
++protected:
++    GreeterImpl *m_impl; // if the backend needs more private data
++    Greeter * const q_ptr;
++
++private:
++    Q_DECLARE_PUBLIC(Greeter)
++};
++}
++
++#endif // UNITY_MOCK_GREETER_PRIVATE_H
 === added file 'plugins/LightDM/liblightdm/UsersModel.cpp'
 --- plugins/LightDM/liblightdm/UsersModel.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/liblightdm/UsersModel.cpp	2015-02-03 12:18:40 +0000
@@ -0,0 +1,123 @@
++/*
++ * Copyright (C) 2013 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/>.
++ *
++ * Author: Michael Terry <michael.terry@canonical.com>
++ */
++
++
++/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
++ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
++ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
++ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
++
++// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
++// To use the same method of setting role name that it does, we
++// set our compatibility to Qt4 here too.
++#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
++
++#include "UsersModel.h"
++#include "UsersModelPrivate.h"
++#include <QtCore/QDir>
++#include <QtCore/QString>
++#include <QtGui/QIcon>
++
++namespace QLightDM
++{
++
++UsersModel::UsersModel(QObject *parent) :
++    QAbstractListModel(parent),
++    d_ptr(new UsersModelPrivate(this))
++{
++    Q_D(UsersModel);
++
++    // Extend roleNames (we want to keep the "display" role)
++    QHash<int, QByteArray> roles = roleNames();
++    roles[NameRole] = "name";
++    roles[RealNameRole] = "realName";
++    roles[LoggedInRole] = "loggedIn";
++    roles[BackgroundRole] = "background";
++    roles[BackgroundPathRole] = "backgroundPath";
++    roles[SessionRole] = "session";
++    roles[HasMessagesRole] = "hasMessages";
++    roles[ImagePathRole] = "imagePath";
++    setRoleNames(roles);
++
++    // Now modify our mock user backgrounds
++    QDir bgdir = QDir("/usr/share/demo-assets/shell/backgrounds/");
++    QStringList backgrounds = bgdir.entryList(QDir::Files | QDir::NoDotAndDotDot);
++
++    for (int i = 0, j = 0; i < d->entries.size(); i++) {
++        Entry &entry = d->entries[i];
++        if (entry.background.isNull() && !backgrounds.isEmpty()) {
++            entry.background = bgdir.filePath(backgrounds[j++]);
++            if (j >= backgrounds.length()) {
++                j = 0;
++            }
++        }
++    }
++}
++
++UsersModel::~UsersModel()
++{
++    delete d_ptr;
++}
++
++int UsersModel::rowCount(const QModelIndex &parent) const
++{
++    Q_D(const UsersModel);
++
++    if (parent.isValid()) {
++        return 0;
++    } else { // parent is root
++        return d->entries.size();
++    }
++}
++
++QVariant UsersModel::data(const QModelIndex &index, int role) const
++{
++    Q_D(const UsersModel);
++
++    if (!index.isValid()) {
++        return QVariant();
++    }
++
++    int row = index.row();
++    switch (role) {
++    case Qt::DisplayRole:
++        return d->entries[row].real_name;
++    case Qt::DecorationRole:
++        return QIcon();
++    case UsersModel::NameRole:
++        return d->entries[row].username;
++    case UsersModel::RealNameRole:
++        return d->entries[row].real_name;
++    case UsersModel::SessionRole:
++        return d->entries[row].session;
++    case UsersModel::LoggedInRole:
++        return d->entries[row].is_active;
++    case UsersModel::BackgroundRole:
++        return QPixmap(d->entries[row].background);
++    case UsersModel::BackgroundPathRole:
++        return d->entries[row].background;
++    case UsersModel::HasMessagesRole:
++        return d->entries[row].has_messages;
++    case UsersModel::ImagePathRole:
++        return "";
++    default:
++        return QVariant();
++    }
++}
++
++}
 === added file 'plugins/LightDM/liblightdm/UsersModel.h'
 --- plugins/LightDM/liblightdm/UsersModel.h	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/liblightdm/UsersModel.h	2015-02-03 12:18:40 +0000
@@ -0,0 +1,66 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2010-2011 David Edmundson.
++ *
++ * 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/>.
++ *
++ * Author: David Edmundson <kde@davidedmundson.co.uk>
++ */
++
++#ifndef UNITY_MOCK_USERSMODEL_H
++#define UNITY_MOCK_USERSMODEL_H
++
++#include <QtCore/QString>
++#include <QtCore/QSharedDataPointer>
++#include <QAbstractListModel>
++
++/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
++ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
++ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
++ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
++
++namespace QLightDM
++{
++class UsersModelPrivate;
++
++class Q_DECL_EXPORT UsersModel : public QAbstractListModel
++{
++    Q_OBJECT
++
++    Q_ENUMS(UserModelRoles)
++
++public:
++    explicit UsersModel(QObject *parent = 0);
++    virtual ~UsersModel();
++
++    enum UserModelRoles {NameRole = Qt::UserRole,
++                         RealNameRole,
++                         LoggedInRole,
++                         BackgroundRole,
++                         SessionRole,
++                         HasMessagesRole,
++                         ImagePathRole,
++                         BackgroundPathRole
++    };
++
++    int rowCount(const QModelIndex &parent) const;
++    QVariant data(const QModelIndex &index, int role) const;
++
++private:
++    UsersModelPrivate * const d_ptr;
++    Q_DECLARE_PRIVATE(UsersModel)
++};
++
++}
++
++#endif // UNITY_MOCK_USERSMODEL_H
 === added file 'plugins/LightDM/liblightdm/UsersModelPrivate.cpp'
 --- plugins/LightDM/liblightdm/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/liblightdm/UsersModelPrivate.cpp	2015-02-03 12:18:40 +0000
@@ -0,0 +1,41 @@
++/*
++ * Copyright (C) 2013 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/>.
++ *
++ * Author: Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "UsersModelPrivate.h"
++
++#include <QDir>
++#include <QSettings>
++#include <QStringList>
++
++namespace QLightDM
++{
++
++UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
++  : q_ptr(parent)
++{
++    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
++    QStringList users = settings.value("users", QStringList() << qgetenv("USER")).toStringList();
++
++    Q_FOREACH(const QString &user, users)
++    {
++        QString name = settings.value(user + "/name", user[0].toUpper() + user.mid(1)).toString();
++        entries.append({user, name, 0, 0, false, false, 0, 0});
++    }
++}
++
++}
 === added file 'plugins/LightDM/liblightdm/UsersModelPrivate.h'
 --- plugins/LightDM/liblightdm/UsersModelPrivate.h	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/liblightdm/UsersModelPrivate.h	2015-02-03 12:18:40 +0000
@@ -0,0 +1,59 @@
++/*
++ * Copyright (C) 2013 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/>.
++ *
++ * Author: Michael Terry <michael.terry@canonical.com>
++ */
++
++#ifndef UNITY_MOCK_USERSMODEL_PRIVATE_H
++#define UNITY_MOCK_USERSMODEL_PRIVATE_H
++
++#include <QtCore/QList>
++#include <QtCore/QString>
++
++namespace QLightDM
++{
++class UsersModel;
++
++class Entry
++{
++public:
++    QString username;
++    QString real_name;
++    QString background;
++    QString layouts;
++    bool is_active;
++    bool has_messages;
++    QString session;
++    QString infographic;
++};
++
++class UsersModelPrivate
++{
++public:
++    explicit UsersModelPrivate(UsersModel *parent = 0);
++    virtual ~UsersModelPrivate() = default;
++
++    QList<Entry> entries;
++
++protected:
++    UsersModel * const q_ptr;
++
++private:
++    Q_DECLARE_PUBLIC(UsersModel)
++};
++
++}
++
++#endif // UNITY_MOCK_USERSMODEL_PRIVATE_H
 === modified file 'plugins/Lights/CMakeLists.txt'
 --- plugins/Lights/CMakeLists.txt	2014-07-02 23:15:54 +0000
 +++ plugins/Lights/CMakeLists.txt	2015-02-03 12:18:40 +0000
@@ -1,5 +1,3 @@
--include(FindPkgConfig)
--
  pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
  pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
 === modified file 'plugins/Powerd/CMakeLists.txt'
 --- plugins/Powerd/CMakeLists.txt	2014-05-02 22:57:00 +0000
 +++ plugins/Powerd/CMakeLists.txt	2015-02-03 12:18:40 +0000
@@ -1,5 +1,3 @@
--include(FindPkgConfig)
--
  pkg_search_module(GIO REQUIRED gio-2.0)
  include_directories(
 === modified file 'plugins/Unity/Launcher/CMakeLists.txt'
 --- plugins/Unity/Launcher/CMakeLists.txt	2014-10-31 08:49:08 +0000
 +++ plugins/Unity/Launcher/CMakeLists.txt	2015-02-03 12:18:40 +0000
@@ -1,4 +1,3 @@
--include(FindPkgConfig)
  pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=5)
  pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
  pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 === modified file 'plugins/Unity/Session/CMakeLists.txt'
 --- plugins/Unity/Session/CMakeLists.txt	2014-10-09 14:53:00 +0000
 +++ plugins/Unity/Session/CMakeLists.txt	2015-02-03 12:18:40 +0000
@@ -1,5 +1,3 @@
--include(FindPkgConfig)
--
  pkg_search_module(GIO REQUIRED gio-2.0)
  include_directories(
 === modified file 'plugins/Utils/CMakeLists.txt'
 --- plugins/Utils/CMakeLists.txt	2014-12-19 14:51:35 +0000
 +++ plugins/Utils/CMakeLists.txt	2015-02-03 12:18:40 +0000
@@ -1,6 +1,3 @@
--# Dependencies
--include(FindPkgConfig)
--
  pkg_search_module(GIO REQUIRED gio-2.0)
  include_directories(
 === modified file 'run.sh'
 --- run.sh	2015-01-20 16:21:07 +0000
 +++ run.sh	2015-02-03 12:18:40 +0000
@@ -6,8 +6,6 @@
  QML_PHONE_SHELL_PATH=./builddir/src/unity8
  GDB=false
  FAKE=false
--PINLOCK=false
--KEYLOCK=false
  USE_MOCKS=false
  MOUSE_TOUCH=true
@@ -16,9 +14,6 @@
      echo "Script to run the shell.\n" >&2
      echo "OPTIONS:" >&2
      echo " -f, --fake Force use of fake Qml modules." >&2
--    echo " -p, --pinlock Use a pin protected user." >&2
--    echo " -k, --keylock Use a passphrase protected user." >&2
--    echo " -l, --lightdm Use the specified lightdm mock." >&2
      echo " -g, --gdb Run through gdb." >&2
      echo " -h, --help Show this help." >&2
      echo " -m, --nomousetouch Run without -mousetouch argument." >&2
@@ -26,7 +21,7 @@
      exit 1
+ }
--ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,lightdm:,nomousetouch" -o "fpkl:ghm" -- "$@"`
++ARGS=`getopt -n$0 -u -a --longoptions="fake,gdb,help:,nomousetouch" -o "fghm" -- "$@"`
  [ $? -ne 0 ] && usage
  eval set -- "$ARGS"
@@ -34,12 +29,6 @@
  do
      case "$1" in
         -f|--fake)     USE_MOCKS=true;;
--       -p|--pinlock)  USE_MOCKS=true; LIGHTDM_MOCK=single-pin;;
--       -k|--keylock)  USE_MOCKS=true; LIGHTDM_MOCK=single-passphrase;;
--       -l|--lightdm)  LIGHTDM_MOCK=$2; shift;
--                      if [ -z "$LIGHTDM_MOCK" ]; then
--                        echo "Please specify an argument to --lightdm"
--                      fi;;
         -g|--gdb)   GDB=true;;
         -h|--help)  usage;;
         -m|--nomousetouch)  MOUSE_TOUCH=false;;
@@ -48,23 +37,11 @@
      shift
  done
--if [ -z "$LIGHTDM_MOCK" ]; then
--  LIGHTDM_MOCK=single
--fi
--
--# Even without USE_MOCKS set, we want to fake our lightdm backend, because it's
--# annoying to be prompted for your password when testing.  To get the same
--# backend used in production, pass '--lightdm=demo'.
--export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/$LIGHTDM_MOCK
--
  if $USE_MOCKS; then
--  rm -f $PWD/builddir/nonmirplugins/LightDM # undo symlink (from below) for cleanliness
    export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
--  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/QMenuModel
++  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/liblightdm:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/QMenuModel
  else
--  # Just link our LightDM mock into the nonmirplugins folder.  We don't want
--  # the rest of our plugins to be used.
--  ln -sf $PWD/builddir/tests/mocks/LightDM $PWD/builddir/nonmirplugins/
++  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/plugins/LightDM/liblightdm
  fi
  QML_PHONE_SHELL_ARGS=""
 === modified file 'tests/autopilot/unity8/shell/__init__.py'
 --- tests/autopilot/unity8/shell/__init__.py	2014-05-01 14:25:18 +0000
 +++ tests/autopilot/unity8/shell/__init__.py	2015-02-03 12:18:40 +0000
@@ -27,19 +27,6 @@
  logger = logging.getLogger(__name__)
--
--def with_lightdm_mock(mock_type):
--    """A simple decorator that sets up the LightDM mock for a single test."""
--    def with_lightdm_mock_internal(fn):
--        @wraps(fn)
--        def wrapper(*args, **kwargs):
--            tests_self = args[0]
--            tests_self.patch_lightdm_mock(mock_type)
--            return fn(*args, **kwargs)
--        return wrapper
--    return with_lightdm_mock_internal
--
--
  def disable_qml_mocking(fn):
      """Simple decorator that disables the QML mocks from being loaded."""
      @wraps(fn)
 === modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
 --- tests/autopilot/unity8/shell/tests/__init__.py	2014-10-31 08:37:28 +0000
 +++ tests/autopilot/unity8/shell/tests/__init__.py	2015-02-03 12:18:40 +0000
@@ -153,7 +153,6 @@
              self.useFixture(toolkit_fixtures.HideUnity7Launcher())
          self._proxy = None
--        self._lightdm_mock_type = None
          self._qml_mock_enabled = True
          self._data_dirs_mock_enabled = True
          self._environment = {}
@@ -265,8 +264,7 @@
              binary_path
+         )
--        if self._lightdm_mock_type is None:
--            self.patch_lightdm_mock()
++        self.patch_lightdm_mock()
          if self._qml_mock_enabled:
              self._environment['QML2_IMPORT_PATH'] = (
@@ -338,12 +336,11 @@
          if data_dirs is not None:
              self._environment['XDG_DATA_DIRS'] = data_dirs
--    def patch_lightdm_mock(self, mock_type='single'):
--        self._lightdm_mock_type = mock_type
--        logger.info("Setting up LightDM mock type '%s'", mock_type)
++    def patch_lightdm_mock(self):
++        logger.info("Setting up LightDM mock lib")
          new_ld_library_path = [
              get_default_extra_mock_libraries(),
--            self._get_lightdm_mock_path(mock_type)
++            self._get_lightdm_mock_path()
+         ]
          if os.getenv('LD_LIBRARY_PATH') is not None:
              new_ld_library_path.append(os.getenv('LD_LIBRARY_PATH'))
@@ -353,16 +350,16 @@
          self._environment['LD_LIBRARY_PATH'] = new_ld_library_path
--    def _get_lightdm_mock_path(self, mock_type):
++    def _get_lightdm_mock_path(self):
          lib_path = get_mocks_library_path()
          lightdm_mock_path = os.path.abspath(
--            os.path.join(lib_path, "LightDM", mock_type)
++            os.path.join(lib_path, "LightDM", "liblightdm")
+         )
          if not os.path.exists(lightdm_mock_path):
              raise RuntimeError(
--                "LightDM mock '%s' does not exist at path '%s'."
--                % (mock_type, lightdm_mock_path)
++                "LightDM mock does not exist at path '%s'."
++                % (lightdm_mock_path)
+             )
          return lightdm_mock_path
 === modified file 'tests/autopilot/unity8/shell/tests/test_edges_demo.py'
 --- tests/autopilot/unity8/shell/tests/test_edges_demo.py	2015-01-09 16:59:07 +0000
 +++ tests/autopilot/unity8/shell/tests/test_edges_demo.py	2015-02-03 12:18:40 +0000
@@ -34,7 +34,6 @@
          super(EdgesDemoTestCase, self).setUp()
          self._qml_mock_enabled = False
          self._data_dirs_mock_enabled = False
--        self._lightdm_mock_type = False
          self.useFixture(fixture_setup.EdgesDemo(True))
          self.unity = self.launch_unity()
 === modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
 --- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-09-29 19:54:33 +0000
 +++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2015-02-03 12:18:40 +0000
@@ -20,7 +20,6 @@
  from __future__ import absolute_import
--from unity8.shell import with_lightdm_mock
  from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
  from autopilot.matchers import Eventually
@@ -41,9 +40,10 @@
      scenarios = _get_device_emulation_scenarios()
--    @with_lightdm_mock("single-pin")
      def test_can_unlock_pin_screen(self):
          """Must be able to unlock the PIN entry lock screen."""
++
++        self._environment['LIBLIGHTDM_MOCK_MODE'] = "single-pin"
          self.launch_unity()
          greeter = self.main_window.get_greeter()
@@ -56,9 +56,10 @@
              self._enter_prompt_passphrase("1234\n")
              self.assertThat(greeter.shown, Eventually(Equals(False)))
--    @with_lightdm_mock("single-passphrase")
      def test_can_unlock_passphrase_screen(self):
          """Must be able to unlock the passphrase entry screen."""
++
++        self._environment['LIBLIGHTDM_MOCK_MODE'] = "single-passphrase"
          self.launch_unity()
          greeter = self.main_window.get_greeter()
@@ -71,9 +72,9 @@
              self._enter_prompt_passphrase("password")
              self.assertThat(greeter.shown, Eventually(Equals(False)))
--    @with_lightdm_mock("single-pin")
      def test_pin_screen_wrong_code(self):
          """Entering the wrong pin code must not dismiss the lock screen."""
++        self._environment['LIBLIGHTDM_MOCK_MODE'] = "single-pin"
          self.launch_unity()
          greeter = self.main_window.get_greeter()
@@ -90,9 +91,9 @@
              self.assertThat(prompt.text, Eventually(Equals("")))
              self.assertThat(greeter.shown, Eventually(Equals(True)))
--    @with_lightdm_mock("single-passphrase")
      def test_passphrase_screen_wrong_password(self):
          """Entering the wrong password must not dismiss the lock screen."""
++        self._environment['LIBLIGHTDM_MOCK_MODE'] = "single-passphrase"
          self.launch_unity()
          greeter = self.main_window.get_greeter()
 === modified file 'tests/mocks/LightDM/CMakeLists.txt'
 --- tests/mocks/LightDM/CMakeLists.txt	2015-01-22 16:41:18 +0000
 +++ tests/mocks/LightDM/CMakeLists.txt	2015-02-03 12:18:40 +0000
@@ -4,16 +4,13 @@
  # actually using the system liblightdm in the normal plugin, this version can
  # be deleted.
--add_subdirectory(demo)
--add_subdirectory(full)
--add_subdirectory(single)
--add_subdirectory(single-pin)
--add_subdirectory(single-passphrase)
++add_subdirectory(liblightdm)
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_BINARY_DIR}
      ${CMAKE_SOURCE_DIR}/plugins/Utils
++    ${CMAKE_SOURCE_DIR}/plugins/LightDM
      ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
      ${libunity8-private_SOURCE_DIR}
+ )
@@ -22,9 +19,11 @@
      ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeter.cpp
      ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
      ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/LightDM/plugin.cpp
      ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
++    MockGreeter.cpp
++    MockUsersModel.cpp
++    plugin.cpp
+     )
  add_library(MockLightDM-qml MODULE
@@ -35,9 +34,9 @@
  # installed on the system.  So we make sure we link to our full fake version
  # At run time, we can point to whichever version we happen to be using via
  # LD_LIBRARY_PATH.
--add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
++add_dependencies(MockLightDM-qml MockLightDM MockUserMetrics)
  target_link_libraries(MockLightDM-qml
--    -L${CMAKE_CURRENT_BINARY_DIR}/full
++    -L${CMAKE_CURRENT_BINARY_DIR}/liblightdm
      -llightdm-qt5-2
      -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
      -lusermetricsoutput
@@ -49,5 +48,5 @@
  add_unity8_mock(LightDM 0.1 LightDM
      PREFIX mocks
      TARGETS MockLightDM-qml
--    ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/full"
++    ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/liblightdm"
+ )
 === added file 'tests/mocks/LightDM/MockGreeter.cpp'
 --- tests/mocks/LightDM/MockGreeter.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/MockGreeter.cpp	2015-02-03 12:18:40 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright (C) 2014 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 "MockGreeter.h"
++#include <GreeterPrivate.h>
++
++QString MockGreeter::mockMode() const
++{
++    Q_D(const Greeter);
++    return d->m_greeter->mockMode();
++}
++
++void MockGreeter::setMockMode(QString mockMode)
++{
++    Q_D(Greeter);
++
++    if (d->m_greeter->mockMode() != mockMode) {
++        d->m_greeter->setMockMode(mockMode);
++        Q_EMIT mockModeChanged(mockMode);
++    }
++}
 === added file 'tests/mocks/LightDM/MockGreeter.h'
 --- tests/mocks/LightDM/MockGreeter.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/MockGreeter.h	2015-02-03 12:18:40 +0000
@@ -0,0 +1,37 @@
++/*
++ * Copyright (C) 2014 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/>.
++ *
++ */
++
++// The real, production, Greeter
++#include <Greeter.h>
++
++#ifndef MOCK_UNITY_GREETER_H
++#define MOCK_UNITY_GREETER_H
++
++class MockGreeter : public Greeter {
++    Q_OBJECT
++
++    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
++
++public:
++    QString mockMode() const;
++    void setMockMode(QString mockMode);
++
++Q_SIGNALS:
++    void mockModeChanged(QString mode);
++};
++
++#endif // MOCK_UNITY_GREETER_H
 === added file 'tests/mocks/LightDM/MockUsersModel.cpp'
 --- tests/mocks/LightDM/MockUsersModel.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/MockUsersModel.cpp	2015-02-03 12:18:40 +0000
@@ -0,0 +1,39 @@
++/*
++ * Copyright (C) 2014 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 "MockUsersModel.h"
++#include <QLightDM/UsersModel>
++#include <QSortFilterProxyModel>
++
++QString MockUsersModel::mockMode() const
++{
++    QLightDM::UsersModel* qUsersModel =
++        static_cast<QLightDM::UsersModel*>(static_cast<QSortFilterProxyModel*>(sourceModel())->sourceModel());
++
++    return qUsersModel->mockMode();
++}
++
++void MockUsersModel::setMockMode(QString mockMode)
++{
++    QLightDM::UsersModel* qUsersModel =
++        static_cast<QLightDM::UsersModel*>(static_cast<QSortFilterProxyModel*>(sourceModel())->sourceModel());
++
++    if (qUsersModel->mockMode() != mockMode) {
++        qUsersModel->setMockMode(mockMode);
++        Q_EMIT mockModeChanged(mockMode);
++    }
++}
 === added file 'tests/mocks/LightDM/MockUsersModel.h'
 --- tests/mocks/LightDM/MockUsersModel.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/MockUsersModel.h	2015-02-03 12:18:40 +0000
@@ -0,0 +1,37 @@
++/*
++ * Copyright (C) 2014 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_UNITY_USERSMODEL_H
++#define MOCK_UNITY_USERSMODEL_H
++
++#include <UsersModel.h>
++
++class MockUsersModel : public UsersModel
++{
++    Q_OBJECT
++
++    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
++
++public:
++    QString mockMode() const;
++    void setMockMode(QString mockMode);
++
++Q_SIGNALS:
++    void mockModeChanged(QString mode);
++};
++
++#endif // MOCK_UNITY_USERSMODEL_H
 === added file 'tests/mocks/LightDM/QLightDM/Greeter'
 --- tests/mocks/LightDM/QLightDM/Greeter	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/QLightDM/Greeter	2015-02-03 12:18:40 +0000
@@ -0,0 +1,17 @@
++/*
++ * Copyright (C) 2014 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 "../liblightdm/Greeter.h"
 === removed symlink 'tests/mocks/LightDM/QLightDM/Greeter'
 === target was u'../Greeter.h'
 === removed symlink 'tests/mocks/LightDM/QLightDM/InfographicModel'
 === target was u'../InfographicModel.h'
 === added file 'tests/mocks/LightDM/QLightDM/UsersModel'
 --- tests/mocks/LightDM/QLightDM/UsersModel	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/QLightDM/UsersModel	2015-02-03 12:18:40 +0000
@@ -0,0 +1,17 @@
++/*
++ * Copyright (C) 2014 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 "../liblightdm/UsersModel.h"
 === removed symlink 'tests/mocks/LightDM/QLightDM/UsersModel'
 === target was u'../UsersModel.h'
 === removed directory 'tests/mocks/LightDM/demo'
 === removed file 'tests/mocks/LightDM/demo/CMakeLists.txt'
 --- tests/mocks/LightDM/demo/CMakeLists.txt	2015-01-12 10:40:46 +0000
 +++ tests/mocks/LightDM/demo/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
--pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
--
--set(LibLightDM_SOURCES
--    ../Greeter.cpp
--    ../UsersModel.cpp
--    GreeterPrivate.cpp
--    UsersModelPrivate.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
--    )
--
--add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})
--add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
--
--include_directories(
--    ${CMAKE_CURRENT_BINARY_DIR}
--    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
--)
--
--target_link_libraries(MockLightDM-demo
--    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
--    -lpam
--)
--target_link_libraries(MockLightDM-demo-shared
--    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
--    -lpam
--)
--
--qt5_use_modules(MockLightDM-demo Concurrent Gui)
--qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
--
--set_target_properties(MockLightDM-demo PROPERTIES COMPILE_FLAGS -fPIC)
--set_target_properties(MockLightDM-demo-shared PROPERTIES
--                      OUTPUT_NAME lightdm-qt5-2)
--
--install(TARGETS MockLightDM-demo-shared
--    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/demo
--    )
 === removed file 'tests/mocks/LightDM/demo/GreeterPrivate.cpp'
 --- tests/mocks/LightDM/demo/GreeterPrivate.cpp	2014-08-26 08:14:44 +0000
 +++ tests/mocks/LightDM/demo/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,281 +0,0 @@
--/*
-- * Copyright (C) 2013 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/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../Greeter.h"
--#include "../GreeterPrivate.h"
--#include <QFuture>
--#include <QFutureInterface>
--#include <QFutureWatcher>
--#include <QQueue>
--#include <QtConcurrent>
--#include <QVector>
--#include <security/pam_appl.h>
--
--namespace QLightDM
--{
--
--class GreeterImpl : public QObject
--{
--    Q_OBJECT
--
--    struct AppData
--    {
--        GreeterImpl *impl;
--        pam_handle *handle;
--    };
--
--    typedef QFutureInterface<QString> ResponseFuture;
--
--public:
--    explicit GreeterImpl(Greeter *parent, GreeterPrivate *greeterPrivate)
--        : QObject(parent),
--          greeter(parent),
--          greeterPrivate(greeterPrivate),
--          pamHandle(nullptr)
--    {
--        qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");
--
--        connect(&futureWatcher, SIGNAL(finished()),
--                this, SLOT(finishPam()));
--        connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),
--                this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
--        // This next connect is how we pass ResponseFutures between threads
--        connect(this, SIGNAL(showPrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
--                this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
--    }
--
--    ~GreeterImpl()
--    {
--        cancelPam();
--    }
--
--    void start(QString username)
--    {
--        // Clear out any existing PAM interactions first
--        cancelPam();
--
--        AppData *appData = new AppData();
--        appData->impl = this;
--
--        // Now actually start a new conversation with PAM
--        pam_conv conversation;
--        conversation.conv = converseWithPam;
--        conversation.appdata_ptr = static_cast<void*>(appData);
--
--        if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {
--            appData->handle = pamHandle;
--            futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));
--        } else {
--            delete appData;
--            greeterPrivate->authenticated = false;
--            Q_EMIT greeter->showMessage("Internal error: could not start PAM authentication", QLightDM::Greeter::MessageTypeError);
--            Q_EMIT greeter->authenticationComplete();
--        }
--    }
--
--    static int authenticateWithPam(pam_handle* pamHandle)
--    {
--        int pamStatus = pam_authenticate(pamHandle, 0);
--        if (pamStatus == PAM_SUCCESS) {
--            pamStatus = pam_acct_mgmt(pamHandle, 0);
--        }
--        if (pamStatus == PAM_NEW_AUTHTOK_REQD) {
--            pamStatus = pam_chauthtok(pamHandle, PAM_CHANGE_EXPIRED_AUTHTOK);
--        }
--        if (pamStatus == PAM_SUCCESS) {
--            pam_setcred(pamHandle, PAM_REINITIALIZE_CRED);
--        }
--        return pamStatus;
--    }
--
--    static int converseWithPam(int num_msg, const pam_message** msg,
--                               pam_response** resp, void* appdata_ptr)
--    {
--        if (num_msg <= 0)
--            return PAM_CONV_ERR;
--
--        auto* tmp_response = static_cast<pam_response*>(calloc(num_msg, sizeof(pam_response)));
--        if (!tmp_response)
--            return PAM_CONV_ERR;
--
--        AppData *appData = static_cast<AppData*>(appdata_ptr);
--        GreeterImpl *impl = appData->impl;
--        pam_handle *handle = appData->handle;
--
--        int count;
--        QVector<ResponseFuture> responses;
--
--        for (count = 0; count < num_msg; ++count)
--        {
--            switch (msg[count]->msg_style)
--            {
--            case PAM_PROMPT_ECHO_ON:
--            {
--                QString message(msg[count]->msg);
--                responses.append(ResponseFuture());
--                responses.last().reportStarted();
--                Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeQuestion, responses.last());
--                break;
--            }
--            case PAM_PROMPT_ECHO_OFF:
--            {
--                QString message(msg[count]->msg);
--                responses.append(ResponseFuture());
--                responses.last().reportStarted();
--                Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeSecret, responses.last());
--                break;
--            }
--            case PAM_TEXT_INFO:
--            {
--                QString message(msg[count]->msg);
--                Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeInfo);
--                break;
--            }
--            default:
--            {
--                QString message(msg[count]->msg);
--                Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeError);
--                break;
--            }
--            }
--        }
--
--        int i = 0;
--        bool raise_error = false;
--
--        for (auto &response : responses)
--        {
--            pam_response* resp_item = &tmp_response[i++];
--            resp_item->resp_retcode = 0;
--            resp_item->resp = strdup(response.future().result().toUtf8());
--
--            if (!resp_item->resp)
--            {
--                raise_error = true;
--                break;
--            }
--        }
--
--        delete appData;
--
--        if (raise_error)
--        {
--            for (int i = 0; i < count; ++i)
--                free(tmp_response[i].resp);
--
--            free(tmp_response);
--            return PAM_CONV_ERR;
--        }
--        else
--        {
--            *resp = tmp_response;
--            return PAM_SUCCESS;
--        }
--    }
--
--public Q_SLOTS:
--    bool respond(QString response)
--    {
--        if (!futures.isEmpty()) {
--            futures.dequeue().reportFinished(&response);
--            return true;
--        } else {
--            return false;
--        }
--    }
--
--Q_SIGNALS:
--    void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);
--    void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);
--
--private Q_SLOTS:
--    void finishPam()
--    {
--        if (pamHandle == nullptr) {
--            return;
--        }
--
--        int pamStatus = futureWatcher.result();
--
--        pam_end(pamHandle, pamStatus);
--        pamHandle = nullptr;
--
--        greeterPrivate->authenticated = (pamStatus == PAM_SUCCESS);
--        Q_EMIT greeter->authenticationComplete();
--    }
--
--    void handleMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type)
--    {
--        if (handle != pamHandle)
--            return;
--
--        Q_EMIT greeter->showMessage(text, type);
--    }
--
--    void handlePrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture future)
--    {
--        if (handle != pamHandle) {
--            future.reportResult(QString());
--            future.reportFinished();
--            return;
--        }
--
--        futures.enqueue(future);
--        Q_EMIT greeter->showPrompt(text, type);
--    }
--
--private:
--    void cancelPam()
--    {
--        // Unfortunately we can't simply cancel our QFuture because QtConcurrent::run doesn't support cancel
--        if (pamHandle != nullptr) {
--            pam_handle *handle = pamHandle;
--            pamHandle = nullptr; // to disable normal finishPam() handling
--            while (respond(QString())); // clear our local queue of QFutures
--            pam_end(handle, PAM_CONV_ERR);
--        }
--    }
--
--    Greeter *greeter;
--    GreeterPrivate *greeterPrivate;
--    pam_handle* pamHandle;
--    QFutureWatcher<int> futureWatcher;
--    QQueue<ResponseFuture> futures;
--};
--
--GreeterPrivate::GreeterPrivate(Greeter* parent)
--  : authenticated(false),
--    authenticationUser(),
--    m_impl(new GreeterImpl(parent, this)),
--    q_ptr(parent)
--{
--}
--
--void GreeterPrivate::handleAuthenticate()
--{
--    m_impl->start(authenticationUser);
--}
--
--void GreeterPrivate::handleRespond(const QString &response)
--{
--    m_impl->respond(response);
--}
--
--}
--
--#include "GreeterPrivate.moc"
 === removed file 'tests/mocks/LightDM/demo/UsersModelPrivate.cpp'
 --- tests/mocks/LightDM/demo/UsersModelPrivate.cpp	2014-07-15 16:38:02 +0000
 +++ tests/mocks/LightDM/demo/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
--/*
-- * Copyright (C) 2013 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/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../UsersModelPrivate.h"
--
--#include <QDir>
--#include <QSettings>
--#include <QStringList>
--
--namespace QLightDM
--{
--
--UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
--  : q_ptr(parent)
--{
--    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
--    QStringList users = settings.value("users", QStringList() << qgetenv("USER")).toStringList();
--
--    Q_FOREACH(const QString &user, users)
--    {
--        QString name = settings.value(user + "/name", user[0].toUpper() + user.mid(1)).toString();
--        entries.append({user, name, 0, 0, false, false, 0, 0});
--    }
--}
--
--}
 === removed directory 'tests/mocks/LightDM/full'
 === removed file 'tests/mocks/LightDM/full/CMakeLists.txt'
 --- tests/mocks/LightDM/full/CMakeLists.txt	2014-06-11 15:36:51 +0000
 +++ tests/mocks/LightDM/full/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
--set(LibLightDM_SOURCES
--    ../Greeter.cpp
--    ../UsersModel.cpp
--    GreeterPrivate.cpp
--    UsersModelPrivate.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
--    )
--
--add_library(MockLightDM-full SHARED ${LibLightDM_SOURCES})
--
--qt5_use_modules(MockLightDM-full Gui)
--
--set_target_properties(MockLightDM-full PROPERTIES
--                      OUTPUT_NAME lightdm-qt5-2)
--
--install(TARGETS MockLightDM-full
--    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/full
--    )
 === removed file 'tests/mocks/LightDM/full/GreeterPrivate.cpp'
 --- tests/mocks/LightDM/full/GreeterPrivate.cpp	2014-08-06 15:27:57 +0000
 +++ tests/mocks/LightDM/full/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
--/*
-- * Copyright (C) 2013 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/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../Greeter.h"
--#include "../GreeterPrivate.h"
--
--namespace QLightDM
--{
--
--GreeterPrivate::GreeterPrivate(Greeter* parent)
--  : authenticated(false),
--    authenticationUser(),
--    twoFactorDone(false),
--    q_ptr(parent)
--{
--}
--
--void GreeterPrivate::handleAuthenticate()
--{
--    Q_Q(Greeter);
--
--    // Send out any messages we need to
--    if (authenticationUser == "info-prompt")
--        Q_EMIT q->showMessage("Welcome to Unity Greeter", Greeter::MessageTypeInfo);
--    else if (authenticationUser == "wide-info-prompt")
--        Q_EMIT q->showMessage("Welcome to Unity Greeter, the greeteriest greeter that ever did appear in these fine lands", Greeter::MessageTypeInfo);
--    else if (authenticationUser == "html-info-prompt")
--        Q_EMIT q->showMessage("<b>&</b>", Greeter::MessageTypeInfo);
--    else if (authenticationUser == "long-info-prompt")
--        Q_EMIT q->showMessage("Welcome to Unity Greeter\n\nWe like to annoy you with super ridiculously long messages.\nLike this one\n\nThis is the last line of a multiple line message.", Greeter::MessageTypeInfo);
--    else if (authenticationUser == "multi-info-prompt") {
--        Q_EMIT q->showMessage("Welcome to Unity Greeter", Greeter::MessageTypeInfo);
--        Q_EMIT q->showMessage("This is an error", Greeter::MessageTypeError);
--        Q_EMIT q->showMessage("You should have seen three messages", Greeter::MessageTypeInfo);
--    }
--
--    // OK, now actually do the prompt
--    if (authenticationUser == "no-password") {
--        authenticated = true;
--        Q_EMIT q->authenticationComplete();
--    } else if (authenticationUser == "has-pin"){
--        Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
--    } else if (authenticationUser == "auth-error") {
--        authenticated = false;
--        Q_EMIT q->authenticationComplete();
--    } else if (authenticationUser == "different-prompt") {
--        Q_EMIT q->showPrompt("Secret word： ", Greeter::PromptTypeSecret);
--    } else {
--        Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
--    }
--}
--
--void GreeterPrivate::handleRespond(const QString &response)
--{
--    Q_Q(Greeter);
--
--    if (authenticationUser == "no-response")
--        return;
--    else if (authenticationUser == "two-factor") {
--        if (!twoFactorDone) {
--            if (response == "password") {
--                twoFactorDone = true;
--                Q_EMIT q->showPrompt("otp", Greeter::PromptTypeQuestion);
--            } else {
--                authenticated = false;
--                q->sendAuthenticationComplete();
--            }
--        } else {
--            authenticated = (response == "otp");
--            q->sendAuthenticationComplete();
--        }
--        return;
--    }
--
--    if (authenticationUser == "has-pin") {
--        authenticated = (response == "1234");
--    } else {
--        authenticated = (response == "password");
--    }
--    q->sendAuthenticationComplete();
--}
--
--}
 === removed file 'tests/mocks/LightDM/full/UsersModelPrivate.cpp'
 --- tests/mocks/LightDM/full/UsersModelPrivate.cpp	2013-06-11 10:30:07 +0000
 +++ tests/mocks/LightDM/full/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
--/*
-- * Copyright (C) 2013 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/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../UsersModelPrivate.h"
--
--namespace QLightDM
--{
--
--UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
--  : q_ptr(parent)
--{
--    entries =
--    {
--        { "has-password",      "Has Password", 0, 0, false, false, 0, 0 },
--        { "has-pin",           "Has PIN",      0, 0, false, false, 0, 0 },
--        { "different-prompt",  "Different Prompt", 0, 0, false, false, 0, 0 },
--        { "no-password",       "No Password", 0, 0, false, false, 0, 0 },
--        { "auth-error",        "Auth Error", 0, 0, false, false, 0, 0 },
--        { "two-factor",        "Two Factor", 0, 0, false, false, 0, 0 },
--        { "info-prompt",       "Info Prompt", 0, 0, false, false, 0, 0 },
--        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, 0, 0 },
--        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, 0, 0 },
--        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, 0, 0 },
--        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, 0, 0 },
--        { "long-name",         "Long name (far far too long to fit)", 0, 0, false, false, 0, 0 },
--        { "color-background",  "Color Background", "#dd4814", 0, false, false, 0, 0 },
--        // white and black are a bit redundant, but useful for manually testing if UI is still readable
--        { "white-background",  "White Background", "#ffffff", 0, false, false, 0, 0 },
--        { "black-background",  "Black Background", "#000000", 0, false, false, 0, 0 },
--        { "no-background",     "No Background", "", 0, false, false, 0, 0 },
--        { "unicode",           "가나다라마", 0, 0, false, false, 0, 0 },
--        { "no-response",       "No Response", 0, 0, false, false, 0, 0 },
--        { "empty-name",        "", 0, 0, false, false, 0, 0 },
--    };
--}
--
--}
 === added directory 'tests/mocks/LightDM/liblightdm'
 === added file 'tests/mocks/LightDM/liblightdm/CMakeLists.txt'
 --- tests/mocks/LightDM/liblightdm/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/liblightdm/CMakeLists.txt	2015-02-03 12:18:40 +0000
@@ -0,0 +1,18 @@
++set(LibLightDM_SOURCES
++    Greeter.cpp
++    UsersModel.cpp
++    GreeterPrivate.cpp
++    UsersModelPrivate.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
++    )
++
++add_library(MockLightDM SHARED ${LibLightDM_SOURCES})
++
++qt5_use_modules(MockLightDM Gui)
++
++set_target_properties(MockLightDM PROPERTIES
++                      OUTPUT_NAME lightdm-qt5-2)
++
++install(TARGETS MockLightDM
++    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/liblightdm
++    )
 === renamed file 'tests/mocks/LightDM/Greeter.cpp' => 'tests/mocks/LightDM/liblightdm/Greeter.cpp'
 --- tests/mocks/LightDM/Greeter.cpp	2014-12-09 17:14:35 +0000
 +++ tests/mocks/LightDM/liblightdm/Greeter.cpp	2015-02-03 12:18:40 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2014 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
@@ -12,8 +12,6 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
   */
  #include "Greeter.h"
@@ -181,4 +179,21 @@
+     }
+ }
++QString Greeter::mockMode() const
++{
++    Q_D(const Greeter);
++    return d->mockMode;
++}
++
++
++void Greeter::setMockMode(QString mockMode)
++{
++    Q_D(Greeter);
++
++    if (d->mockMode != mockMode) {
++        d->mockMode = mockMode;
++        Q_EMIT mockModeChanged(mockMode);
++    }
++}
++
+ }
 === renamed file 'tests/mocks/LightDM/Greeter.h' => 'tests/mocks/LightDM/liblightdm/Greeter.h'
 --- tests/mocks/LightDM/Greeter.h	2014-12-09 17:14:35 +0000
 +++ tests/mocks/LightDM/liblightdm/Greeter.h	2015-02-03 12:18:40 +0000
@@ -47,6 +47,9 @@
      Q_ENUMS(PromptType MessageType)
++    //Mock-only API for testing purposes
++    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
++
  public:
      enum PromptType {
          PromptTypeQuestion,
@@ -79,6 +82,9 @@
      QString authenticationUser() const;
      QString hostname() const;
++    QString mockMode() const;
++    void setMockMode(QString mockMode);
++
  public Q_SLOTS:
      bool connectSync();
      void authenticate(const QString &username=QString());
@@ -95,6 +101,7 @@
      void showPrompt(QString text, QLightDM::Greeter::PromptType type);
      void authenticationComplete();
      void autologinTimerExpired();
++    void mockModeChanged(QString mode);
  protected:
      void sendAuthenticationComplete();
 === added file 'tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp'
 --- tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp	2015-02-03 12:18:40 +0000
@@ -0,0 +1,132 @@
++/*
++ * Copyright (C) 2014 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 "Greeter.h"
++#include "GreeterPrivate.h"
++
++namespace QLightDM
++{
++
++GreeterPrivate::GreeterPrivate(Greeter* parent)
++  : authenticated(false),
++    authenticationUser(),
++    twoFactorDone(false),
++    mockMode("single"),
++    q_ptr(parent)
++{
++    char *envMockMode = getenv("LIBLIGHTDM_MOCK_MODE");
++    if (envMockMode) {
++        mockMode = envMockMode;
++    }
++}
++
++void GreeterPrivate::handleAuthenticate()
++{
++    Q_Q(Greeter);
++
++    if (mockMode == "single") {
++        authenticated = true;
++        Q_EMIT q->authenticationComplete();
++    } else if (mockMode == "single-passphrase" || mockMode == "single-pin") {
++        Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
++    } else if (mockMode == "full") {
++        handleAuthenticate_full();
++    }
++}
++
++void GreeterPrivate::handleAuthenticate_full()
++{
++    Q_Q(Greeter);
++
++    // Send out any messages we need to
++    if (authenticationUser == "info-prompt")
++        Q_EMIT q->showMessage("Welcome to Unity Greeter", Greeter::MessageTypeInfo);
++    else if (authenticationUser == "wide-info-prompt")
++        Q_EMIT q->showMessage("Welcome to Unity Greeter, the greeteriest greeter that ever did appear in these fine lands", Greeter::MessageTypeInfo);
++    else if (authenticationUser == "html-info-prompt")
++        Q_EMIT q->showMessage("<b>&</b>", Greeter::MessageTypeInfo);
++    else if (authenticationUser == "long-info-prompt")
++        Q_EMIT q->showMessage("Welcome to Unity Greeter\n\nWe like to annoy you with super ridiculously long messages.\nLike this one\n\nThis is the last line of a multiple line message.", Greeter::MessageTypeInfo);
++    else if (authenticationUser == "multi-info-prompt") {
++        Q_EMIT q->showMessage("Welcome to Unity Greeter", Greeter::MessageTypeInfo);
++        Q_EMIT q->showMessage("This is an error", Greeter::MessageTypeError);
++        Q_EMIT q->showMessage("You should have seen three messages", Greeter::MessageTypeInfo);
++    }
++
++    // OK, now actually do the prompt
++    if (authenticationUser == "no-password") {
++        authenticated = true;
++        Q_EMIT q->authenticationComplete();
++    } else if (authenticationUser == "has-pin"){
++        Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
++    } else if (authenticationUser == "auth-error") {
++        authenticated = false;
++        Q_EMIT q->authenticationComplete();
++    } else if (authenticationUser == "different-prompt") {
++        Q_EMIT q->showPrompt("Secret word： ", Greeter::PromptTypeSecret);
++    } else {
++        Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
++    }
++}
++
++void GreeterPrivate::handleRespond(QString const &response)
++{
++    Q_Q(Greeter);
++
++    if (mockMode == "single") {
++        // NOOP
++    } else if (mockMode == "single-passphrase") {
++        authenticated = (response == "password");
++        q->sendAuthenticationComplete();
++    } else if (mockMode == "single-pin") {
++        authenticated = (response == "1234");
++        q->sendAuthenticationComplete();
++    } else if (mockMode == "full") {
++        handleRespond_full(response);
++    }
++}
++
++void GreeterPrivate::handleRespond_full(const QString &response)
++{
++    Q_Q(Greeter);
++
++    if (authenticationUser == "no-response")
++        return;
++    else if (authenticationUser == "two-factor") {
++        if (!twoFactorDone) {
++            if (response == "password") {
++                twoFactorDone = true;
++                Q_EMIT q->showPrompt("otp", Greeter::PromptTypeQuestion);
++            } else {
++                authenticated = false;
++                q->sendAuthenticationComplete();
++            }
++        } else {
++            authenticated = (response == "otp");
++            q->sendAuthenticationComplete();
++        }
++        return;
++    }
++
++    if (authenticationUser == "has-pin") {
++        authenticated = (response == "1234");
++    } else {
++        authenticated = (response == "password");
++    }
++    q->sendAuthenticationComplete();
++}
++
++}
 === renamed file 'tests/mocks/LightDM/GreeterPrivate.h' => 'tests/mocks/LightDM/liblightdm/GreeterPrivate.h'
 --- tests/mocks/LightDM/GreeterPrivate.h	2014-07-01 20:21:23 +0000
 +++ tests/mocks/LightDM/liblightdm/GreeterPrivate.h	2015-02-03 12:18:40 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2014 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
@@ -12,8 +12,6 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
   */
  #ifndef UNITY_MOCK_GREETER_PRIVATE_H
@@ -37,6 +35,8 @@
      QString authenticationUser;
      bool twoFactorDone;
++    QString mockMode;
++
      void handleAuthenticate();
      void handleRespond(const QString &response);
@@ -45,6 +45,8 @@
      Greeter * const q_ptr;
  private:
++    void handleAuthenticate_full();
++    void handleRespond_full(const QString &response);
      Q_DECLARE_PUBLIC(Greeter)
  };
+ }
 === renamed file 'tests/mocks/LightDM/UsersModel.cpp' => 'tests/mocks/LightDM/liblightdm/UsersModel.cpp'
 --- tests/mocks/LightDM/UsersModel.cpp	2013-06-05 22:03:08 +0000
 +++ tests/mocks/LightDM/liblightdm/UsersModel.cpp	2015-02-03 12:18:40 +0000
@@ -114,4 +114,21 @@
+     }
+ }
++QString UsersModel::mockMode() const
++{
++    Q_D(const UsersModel);
++    return d->mockMode;
++}
++
++void UsersModel::setMockMode(QString mockMode)
++{
++    Q_D(UsersModel);
++
++    if (d->mockMode != mockMode) {
++        d->mockMode = mockMode;
++        Q_EMIT mockModeChanged(mockMode);
++        d->resetEntries();
++    }
++}
++
+ }
 === renamed file 'tests/mocks/LightDM/UsersModel.h' => 'tests/mocks/LightDM/liblightdm/UsersModel.h'
 --- tests/mocks/LightDM/UsersModel.h	2013-06-05 22:03:08 +0000
 +++ tests/mocks/LightDM/liblightdm/UsersModel.h	2015-02-03 12:18:40 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013-2014 Canonical, Ltd.
   * Copyright (C) 2010-2011 David Edmundson.
+  *
   * This program is free software; you can redistribute it and/or modify
@@ -13,8 +13,6 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Author: David Edmundson <kde@davidedmundson.co.uk>
   */
  #ifndef UNITY_MOCK_USERSMODEL_H
@@ -35,6 +33,12 @@
      Q_ENUMS(UserModelRoles)
++    //Mock-only API for testing purposes
++    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
++
++Q_SIGNALS:
++    void mockModeChanged(QString mode);
++
  public:
      explicit UsersModel(QObject *parent = 0);
      virtual ~UsersModel();
@@ -52,6 +56,9 @@
      int rowCount(const QModelIndex &parent) const;
      QVariant data(const QModelIndex &index, int role) const;
++    QString mockMode() const;
++    void setMockMode(QString mockMode);
++
  private:
      UsersModelPrivate * const d_ptr;
      Q_DECLARE_PRIVATE(UsersModel)
 === added file 'tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp'
 --- tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp	2015-02-03 12:18:40 +0000
@@ -0,0 +1,104 @@
++/*
++ * Copyright (C) 2014 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 "UsersModelPrivate.h"
++#include "UsersModel.h"
++
++namespace QLightDM
++{
++
++UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
++  : mockMode("single")
++  , q_ptr(parent)
++{
++    char *envMockMode = getenv("LIBLIGHTDM_MOCK_MODE");
++    if (envMockMode) {
++        mockMode = envMockMode;
++    }
++    resetEntries();
++}
++
++void UsersModelPrivate::resetEntries()
++{
++    Q_Q(UsersModel);
++
++    q->beginResetModel();
++
++    if (mockMode == "single") {
++        resetEntries_single();
++    } else if (mockMode == "single-passphrase") {
++        resetEntries_singlePassphrase();
++    } else if (mockMode == "single-pin") {
++        resetEntries_singlePin();
++    } else if (mockMode == "full") {
++        resetEntries_full();
++    }
++
++    q->endResetModel();
++}
++
++void UsersModelPrivate::resetEntries_single()
++{
++    entries =
++    {
++        { "single", "Single User", 0, 0, false, false, 0, 0 },
++    };
++}
++
++void UsersModelPrivate::resetEntries_singlePassphrase()
++{
++    entries =
++    {
++        { "single", "Single User", 0, 0, false, false, 0, 0 },
++    };
++}
++
++void UsersModelPrivate::resetEntries_singlePin()
++{
++    entries =
++    {
++        { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },
++    };
++}
++
++void UsersModelPrivate::resetEntries_full()
++{
++    entries =
++    {
++        { "has-password",      "Has Password", 0, 0, false, false, 0, 0 },
++        { "has-pin",           "Has PIN",      0, 0, false, false, 0, 0 },
++        { "different-prompt",  "Different Prompt", 0, 0, false, false, 0, 0 },
++        { "no-password",       "No Password", 0, 0, false, false, 0, 0 },
++        { "auth-error",        "Auth Error", 0, 0, false, false, 0, 0 },
++        { "two-factor",        "Two Factor", 0, 0, false, false, 0, 0 },
++        { "info-prompt",       "Info Prompt", 0, 0, false, false, 0, 0 },
++        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, 0, 0 },
++        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, 0, 0 },
++        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, 0, 0 },
++        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, 0, 0 },
++        { "long-name",         "Long name (far far too long to fit)", 0, 0, false, false, 0, 0 },
++        { "color-background",  "Color Background", "#dd4814", 0, false, false, 0, 0 },
++        // white and black are a bit redundant, but useful for manually testing if UI is still readable
++        { "white-background",  "White Background", "#ffffff", 0, false, false, 0, 0 },
++        { "black-background",  "Black Background", "#000000", 0, false, false, 0, 0 },
++        { "no-background",     "No Background", "", 0, false, false, 0, 0 },
++        { "unicode",           "가나다라마", 0, 0, false, false, 0, 0 },
++        { "no-response",       "No Response", 0, 0, false, false, 0, 0 },
++        { "empty-name",        "", 0, 0, false, false, 0, 0 },
++    };
++}
++
++} // namespace QLightDM
 === renamed file 'tests/mocks/LightDM/UsersModelPrivate.h' => 'tests/mocks/LightDM/liblightdm/UsersModelPrivate.h'
 --- tests/mocks/LightDM/UsersModelPrivate.h	2013-06-05 22:03:08 +0000
 +++ tests/mocks/LightDM/liblightdm/UsersModelPrivate.h	2015-02-03 12:18:40 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2014 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
@@ -12,8 +12,6 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
   */
  #ifndef UNITY_MOCK_USERSMODEL_PRIVATE_H
@@ -46,11 +44,17 @@
      virtual ~UsersModelPrivate() = default;
      QList<Entry> entries;
++    QString mockMode;
++    void resetEntries();
  protected:
      UsersModel * const q_ptr;
  private:
++    void resetEntries_single();
++    void resetEntries_singlePassphrase();
++    void resetEntries_singlePin();
++    void resetEntries_full();
      Q_DECLARE_PUBLIC(UsersModel)
  };
 === added file 'tests/mocks/LightDM/plugin.cpp'
 --- tests/mocks/LightDM/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/plugin.cpp	2015-02-03 12:18:40 +0000
@@ -0,0 +1,68 @@
++/*
++ * Copyright (C) 2014 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 <DBusGreeter.h>
++#include <DBusGreeterList.h>
++#include "MockGreeter.h"
++#include "MockUsersModel.h"
++#include <libusermetricsoutput/ColorTheme.h>
++#include <libusermetricsoutput/UserMetrics.h>
++#include <QLightDM/UsersModel>
++
++#include <QAbstractItemModel>
++#include <QDBusConnection>
++#include <QtQml/qqml.h>
++
++static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
++{
++    Q_UNUSED(engine)
++    Q_UNUSED(scriptEngine)
++
++    MockGreeter *greeter = new MockGreeter;
++    new DBusGreeter(greeter, "/");
++    new DBusGreeterList(greeter, "/list");
++
++    return greeter;
++}
++
++static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
++{
++    Q_UNUSED(engine)
++    Q_UNUSED(scriptEngine)
++    return new MockUsersModel;
++}
++
++static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
++{
++    Q_UNUSED(engine)
++    Q_UNUSED(scriptEngine)
++    return UserMetricsOutput::UserMetrics::getInstance();
++}
++
++void LightDMPlugin::registerTypes(const char *uri)
++{
++    qmlRegisterType<QAbstractItemModel>();
++    qmlRegisterType<UserMetricsOutput::ColorTheme>();
++
++    Q_ASSERT(uri == QLatin1String("LightDM"));
++    qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
++    qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
++    qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
++    qmlRegisterSingletonType<MockUsersModel>(uri, 0, 1, "Users", users_provider);
++    qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");
++    qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
++}
 === added file 'tests/mocks/LightDM/plugin.h'
 --- tests/mocks/LightDM/plugin.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/plugin.h	2015-02-03 12:18:40 +0000
@@ -0,0 +1,32 @@
++/*
++ * Copyright (C) 2014 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_LIGHTDM_PLUGIN_H
++#define MOCK_LIGHTDM_PLUGIN_H
++
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlExtensionPlugin>
++
++class LightDMPlugin : public QQmlExtensionPlugin
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++
++public:
++    void registerTypes(const char *uri);
++};
++
++#endif
 === removed directory 'tests/mocks/LightDM/single'
 === removed directory 'tests/mocks/LightDM/single-passphrase'
 === removed file 'tests/mocks/LightDM/single-passphrase/CMakeLists.txt'
 --- tests/mocks/LightDM/single-passphrase/CMakeLists.txt	2014-06-11 15:36:51 +0000
 +++ tests/mocks/LightDM/single-passphrase/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
--set(LibLightDM_SOURCES
--    ../Greeter.cpp
--    ../UsersModel.cpp
--    GreeterPrivate.cpp
--    UsersModelPrivate.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
--    )
--
--
--add_library(MockLightDM-single-passphrase SHARED ${LibLightDM_SOURCES})
--
--qt5_use_modules(MockLightDM-single-passphrase Gui)
--
--set_target_properties(MockLightDM-single-passphrase PROPERTIES
--                      OUTPUT_NAME lightdm-qt5-2)
--
--install(TARGETS MockLightDM-single-passphrase
--    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single-passphrase
--    )
 === removed file 'tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp'
 --- tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp	2014-08-06 15:27:57 +0000
 +++ tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
--/*
-- * Copyright (C) 2013 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/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../Greeter.h"
--#include "../GreeterPrivate.h"
--
--namespace QLightDM
--{
--
--GreeterPrivate::GreeterPrivate(Greeter* parent)
--  : authenticated(false),
--    authenticationUser(),
--    q_ptr(parent)
--{
--}
--
--void GreeterPrivate::handleAuthenticate()
--{
--    Q_Q(Greeter);
--    Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
--}
--
--void GreeterPrivate::handleRespond(const QString &response)
--{
--    Q_Q(Greeter);
--
--    authenticated = (response == "password");
--    q->sendAuthenticationComplete();
--}
--
--}
 === removed file 'tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp'
 --- tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp	2013-06-14 19:35:25 +0000
 +++ tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
--/*
-- * Copyright (C) 2013 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/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../UsersModelPrivate.h"
--
--namespace QLightDM
--{
--
--UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
--  : q_ptr(parent)
--{
--    entries =
--    {
--        { "single", "Has Passphrase", 0, 0, false, false, 0, 0 },
--    };
--}
--
--}
 === removed directory 'tests/mocks/LightDM/single-pin'
 === removed file 'tests/mocks/LightDM/single-pin/CMakeLists.txt'
 --- tests/mocks/LightDM/single-pin/CMakeLists.txt	2014-06-11 15:36:51 +0000
 +++ tests/mocks/LightDM/single-pin/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
--set(LibLightDM_SOURCES
--    ../Greeter.cpp
--    ../UsersModel.cpp
--    GreeterPrivate.cpp
--    UsersModelPrivate.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
--    )
--
--
--add_library(MockLightDM-single-pin SHARED ${LibLightDM_SOURCES})
--
--qt5_use_modules(MockLightDM-single-pin Gui)
--
--set_target_properties(MockLightDM-single-pin PROPERTIES
--                      OUTPUT_NAME lightdm-qt5-2)
--
--install(TARGETS MockLightDM-single-pin
--    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single-pin
--    )
 === removed file 'tests/mocks/LightDM/single-pin/GreeterPrivate.cpp'
 --- tests/mocks/LightDM/single-pin/GreeterPrivate.cpp	2014-08-06 15:27:57 +0000
 +++ tests/mocks/LightDM/single-pin/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
--/*
-- * Copyright (C) 2013 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/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../Greeter.h"
--#include "../GreeterPrivate.h"
--
--namespace QLightDM
--{
--
--GreeterPrivate::GreeterPrivate(Greeter* parent)
--  : authenticated(false),
--    authenticationUser(),
--    q_ptr(parent)
--{
--}
--
--void GreeterPrivate::handleAuthenticate()
--{
--    Q_Q(Greeter);
--    Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
--}
--
--void GreeterPrivate::handleRespond(const QString &response)
--{
--    Q_Q(Greeter);
--
--    authenticated = (response == "1234");
--    q->sendAuthenticationComplete();
--}
--
--}
 === removed file 'tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp'
 --- tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp	2014-07-02 16:17:14 +0000
 +++ tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
--/*
-- * Copyright (C) 2013 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/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../UsersModelPrivate.h"
--
--namespace QLightDM
--{
--
--UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
--  : q_ptr(parent)
--{
--    entries =
--    {
--        { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },
--    };
--}
--
--}
 === removed file 'tests/mocks/LightDM/single/CMakeLists.txt'
 --- tests/mocks/LightDM/single/CMakeLists.txt	2014-06-11 15:36:51 +0000
 +++ tests/mocks/LightDM/single/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
--set(LibLightDM_SOURCES
--    ../Greeter.cpp
--    ../UsersModel.cpp
--    GreeterPrivate.cpp
--    UsersModelPrivate.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
--    )
--
--add_library(MockLightDM-single SHARED ${LibLightDM_SOURCES})
--
--qt5_use_modules(MockLightDM-single Gui)
--
--set_target_properties(MockLightDM-single PROPERTIES
--                      OUTPUT_NAME lightdm-qt5-2)
--
--install(TARGETS MockLightDM-single
--    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single
--    )
 === removed file 'tests/mocks/LightDM/single/GreeterPrivate.cpp'
 --- tests/mocks/LightDM/single/GreeterPrivate.cpp	2013-07-29 22:16:04 +0000
 +++ tests/mocks/LightDM/single/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
--/*
-- * Copyright (C) 2013 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/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../Greeter.h"
--#include "../GreeterPrivate.h"
--
--namespace QLightDM
--{
--
--GreeterPrivate::GreeterPrivate(Greeter* parent)
--  : authenticated(false),
--    authenticationUser(),
--    twoFactorDone(false),
--    q_ptr(parent)
--{
--}
--
--void GreeterPrivate::handleAuthenticate()
--{
--    Q_Q(Greeter);
--
--    authenticated = true;
--    Q_EMIT q->authenticationComplete();
--}
--
--void GreeterPrivate::handleRespond(QString const &response)
--{
--    Q_UNUSED(response)
--}
--
--}
 === removed file 'tests/mocks/LightDM/single/UsersModelPrivate.cpp'
 --- tests/mocks/LightDM/single/UsersModelPrivate.cpp	2013-06-14 19:35:25 +0000
 +++ tests/mocks/LightDM/single/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
--/*
-- * Copyright (C) 2013 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/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../UsersModelPrivate.h"
--
--namespace QLightDM
--{
--
--UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
--  : q_ptr(parent)
--{
--    entries =
--    {
--        { "single", "Single User", 0, 0, false, false, 0, 0 },
--    };
--}
--
--}
 === modified file 'tests/plugins/LightDM/CMakeLists.txt'
 --- tests/plugins/LightDM/CMakeLists.txt	2015-01-22 16:41:18 +0000
 +++ tests/plugins/LightDM/CMakeLists.txt	2015-02-03 12:18:40 +0000
@@ -11,10 +11,10 @@
      ${LIBLIGHTDM_INCLUDE_DIRS}
+     )
--add_dependencies(GreeterDBusTestExec MockLightDM-full)
--target_link_libraries(GreeterDBusTestExec -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
++add_dependencies(GreeterDBusTestExec MockLightDM)
++target_link_libraries(GreeterDBusTestExec -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
      -llightdm-qt5-2)
  add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
--add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full" MockLightDM-full "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
++add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
 === modified file 'tests/plugins/LightDM/greeter.qml'
 --- tests/plugins/LightDM/greeter.qml	2013-12-03 11:43:15 +0000
 +++ tests/plugins/LightDM/greeter.qml	2015-02-03 12:18:40 +0000
@@ -19,4 +19,9 @@
  Item {
      property var greeter: LightDM.Greeter
++    Binding {
++        target: LightDM.Greeter
++        property: "mockMode"
++        value: "full"
++    }
+ }
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2015-01-21 18:32:48 +0000
 +++ tests/qmltests/CMakeLists.txt	2015-02-03 12:18:40 +0000
@@ -16,11 +16,11 @@
  set(qmltest_DEFAULT_TARGETS qmluitests)
  set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
--set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
++set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
--add_qml_test(. Shell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
--add_qml_test(. ShellWithPin ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single-pin:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
--add_qml_test(. TabletShell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full:${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
++add_qml_test(. Shell)
++add_qml_test(. ShellWithPin)
++add_qml_test(. TabletShell)
  add_qml_test(Components Background)
  add_qml_test(Components Carousel)
  add_qml_test(Components Dialogs)
@@ -61,10 +61,10 @@
  add_qml_test(Dash/ScopeSettings ScopeSettingNumber)
  add_qml_test(Dash/ScopeSettings ScopeSettingString)
  add_qml_test(Dash/ScopeSettings ScopeSettingsWidgetFactory)
--add_qml_test(Greeter MultiGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
--add_qml_test(Greeter SingleGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
--add_qml_test(Greeter Infographics ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
--add_qml_test(Greeter Clock ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
++add_qml_test(Greeter MultiGreeter)
++add_qml_test(Greeter SingleGreeter)
++add_qml_test(Greeter Infographics)
++add_qml_test(Greeter Clock)
  add_qml_test(Launcher Launcher)
  add_qml_test(Notifications Notifications)
  add_qml_test(Notifications VisualSnapDecisionsQueue)
@@ -72,22 +72,22 @@
  add_qml_test(Notifications SwipeToAct)
  add_qml_test(Panel ActiveCallHint)
  add_qml_test(Panel IndicatorItem)
--add_qml_test(Panel IndicatorItemRow ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
--add_qml_test(Panel IndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
--add_qml_test(Panel IndicatorsBar ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
--add_qml_test(Panel IndicatorsMenu ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
--add_qml_test(Panel MenuContent ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
--add_qml_test(Panel Panel ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
++add_qml_test(Panel IndicatorItemRow)
++add_qml_test(Panel IndicatorPage)
++add_qml_test(Panel IndicatorsBar)
++add_qml_test(Panel IndicatorsMenu)
++add_qml_test(Panel MenuContent)
++add_qml_test(Panel Panel)
  add_qml_test(Panel SearchIndicator)
  add_qml_test(Panel/Indicators IndicatorsLight ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
  # These MenuItemFactory tests need the test/mocks/ to come before plugins/
  add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
  add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
--add_qml_test(Stages ApplicationWindow ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
--add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
--add_qml_test(Stages SpreadDelegate ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
--add_qml_test(Stages SurfaceContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
--add_qml_test(Stages SessionContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
++add_qml_test(Stages ApplicationWindow)
++add_qml_test(Stages PhoneStage ENVIRONMENT)
++add_qml_test(Stages SpreadDelegate ENVIRONMENT)
++add_qml_test(Stages SurfaceContainer ENVIRONMENT)
++add_qml_test(Stages SessionContainer ENVIRONMENT)
  add_qml_test(Stages WindowMoveResizeArea)
  add_qml_test(Stages Splash)
  add_qml_test(Wizard Wizard)
 === modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
 --- tests/qmltests/Greeter/tst_Infographics.qml	2013-12-17 16:04:47 +0000
 +++ tests/qmltests/Greeter/tst_Infographics.qml	2015-02-03 12:18:40 +0000
@@ -23,6 +23,16 @@
  import LightDM 0.1 as LightDM
  Item {
++    Binding {
++        target: LightDM.Greeter
++        property: "mockMode"
++        value: "full"
++    }
++    Binding {
++        target: LightDM.Users
++        property: "mockMode"
++        value: "full"
++    }
      property variant infographicModel: LightDM.Infographic
      width: units.gu(120)
 === modified file 'tests/qmltests/Greeter/tst_MultiGreeter.qml'
 --- tests/qmltests/Greeter/tst_MultiGreeter.qml	2014-12-09 14:50:59 +0000
 +++ tests/qmltests/Greeter/tst_MultiGreeter.qml	2015-02-03 12:18:40 +0000
@@ -26,6 +26,17 @@
      width: units.gu(120)
      height: units.gu(80)
++    Binding {
++        target: LightDM.Greeter
++        property: "mockMode"
++        value: "full"
++    }
++    Binding {
++        target: LightDM.Users
++        property: "mockMode"
++        value: "full"
++    }
++
      Greeter {
          id: greeter
          anchors.fill: parent
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-01-09 10:42:42 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-02-03 12:18:40 +0000
@@ -36,6 +36,13 @@
      width: units.gu(60)
      height: units.gu(71)
++    Component.onCompleted: {
++        // must set the mock mode before loading the Shell
++        LightDM.Greeter.mockMode = "single";
++        LightDM.Users.mockMode = "single";
++        shellLoader.active = true;
++    }
++
      QtObject {
          id: applicationArguments
@@ -56,7 +63,7 @@
          anchors.fill: parent
          Loader {
              id: shellLoader
--
++            active: false
              property bool itemDestroyed: false
              sourceComponent: Component {
                  Shell {
 === modified file 'tests/qmltests/tst_ShellWithPin.qml'
 --- tests/qmltests/tst_ShellWithPin.qml	2014-12-09 17:14:35 +0000
 +++ tests/qmltests/tst_ShellWithPin.qml	2015-02-03 12:18:40 +0000
@@ -33,6 +33,13 @@
      width: contentRow.width
      height: contentRow.height
++    Component.onCompleted: {
++        // must set the mock mode before loading the Shell
++        LightDM.Greeter.mockMode = "single-pin";
++        LightDM.Users.mockMode = "single-pin";
++        shellLoader.active = true;
++    }
++
      QtObject {
          id: applicationArguments
@@ -54,6 +61,7 @@
          Loader {
              id: shellLoader
++            active: false
              width: units.gu(40)
              height: units.gu(71)
 === modified file 'tests/qmltests/tst_TabletShell.qml'
 --- tests/qmltests/tst_TabletShell.qml	2015-01-09 09:15:45 +0000
 +++ tests/qmltests/tst_TabletShell.qml	2015-02-03 12:18:40 +0000
@@ -32,6 +32,13 @@
      id: root
      spacing: 0
++    Component.onCompleted: {
++        // must set the mock mode before loading the Shell
++        LightDM.Greeter.mockMode = "full";
++        LightDM.Users.mockMode = "full";
++        shellLoader.active = true;
++    }
++
      QtObject {
          id: applicationArguments
@@ -51,6 +58,7 @@
      Loader {
          id: shellLoader
++        active: false
          width: units.gu(100)
          height: units.gu(80)