Merge lp:~mterry/unity8/session-lightdm into lp:unity8

[Michael Terry]

Use liblightdm for session lockscreen too.
This lets us switch users directly from the lockscreen, rather than going to the system greeter.

This is mostly simplification.

- I drop the distinction between FullLightDM and IntegratedLightDM. Now we always use the full lightdm experience. This lets us drop our custom PAM and custom user code in IntegratedLightDM. No more support for ~/.unity8-greeter-demo, but that's fine. We don't need it anymore with this branch.

- I drop the mock plugin entirely. (opting instead for a tiny "mock()" API call on the real plugin that returns an object that can be used to manipulate our mock liblightdm, if we're in testing mode)

- I simplify the mock liblightdm to avoid separate files for the Private classes. That can all go into the main files. The separation isn't worth wading through the files to find what you want.

- I add a "greeterMode" property to our AccountsService plugin. This toggles whether we try to write non-active user properties back to the system AccountsService daemon or not. When running in-session, we don't want to. We don't have permission to anyway, and it doesn't really matter for the properties we change (notably, the FailedLogins count -- we can just keep track of that locally. It's not urgent that we write that to disk in this case.)

This is easier to test on a yakkety desktop right now. The phone version of LightDM does not support this feature yet.

As part of landing, we will backport lightdm from yakkety.

======

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 Yes. Two config changes to enable this new mode:
 - https://code.launchpad.net/~mterry/unity8-desktop-session/session-lightdm/+merge/300129
 - https://code.launchpad.net/~mterry/ubuntu-touch-session/session-lightdm/+merge/300224

 And a backported yakkety lightdm.

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

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

 * If you changed the UI, has there been a design review?
 NA

[lp:~mterry/unity8/session-lightdm]

2545. By CI Train Bot Account on 2016-07-21

Resync trunk.

2546. By Launchpad Translations on behalf of unity-team on 2016-07-22

Launchpad automatic translations update.

2547. By Launchpad Translations on behalf of unity-team on 2016-07-25

Launchpad automatic translations update.

2548. By Timo Jyrinki on 2016-07-26

* Rebuild against Qt 5.6.
* Add https://code.launchpad.net/~aacid/unity8/floor_includes/+merge/300850

2549. By CI Train Bot Account on 2016-07-28

Bump the version to secure UITK compatibility

2550. By Albert Astals Cid on 2016-07-28

Pass the correct number of arguments to mapToItem

One argument used to work in Qt 5.4 and 5.5 but it is not documented and seems to have broken on Qt 5.6 so just update to the correct signature (LP: #1606835)

Approved by: Michael Zanetti

2551. By CI Train Bot Account on 2016-07-28

Releasing 8.14+16.10.20160728-0ubuntu1

2552. By Launchpad Translations on behalf of unity-team on 2016-07-30

Launchpad automatic translations update.

2553. By Lukáš Tinkl on 2016-08-03

Implement frontend support for running keyboard indicator

Approved by: Michael Terry

2554. By Lukáš Tinkl on 2016-08-03

Provide window/surface close shortcuts across all the stages (LP: #1578392, #1606528)

Approved by: Michael Terry, Unity8 CI Bot

2555. By Lukáš Tinkl on 2016-08-03

Restart the location trust prompt service when exiting the wizard (LP: #1594430)

Approved by: Michael Terry

2556. By Daniel d'Andrada on 2016-08-03

Fix splashscreen orientation when app rotates own contents

+ Refactor states code in SpreadDelegate, removing redundancy

+ Fix mock MirSurfaceItem::orientationAngle implementation,
  mirroring what the real implementation in qtmir does. (LP: #1586050)

Approved by: Albert Astals Cid

2557. By Lukáš Tinkl on 2016-08-03

Implement clearing the search and closing the panel on pressing Escape key in the dash header

Approved by: Albert Astals Cid

2558. By Albert Astals Cid on 2016-08-03

Fix DisabledScreenNotice::test_rotation

Change expectFail into expectFailContinue
Otherwise the rest of the test doesn't get executed and we do want it to in this case

Approved by: Daniel d'Andrada

2559. By Albert Astals Cid on 2016-08-03

Unbox the artshapeLoader

There's no need for it to be inside an Item

Approved by: Albert Astals Cid

2560. By Albert Astals Cid on 2016-08-03

Make the delegate of DashNavigationList an async Loader

This list may be created while horizontally swiping through scopes
which means it may create all the visible delegates in a sync manner
while the swipe animation is happening and be jumpy

Previously the polish step of the list was taking around 230ms to in the amazon scope
now it's around 7ms without any noticeable delay in other places of the code

Approved by: Josh Arenson, Unity8 CI Bot

2561. By Albert Astals Cid on 2016-08-03

unity-scope-tool: Use parse instead of process

This way we can pass --desktop_file_hint on the phone

Approved by: Michael Terry

2562. By Andrea Cimitan on 2016-08-03

Unfocus the search text field in the dash page header when requested (LP: #1590820)

Approved by: Albert Astals Cid

2563. By Andrea Cimitan on 2016-08-03

Use binding for filter popover contentWidth (LP: #1595116)

Approved by: Albert Astals Cid

2564. By Andrea Cimitan on 2016-08-03

Add few sourceSize for Image we forgot (LP: #1595113)

Approved by: Albert Astals Cid

2565. By Andrea Cimitan on 2016-08-03

Replace Flickable with an Item inside DashPageHeader for headerContainer (LP: #1599235)

Approved by: Albert Astals Cid, Josh Arenson

2566. By Albert Astals Cid on 2016-08-03

VerticalJournal improvements regarding model insertions and item height changes

insertions in the middle need to trigger a reset
Item height changes need to trigger a relayout (LP: #1599754)

Approved by: Michał Sawicz

2567. By Daniel d'Andrada on 2016-08-03

tst_PreviewIconActions: Make test name match filename

and also test targets (make testFoo, etc)

Just like every other test.

So that you no longer see messages like that:
qmltestrunner.PreviewIconActionTest::test_checkButtonWithTemporary
As "make testPreviewIconActionTest" doesn't exist

Approved by: Albert Astals Cid

2568. By Daniel d'Andrada on 2016-08-03

Cursor: make its size grid unit based

So that it scales along with the rest of the UI (LP: #1604014)

Approved by: Albert Astals Cid, Unity8 CI Bot

2569. By Lukáš Tinkl on 2016-08-03

Fix log timestamps (LP: #1602196)

Approved by: Albert Astals Cid, Unity8 CI Bot

2570. By Michael Terry on 2016-08-03

Fix indicator profile bug that caused sound indicator to say Mute instead of Silent Mode. (LP: #1604205)

Approved by: Lukáš Tinkl

2571. By Michał Sawicz on 2016-08-03

Add arm64 support, drop unnecessary B-D on web plugin

Approved by: Michael Terry

2572. By Michael Terry on 2016-08-03

Fix lockscreen appearing right after unlocking a locked session on the desktop. (LP: #1604374)

Approved by: Josh Arenson

2573. By Albert Astals Cid on 2016-08-03

Add math.h includes for compilation in yakkety (LP: #1605502)

Approved by: Lukáš Tinkl, Timo Jyrinki

2574. By Lukáš Tinkl on 2016-08-03

Don't display the mode switch warning dialog on tablets (LP: #1600290)

Approved by: Michael Zanetti

2575. By Daniel d'Andrada on 2016-08-03

TouchEventSequenceWrapper: item might get deleted when touch sequence is committed (LP: #1607686)

Approved by: Albert Astals Cid

2576. By CI Train Bot Account on 2016-08-03

Releasing 8.14+16.10.20160803-0ubuntu1

2577. By Launchpad Translations on behalf of unity-team on 2016-08-09

Launchpad automatic translations update.

2578. By Albert Astals Cid on 2016-08-11

Take into account carousel selectedItemScaleFactor when setting card fixedArtShapeSize (LP: #1599238)

Approved by: Andrea Cimitan

2579. By Michael Zanetti on 2016-08-11

Clean up some build script legacy

Approved by: Albert Astals Cid

2580. By Michael Zanetti on 2016-08-11

Add a crossbuilder_post file to make crossbuilder restart unity8 after deploying

Approved by: Michał Sawicz

2581. By Albert Astals Cid on 2016-08-11

Remove unused LimitProxyModel

Probably cruft from when we used to have more than one preview in the previews view

Approved by: Josh Arenson, Unity8 CI Bot

2582. By Albert Astals Cid on 2016-08-11

Do not calculate implicitHeight for Cards in a CardGrid

We set their height with
     item.height = Qt.binding(function() { return cardTool.cardHeight; });
anyway so it's lost CPU time

The qmlprofiler said it took around 1.5% of the time of scrolling up/down a very long scope

Approved by: Andrea Cimitan

2583. By Larry Price on 2016-08-11

Allow libertine-scope to show empty search result hint unmodified.
Fixes bug #1606693. (LP: #1606693)

Approved by: Albert Astals Cid

2584. By Michael Zanetti on 2016-08-11

fixes for the automatic switching between usage modes

* evaluate usage mode when the screen size changes
* switch to staged mode even if a mouse is attached when the screen is too small (LP: #1590944)

Approved by: Albert Astals Cid

2585. By Lukáš Tinkl on 2016-08-11

Open the quicklist (context) menu also using the Menu key (LP: #1608265)

Approved by: Michael Zanetti

2586. By Lukáš Tinkl on 2016-08-11

Fix incorrect SIM PIN dialog position when entering a wrong PIN (LP: #1596076)

Approved by: Josh Arenson, Michael Zanetti

2587. By Albert Astals Cid on 2016-08-11

Small clazy fixes

Approved by: Lukáš Tinkl

2588. By Lukáš Tinkl on 2016-08-11

Apply the correct keymap also on prompt surfaces (LP: #1610124)

Approved by: Albert Astals Cid

2589. By Omer Akram on 2016-08-11

Add object names for setup wizard

Approved by: Albert Astals Cid

2590. By Lukáš Tinkl on 2016-08-11

Implement an optional system update feature during OOBE wizard (LP: #1580785)

Approved by: Michał Sawicz

2591. By Lukáš Tinkl on 2016-08-11

Implement a page for choosing HW keyboard layout in OOBE wizard

Approved by: Albert Astals Cid

2592. By Daniel d'Andrada on 2016-08-11

Remove stage property from Application

It's not used anymore

Approved by: Michał Sawicz

2593. By CI Train Bot Account on 2016-08-11

Releasing 8.14+16.10.20160811.1-0ubuntu1

2594. By CI Train Bot Account on 2016-08-16

Resync trunk.

2595. By Launchpad Translations on behalf of unity-team on 2016-08-17

Launchpad automatic translations update.

2596. By Launchpad Translations on behalf of unity-team on 2016-08-18

Launchpad automatic translations update.

2597. By Lukáš Tinkl on 2016-08-19

Reset topmostIsFullscreen to correctly rotate the shell when dismissing SIM PIN screen (LP: #1614070)

Approved by: Albert Astals Cid

2598. By CI Train Bot Account on 2016-08-19

Releasing 8.14+16.10.20160819-0ubuntu1

2599. By CI Train Bot Account on 2016-08-24

Resync trunk.

2600. By Launchpad Translations on behalf of unity-team on 2016-08-25

Launchpad automatic translations update.

2601. By Alfonso Sanchez-Beato on 2016-08-26

Make sure we emit sounds when taking a screenshot even after media-hub
has restarted (LP: #1544477) (LP: #1544477)

2602. By CI Train Bot Account on 2016-08-26

Releasing 8.14+16.10.20160826-0ubuntu1

2603. By CI Train Bot Account on 2016-08-31

Resync trunk.

2604. By Daniel d'Andrada on 2016-08-31

Added implementation for MirSurfaceInterface::persistentId

Approved by: Daniel d'Andrada

2605. By CI Train Bot Account on 2016-08-31

Releasing 8.14+16.10.20160831.3-0ubuntu1

2606. By CI Train Bot Account on 2016-09-02

Resync trunk.

2607. By Launchpad Translations on behalf of unity-team on 2016-09-03

Launchpad automatic translations update.

2608. By Launchpad Translations on behalf of unity-team on 2016-09-12

Launchpad automatic translations update.

2609. By Andrea Cimitan on 2016-09-22

override some Qt Components definitions so we can have sane default values for flick speeds

Approved by: Albert Astals Cid

2610. By Andrea Cimitan on 2016-09-22

Elide the label text inside recent searches panel (LP: #1611796)

Approved by: Albert Astals Cid

2611. By Andrea Cimitan on 2016-09-22

Add a PreviewSingleton module to store some data for previews (LP: #1595235)

Approved by: Albert Astals Cid

2612. By Andrea Cimitan on 2016-09-22

Use PreviewSingleton for PreviewRatingInput and PreviewCommentInput (LP: #1595235)

Approved by: Albert Astals Cid

2613. By Andrea Cimitan on 2016-09-22

rework GenericScopeView PullToRefresh test

Approved by: Albert Astals Cid

2614. By Andrea Cimitan on 2016-09-22

use mouseFlick instead touchFlick for manage_dash_move_current

Approved by: Albert Astals Cid

2615. By Andrea Cimitan on 2016-09-22

add a couple of waiting tricks for a flaky dash test

Approved by: Albert Astals Cid

2616. By Albert Astals Cid on 2016-09-22

LVWPH: update clipItem height when list height changes (LP: #1606935)

Approved by: Andrea Cimitan

2617. By Albert Astals Cid on 2016-09-22

Put the touchdown shape inside a loader

We only create the shape when needed, saving a bit of CPU time when we're just scrolling around the scopes

Doesn't seem to make the touchdown appear time on press noticeably slower

Approved by: Andrea Cimitan, Josh Arenson, Michael Terry, Unity8 CI Bot

2618. By Albert Astals Cid on 2016-09-22

No need for the touchdown in the card for the cardtool

We only use that card to get some size measurements so the touchdown code adds nothing

Approved by: Andrea Cimitan

2619. By Albert Astals Cid on 2016-09-22

Add bottom gradient to the Show Less floating button

Approved by: Andrea Cimitan

2620. By Albert Astals Cid on 2016-09-22

Remove artShapeSize from non cardtool cards

artShapeSize is only used in the cardtool card to read the value them we pass down in fixedArtShapeSize

According to qmlprofiler evaluating this useless binding accounts for ~0.5% when scrolling up and down a very long scope

Approved by: Andrea Cimitan

2621. By Albert Astals Cid on 2016-09-22

LVWPH: Fix case in which header was shown incorrectly

Making the list smaller did not move the header so it ended up being in view

Approved by: Josh Arenson

2622. By Albert Astals Cid on 2016-09-22

LVWPH: Fix items cut on top in the dash (or at least some instances of it)

This reverts a workaround for tests failing introduced in r2121

The commit log of that revision says "The other solutions involve implementing maxYExtent"
which we actually implemented in r2351 so the workaround would not seem needed anymore
and on top of it is causing brokenness so remove it

Approved by: Josh Arenson

2623. By Albert Astals Cid on 2016-09-22

Reduce calls to CardCreatorCache.getCardComponent while the component is being created

As it is right now on the phone we do calls with empty cardTool.artShapeStyle and cardTool.categoryLayout
that are useless so protect against it to save time. This is not reproducible on the desktop (there's a different Qt though 5.6 vs 5.4) (LP: #1615675)

Approved by: Andrea Cimitan

2624. By Albert Astals Cid on 2016-09-22

Dash::test_cardIconStyle change compare into tryCompareFunction

On very slow machines (CI or valgrind) the UCProportionalShape is not created immediately so give it some slack

Approved by: Andrea Cimitan

2625. By Albert Astals Cid on 2016-09-22

Make PreviewActionsTest::test_comboButton more stable

We also wait for the buttonGroup height to have settled otherwise the mouse clicks can end up in the wrong place

Approved by: Andrea Cimitan

2626. By Albert Astals Cid on 2016-09-22

Adapt onShiftedContentXChanged to work when the content changes very abruptly

This happens in CI quite a bit (and locally when run under xvfb)

Approved by: Michael Zanetti

2627. By Albert Astals Cid on 2016-09-22

Make tryGenericScopeView show the scope correctly

Approved by: Andrea Cimitan

2628. By Albert Astals Cid on 2016-09-22

Make sure the spinner does not get too close to the title text (LP: #1597392)

Approved by: Lukáš Tinkl

2629. By Albert Astals Cid on 2016-09-22

Show "Pull to refresh" in white when overlaid in low luminance colors (LP: #1596849)

Approved by: Michael Terry

2630. By Josh Arenson on 2016-09-22

Add a frontend to the sessions model and enable a session chooser in the greeter.

Approved by: Michael Terry

2631. By Michael Terry on 2016-09-22

Support launching apps inside a unity8 session from the greeter and support emergency dialing inside the greeter.

2632. By Michael Terry on 2016-09-22

Fix tryShell to actually show appropriate backgrounds for each mock user.

Approved by: Albert Astals Cid

2633. By Michael Terry on 2016-09-22

Add an indicator to the greeter when a user is logged in (only shown if we have more than one user)

Approved by: Albert Astals Cid

2634. By Michael Terry on 2016-09-22

Hide the greeter OSK if indicators are open and don't show the edge tutorial during an emergency call.

Approved by: Albert Astals Cid

2635. By Michael Terry on 2016-09-22

Switch from lockscreen PIN pad to a passcode entry box that uses the OSK.

Approved by: Albert Astals Cid

2636. By Michael Terry on 2016-09-22

Use the default system wallpaper instead of our custom one.

Additionally, crop the default wallpaper instead of rotating it, only darken the wallpaper if it's not the default one, and avoid reloading the wallpaper when the device is rotated.

2637. By Daniel d'Andrada on 2016-09-22

Set progress bar indeterminate when processing signal received. (LP: #1249349)

Approved by: Daniel d'Andrada

2638. By Daniel d'Andrada on 2016-09-22

Implement cursor confinement (LP: #1590099)

Approved by: Lukáš Tinkl

2639. By Lukáš Tinkl on 2016-09-22

Implement edge maximizing (aka window snapping) (LP: #1602628)

Approved by: Daniel d'Andrada

2640. By Albert Astals Cid on 2016-09-22

Make test_Shell non ultra slow again

By setting the timeout to 0 to findChild we know may return null (LP: #1597366)

Approved by: Lukáš Tinkl, Michael Zanetti

2641. By Albert Astals Cid on 2016-09-22

Improve findChild calls inside tryCompareFunction.

findChild has a timeout retry since a while ago. This means that if we have a findChild inside a tryCompareFunction the retries multiply and it takes around 30 minutes for the tryCompareFunction to fail if the findChild is failing, so what we do is set the timeout of findChild to 0.

In other cases we just had a tryCompareFunction that made sure the findChild after it would succeed, since now findChild has a retry mechanism we can just remove that tryCompareFunction altogether.

Approved by: Michał Sawicz, Unity8 CI Bot

2642. By Lukáš Tinkl on 2016-09-22

On the PC platform (as opposed to running on $devices), use the "mute" action instead of silent mode

Approved by: Albert Astals Cid, Unity8 CI Bot

2643. By Lukáš Tinkl on 2016-09-22

Respect Fitt's law wrt the window control buttons in panel (LP: #1611959)

Approved by: Albert Astals Cid

2644. By Lukáš Tinkl on 2016-09-22

Fix 2 failing color-related tests

Approved by: Michał Sawicz

2645. By Michael Terry on 2016-09-22

Update look of infographic a bit

Approved by: Albert Astals Cid

2646. By Michael Terry on 2016-09-22

Make infographic bubbles white even on the default wallpaper.

Approved by: Albert Astals Cid

2647. By Marco Trevisan (Treviño) on 2016-09-22

Indicators, mocks: add fake indicators menuitem to populate mocks with different menu types

Also allow to use fake indicators model in IndicatorsClient

Approved by: Albert Astals Cid, Lukáš Tinkl

2648. By Marco Trevisan (Treviño) on 2016-09-22

IndicatorsClient: use PageHeader and ListItemLayout's

Approved by: Albert Astals Cid

2649. By CI Train Bot Account on 2016-09-22

Releasing 8.14+16.10.20160922-0ubuntu1

2650. By CI Train Bot Account on 2016-09-26

Resync trunk.

2651. By Launchpad Translations on behalf of unity-team on 2016-09-27

Launchpad automatic translations update.

2652. By Launchpad Translations on behalf of unity-team on 2016-09-28

Launchpad automatic translations update.

2653. By Launchpad Translations on behalf of unity-team on 2016-09-29

Launchpad automatic translations update.

2654. By Launchpad Translations on behalf of unity-team on 2016-09-30

Launchpad automatic translations update.

2655. By Launchpad Translations on behalf of unity-team on 2016-10-03

Launchpad automatic translations update.

2656. By Michael Terry on 2016-10-04

* debian/control:
  - Drop unity-scope-mediascanner2 to a Suggests rather than a Recommends,
    to ease our transition to main. It's already seeded directly in
    Touch, so this will only affect the Desktop variant of unity8.

2657. By Launchpad Translations on behalf of unity-team on 2016-10-08

Launchpad automatic translations update.

2658. By Launchpad Translations on behalf of unity-team on 2016-10-18

Launchpad automatic translations update.

2659. By Launchpad Translations on behalf of unity-team on 2016-10-19

Launchpad automatic translations update.

2660. By Michael Terry on 2016-10-24

Grab launcher icon information from ubuntu-app-launch, not directly from desktop files.

Approved by: Michael Zanetti

2661. By Michael Terry on 2016-10-24

Adjust root paths if we're running inside a snap. (LP: #1629009)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2662. By Michael Zanetti on 2016-10-24

Merge all Stages into one single codebase. Apply new spread visuals.

This deletes PhoneStage, TabletStage and DesktopStage, and merges all of the functionality into Stage. Also the spread visuals have been updated by design to work with all usage modes. (LP: #1489517, #1603914, #1635800)

Approved by: Lukáš Tinkl

2663. By Lukáš Tinkl on 2016-10-24

Restore the double tap decoration to maximize feature (LP: #1627281)

Approved by: Michael Zanetti

2664. By Andrea Azzarone on 2016-10-24

Remove UbuntuShapeForItem and replace its use with the more standard Ubuntu.Components.UbuntuShape.

Approved by: Albert Astals Cid, Lukáš Tinkl

2665. By Lukáš Tinkl on 2016-10-24

Hide the cursor for fullscreen apps after 3 seconds of inactivity

Approved by: Albert Astals Cid

2666. By Albert Astals Cid on 2016-10-24

Make PreviewProgress be thicker again

Last UITK landing reverted us to a very thin line, the code was a bit weird in which we both set implicitHeight and height in a bit of almost recursive fasion.

Make it simpler by just setting the height (LP: #1629382)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2667. By Marco Trevisan (Treviño) on 2016-10-24

MenuItemFactory: use more features from SlotsLayout based settings components

Remove some legacy elements that were needed before

Approved by: Albert Astals Cid

2668. By Lukáš Tinkl on 2016-10-24

Implement moving windows by Alt + left mouse button

Approved by: Daniel d'Andrada

2669. By Albert Astals Cid on 2016-10-24

tst_PreviewZoomableImage: Wait for LazyImage transitions on init() (LP: #1630136)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2670. By CI Train Bot Account on 2016-10-24

Releasing 8.14+17.04.20161024-0ubuntu1

2671. By Marco Trevisan (Treviño) on 2016-10-27

MenuItemFactory: activate item on calendar selection change

This informs the indicator-datetime to update the list of the upcoming events (LP: #1541125)

Approved by: Lukáš Tinkl

2672. By CI Train Bot Account on 2016-10-27

Releasing 8.14+17.04.20161027-0ubuntu1

2673. By CI Train Bot Account on 2016-11-07

Resync trunk.

2674. By Launchpad Translations on behalf of unity-team on 2016-11-08

Launchpad automatic translations update.

2675. By Andrea Cimitan on 2016-11-09

Remove background under header pagination dots, update dots assets, remove dash paper background, update bottom edge asset

Approved by: Albert Astals Cid, Unity8 CI Bot

2676. By Albert Astals Cid on 2016-11-09

Make more CardTool properties readonly

This removes "hacks" from GenericScopeView and moves them to either CardTool or CardGrid in a less "this is a hack" way

Approved by: Andrea Cimitan, Unity8 CI Bot

2677. By Andrea Cimitan on 2016-11-09

Few styling changes for cards

Approved by: Albert Astals Cid, Unity8 CI Bot

2678. By Albert Astals Cid on 2016-11-09

Make the > in Dash Section Header be after text

Instead than at the right of the view (LP: #1508905)

Approved by: Andrea Cimitan

2679. By Albert Astals Cid on 2016-11-09

Rework Dash Preview column margins

    If there's one column
     Preview widgets have 2GU on each side
      Unless it's one of the "full screen" widgets, i.e. video/image
     This hasn't changed in this patch

    If there's two columns
     the columns have 4GU on each side and between eachother
     This has changed according to design guidelines

Approved by: Andrea Cimitan, Unity8 CI Bot

2680. By Albert Astals Cid on 2016-11-09

Improve LVWPH <-> GenericScopeView interaction

Send up directly the delegate instead of the delegateIndex and then asking back for the delegate

Saves time and also if the delegateIndex is the same number but the delegate different the delegate won't be updated because QML doesn't know it's different (LP: #1508905, #1622423)

Approved by: Michael Zanetti, Paweł Stołowski, Unity8 CI Bot

2681. By Albert Astals Cid on 2016-11-09

Make the PreviewButtons be of the width of the button and not half the total width

half the total width is still the max width and the combos are still all the same width

Approved by: Andrea Cimitan, Unity8 CI Bot

2682. By Andrea Cimitan on 2016-11-09

various tweaks to fonts inside previews

Approved by: Albert Astals Cid

2683. By Albert Astals Cid on 2016-11-09

Fix first column of the preview table to be 25%

This way two consecutive tables have the second column start at the same X coordinate

Approved by: Andrea Cimitan

2684. By Andrea Cimitan on 2016-11-09

More visual tweaks

Approved by: Albert Astals Cid

2685. By Michael Terry on 2016-11-09

More path lookup fixes for running inside of a snap. (LP: #1629009)

Approved by: Michael Zanetti, Unity8 CI Bot

2686. By Michael Zanetti on 2016-11-09

Added blur and darkening to wallpaper while in spread

Approved by: Lukáš Tinkl

2687. By Michael Zanetti on 2016-11-09

Fixes in the spread after design review

- add a minimum width for the tile info to prevent it going to ...
- tiles should not be interactive any more when moving to spread
- add some resistance to the drag when an app is not closeable
- allow rotating when there is no app focused
- add a fade in animation to the icons in the spread
- fix spread looking out of place when there's only one item (LP: #1637502, #1638848)

Approved by: Lukáš Tinkl

2688. By Michael Zanetti on 2016-11-09

More fixes to the unified stages code (LP: #1637205, #1637249, #1637258)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2689. By Michael Zanetti on 2016-11-09

Delay alt tab for tiny bit in order to avoid flickering on quick alt-tabs

Approved by: Lukáš Tinkl

2690. By Lukáš Tinkl on 2016-11-09

Stabilize test_doubleTapToMaximizeWindow()

Approved by: Michael Zanetti, Unity8 CI Bot

2691. By Brian Douglass on 2016-11-09

Add a new setting to enable/disable the launcher

Approved by: Michael Zanetti

2692. By Tomás Tormo on 2016-11-09

Reload Infographics userdata when the day changes (LP: #1378814)

Approved by: Albert Astals Cid

2693. By Lukáš Tinkl on 2016-11-09

Enable loading the main Qt catalog which in turn allows for using RTL languages

Approved by: Albert Astals Cid

2694. By Lukáš Tinkl on 2016-11-09

Fix the pixelated notification icon by setting sourceSize (LP: #1637712)

Approved by: Michael Zanetti, Unity8 CI Bot

2695. By CI Train Bot Account on 2016-11-09

Releasing 8.14+17.04.20161109-0ubuntu1

2696. By Launchpad Translations on behalf of unity-team on 2016-11-12

Launchpad automatic translations update.

2697. By Michael Zanetti on 2016-11-16

Stabilize OrientedShell tests

Approved by: Lukáš Tinkl, Unity8 CI Bot

2698. By CI Train Bot Account on 2016-11-16

* MenuItemFactory: bind calendar backend properties to calendarMenu item
  Adds support for showing the calendar at the requested date, marking days
  with events properly and toggling the visibility of the week number.
* Bump version as USC breaks with unity8 << 8.14

2699. By CI Train Bot Account on 2016-11-16

MenuItemFactory: use Menus.RadioMenu and Menus.ButtonMenu

2700. By Marco Trevisan (Treviño) on 2016-11-16

testLauncher: use tryCompare to check launcher contentY

Also init the launcher before each test

Approved by: Albert Astals Cid, Lukáš Tinkl, Unity8 CI Bot

2701. By Albert Astals Cid on 2016-11-16

[Hopefully] Fix infinite loop in some of the GSV tests

Potentially this could happen in real life too

Given rounding issues sometimes we ended up in a loop of showing the floatingSeeLess,
this makes the ScopeListView shorter which ends up in recalculation of whether floatingSeeLess
should be visible which then meant no and loop forever.

With this change i've run the test for 24 hours without it being stuck when previously it got stuck each 2 hours aprox (LP: #1599301)

Approved by: Michał Sawicz

2702. By CI Train Bot Account on 2016-11-16

Releasing 8.15+17.04.20161116.1-0ubuntu1

2703. By Launchpad Translations on behalf of unity-team on 2016-11-22

Launchpad automatic translations update.

2704. By Launchpad Translations on behalf of unity-team on 2016-11-23

Launchpad automatic translations update.

2705. By Andrea Cimitan on 2016-11-29

Fix white text (LP: #1644468)

Approved by: Albert Astals Cid, Unity8 CI Bot

2706. By Andrea Cimitan on 2016-11-29

Make MascotLoader in CardCreator flat

Approved by: Albert Astals Cid, Unity8 CI Bot

2707. By Andrea Cimitan on 2016-11-29

Make the remaining UbuntuShape flat

Approved by: Albert Astals Cid, Unity8 CI Bot

2708. By Andrea Cimitan on 2016-11-29

added dropshadow from panel indicators to dash page header extra panel, so there is right shadow when the extra panel is narrow

Approved by: Albert Astals Cid, Unity8 CI Bot

2709. By Andrea Cimitan on 2016-11-29

Look up for expandable template dash category flag

Approved by: Albert Astals Cid, Unity8 CI Bot

2710. By Albert Astals Cid on 2016-11-29

Fix PreviewProgress implicitHeight

We actually want this to be the height of the progressbar that we fix so use that and not the implicitHeight (LP: #1641943)

Approved by: Andrea Cimitan, Unity8 CI Bot

2711. By Andrea Azzarone on 2016-11-29

Set Mir.cursorName to "grabbing" on first mouse press on a window decoration. Don't wait for press+motion. (LP: #1618078)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2712. By Andrea Azzarone on 2016-11-29

Do not show a divider between each quicklist entry but just between each section, similar to how unity7 does. (LP: #1637478)

Approved by: Albert Astals Cid, Unity8 CI Bot

2713. By Daniel d'Andrada on 2016-11-29

There's no need for WindowDecoration to access the appDelegate

It damages modularity.

Approved by: Michael Zanetti, Unity8 CI Bot

2714. By Brian Douglass on 2016-11-29

Added a setting to enable/disable the indicator dropdown menu.

Approved by: Michael Zanetti, Unity8 CI Bot

2715. By Michael Zanetti on 2016-11-29

disable spread interaction while locked (LP: #1641578)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2716. By Olivier Tilloy on 2016-11-29

Remove dependency on transitional package. (LP: #1583079)

Approved by: Albert Astals Cid, Unity8 CI Bot

2717. By Lukáš Tinkl on 2016-11-29

Enable brightness (laptop backlight) handling on desktop/laptop PCs (LP: #1595947)

Approved by: Michael Zanetti, Unity8 CI Bot

2718. By Andrea Azzarone on 2016-11-29

Implement launcher tooltips.

Approved by: Michał Sawicz

2719. By Albert Astals Cid on 2016-11-29

Adapt to dummy notification being gone

and warning fix as bonus

Approved by: Lukáš Tinkl, Unity8 CI Bot

2720. By Albert Astals Cid on 2016-11-29

Fix autopilot test_lock_screen tests

Approved by: Andrea Cimitan, Unity8 CI Bot

2721. By Albert Astals Cid on 2016-11-29

Autopilot: Add more applications to the list for wider screens

Otherwise the test was failing because available_applications was too short

Approved by: Andrea Cimitan, Unity8 CI Bot

2722. By Albert Astals Cid on 2016-11-29

Fix autopilot DashHelperTestCase.test_search

Approved by: Andrea Cimitan, Unity8 CI Bot

2723. By Albert Astals Cid on 2016-11-29

Also install the Screens mock

This way we can run some more autopilot tests in X11

Approved by: Lukáš Tinkl, Unity8 CI Bot

2724. By Albert Astals Cid on 2016-11-29

Give default value to gu-px size

Fixes some of the autopilot greeter tests when run under X11

Approved by: Andrea Cimitan, Unity8 CI Bot

2725. By CI Train Bot Account on 2016-11-29

Releasing 8.15+17.04.20161129-0ubuntu1

2726. By Launchpad Translations on behalf of unity-team on 2016-12-01

Launchpad automatic translations update.

2727. By Lukáš Tinkl on 2016-12-07

Fix the Super key not invoking the dash scope home (LP: #1607427)

Approved by: Daniel d'Andrada, Unity8 CI Bot

2728. By Albert Astals Cid on 2016-12-07

Add the Wsuggest-override flag to gcc

While at it mark system includes as such so we don't get warnings we can not fix

Approved by: Michael Zanetti, Unity8 CI Bot

2729. By Albert Astals Cid on 2016-12-07

Add support for compiler sanitizers via ECM

2730. By Albert Astals Cid on 2016-12-07

Use timeStep as delay time

Passing iterations / speed didn't make much sense since that parameter is a delay in milliseconds and the default parameters would give a value of 5 / units.gu(10) that is smaller than 1 millisecond.

Qt 5.7 calculation for velocity was very unhappy if we moved things so fast in less than 1ms and ignored the movements, so this also makes tests pass on Qt 5.7 (LP: #1642919)

Approved by: Josh Arenson, Unity8 CI Bot

2731. By Michael Zanetti on 2016-12-07

Add the ApplicationDrawer

Approved by: Lukáš Tinkl, Unity8 CI Bot

2732. By Michael Zanetti on 2016-12-07

tune right edge push

make it less intrusive when accidentally hitting the edge with the mouse
tweak visuals for the mouse case (LP: #1646094)

Approved by: Unity8 CI Bot

2733. By Michael Zanetti on 2016-12-07

improve close button visiblity when hovering with the mouse

Approved by: Albert Astals Cid, Unity8 CI Bot

2734. By Albert Astals Cid on 2016-12-07

Bring back fix for 1517830

Now with autotest \o/ (LP: #1517830)

Approved by: Andrea Cimitan, Unity8 CI Bot

2735. By Daniel d'Andrada on 2016-12-07

Fix "make tryApplicationWindow"

No surface was showing up on the screen
Also remove outdated button (feature is no longer there)

Approved by: Albert Astals Cid, Unity8 CI Bot

2736. By Albert Astals Cid on 2016-12-07

Fix compile warnings in mocks

Approved by: Daniel d'Andrada, Unity8 CI Bot

2737. By Josh Arenson on 2016-12-07

Enable the greeter to remember which session the user last logged into

This also fixes a small issue with how the default session was handled. (LP: #1631365)

Approved by: Albert Astals Cid, Unity8 CI Bot

2738. By Daniel d'Andrada on 2016-12-07

Take save/restore functions out of WindowResizeArea

They've no relationship with resizing whatsoever.

Approved by: Lukáš Tinkl, Unity8 CI Bot

2739. By Michael Zanetti on 2016-12-07

Update virtual touchpad visuals and add a tutorial. (LP: #1585220)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2740. By Albert Astals Cid on 2016-12-07

Do not hide panel when launching an application if the mouse is on the panel

Need Functions.itemUnderMouse because MouseArea.containsMouse returns true when tapping (i.e. no mouse used) on it.

Unfortunately the QML testlib do not set the proper value when issueing a mouseMove so i can't add a test that proofs it works, i'll try to propose something upstream and then add the test at a later MR (LP: #1591311)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2741. By Pete Woods on 2016-12-07

MenuItemFactory: Add subtitle support to SwitchItem widget

Approved by: Marco Trevisan (Treviño), Michał Sawicz, Unity8 CI Bot

2742. By CI Train Bot Account on 2016-12-07

Releasing 8.15+17.04.20161207.1-0ubuntu1

2743. By Launchpad Translations on behalf of unity-team on 2016-12-15

Launchpad automatic translations update.

2744. By Daniel d'Andrada on 2016-12-15

Let the model deal with some window management decisions

eg: which window to focus, whether to change surface state

unity8 requests and reacts to changes in the model instead of applying them (LP: #1346633)

Approved by: Emanuele Antonio Faraone, Lukáš Tinkl

2745. By CI Train Bot Account on 2016-12-15

Releasing 8.15+17.04.20161215-0ubuntu1

2746. By CI Train Bot Account on 2016-12-22

Resync trunk.

2747. By Launchpad Translations on behalf of unity-team on 2016-12-23

Launchpad automatic translations update.

2748. By Launchpad Translations on behalf of unity-team on 2016-12-29

Launchpad automatic translations update.

2749. By Timo Jyrinki on 2017-01-10

No change rebuild

2750. By Michael Terry on 2017-01-10

Run the qmluitests.sh autopkg test against the installed package.

This is faster and more accurate than rebuilding unity8 and running tests from the build dir.

Approved by: Albert Astals Cid, Unity8 CI Bot

2751. By Nick Dedekind on 2017-01-10

Added registry for application menus

Approved by: Michael Zanetti, Unity8 CI Bot

2752. By Michał Sawicz on 2017-01-10

Application menus

2753. By Michael Zanetti on 2017-01-10

PreviewRatingInput: Use displayText instead of text to enable/disable the Send button (LP: #1595910)

Approved by: Andrea Cimitan, Christian Dywan, Unity8 CI Bot

2754. By Michael Zanetti on 2017-01-10

Add a D-Bus interface to control some debug facilities on the fly

Approved by: Gerry Boland, Unity8 CI Bot

2755. By Michael Zanetti on 2017-01-10

some launcher workarounds for the snapping

Approved by: Albert Astals Cid, Unity8 CI Bot

2756. By dobey on 2017-01-10

Remove the payments widget and dependency on libpay as no longer needed.

Approved by: Andrea Cimitan, Unity8 CI Bot

2757. By Lukáš Tinkl on 2017-01-10

Fix touch window controls being unreachable when the overlay is being displayed (LP: #1648167)

Approved by: Josh Arenson, Unity8 CI Bot

2758. By Albert Astals Cid on 2017-01-10

Give focus to one of the buttons of the dialog

This one you can use Tab/Alt+Tab to navigate through them.

Unfortunately there's still the problem that if there's some other elements that take focus (like indicators), focus will also travel through them, but this is an start.

Approved by: Daniel d'Andrada, Unity8 CI Bot

2759. By Albert Astals Cid on 2017-01-10

tst_WindowResizeArea: Use default values for mouseFlick speed and iterations (LP: #1651580)

Approved by: Daniel d'Andrada, Unity8 CI Bot

2760. By Albert Astals Cid on 2017-01-10

Require Qt 5.6 & misc fixes

Require Qt 5.6:
    We align with what we're really testing
    We can use Q_ENUM/Q_FLAG instead of Q_ENUMS/Q_FLAGS (Qt 5.5)

CursorImageInfo.cpp
    Join two QString::arg into one

SessionsModel.cpp
UsersModel.cpp
    Remove useless Q_D

dashconnection.cpp
ColorTheme.cpp
UserMetrics.cpp
horizontaljournaltest.cpp
listviewwithpageheadersectionexternalmodeltest.cpp
organicgridtest.cpp
verticaljournaltest.cpp
    QObjects should have the Q_OBJECT macro

indicatorsmodel.h
fakeindicatorsmodel.h
    There's no Roles enum, remove

appdrawerproxymodel.cpp
MirSurfaceItem.cpp
    Add & to the foreach variable

appdrawerproxymodel.cpp
    Make the string comparison faster

easingcurve.h
    Remove QEasingCurve::Type declaration, it's already in Qt

unitysortfilterproxymodelqml.h
fake_scopesoverview.h
    Make some parent functions accessible to remove clang warnings

PageList.cpp
unitymenumodel.cpp
qinputdeviceinfo_mock.cpp
    Better way to iterate the container

Greeter.cpp
    Cheaper env var checking

mediaplayer.cpp
mediaplayer.h
    Rename timerEvent, clang was not happy since QObject has another one

ApplicationInfo.h
    Mark as override

MockAppDrawerModel.cpp
launchermodeltest.cpp
screens.cpp
    Fix warning

fake_previewwidgetmodel.h
    Forward declare struct the same way it is defined later

fake_scopes.cpp
    Safer connect

horizontaljournaltest.cpp
verticaljournaltest.cpp
testutil.cpp
    Use at instead of [] in temporary

launchermodelastest.cpp
    Remove unused member
    Use toModelIndex() instead of value<QModelIndex>()

Approved by: Michael Zanetti, Unity8 CI Bot

2761. By Lukáš Tinkl on 2017-01-10

Fixup paths for window state storage in snappy environment

Approved by: Albert Astals Cid, Unity8 CI Bot

2762. By Josh Arenson on 2017-01-10

Allow the scopes list to automatically scroll when a scope is being dragged past the bounds of the screen. (LP: #1575319)

Approved by: Andrea Cimitan, Unity8 CI Bot

2763. By Daniel van Vugt on 2017-01-10

Deprecate usage of Mir's input resampling, instead opting for:
  Shell: Raw native input events
  Apps: Qt's built-in touch compression input resampling algorithm,
         and other toolkits are expected to provide their own.

This fixes LP: #1497105 nicely, allowing apps to receive the full-speed
input stream (if they ask their toolkit to give it to them).

As an added bonus this also eliminates the 0-16.9ms (average 8.4ms) of
input lag that apps under Unity8 would experience. We do still have the
problem of output lag making everything still look laggy but I am
working to eliminate that soon in Mir 0.26.0. (LP: #1497105, #1591328)

Approved by: Gerry Boland, Unity8 CI Bot

2764. By Lukáš Tinkl on 2017-01-10

Add Unity.Platform mock for our tests (LP: #1655336)

Approved by: Michał Sawicz

2765. By Michał Sawicz on 2017-01-10

Nuke leftover Platform in IndicatorsManager

Approved by: Nick Dedekind

2766. By CI Train Bot Account on 2017-01-10

Releasing 8.15+17.04.20170110.4-0ubuntu1

2767. By CI Train Bot Account on 2017-01-15

Resync trunk.

2768. By Launchpad Translations on behalf of unity-team on 2017-01-16

Launchpad automatic translations update.

2769. By Launchpad Translations on behalf of unity-team on 2017-01-18

Launchpad automatic translations update.

2770. By Launchpad Translations on behalf of unity-team on 2017-01-19

Launchpad automatic translations update.

2771. By Lukáš Tinkl on 2017-01-24

Fix keymap not being applied on the shell itself (LP: #1626435)

Approved by: Gerry Boland, Unity8 CI Bot

2772. By Albert Astals Cid on 2017-01-24

Limit tab-focus travelling on dialogs with a fence

Approved by: Lukáš Tinkl, Unity8 CI Bot

2773. By Lukáš Tinkl on 2017-01-24

Shell dialog improvements (kbd focus, mouse eater)

Approved by: Michael Zanetti, Unity8 CI Bot

2774. By Albert Astals Cid on 2017-01-24

Restore focus to where it was when our ShellDialogs get unloaded

UITK Dialogs want to have this feature but it seems to be broken, so i'm fixing it here first (since we use dialogs in a kind of special way)
I'll try to fix UITK next

Approved by: Andrea Cimitan, Unity8 CI Bot

2775. By Michael Terry on 2017-01-24

Simplify the lightdm mock to make future greeter improvements easier to test.

I simplified the mock liblightdm to avoid separate files for the Private classes. That can all go into the main files. The separation isn't worth wading through the files to find what you want.

And I dropped the mock LightDM plugin entirely. (opting instead for a tiny "mock()" API call on the real plugin that returns an object that can be used to manipulate our mock liblightdm, if we're in testing mode)

Approved by: Albert Astals Cid, Unity8 CI Bot

2776. By Josh Arenson on 2017-01-24

Add a test for the session chooser icon in the greeter's sessions list

Approved by: Albert Astals Cid, Unity8 CI Bot

2777. By Michael Terry on 2017-01-24

Add support for guest sessions in unity8-greeter.

Adds support for the "hasGuestAccount" and "selectGuest" LightDM hints and does so largely by having the users model report a "*guest" user, rather than adding special support in qml.

Approved by: Albert Astals Cid, Unity8 CI Bot

2778. By Michael Terry on 2017-01-24

Add support for LightDM hints for manual logins and hiding normal users.

Approved by: Albert Astals Cid, Unity8 CI Bot

2779. By Michael Terry on 2017-01-24

Use a model for PAM prompts, supporting more possible interactions.

- This lets us show more than one message and more than one prompt from PAM.

- We now also show error text when a user enters a wrong password. This matches unity7-greeter behavior.

- Similarly, when a fingerprint login is attempted, but we are demanding a real login (e.g. the user hasn't logged in before), we now show a message to explain that a bit.

- Simplify the Greeter/View interactions a bit. We no longer need to signal quite as much events, since the view reflects the prompts model directly.

- Fix keyboard focus highlight handling among prompts.

- Update and expand the tests.

Approved by: Albert Astals Cid

2780. By Albert Astals Cid on 2017-01-24

Update current session after changing the user

This matches unity7 greeter behaviour, i.e. if you change the session and then change the user, the session that shows up is the last session that new user logged in and not the new session you selected in the previous user

Approved by: Josh Arenson, Unity8 CI Bot

2781. By Albert Astals Cid on 2017-01-24

Add keyboard navigation for Indicators

Esc closes
Left/Right selects prev/next indicator

Approved by: Michael Zanetti, Unity8 CI Bot

2782. By Nick Dedekind on 2017-01-24

Added Alt+F10 shortcut to open app menus. (LP: #1656896)

Approved by: Albert Astals Cid, Unity8 CI Bot

2783. By Daniel d'Andrada on 2017-01-24

Simplify DecoratedWindow

Reduce the number of nested MouseAreas

Approved by: Nick Dedekind, Unity8 CI Bot

2784. By Nick Dedekind on 2017-01-24

Fixed menu layout width calculations. (LP: #1657050)

Approved by: Albert Astals Cid, Unity8 CI Bot

2785. By Michael Zanetti on 2017-01-24

hint the launcher to indicate a successful size change to the user (LP: #1646457)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2786. By Lukáš Tinkl on 2017-01-24

Start searching directly as you type, w/o having to first focus/click the search field.

Approved by: Michael Zanetti, Unity8 CI Bot

2787. By Michael Zanetti on 2017-01-24

Improvements for the appdrawer

Allow cancelling of the reveal gesture
move the app store uri to a gsetting (LP: #1648173)

Approved by: Lukáš Tinkl, Unity8 CI Bot

2788. By Michael Zanetti on 2017-01-24

Adjust home key to still focus the dash instead of messing with the drawer

Approved by: Lukáš Tinkl

2789. By Albert Astals Cid on 2017-01-24

a window -> the current window

Approved by: Lukáš Tinkl

2790. By Lukáš Tinkl on 2017-01-24

Add a test for the real implementation of WindowStateStorage

Approved by: Albert Astals Cid, Unity8 CI Bot

2791. By Albert Astals Cid on 2017-01-24

There's no spreadDelegate_ anymore

Goes from ~9 to ~3 minutes

Approved by: Michael Zanetti, Unity8 CI Bot

2792. By Michael Terry on 2017-01-24

Fix grouping of autopkg output and allow optionally passing arguments to installed test scripts.

Approved by: Albert Astals Cid, Unity8 CI Bot

2793. By Lukáš Tinkl on 2017-01-24

Use a four finger gesture to open the drawer, much like in u7

Approved by: Michael Zanetti, Unity8 CI Bot

2794. By Michael Zanetti on 2017-01-24

allow 4 finger simulation with mousetouchadaptor

Approved by: Lukáš Tinkl, Unity8 CI Bot

2795. By Nick Dedekind on 2017-01-24

Skip Panel::test_drag_indicator_item_down_shows_menu

Approved by: Lukáš Tinkl, Michał Sawicz, Unity8 CI Bot

2796. By Daniel d'Andrada on 2017-01-24

Remove unnecessary warning message

It's being printed on every initialization for quite a while now and it's not prompting us
to perform any action. Thus this can't be really a warning if it's always there.

Approved by: Michael Zanetti, Unity8 CI Bot

2797. By CI Train Bot Account on 2017-01-24

Releasing 8.15+17.04.20170124-0ubuntu1

2798. By Launchpad Translations on behalf of unity-team on 2017-01-26

Launchpad automatic translations update.

2799. By Michael Terry on 2017-01-26

Drop IntegratedLightDM and always use system liblightdm instead

Unmerged revisions

2799. By Michael Terry on 2017-01-26

Drop IntegratedLightDM and always use system liblightdm instead

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-11 06:26:26 +0000
+++ CMakeLists.txt	2016-08-25 20:40:06 +0000
@@ -61,6 +61,7 @@
 pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
+pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
 pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
 pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)
 

=== modified file 'cmake/modules/QmlTest.cmake'
--- cmake/modules/QmlTest.cmake	2016-03-04 15:07:31 +0000
+++ cmake/modules/QmlTest.cmake	2016-08-25 20:40:06 +0000
@@ -65,11 +65,11 @@
 # This function wraps add_executable_test, see below for available arguments.
 
 function(add_qml_unittest PATH COMPONENT_NAME)
-    import_executables(qmltestrunner)
+    import_executables(dbus-run-session)
 
-    add_executable_test(${COMPONENT_NAME} qmltestrunner
+    add_executable_test(${COMPONENT_NAME} dbus-run-session
         ${ARGN}
-        ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
+        ARGS -- qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
     )
 endfunction()
 

=== modified file 'debian/rules'
--- debian/rules	2016-06-20 14:56:40 +0000
+++ debian/rules	2016-08-25 20:40:06 +0000
@@ -36,7 +36,3 @@
 # use private lib directories
 override_dh_makeshlibs:
 	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
-
-# libMockLightDM-qml.so links against liblightdm-qt5-3.so which doesn't exist
-override_dh_shlibdeps:
-	dh_shlibdeps -XlibMockLightDM-qml.so

=== modified file 'plugins/AccountsService/AccountsService.cpp'
--- plugins/AccountsService/AccountsService.cpp	2016-08-11 06:25:34 +0000
+++ plugins/AccountsService/AccountsService.cpp	2016-08-25 20:40:06 +0000
@@ -80,6 +80,7 @@
 AccountsService::AccountsService(QObject* parent, const QString &user)
     : QObject(parent)
     , m_service(new AccountsServiceDBusAdaptor(this))
+    , m_greeterMode(true)
 {
     m_unityInput = new QDBusInterface(QStringLiteral("com.canonical.Unity.Input"),
                                       QStringLiteral("/com/canonical/Unity/Input"),
@@ -155,6 +156,19 @@
     refresh(!wasEmpty);
 }
 
+bool AccountsService::greeterMode() const
+{
+    return m_greeterMode;
+}
+
+void AccountsService::setGreeterMode(bool greeterMode)
+{
+    if (m_greeterMode != greeterMode) {
+        m_greeterMode = greeterMode;
+        Q_EMIT greeterModeChanged();
+    }
+}
+
 bool AccountsService::demoEdges() const
 {
     auto value = getProperty(IFACE_UNITY, PROP_DEMO_EDGES);
@@ -341,7 +355,19 @@
 {
     if (m_properties[interface][property].value != value) {
         m_properties[interface][property].value = value;
-        m_service->setUserPropertyAsync(m_user, interface, property, value);
+        if (m_greeterMode || m_user == g_get_user_name()) {
+            // Only write any changes back to AccountsService if we are running
+            // as a proper LightDM greeter (or are writing values for our own
+            // user).
+            // (A) Only the lightdm user has permission to set everyone's
+            //     properties.
+            // (B) We don't want to have policykit throw up a password dialog
+            //     when we are running in the user session.
+            // (C) We only write things to AS that are safe to ignore for other
+            //     users anyway (like failedLogins count, which does not NEED
+            //     to be persistent).
+            m_service->setUserPropertyAsync(m_user, interface, property, value);
+        }
         emitChangedForProperty(interface, property);
     }
 }

=== modified file 'plugins/AccountsService/AccountsService.h'
--- plugins/AccountsService/AccountsService.h	2016-08-08 10:10:25 +0000
+++ plugins/AccountsService/AccountsService.h	2016-08-25 20:40:06 +0000
@@ -34,6 +34,10 @@
                 READ user
                 WRITE setUser
                 NOTIFY userChanged)
+    Q_PROPERTY (bool greeterMode
+                READ greeterMode
+                WRITE setGreeterMode
+                NOTIFY greeterModeChanged)
     Q_PROPERTY (bool demoEdges
                 READ demoEdges
                 WRITE setDemoEdges
@@ -92,6 +96,8 @@
 
     QString user() const;
     void setUser(const QString &user);
+    bool greeterMode() const;
+    void setGreeterMode(bool greeterMode);
     bool demoEdges() const;
     void setDemoEdges(bool demoEdges);
     QStringList demoEdgesCompleted() const;
@@ -119,6 +125,7 @@
 
 Q_SIGNALS:
     void userChanged();
+    void greeterModeChanged();
     void demoEdgesChanged();
     void demoEdgesCompletedChanged();
     void enableFingerprintIdentificationChanged();
@@ -167,6 +174,7 @@
     AccountsServiceDBusAdaptor *m_service;
     QDBusInterface *m_unityInput;
     QString m_user;
+    bool m_greeterMode;
 };
 
 #endif

=== modified file 'plugins/LightDM/CMakeLists.txt'
--- plugins/LightDM/CMakeLists.txt	2016-03-02 02:54:30 +0000
+++ plugins/LightDM/CMakeLists.txt	2016-08-25 20:40:06 +0000
@@ -1,19 +1,20 @@
 pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
 
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Quick REQUIRED)
-
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
     ${libunity8-private_SOURCE_DIR}
+    )
+
+include_directories(
+    SYSTEM
+    ${LIBLIGHTDM_INCLUDE_DIRS}
     ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
-)
+    )
 
-set(QMLPLUGIN_SRC
-    ../Utils/unitysortfilterproxymodelqml.cpp
+add_library(LightDM-qml MODULE
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     DBusGreeter.cpp
     DBusGreeterList.cpp
     Greeter.cpp
@@ -22,5 +23,11 @@
     UsersModel.cpp
     )
 
-add_subdirectory(FullLightDM)
-add_subdirectory(IntegratedLightDM)
+target_link_libraries(LightDM-qml
+    unity8-private
+    ${LIBLIGHTDM_LDFLAGS}
+    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
+    )
+
+qt5_use_modules(LightDM-qml DBus Gui Qml)
+add_unity8_plugin(LightDM 0.1 LightDM TARGETS LightDM-qml)

=== removed directory 'plugins/LightDM/FullLightDM'
=== removed file 'plugins/LightDM/FullLightDM/CMakeLists.txt'
--- plugins/LightDM/FullLightDM/CMakeLists.txt	2016-07-08 15:44:53 +0000
+++ plugins/LightDM/FullLightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
-
-set(PLUGIN_CLASSNAME "FullLightDM")
-
-add_definitions(-DFULL_LIGHTDM)
-
-include_directories(
-    ../
-    ${LIBLIGHTDM_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    )
-
-foreach(source_file ${QMLPLUGIN_SRC})
-    list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
-endforeach()
-
-add_library(FullLightDM-qml MODULE
-    ${RELATIVE_QMLPLUGIN_SRC}
-    )
-
-target_link_libraries(FullLightDM-qml
-    unity8-private
-    ${LIBLIGHTDM_LDFLAGS}
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    )
-
-qt5_use_modules(FullLightDM-qml DBus Gui Qml)
-add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)

=== modified file 'plugins/LightDM/Greeter.cpp'
--- plugins/LightDM/Greeter.cpp	2016-06-13 20:08:35 +0000
+++ plugins/LightDM/Greeter.cpp	2016-08-25 20:40:06 +0000
@@ -147,3 +147,9 @@
     Q_EMIT isAuthenticatedChanged();
     Q_EMIT authenticationComplete();
 }
+
+QObject *Greeter::mock()
+{
+    Q_D(Greeter);
+    return d->m_greeter->property("mock").value<QObject*>();
+}

=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/LightDM/Greeter.h	2016-06-13 20:08:35 +0000
+++ plugins/LightDM/Greeter.h	2016-08-25 20:40:06 +0000
@@ -40,6 +40,8 @@
     Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
     Q_PROPERTY(QString selectUser READ selectUser CONSTANT)
 
+    Q_PROPERTY(QObject *mock READ mock CONSTANT) // for testing
+
 public:
     explicit Greeter(QObject* parent=0);
 
@@ -50,6 +52,8 @@
     bool promptless() const;
     QString selectUser() const;
 
+    QObject *mock();
+
 public Q_SLOTS:
     void authenticate(const QString &username=QString());
     void respond(const QString &response);

=== removed directory 'plugins/LightDM/IntegratedLightDM'
=== removed file 'plugins/LightDM/IntegratedLightDM/CMakeLists.txt'
--- plugins/LightDM/IntegratedLightDM/CMakeLists.txt	2016-07-08 15:44:53 +0000
+++ plugins/LightDM/IntegratedLightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-set(PLUGIN_CLASSNAME "IntegratedLightDM")
-
-add_definitions(-DINTEGRATED_LIGHTDM)
-
-foreach(include_directory ${QMLPLUGIN_INCLUDES})
-        list(APPEND RELATIVE_QMLPLUGIN_INCLUDES ../${include_directory})
-endforeach()
-
-include_directories(
-    . #QLightDM
-    ${QMLPLUGIN_INCLUDES}
-    ${libunity8-private_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-foreach(source_file ${QMLPLUGIN_SRC})
-    list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
-endforeach()
-
-add_library(IntegratedLightDM-qml MODULE
-    ${RELATIVE_QMLPLUGIN_SRC}
-    )
-
-target_link_libraries(IntegratedLightDM-qml
-    integratedLightDM
-    unity8-private
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    )
-
-qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)
-add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)
-
-add_subdirectory(liblightdm)

=== removed directory 'plugins/LightDM/IntegratedLightDM/QLightDM'
=== removed file 'plugins/LightDM/IntegratedLightDM/QLightDM/Greeter'
--- plugins/LightDM/IntegratedLightDM/QLightDM/Greeter	2016-06-13 21:21:57 +0000
+++ plugins/LightDM/IntegratedLightDM/QLightDM/Greeter	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../liblightdm/Greeter.h"

=== removed file 'plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel'
--- plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel	2016-06-13 21:21:57 +0000
+++ plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../liblightdm/SessionsModel.h"

=== removed file 'plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel'
--- plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel	2016-06-13 21:21:57 +0000
+++ plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../liblightdm/UsersModel.h"

=== removed directory 'plugins/LightDM/IntegratedLightDM/liblightdm'
=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt'
--- plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-03-17 16:51:38 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
-
-set(LibLightDM_SOURCES
-    Greeter.cpp
-    SessionsModel.cpp
-    UsersModel.cpp
-    GreeterPrivate.cpp
-    SessionsModelPrivate.cpp
-    UsersModelPrivate.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
-    )
-
-add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})
-add_library(integratedLightDMSession STATIC ${LibLightDM_SOURCES})
-add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/plugins/AccountsService
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${GLIB_INCLUDE_DIRS}
-    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
-)
-
-target_link_libraries(integratedLightDM
-    ${GLIB_LIBRARIES}
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    -lpam
-)
-target_link_libraries(integratedLightDMSession
-    ${GLIB_LIBRARIES}
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    -lpam
-)
-target_link_libraries(MockLightDM-demo-shared
-    ${GLIB_LIBRARIES}
-    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
-    -lpam
-)
-
-qt5_use_modules(integratedLightDM Concurrent DBus Gui)
-qt5_use_modules(integratedLightDMSession Concurrent DBus Gui)
-qt5_use_modules(MockLightDM-demo-shared Concurrent DBus Gui)
-
-set_target_properties(integratedLightDM PROPERTIES
-                      COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")
-set_target_properties(integratedLightDMSession PROPERTIES
-                      COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")
-set_target_properties(MockLightDM-demo-shared PROPERTIES
-                      COMPILE_FLAGS "-DSM_BUSNAME=systemBus"
-                      OUTPUT_NAME lightdm-qt5-3)
-
-install(TARGETS MockLightDM-demo-shared
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/demo
-    )

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-03-02 02:37:37 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	1970-01-01 00:00:00 +0000
@@ -1,184 +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 <[e-mail]>
- */
-
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * 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 QLatin1String("");
-}
-
-QString Greeter::defaultSessionHint() const
-{
-    return QStringLiteral("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 QLatin1String("");
-}
-
-bool Greeter::selectGuestHint() const
-{
-    return false;
-}
-
-QString Greeter::autologinUserHint() const
-{
-    return QLatin1String("");
-}
-
-bool Greeter::autologinGuestHint() const
-{
-    return false;
-}
-
-int Greeter::autologinTimeoutHint() const
-{
-    return 0;
-}
-
-bool Greeter::inAuthentication() const
-{
-    return false;
-}
-
-QString Greeter::hostname() const
-{
-    return QStringLiteral("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 (qEnvironmentVariableIsEmpty("UNITY_TESTING")) {
-        // simulate PAM's delay
-        QTimer::singleShot(1000, this, &Greeter::authenticationComplete);
-    } else {
-        Q_EMIT authenticationComplete();
-    }
-}
-
-}

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2015-09-11 13:38:45 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * 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 <[e-mail]>
- */
-
-#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_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

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp	2015-11-02 17:22:30 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,304 +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 <[e-mail]>
- */
-
-#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, &QFutureWatcher<int>::finished, this, &GreeterImpl::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)),
-                Qt::BlockingQueuedConnection);
-    }
-
-    ~GreeterImpl()
-    {
-        cancelPam();
-    }
-
-    void start(QString username)
-    {
-        // Clear out any existing PAM interactions first
-        cancelPam();
-        if (pamHandle != nullptr) {
-            // While we were cancelling pam above, we processed Qt events.
-            // Which may have allowed someone to call start() on us again.
-            // In which case, we'll bail on our current start() call.
-            // This isn't racy because it's all in the same thread.
-            return;
-        }
-
-        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::mapped(QList<pam_handle*>() << pamHandle, authenticateWithPam));
-        } else {
-            delete appData;
-            greeterPrivate->authenticated = false;
-            Q_EMIT greeter->showMessage(QStringLiteral("Internal error: could not start PAM authentication"), QLightDM::Greeter::MessageTypeError);
-            Q_EMIT greeter->authenticationComplete();
-        }
-    }
-
-    static int authenticateWithPam(pam_handle* const& 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()
-    {
-        if (pamHandle != nullptr) {
-            QFuture<int> pamFuture = futureWatcher.future();
-            pam_handle *handle = pamHandle;
-            pamHandle = nullptr; // to disable normal finishPam() handling
-            pamFuture.cancel();
-
-            // Note the empty loop, we just want to clear the futures queue.
-            // Any further prompts from the pam thread will be immediately
-            // responded to/dismissed in handlePrompt().
-            while (respond(QString()));
-
-            // Now let signal/slot handling happen so the thread can finish
-            while (!pamFuture.isFinished()) {
-                QCoreApplication::processEvents();
-            }
-
-            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)
-{
-}
-
-GreeterPrivate::~GreeterPrivate()
-{
-    delete m_impl;
-}
-
-void GreeterPrivate::handleAuthenticate()
-{
-    m_impl->start(authenticationUser);
-}
-
-void GreeterPrivate::handleRespond(const QString &response)
-{
-    m_impl->respond(response);
-}
-
-}
-
-#include "GreeterPrivate.moc"

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h	2015-09-11 13:38:45 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h	1970-01-01 00:00:00 +0000
@@ -1,51 +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 <[e-mail]>
- */
-
-#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();
-
-    // 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

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2016-06-15 15:29:34 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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/>.
- *
- */
-
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
- * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/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 "SessionsModel.h"
-#include "SessionsModelPrivate.h"
-#include <QtCore/QDir>
-#include <QtCore/QString>
-
-namespace QLightDM
-{
-
-SessionsModel::SessionsModel(QObject* parent) :
-    QAbstractListModel(parent),
-    d_ptr(new SessionsModelPrivate(this))
-{
-    Q_D(SessionsModel);
-    m_roleNames = QAbstractListModel::roleNames();
-    m_roleNames[KeyRole] = "key";
-    m_roleNames[TypeRole] = "type";
-}
-
-SessionsModel::~SessionsModel()
-{
-    delete d_ptr;
-}
-
-QVariant SessionsModel::data(const QModelIndex& index, int role) const
-{
-    Q_D(const SessionsModel);
-
-    if(!index.isValid()) {
-        return QVariant();
-    }
-
-    int row = index.row();
-
-    switch (role) {
-        case QLightDM::SessionsModel::KeyRole:
-            return d->sessionItems[row].key;
-        case Qt::DisplayRole:
-            return d->sessionItems[row].name;
-        default:
-            return QVariant();
-    }
-}
-
-QHash<int, QByteArray> SessionsModel::roleNames() const
-{
-    return m_roleNames;
-}
-
-int SessionsModel::rowCount(const QModelIndex& parent) const
-{
-    Q_D(const SessionsModel);
-
-    if (parent.isValid()) {
-        return 0;
-    } else { // parent is root
-        return d->sessionItems.size();
-    }
-}
-
-} // namespace QLightDM

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2015-11-23 22:45:55 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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_INTEGRATED_SESSIONSMODEL_H
-#define UNITY_INTEGRATED_SESSIONSMODEL_H
-
-#include <QtCore/QAbstractListModel>
-#include <QtCore/QString>
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
- * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-// This is taken from liblightdm and modified to confirm to our syle conventions
-namespace QLightDM
-{
-class SessionsModelPrivate;
-
-class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
-    {
-        Q_OBJECT
-
-        Q_ENUMS(SessionModelRoles SessionType)
-
-    public:
-
-        enum SessionModelRoles {
-            //name is exposed as Qt::DisplayRole
-            //comment is exposed as Qt::TooltipRole
-            KeyRole = Qt::UserRole,
-            IdRole = KeyRole, /** Deprecated */
-            TypeRole
-        };
-
-        enum SessionType {
-            LocalSessions,
-            RemoteSessions
-        };
-
-        explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/
-        explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);
-        virtual ~SessionsModel();
-
-        QHash<int, QByteArray> roleNames() const override;
-        int rowCount(const QModelIndex& parent) const override;
-        QVariant data(const QModelIndex& index, int role) const override;
-
-    protected:
-        SessionsModelPrivate* const d_ptr;
-
-    private:
-        QHash<int, QByteArray> m_roleNames;
-        Q_DECLARE_PRIVATE(SessionsModel)
-    };
-}
-
-#endif // UNITY_INTEGRATED_SESSIONSMODEL_H

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	2016-06-24 15:47:41 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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 "SessionsModelPrivate.h"
-
-#include <QDir>
-#include <QSettings>
-#include <QStringList>
-
-namespace QLightDM
-{
-
-SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
-  : q_ptr(parent)
-{
-    // Since this model is never visible, as there is only 1 session,
-    // just use the session name as the key
-    QString sessionName = qgetenv("XDG_SESSION_DESKTOP");
-    sessionItems.append({sessionName, "", sessionName, ""});
-}
-
-} // namespace QLightDM

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	2016-06-23 16:00:11 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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_INTEGRATED_SESSIONSMODEL_PRIVATE_H
-#define UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
-
-#include <QtCore/QList>
-#include <QtCore/QString>
-
-namespace QLightDM
-{
-class SessionsModel;
-
-class SessionItem
-{
-public:
-    QString key;
-    QString type; // unused
-    QString name;
-    QString comment; // unused
-};
-
-class SessionsModelPrivate
-{
-public:
-    explicit SessionsModelPrivate(SessionsModel* parent=0);
-    virtual ~SessionsModelPrivate() = default;
-
-    QList<SessionItem> sessionItems;
-
-protected:
-    SessionsModel* const q_ptr;
-
-private:
-    Q_DECLARE_PUBLIC(SessionsModel)
-};
-
-} // namespace QLightDM
-
-#endif // UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp	2016-08-08 14:15:49 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2013-2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * 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))
-{
-    // 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";
-    roles[UidRole] = "uid";
-    setRoleNames(roles);
-
-    connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {
-        QModelIndex index = createIndex(i, 0);
-        Q_EMIT dataChanged(index, index);
-    });
-}
-
-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 "";
-    case UsersModel::UidRole:
-        return d->entries[row].uid;
-    default:
-        return QVariant();
-    }
-}
-
-}

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	2016-06-27 14:51:40 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/*
- * 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 <[e-mail]>
- */
-
-#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() = default;
-
-    enum UserModelRoles {NameRole = Qt::UserRole,
-                         RealNameRole,
-                         LoggedInRole,
-                         BackgroundRole,
-                         SessionRole,
-                         HasMessagesRole,
-                         ImagePathRole,
-                         BackgroundPathRole,
-                         UidRole
-    };
-
-    int rowCount(const QModelIndex &parent) const override;
-    QVariant data(const QModelIndex &index, int role) const override;
-
-private:
-    UsersModelPrivate * const d_ptr;
-    Q_DECLARE_PRIVATE(UsersModel)
-};
-
-}
-
-#endif // UNITY_MOCK_USERSMODEL_H

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-06-28 20:34:34 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2013-2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#include "UsersModelPrivate.h"
-
-#include "AccountsServiceDBusAdaptor.h"
-#include "UsersModel.h"
-
-#include <glib.h>
-#include <QDebug>
-#include <QDir>
-#include <QSettings>
-#include <QStringList>
-#include <unistd.h>
-
-namespace QLightDM
-{
-
-UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
-  : QObject(parent),
-    q_ptr(parent),
-    m_service(new AccountsServiceDBusAdaptor(this))
-{
-    QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");
-    QString currentUser = g_get_user_name();
-    uid_t currentUid = getuid();
-
-    if (demoFile.exists()) {
-        QSettings settings(demoFile.filePath(), QSettings::NativeFormat);
-        QStringList users = settings.value(QStringLiteral("users"), QStringList() << currentUser).toStringList();
-
-        entries.reserve(users.count());
-        Q_FOREACH(const QString &user, users)
-        {
-            QString name = settings.value(user + "/name", user).toString();
-            entries.append({user, name, 0, 0, false, false, 0, 0, currentUid++});
-        }
-    } else {
-        entries.append({currentUser, 0, 0, 0, false, false, 0, 0, currentUid});
-
-        connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,
-                this, [this](const QString &user) {
-            if (user == entries[0].username) {
-                updateName(true);
-            }
-        });
-        updateName(false);
-    }
-}
-
-void UsersModelPrivate::updateName(bool async)
-{
-    auto pendingReply = m_service->getUserPropertyAsync(entries[0].username,
-                                                        QStringLiteral("org.freedesktop.Accounts.User"),
-                                                        QStringLiteral("RealName"));
-    auto *watcher = new QDBusPendingCallWatcher(pendingReply, this);
-
-    connect(watcher, &QDBusPendingCallWatcher::finished,
-            this, [this](QDBusPendingCallWatcher* watcher) {
-
-        QDBusPendingReply<QVariant> reply = *watcher;
-        watcher->deleteLater();
-        if (reply.isError()) {
-            qWarning() << "Failed to get 'RealName' property - " << reply.error().message();
-            return;
-        }
-
-        const QString realName = reply.value().toString();
-        if (entries[0].real_name != realName) {
-            entries[0].real_name = realName;
-            Q_EMIT dataChanged(0);
-        }
-    });
-    if (!async) {
-        watcher->waitForFinished();
-    }
-}
-
-}

=== removed file 'plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.h	2016-06-27 14:51:40 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2013-2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
- */
-
-#ifndef UNITY_MOCK_USERSMODEL_PRIVATE_H
-#define UNITY_MOCK_USERSMODEL_PRIVATE_H
-
-#include <QList>
-#include <QObject>
-#include <QString>
-
-class AccountsServiceDBusAdaptor;
-
-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;
-    uid_t uid;
-};
-
-class UsersModelPrivate : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit UsersModelPrivate(UsersModel *parent = 0);
-    virtual ~UsersModelPrivate() = default;
-
-    QList<Entry> entries;
-
-Q_SIGNALS:
-    void dataChanged(int);
-
-protected:
-    UsersModel * const q_ptr;
-
-private:
-    Q_DECLARE_PUBLIC(UsersModel)
-
-    void updateName(bool async);
-
-    AccountsServiceDBusAdaptor *m_service;
-};
-
-}
-
-#endif // UNITY_MOCK_USERSMODEL_PRIVATE_H

=== removed file 'plugins/LightDM/IntegratedLightDM/qmldir'
--- plugins/LightDM/IntegratedLightDM/qmldir	2016-02-03 23:45:45 +0000
+++ plugins/LightDM/IntegratedLightDM/qmldir	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-module LightDM.IntegratedLightDM
-plugin IntegratedLightDM-qml
-typeinfo IntegratedLightDM.qmltypes

=== modified file 'plugins/LightDM/SessionsModel.cpp'
--- plugins/LightDM/SessionsModel.cpp	2016-06-14 20:08:43 +0000
+++ plugins/LightDM/SessionsModel.cpp	2016-08-25 20:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -105,6 +105,11 @@
     }
 }
 
+QObject *SessionsModel::mock()
+{
+    return m_model->property("mock").value<QObject*>();
+}
+
 SessionsModel::SessionsModel(QObject* parent)
   : UnitySortFilterProxyModelQML(parent)
 {
@@ -114,7 +119,6 @@
     m_roleNames[IconRole] = "icon_url";
 
     setModel(m_model);
-    setSourceModel(m_model);
     setSortCaseSensitivity(Qt::CaseInsensitive);
     setSortLocaleAware(true);
     setSortRole(Qt::DisplayRole);

=== modified file 'plugins/LightDM/SessionsModel.h'
--- plugins/LightDM/SessionsModel.h	2015-11-23 22:57:45 +0000
+++ plugins/LightDM/SessionsModel.h	2016-08-25 20:40:06 +0000
@@ -32,6 +32,9 @@
 
     Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories
             WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)
+
+    Q_PROPERTY(QObject *mock READ mock CONSTANT) // for testing
+
 Q_SIGNALS:
     void iconSearchDirectoriesChanged();
 
@@ -55,6 +58,9 @@
     Q_INVOKABLE QUrl iconUrl(const QString sessionName) const;
 
     void setIconSearchDirectories(const QList<QUrl> searchDirectories);
+
+    QObject *mock();
+
 private:
     QLightDM::SessionsModel* m_model;
     QHash<int, QByteArray> m_roleNames;

=== modified file 'plugins/LightDM/UsersModel.cpp'
--- plugins/LightDM/UsersModel.cpp	2015-10-26 20:15:08 +0000
+++ plugins/LightDM/UsersModel.cpp	2016-08-25 20:40:06 +0000
@@ -68,4 +68,11 @@
     sort(0);
 }
 
+QObject *UsersModel::mock()
+{
+    // get through MangleModel down to QLightDM::UsersModel
+    MangleModel *mangleModel = static_cast<MangleModel*>(sourceModel());
+    return mangleModel->sourceModel()->property("mock").value<QObject*>();
+}
+
 #include "UsersModel.moc"

=== modified file 'plugins/LightDM/UsersModel.h'
--- plugins/LightDM/UsersModel.h	2015-09-11 13:38:45 +0000
+++ plugins/LightDM/UsersModel.h	2016-08-25 20:40:06 +0000
@@ -30,8 +30,12 @@
 {
     Q_OBJECT
 
+    Q_PROPERTY(QObject *mock READ mock CONSTANT) // for testing
+
 public:
     explicit UsersModel(QObject* parent=0);
+
+    QObject *mock();
 };
 
 #endif

=== modified file 'plugins/LightDM/plugin.cpp'
--- plugins/LightDM/plugin.cpp	2015-11-18 03:52:01 +0000
+++ plugins/LightDM/plugin.cpp	2016-08-25 20:40:06 +0000
@@ -63,20 +63,13 @@
     return UserMetricsOutput::UserMetrics::getInstance();
 }
 
-void PLUGIN_CLASSNAME::registerTypes(const char *uri)
+void LightDM::registerTypes(const char *uri)
 {
     qmlRegisterType<QAbstractItemModel>();
     qmlRegisterType<UserMetricsOutput::ColorTheme>();
 
-#if defined INTEGRATED_LIGHTDM
-    Q_ASSERT(uri == QLatin1String("LightDM.IntegratedLightDM"));
-    qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
-#elif defined FULL_LIGHTDM
-    Q_ASSERT(uri == QLatin1String("LightDM.FullLightDM"));
+    Q_ASSERT(uri == QLatin1String("LightDM"));
     qmlRegisterSingletonType<QLightDM::Greeter>(uri, 0, 1, "Greeter", greeter_provider);
-#else
-    #error No library defined in LightDM plugin
-#endif
 
     qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
     qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");

=== modified file 'plugins/LightDM/plugin.h'
--- plugins/LightDM/plugin.h	2015-11-02 17:37:26 +0000
+++ plugins/LightDM/plugin.h	2016-08-25 20:40:06 +0000
@@ -21,7 +21,7 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
 
-class PLUGIN_CLASSNAME : public QQmlExtensionPlugin
+class LightDM : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

=== renamed file 'plugins/LightDM/FullLightDM/qmldir' => 'plugins/LightDM/qmldir'
--- plugins/LightDM/FullLightDM/qmldir	2016-02-03 23:45:45 +0000
+++ plugins/LightDM/qmldir	2016-08-25 20:40:06 +0000
@@ -1,3 +1,2 @@
-module LightDM.FullLightDM
-plugin FullLightDM-qml
-typeinfo FullLightDM.qmltypes
+module LightDM
+plugin LightDM-qml

=== modified file 'plugins/Unity/Session/dbusunitysessionservice.cpp'
--- plugins/Unity/Session/dbusunitysessionservice.cpp	2016-06-22 13:38:16 +0000
+++ plugins/Unity/Session/dbusunitysessionservice.cpp	2016-08-25 20:40:06 +0000
@@ -337,58 +337,16 @@
     // user session.
     Q_EMIT LockRequested();
     Q_EMIT lockRequested();
+    Q_EMIT Locked();
 }
 
 void DBusUnitySessionService::Lock()
 {
     // Normal lock (with animation, as compared to PromptLock above).  Usually
     // used by indicator-session to lock the session in place.
-    //
-    // FIXME: We also -- as a bit of a hack around indicator-session not fully
-    // supporting a phone profile -- switch to greeter here.  The unity7 flow is
-    // that the user chooses "Lock/Switch" from the indicator, and then can go
-    // to greeter by selecting "Switch" again from the indicator, which is now
-    // exposed by the desktop_lockscreen profile.  But since in unity8, we try
-    // to expose most things all the time, we don't use the separate lockscreen
-    // profile.  Instead, we just go directly to the greeter the first time
-    // a user presses "Lock/Switch".  This isn't what this DBus call is
-    // supposed to do, but we can live with it for now.
-    //
-    // Here's a bug about indicator-session growing a converged Touch profile:
-    // https://launchpad.net/bugs/1557716
-    //
-    // We only do this here in the animated-lock call because that's the only
-    // time the indicator locks without also asking the display manager to
-    // switch sessions on us.  And since we are switching screens, we also
-    // don't bother respecting the animate request, simply doing a PromptLock.
+    // Though here we don't really worry about the difference and just call
+    // PromptLock.
     PromptLock();
-    switchToGreeter();
-}
-
-void DBusUnitySessionService::switchToGreeter()
-{
-    // lock the session using the org.freedesktop.DisplayManager system DBUS service
-    const QString sessionPath = QString::fromLocal8Bit(qgetenv("XDG_SESSION_PATH"));
-    QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DisplayManager"),
-                                                      sessionPath,
-                                                      QStringLiteral("org.freedesktop.DisplayManager.Session"),
-                                                      QStringLiteral("Lock"));
-
-    QDBusPendingCall pendingCall = QDBusConnection::SM_BUSNAME().asyncCall(msg);
-    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall, this);
-    connect(watcher, &QDBusPendingCallWatcher::finished,
-        this, [this](QDBusPendingCallWatcher* watcher) {
-
-        QDBusPendingReply<void> reply = *watcher;
-        watcher->deleteLater();
-        if (reply.isError()) {
-            qWarning() << "Lock call failed" << reply.error().message();
-            return;
-        }
-
-        // emit Locked when the call succeeds
-        Q_EMIT Locked();
-    });
 }
 
 void DBusUnitySessionService::doUnlock()

=== modified file 'plugins/Unity/Session/dbusunitysessionservice.h'
--- plugins/Unity/Session/dbusunitysessionservice.h	2016-06-22 13:38:16 +0000
+++ plugins/Unity/Session/dbusunitysessionservice.h	2016-08-25 20:40:06 +0000
@@ -262,9 +262,6 @@
 
 private Q_SLOTS:
     void doUnlock();
-
-private:
-    void switchToGreeter();
 };
 
 class DBusGnomeSessionManagerWrapper : public UnityDBusObject

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2016-07-15 19:37:39 +0000
+++ qml/Components/Dialogs.qml	2016-08-25 20:40:06 +0000
@@ -19,10 +19,10 @@
 import Unity.Application 0.1
 import Unity.Session 0.1
 import GlobalShortcut 1.0
+import LightDM 0.1 as LightDM
 import Ubuntu.Components 1.3
 import Unity.Platform 1.0
 import Utils 0.1
-import "../Greeter"
 
 Item {
     id: root
@@ -112,12 +112,12 @@
 
     GlobalShortcut { // lock screen
         shortcut: Qt.Key_ScreenSaver
-        onTriggered: LightDMService.greeter.showGreeter()
+        onTriggered: LightDM.Greeter.showGreeter()
     }
 
     GlobalShortcut { // lock screen
         shortcut: Qt.ControlModifier|Qt.AltModifier|Qt.Key_L
-        onTriggered: LightDMService.greeter.showGreeter()
+        onTriggered: LightDM.Greeter.showGreeter()
     }
 
     QtObject {
@@ -151,7 +151,7 @@
             Button {
                 text: i18n.ctr("Button: Lock the system", "Lock")
                 onClicked: {
-                    LightDMService.greeter.showGreeter()
+                    LightDM.Greeter.showGreeter()
                     logoutDialog.hide();
                 }
             }

=== removed file 'qml/Greeter/FullLightDMImpl.qml'
--- qml/Greeter/FullLightDMImpl.qml	2015-11-09 15:30:25 +0000
+++ qml/Greeter/FullLightDMImpl.qml	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import LightDM.FullLightDM 0.1 as LightDM
-
-Item{
-    id: implementation
-
-    property var greeter: LightDM.Greeter
-    property var infographic: LightDM.Infographic
-    property var users: LightDM.Users
-    property var userRoles: LightDM.UserRoles
-
-}

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2016-07-19 19:11:20 +0000
+++ qml/Greeter/Greeter.qml	2016-08-25 20:40:06 +0000
@@ -18,13 +18,13 @@
 import AccountsService 0.1
 import Biometryd 0.0
 import GSettings 1.0
+import LightDM 0.1 as LightDM
 import Powerd 0.1
 import Ubuntu.Components 1.3
 import Ubuntu.SystemImage 0.1
 import Unity.Launcher 0.1
 import Unity.Session 0.1
 
-import "." 0.1
 import "../Components"
 
 Showable {
@@ -50,7 +50,7 @@
     readonly property bool hasLockedApp: lockedApp !== ""
 
     property bool forcedUnlock
-    readonly property bool locked: LightDMService.greeter.active && !LightDMService.greeter.authenticated && !forcedUnlock
+    readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
 
     property bool tabletMode
     property url viewSource // only used for testing
@@ -135,8 +135,8 @@
     QtObject {
         id: d
 
-        readonly property bool multiUser: LightDMService.users.count > 1
-        readonly property int selectUserIndex: d.getUserIndex(LightDMService.greeter.selectUser)
+        readonly property bool multiUser: LightDM.Users.count > 1
+        readonly property int selectUserIndex: d.getUserIndex(LightDM.Greeter.selectUser)
         property int currentIndex: Math.max(selectUserIndex, 0)
         property bool waiting
         property bool isLockscreen // true when we are locking an active session, rather than first user login
@@ -164,8 +164,8 @@
                 return -1;
 
             // Find index for requested user, if it exists
-            for (var i = 0; i < LightDMService.users.count; i++) {
-                if (username === LightDMService.users.data(i, LightDMService.userRoles.NameRole)) {
+            for (var i = 0; i < LightDM.Users.count; i++) {
+                if (username === LightDM.Users.data(i, LightDM.UserRoles.NameRole)) {
                     return i;
                 }
             }
@@ -174,17 +174,17 @@
         }
 
         function selectUser(index, reset) {
-            if (index < 0 || index >= LightDMService.users.count)
+            if (index < 0 || index >= LightDM.Users.count)
                 return;
             d.waiting = true;
             if (reset) {
                 loader.item.reset();
             }
             currentIndex = index;
-            var user = LightDMService.users.data(index, LightDMService.userRoles.NameRole);
+            var user = LightDM.Users.data(index, LightDM.UserRoles.NameRole);
             AccountsService.user = user;
             LauncherModel.setUser(user);
-            LightDMService.greeter.authenticate(user); // always resets auth state
+            LightDM.Greeter.authenticate(user); // always resets auth state
         }
 
         function hideView() {
@@ -192,18 +192,22 @@
                 loader.item.enabled = false; // drop OSK and prevent interaction
                 loader.item.notifyAuthenticationSucceeded(false /* showFakePassword */);
                 loader.item.hide();
+                sessionStarted();
             }
         }
 
         function login() {
             d.waiting = true;
-            if (LightDMService.greeter.startSessionSync()) {
-                sessionStarted();
-                hideView();
-            } else if (loader.item) {
+            var success = LightDM.Greeter.startSessionSync();
+            d.waiting = false;
+
+            // If successful as a lockscreen, we don't need to hide ourselves.
+            // logind will tell us to unlock if our current user logged in.
+
+            if (!success) {
                 loader.item.notifyAuthenticationFailed();
+                d.selectUser(d.currentIndex, false);
             }
-            d.waiting = false;
         }
 
         function startUnlock(toTheRight) {
@@ -216,6 +220,7 @@
 
         function checkForcedUnlock(hideNow) {
             if (forcedUnlock && shown) {
+                d.waiting = false;
                 hideView();
                 if (hideNow) {
                     root.hideNow(); // skip hide animation
@@ -339,7 +344,7 @@
             root.lockedApp = "";
             item.forceActiveFocus();
             d.selectUser(d.currentIndex, true);
-            LightDMService.infographic.readyForDataChange();
+            LightDM.Infographic.readyForDataChange();
         }
 
         Connections {
@@ -349,7 +354,7 @@
             }
             onResponded: {
                 if (root.locked) {
-                    LightDMService.greeter.respond(response);
+                    LightDM.Greeter.respond(response);
                 } else {
                     d.login();
                 }
@@ -420,18 +425,18 @@
         Binding {
             target: loader.item
             property: "userModel"
-            value: LightDMService.users
+            value: LightDM.Users
         }
 
         Binding {
             target: loader.item
             property: "infographicModel"
-            value: LightDMService.infographic
+            value: LightDM.Infographic
         }
     }
 
     Connections {
-        target: LightDMService.greeter
+        target: LightDM.Greeter
 
         onShowGreeter: root.forceShow()
         onHideGreeter: root.forcedUnlock = true
@@ -462,12 +467,12 @@
         onAuthenticationComplete: {
             d.waiting = false;
 
-            if (LightDMService.greeter.authenticated) {
-                if (!LightDMService.greeter.promptless) {
+            if (LightDM.Greeter.authenticated) {
+                if (!LightDM.Greeter.promptless) {
                     d.login();
                 }
             } else {
-                if (!LightDMService.greeter.promptless) {
+                if (!LightDM.Greeter.promptless) {
                     AccountsService.failedLogins++;
                 }
 
@@ -488,7 +493,7 @@
                 }
 
                 loader.item.notifyAuthenticationFailed();
-                if (!LightDMService.greeter.promptless) {
+                if (!LightDM.Greeter.promptless) {
                     d.selectUser(d.currentIndex, false);
                 }
             }
@@ -507,20 +512,20 @@
     }
 
     Binding {
-        target: LightDMService.greeter
+        target: LightDM.Greeter
         property: "active"
         value: root.active
     }
 
     Binding {
-        target: LightDMService.infographic
+        target: LightDM.Infographic
         property: "username"
-        value: AccountsService.statsWelcomeScreen ? LightDMService.users.data(d.currentIndex, LightDMService.userRoles.NameRole) : ""
+        value: AccountsService.statsWelcomeScreen ? LightDM.Users.data(d.currentIndex, LightDM.UserRoles.NameRole) : ""
     }
 
     Connections {
         target: i18n
-        onLanguageChanged: LightDMService.infographic.readyForDataChange()
+        onLanguageChanged: LightDM.Infographic.readyForDataChange()
     }
 
     Observer {
@@ -572,7 +577,7 @@
                 failOperation("fingerprint reader is locked");
                 return;
             }
-            if (result !== LightDMService.users.data(d.currentIndex, LightDMService.userRoles.UidRole)) {
+            if (result !== LightDM.Users.data(d.currentIndex, LightDM.UserRoles.UidRole)) {
                 AccountsService.failedFingerprintLogins++;
                 failOperation("not the selected user");
                 return;

=== removed file 'qml/Greeter/IntegratedLightDMImpl.qml'
--- qml/Greeter/IntegratedLightDMImpl.qml	2015-11-07 00:12:17 +0000
+++ qml/Greeter/IntegratedLightDMImpl.qml	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import LightDM.IntegratedLightDM 0.1 as LightDM
-
-Item{
-    id: implementation
-
-    property var greeter: LightDM.Greeter
-    property var infographic: LightDM.Infographic
-    property var users: LightDM.Users
-    property var userRoles: LightDM.UserRoles
-
-}

=== removed file 'qml/Greeter/LightDMService.qml'
--- qml/Greeter/LightDMService.qml	2015-11-06 19:43:38 +0000
+++ qml/Greeter/LightDMService.qml	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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/>.
- */
-
-/**
- * Lightweight wrapper that allows for loading integrated/real LightDM
- * plugin
- */
-
-pragma Singleton
-import QtQuick 2.4
-
-Loader {
-    id: loader
-
-    property var greeter: d.valid ? loader.item.greeter : null
-    property var infographic: d.valid ? loader.item.infographic : null
-    property var users: d.valid ? loader.item.users : null
-    property var userRoles: d.valid ? loader.item.userRoles : null
-
-    // This trickery handles cases where applicationArguments aren't provided
-    // such as during testing
-    property var fullLightDM: {
-        if (typeof applicationArguments !== "undefined") {
-            if (applicationArguments.mode === "greeter") {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    source:  fullLightDM ?
-        "FullLightDMImpl.qml" : "IntegratedLightDMImpl.qml"
-
-    QtObject {
-        id: d
-
-        property bool valid: loader.item !== null
-    }
-}

=== removed file 'qml/Greeter/qmldir'
--- qml/Greeter/qmldir	2015-10-20 00:59:12 +0000
+++ qml/Greeter/qmldir	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-singleton LightDMService 0.1 LightDMService.qml

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-08-19 09:16:28 +0000
+++ qml/Shell.qml	2016-08-25 20:40:06 +0000
@@ -26,6 +26,7 @@
 import Unity.Launcher 0.1
 import GlobalShortcut 1.0 // has to be before Utils, because of WindowInputFilter
 import GSettings 1.0
+import LightDM 0.1 as LightDM
 import Utils 0.1
 import Powerd 0.1
 import SessionBroadcast 0.1
@@ -171,6 +172,12 @@
         value: ApplicationManager
     }
 
+    Binding {
+        target: AccountsService
+        property: "greeterMode"
+        value: shell.mode === "greeter"
+    }
+
     Component.onCompleted: {
         finishStartUpTimer.start();
     }
@@ -501,7 +508,7 @@
     function showHome() {
         greeter.notifyUserRequestedApp("unity8-dash");
 
-        var animate = !LightDMService.greeter.active && !stages.shown
+        var animate = !LightDM.Greeter.active && !stages.shown
         dash.setCurrentScope(0, animate, false)
         ApplicationManager.requestFocusApplication("unity8-dash")
     }
@@ -558,7 +565,7 @@
             readonly property bool focusedSurfaceIsFullscreen: MirFocusController.focusedSurface
                 ? MirFocusController.focusedSurface.state === Mir.FullscreenState
                 : false
-            fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0)
+            fullscreenMode: (focusedSurfaceIsFullscreen && !LightDM.Greeter.active && launcher.progress == 0)
                             || greeter.hasLockedApp
             locked: greeter && greeter.active
         }

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-06-29 14:44:41 +0000
+++ tests/CMakeLists.txt	2016-08-25 20:40:06 +0000
@@ -46,8 +46,8 @@
     set(ld_paths)
     if(U8TEST_LIGHTDM)
         list(APPEND ld_paths
+            ${UNITY_MOCKPATH}/liblightdm
             ${UNITY_MOCKPATH}/libusermetrics
-            ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
         )
     endif()
 

=== modified file 'tests/autopilot/unity8/fixture_setup.py'
--- tests/autopilot/unity8/fixture_setup.py	2015-10-26 20:15:08 +0000
+++ tests/autopilot/unity8/fixture_setup.py	2016-08-25 20:40:06 +0000
@@ -74,7 +74,7 @@
     def _get_lightdm_mock_path(self):
         lib_path = get_mocks_library_path()
         lightdm_mock_path = os.path.abspath(
-            os.path.join(lib_path, "LightDM" ,"IntegratedLightDM", "liblightdm")
+            os.path.join(lib_path, "liblightdm")
         )
 
         if not os.path.exists(lightdm_mock_path):

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2015-10-26 20:15:08 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2016-08-25 20:40:06 +0000
@@ -261,7 +261,7 @@
     def _get_lightdm_mock_path(self):
         lib_path = get_mocks_library_path()
         lightdm_mock_path = os.path.abspath(
-            os.path.join(lib_path, "LightDM" ,"IntegratedLightDM", "liblightdm")
+            os.path.join(lib_path, "liblightdm")
         )
 
         if not os.path.exists(lightdm_mock_path):

=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
--- tests/mocks/AccountsService/AccountsService.cpp	2016-06-20 15:24:27 +0000
+++ tests/mocks/AccountsService/AccountsService.cpp	2016-08-25 20:40:06 +0000
@@ -24,6 +24,7 @@
     m_enableLauncherWhileLocked(true),
     m_enableIndicatorsWhileLocked(true),
     m_backgroundFile(qmlDirectory() + "/graphics/phone_background.jpg"),
+    m_greeterMode(true),
     m_statsWelcomeScreen(true),
     m_failedLogins(0),
     m_failedFingerprintLogins(0),
@@ -46,6 +47,19 @@
     Q_EMIT passwordDisplayHintChanged();
 }
 
+bool AccountsService::greeterMode() const
+{
+    return m_greeterMode;
+}
+
+void AccountsService::setGreeterMode(bool greeterMode)
+{
+    if (m_greeterMode != greeterMode) {
+        m_greeterMode = greeterMode;
+        Q_EMIT greeterModeChanged();
+    }
+}
+
 bool AccountsService::demoEdges() const
 {
     return m_demoEdges;

=== modified file 'tests/mocks/AccountsService/AccountsService.h'
--- tests/mocks/AccountsService/AccountsService.h	2016-06-30 22:42:32 +0000
+++ tests/mocks/AccountsService/AccountsService.h	2016-08-25 20:40:06 +0000
@@ -30,6 +30,10 @@
                 READ user
                 WRITE setUser
                 NOTIFY userChanged)
+    Q_PROPERTY (bool greeterMode
+                READ greeterMode
+                WRITE setGreeterMode
+                NOTIFY greeterModeChanged)
     Q_PROPERTY (bool demoEdges
                 READ demoEdges
                 WRITE setDemoEdges
@@ -97,6 +101,8 @@
 
     QString user() const;
     void setUser(const QString &user);
+    bool greeterMode() const;
+    void setGreeterMode(bool greeterMode);
     bool demoEdges() const;
     void setDemoEdges(bool demoEdges);
     QStringList demoEdgesCompleted() const;
@@ -131,6 +137,7 @@
 
 Q_SIGNALS:
     void userChanged();
+    void greeterModeChanged();
     void demoEdgesChanged();
     void demoEdgesCompletedChanged();
     void enableFingerprintIdentificationChanged();
@@ -153,6 +160,7 @@
     bool m_enableIndicatorsWhileLocked;
     QString m_backgroundFile;
     QString m_user;
+    bool m_greeterMode;
     bool m_statsWelcomeScreen;
     uint m_failedLogins;
     uint m_failedFingerprintLogins;

=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2016-06-27 14:51:40 +0000
+++ tests/mocks/CMakeLists.txt	2016-08-25 20:40:06 +0000
@@ -33,8 +33,8 @@
 add_subdirectory(Cursor)
 add_subdirectory(GSettings.1.0)
 add_subdirectory(indicator-service)
+add_subdirectory(liblightdm)
 add_subdirectory(libusermetrics)
-add_subdirectory(LightDM)
 add_subdirectory(Lights)
 add_subdirectory(MeeGo)
 add_subdirectory(Powerd)

=== removed directory 'tests/mocks/LightDM'
=== removed file 'tests/mocks/LightDM/CMakeLists.txt'
--- tests/mocks/LightDM/CMakeLists.txt	2015-09-25 13:01:00 +0000
+++ tests/mocks/LightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-add_subdirectory(IntegratedLightDM)

=== removed directory 'tests/mocks/LightDM/IntegratedLightDM'
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt'
--- tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt	2015-11-19 00:25:25 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-# This is a copy of the normal LightDM plugin, but instead of statically
-# linking in the lightdm bits, this one uses shared libraries so we can swap
-# out different sets of users for different tests.  When we finally switch to
-# actually using the system liblightdm in the normal plugin, this version can
-# be deleted.
-
-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}
-)
-
-set(QMLPLUGIN_SRC
-    ${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/SessionsModel.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
-    MockGreeter.cpp
-    MockSessionsModel.cpp
-    MockUsersModel.cpp
-    plugin.cpp
-    )
-
-add_library(MockLightDM-qml MODULE
-    ${QMLPLUGIN_SRC}
-    )
-
-# We want to link to liblightdm-qt5-3, but we don't want to depend on it being
-# 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.
-target_link_libraries(MockLightDM-qml
-    MockLightDM
-    MockUserMetrics
-    unity8-private
-    )
-
-qt5_use_modules(MockLightDM-qml DBus Gui Qml)
-
-add_unity8_mock(LightDM.IntegratedLightDM 0.1 LightDM/IntegratedLightDM
-    PREFIX mocks
-    TARGETS MockLightDM-qml
-    ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/liblightdm"
-)

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp	2016-06-09 21:45:09 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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);
-    }
-}
-
-QString MockGreeter::selectUserHint() const
-{
-    Q_D(const Greeter);
-    return d->m_greeter->selectUserHint();
-}
-
-void MockGreeter::setSelectUserHint(const QString &selectUserHint)
-{
-    Q_D(Greeter);
-
-    if (d->m_greeter->selectUserHint() != selectUserHint) {
-        d->m_greeter->setSelectUserHint(selectUserHint);
-        Q_EMIT selectUserHintChanged();
-    }
-}

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h'
--- tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h	2016-06-09 21:45:09 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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)
-    Q_PROPERTY(QString selectUser READ selectUserHint WRITE setSelectUserHint NOTIFY selectUserHintChanged)
-
-public:
-    QString mockMode() const;
-    void setMockMode(QString mockMode);
-
-    QString selectUserHint() const;
-    void setSelectUserHint(const QString &selectUserHint);
-
-Q_SIGNALS:
-    void mockModeChanged(QString mode);
-    void selectUserHintChanged();
-};
-
-#endif // MOCK_UNITY_GREETER_H

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp	2015-11-23 22:57:45 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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 "MockSessionsModel.h"
-#include <QLightDM/SessionsModel>
-
-QString MockSessionsModel::testScenario() const
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    return qSessionsModel->testScenario();
-}
-
-void MockSessionsModel::setTestScenario(const QString testScenario)
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    if (qSessionsModel->testScenario() != testScenario) {
-        qSessionsModel->setTestScenario(testScenario);
-    }
-}

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h	2015-11-19 00:25:25 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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_SESSIONSMODEL_H
-#define MOCK_UNITY_SESSIONSMODEL_H
-
-#include <SessionsModel.h>
-
-class MockSessionsModel : public SessionsModel
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario)
-
-public:
-    QString testScenario() const;
-    void setTestScenario(QString testScenario);
-};
-
-#endif // MOCK_UNITY_SESSIONSMODEL_H

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp	2015-09-25 13:01:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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);
-    }
-}

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h	2015-09-25 13:01:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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

=== removed directory 'tests/mocks/LightDM/IntegratedLightDM/QLightDM'
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/QLightDM/Greeter'
--- tests/mocks/LightDM/IntegratedLightDM/QLightDM/Greeter	2015-01-20 11:50:19 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/QLightDM/Greeter	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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 file 'tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel'
--- tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel	2015-11-18 03:52:01 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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/SessionsModel.h"

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/QLightDM/UsersModel'
--- tests/mocks/LightDM/IntegratedLightDM/QLightDM/UsersModel	2015-01-20 11:50:19 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/QLightDM/UsersModel	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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 file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp	2016-06-09 21:45:09 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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();
-}
-
-}

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h	2016-06-09 21:45:09 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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_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;
-    bool twoFactorDone;
-    QString selectUserHint;
-
-    QString mockMode;
-
-    void handleAuthenticate();
-    void handleRespond(const QString &response);
-
-protected:
-    Greeter * const q_ptr;
-
-private:
-    void handleAuthenticate_full();
-    void handleRespond_full(const QString &response);
-    Q_DECLARE_PUBLIC(Greeter)
-};
-}
-
-#endif // UNITY_MOCK_GREETER_PRIVATE_H

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	2016-06-15 15:29:34 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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 "SessionsModel.h"
-#include "SessionsModelPrivate.h"
-
-namespace QLightDM
-{
-
-SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
-    : testScenario("singleSession")
-    , q_ptr(parent)
-{
-    resetEntries();
-}
-
-void SessionsModelPrivate::resetEntries()
-{
-    Q_Q(SessionsModel);
-
-    q->beginResetModel();
-        if (testScenario == "multipleSessions") {
-            resetEntries_multipleSessions();
-        } else if (testScenario == "noSessions") {
-            resetEntries_noSessions();
-        } else {
-            resetEntries_singleSession();
-        }
-    q->endResetModel();
-}
-
-void SessionsModelPrivate::resetEntries_multipleSessions()
-{
-    sessionItems =
-        {
-            {"ubuntu", "", "Ubuntu", ""},
-            {"ubuntu-2d", "", "Ubuntu 2D", ""},
-            {"gnome", "", "GNOME", ""},
-            {"gnome-classic", "", "GNOME Classic", ""},
-            {"gnome-flashback-compiz", "", "GNOME Flashback (Compiz)", ""},
-            {"gnome-flashback-metacity", "", "GNOME Flashback (Metacity)", ""},
-            {"gnome-wayland", "", "GNOME on Wayland", ""},
-            {"plasma", "", "Plasma", ""},
-            {"kde", "", "KDE" , ""},
-            {"xterm", "", "Recovery Console", ""},
-            {"", "", "Unknown?", ""}
-        };
-}
-
-void SessionsModelPrivate::resetEntries_noSessions()
-{
-    sessionItems = {};
-}
-
-void SessionsModelPrivate::resetEntries_singleSession()
-{
-    sessionItems = {{"ubuntu", "", "Ubuntu", ""}};
-}
-
-} // namespace QLightDM

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	2016-06-15 15:29:34 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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_MOCK_SESSIONSMODEL_PRIVATE_H
-#define UNITY_MOCK_SESSIONSMODEL_PRIVATE_H
-
-#include <QtCore/QList>
-#include <QtCore/QString>
-
-namespace QLightDM
-{
-class SessionsModel;
-
-class SessionItem
-{
-public:
-    QString key;
-    QString type; // unused
-    QString name;
-    QString comment; // unused
-};
-
-class SessionsModelPrivate
-{
-public:
-    explicit SessionsModelPrivate(SessionsModel* parent=0);
-    virtual ~SessionsModelPrivate() = default;
-
-    QList<SessionItem> sessionItems;
-    QString testScenario;
-
-    void resetEntries();
-protected:
-    SessionsModel* const q_ptr;
-
-private:
-    void resetEntries_multipleSessions();
-    void resetEntries_noSessions();
-    void resetEntries_singleSession();
-    Q_DECLARE_PUBLIC(SessionsModel)
-};
-
-} // namespace QLightDM
-
-#endif // UNITY_MOCK_SESSIONSMODEL_PRIVATE_H

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-06-30 15:49:16 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2014-2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "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();
-    }
-
-    // Assign uids in a loop, just to avoid having to muck with them when
-    // adding or removing test users.
-    for (int i = 0; i < entries.size(); i++) {
-        entries[i].uid = i + 1;
-    }
-
-    q->endResetModel();
-}
-
-void UsersModelPrivate::resetEntries_single()
-{
-    entries =
-    {
-        { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
-    };
-}
-
-void UsersModelPrivate::resetEntries_singlePassphrase()
-{
-    entries =
-    {
-        { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
-    };
-}
-
-void UsersModelPrivate::resetEntries_singlePin()
-{
-    entries =
-    {
-        { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },
-    };
-}
-
-void UsersModelPrivate::resetEntries_full()
-{
-    entries =
-    {
-        { "has-password",      "Has Password", 0, 0, false, false, "ubuntu", 0 },
-        { "has-pin",           "Has PIN",      0, 0, false, false, "ubuntu", 0 },
-        { "different-prompt",  "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "no-password",       "No Password", 0, 0, false, false, "ubuntu", 0 },
-        { "auth-error",        "Auth Error", 0, 0, false, false, "ubuntu", 0 },
-        { "two-factor",        "Two Factor", 0, 0, false, false, "ubuntu", 0 },
-        { "info-prompt",       "Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
-        { "color-background",  "Color Background", "#dd4814", 0, false, false, "ubuntu", 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, "ubuntu", 0 },
-        { "black-background",  "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
-        { "no-background",     "No Background", "", 0, false, false, "ubuntu", 0 },
-        { "unicode",           "가나다라마", 0, 0, false, false, "ubuntu", 0 },
-        { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0 },
-        { "empty-name",        "", 0, 0, false, false, "ubuntu", 0 },
-    };
-}
-
-} // namespace QLightDM

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.h	2016-05-24 22:11:21 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.h	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2014-2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef 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;
-    uid_t uid;
-};
-
-class UsersModelPrivate
-{
-public:
-    explicit UsersModelPrivate(UsersModel *parent = 0);
-    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)
-};
-
-}
-
-#endif // UNITY_MOCK_USERSMODEL_PRIVATE_H

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/plugin.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/plugin.cpp	2015-11-18 03:52:01 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2014, 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "plugin.h"
-#include <DBusGreeter.h>
-#include <DBusGreeterList.h>
-#include "MockGreeter.h"
-#include "MockSessionsModel.h"
-#include "MockUsersModel.h"
-#include <QLightDM/SessionsModel>
-#include "ColorTheme.h"
-#include "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 *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-    return new MockSessionsModel;
-}
-
-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.IntegratedLightDM"));
-    qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
-    qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
-    qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
-    qmlRegisterSingletonType<MockSessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
-    qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", "Type is not instantiable");
-    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);
-}

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/plugin.h'
--- tests/mocks/LightDM/IntegratedLightDM/plugin.h	2015-09-25 13:01:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/plugin.h	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2014, 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef 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) override;
-};
-
-#endif

=== removed file 'tests/mocks/LightDM/IntegratedLightDM/qmldir'
--- tests/mocks/LightDM/IntegratedLightDM/qmldir	2015-09-25 13:01:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-module LightDM.IntegratedLightDM
-plugin MockLightDM-qml

=== renamed directory 'tests/mocks/LightDM/IntegratedLightDM/liblightdm' => 'tests/mocks/liblightdm'
=== modified file 'tests/mocks/liblightdm/CMakeLists.txt'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt	2015-11-18 03:52:01 +0000
+++ tests/mocks/liblightdm/CMakeLists.txt	2016-08-25 20:40:06 +0000
@@ -1,20 +1,18 @@
-set(LibLightDM_SOURCES
-    Greeter.cpp
-    SessionsModel.cpp
-    UsersModel.cpp
-    GreeterPrivate.cpp
-    SessionsModelPrivate.cpp
-    UsersModelPrivate.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
+set(MockLightDM_SOURCES
+    MockController.cpp
+    MockGreeter.cpp
+    MockSessionsModel.cpp
+    MockUsersModel.cpp
     )
 
-add_library(MockLightDM SHARED ${LibLightDM_SOURCES})
+add_library(MockLightDM SHARED ${MockLightDM_SOURCES})
 
-qt5_use_modules(MockLightDM Gui)
+qt5_use_modules(MockLightDM DBus Gui)
 
 set_target_properties(MockLightDM PROPERTIES
-                      OUTPUT_NAME lightdm-qt5-3)
+                      OUTPUT_NAME lightdm-qt5-3
+                      VERSION 0)
 
 install(TARGETS MockLightDM
-    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/liblightdm
+    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm
     )

=== added file 'tests/mocks/liblightdm/MockController.cpp'
--- tests/mocks/liblightdm/MockController.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/liblightdm/MockController.cpp	2016-08-25 20:40:06 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockController.h"
+
+static QLightDM::MockController *m_instance = nullptr;
+
+namespace QLightDM
+{
+
+MockController::MockController(QObject *parent)
+  : QObject(parent)
+{
+    m_userMode = qgetenv("LIBLIGHTDM_MOCK_MODE");
+    if (m_userMode.isEmpty()) {
+        m_userMode = "full";
+    }
+    m_sessionMode = "full";
+}
+
+MockController::~MockController()
+{
+}
+
+MockController *MockController::instance()
+{
+    if (!m_instance) {
+        m_instance = new MockController;
+    }
+    return m_instance;
+}
+
+QString MockController::selectUserHint() const
+{
+    return m_selectUserHint;
+}
+
+void MockController::setSelectUserHint(const QString &selectUserHint)
+{
+    if (m_selectUserHint != selectUserHint) {
+        m_selectUserHint = selectUserHint;
+        Q_EMIT selectUserHintChanged();
+    }
+}
+
+QString MockController::userMode() const
+{
+    return m_userMode;
+}
+
+void MockController::setUserMode(const QString &userMode)
+{
+    if (m_userMode != userMode) {
+        m_userMode = userMode;
+        Q_EMIT userModeChanged();
+    }
+}
+
+QString MockController::sessionMode() const
+{
+    return m_sessionMode;
+}
+
+void MockController::setSessionMode(const QString &sessionMode)
+{
+    if (m_sessionMode != sessionMode) {
+        m_sessionMode = sessionMode;
+        Q_EMIT sessionModeChanged();
+    }
+}
+
+}

=== added file 'tests/mocks/liblightdm/MockController.h'
--- tests/mocks/liblightdm/MockController.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/liblightdm/MockController.h	2016-08-25 20:40:06 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_MOCK_LIBLIGHTDM_CONTROLLER_H
+#define UNITY_MOCK_LIBLIGHTDM_CONTROLLER_H
+
+#include <QObject>
+#include <QString>
+
+
+namespace QLightDM
+{
+class Q_DECL_EXPORT MockController : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString selectUserHint READ selectUserHint WRITE setSelectUserHint NOTIFY selectUserHintChanged)
+
+    // single, single-pin, single-passphrase, full
+    Q_PROPERTY(QString userMode READ userMode WRITE setUserMode NOTIFY userModeChanged)
+
+    // single, none, full
+    Q_PROPERTY(QString sessionMode READ sessionMode WRITE setSessionMode NOTIFY sessionModeChanged)
+
+public:
+    static MockController *instance();
+    virtual ~MockController();
+
+    QString selectUserHint() const;
+    void setSelectUserHint(const QString &selectUserHint);
+
+    QString userMode() const;
+    void setUserMode(const QString &userMode);
+
+    QString sessionMode() const;
+    void setSessionMode(const QString &sessionMode);
+
+Q_SIGNALS:
+    void selectUserHintChanged();
+    void userModeChanged();
+    void sessionModeChanged();
+
+private:
+    explicit MockController(QObject* parent=0);
+
+    QString m_selectUserHint;
+    QString m_userMode;
+    QString m_sessionMode;
+};
+}
+
+#endif

=== renamed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp' => 'tests/mocks/liblightdm/MockGreeter.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-06-13 20:08:35 +0000
+++ tests/mocks/liblightdm/MockGreeter.cpp	2016-08-25 20:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,27 +14,38 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Greeter.h"
-#include "GreeterPrivate.h"
-#include <QtCore/QCoreApplication>
+#include "MockController.h"
+#include "MockGreeter.h"
+#include <QDBusInterface>
+#include <QDBusPendingCall>
 #include <QTimer>
 
 namespace QLightDM
 {
 
+class GreeterPrivate
+{
+public:
+    bool authenticated = false;
+    QString authenticationUser;
+    bool twoFactorDone = false;
+};
+
 Greeter::Greeter(QObject *parent)
-  : QObject(parent),
-    d_ptr(new GreeterPrivate(this))
+  : QObject(parent)
+  , d_ptr(new GreeterPrivate)
 {
 }
 
 Greeter::~Greeter()
 {
+    delete d_ptr;
 }
 
 QString Greeter::authenticationUser() const
 {
     Q_D(const Greeter);
+
     return d->authenticationUser;
 }
 
@@ -76,14 +87,7 @@
 
 QString Greeter::selectUserHint() const
 {
-    Q_D(const Greeter);
-    return d->selectUserHint;
-}
-
-void Greeter::setSelectUserHint(const QString &selectUserHint)
-{
-    Q_D(Greeter);
-    d->selectUserHint = selectUserHint;
+    return MockController::instance()->selectUserHint();
 }
 
 bool Greeter::selectGuestHint() const
@@ -119,6 +123,7 @@
 bool Greeter::isAuthenticated() const
 {
     Q_D(const Greeter);
+
     return d->authenticated;
 }
 
@@ -134,13 +139,42 @@
     d->authenticated = false;
     d->authenticationUser = username;
     d->twoFactorDone = false;
-    QTimer::singleShot(0, this, &Greeter::delayedAuthentication);
+    QTimer::singleShot(0, this, &Greeter::handleAuthenticate);
 }
 
-void Greeter::delayedAuthentication()
+void Greeter::handleAuthenticate()
 {
     Q_D(Greeter);
-    d->handleAuthenticate();
+
+    // Send out any messages we need to
+    if (d->authenticationUser == "info-prompt")
+        Q_EMIT showMessage("Welcome to Unity Greeter", Greeter::MessageTypeInfo);
+    else if (d->authenticationUser == "wide-info-prompt")
+        Q_EMIT showMessage("Welcome to Unity Greeter, the greeteriest greeter that ever did appear in these fine lands", Greeter::MessageTypeInfo);
+    else if (d->authenticationUser == "html-info-prompt")
+        Q_EMIT showMessage("<b>&</b>", Greeter::MessageTypeInfo);
+    else if (d->authenticationUser == "long-info-prompt")
+        Q_EMIT 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 (d->authenticationUser == "multi-info-prompt") {
+        Q_EMIT showMessage("Welcome to Unity Greeter", Greeter::MessageTypeInfo);
+        Q_EMIT showMessage("This is an error", Greeter::MessageTypeError);
+        Q_EMIT showMessage("You should have seen three messages", Greeter::MessageTypeInfo);
+    }
+
+    // OK, now actually do the prompt
+    if (d->authenticationUser == "no-password") {
+        d->authenticated = true;
+        Q_EMIT authenticationComplete();
+    } else if (d->authenticationUser == "has-pin"){
+        Q_EMIT showPrompt("Password: ", Greeter::PromptTypeSecret);
+    } else if (d->authenticationUser == "auth-error") {
+        d->authenticated = false;
+        Q_EMIT authenticationComplete();
+    } else if (d->authenticationUser == "different-prompt") {
+        Q_EMIT showPrompt("Secret word： ", Greeter::PromptTypeSecret);
+    } else {
+        Q_EMIT showPrompt("Password: ", Greeter::PromptTypeSecret);
+    }
 }
 
 void Greeter::authenticateAsGuest()
@@ -166,6 +200,16 @@
 bool Greeter::startSessionSync(const QString &session)
 {
     Q_UNUSED(session)
+
+    // Send a request to hide the greeter.  This is normally done by logind,
+    // but when testing, we don't want the bother of mocking that out. Instead,
+    // just send the request directly ourselves.
+    QDBusInterface iface("com.canonical.UnityGreeter",
+                         "/",
+                         "com.canonical.UnityGreeter",
+                         QDBusConnection::sessionBus());
+    iface.asyncCall("HideGreeter");
+
     return true;
 }
 
@@ -173,7 +217,30 @@
 {
     Q_D(Greeter);
 
-    d->handleRespond(response);
+    if (d->authenticationUser == "no-response")
+        return;
+    else if (d->authenticationUser == "two-factor") {
+        if (!d->twoFactorDone) {
+            if (response == "password") {
+                d->twoFactorDone = true;
+                Q_EMIT showPrompt("otp", Greeter::PromptTypeQuestion);
+            } else {
+                d->authenticated = false;
+                sendAuthenticationComplete();
+            }
+        } else {
+            d->authenticated = (response == "otp");
+            sendAuthenticationComplete();
+        }
+        return;
+    }
+
+    if (d->authenticationUser == "has-pin") {
+        d->authenticated = (response == "1234");
+    } else {
+        d->authenticated = (response == "password");
+    }
+    sendAuthenticationComplete();
 }
 
 void Greeter::sendAuthenticationComplete()
@@ -186,21 +253,9 @@
     }
 }
 
-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);
-    }
+QObject *Greeter::mock()
+{
+    return MockController::instance();
 }
 
 }

=== renamed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h' => 'tests/mocks/liblightdm/MockGreeter.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2016-06-09 21:45:09 +0000
+++ tests/mocks/liblightdm/MockGreeter.h	2016-08-25 20:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2016 Canonical, Ltd.
  * Copyright (C) 2010-2011 David Edmundson.
  * Copyright (C) 2010-2011 Robert Ancell
  *
@@ -21,13 +21,12 @@
 #ifndef UNITY_MOCK_GREETER_H
 #define UNITY_MOCK_GREETER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QVariant>
-
+#include <QObject>
+#include <QVariant>
 
 namespace QLightDM
 {
-    class GreeterPrivate;
+class GreeterPrivate;
 
 class Q_DECL_EXPORT Greeter : public QObject
 {
@@ -45,8 +44,7 @@
 
     Q_ENUMS(PromptType MessageType)
 
-    //Mock-only API for testing purposes
-    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
+    Q_PROPERTY(QObject *mock READ mock CONSTANT) // only in mock
 
 public:
     enum PromptType {
@@ -70,7 +68,6 @@
     bool lockHint () const;
     bool hasGuestAccountHint() const;
     QString selectUserHint() const;
-    void setSelectUserHint(const QString &selectUserHint); // only in mock
     bool selectGuestHint() const;
     QString autologinUserHint() const;
     bool autologinGuestHint() const;
@@ -81,8 +78,7 @@
     QString authenticationUser() const;
     QString hostname() const;
 
-    QString mockMode() const;
-    void setMockMode(QString mockMode);
+    QObject *mock();
 
 public Q_SLOTS:
     bool connectSync();
@@ -100,15 +96,13 @@
     void showPrompt(QString text, QLightDM::Greeter::PromptType type);
     void authenticationComplete();
     void autologinTimerExpired();
-    void mockModeChanged(QString mode);
-
-protected:
-    void sendAuthenticationComplete();
 
 private Q_SLOTS:
-    void delayedAuthentication();
+    void handleAuthenticate();
 
 private:
+    void sendAuthenticationComplete();
+
     GreeterPrivate *d_ptr;
     Q_DECLARE_PRIVATE(Greeter)
 };

=== renamed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp' => 'tests/mocks/liblightdm/MockSessionsModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2016-06-15 15:29:34 +0000
+++ tests/mocks/liblightdm/MockSessionsModel.cpp	2016-08-25 20:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,22 +21,41 @@
 // set our compatibility to Qt4 here too.
 #define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
 
-#include "SessionsModel.h"
-#include "SessionsModelPrivate.h"
-#include <QtCore/QDir>
-#include <QtCore/QString>
+#include "MockController.h"
+#include "MockSessionsModel.h"
 
 namespace QLightDM
 {
 
-SessionsModel::SessionsModel(QObject* parent) :
-    QAbstractListModel(parent),
-    d_ptr(new SessionsModelPrivate(this))
+class SessionItem
+{
+public:
+    QString key;
+    QString type; // unused
+    QString name;
+    QString comment; // unused
+};
+
+class SessionsModelPrivate
+{
+public:
+    QHash<int, QByteArray> roleNames;
+    QList<SessionItem> sessionItems;
+};
+
+SessionsModel::SessionsModel(QObject* parent)
+    : QAbstractListModel(parent)
+    , d_ptr(new SessionsModelPrivate)
 {
     Q_D(SessionsModel);
-    m_roleNames = QAbstractListModel::roleNames();
-    m_roleNames[KeyRole] = "key";
-    m_roleNames[TypeRole] = "type";
+
+    d->roleNames = QAbstractListModel::roleNames();
+    d->roleNames[KeyRole] = "key";
+    d->roleNames[TypeRole] = "type";
+
+    connect(MockController::instance(), SIGNAL(sessionModeChanged()),
+            this, SLOT(resetEntries()));
+    resetEntries();
 }
 
 SessionsModel::~SessionsModel()
@@ -66,7 +85,9 @@
 
 QHash<int, QByteArray> SessionsModel::roleNames() const
 {
-    return m_roleNames;
+    Q_D(const SessionsModel);
+
+    return d->roleNames;
 }
 
 int SessionsModel::rowCount(const QModelIndex& parent) const
@@ -80,20 +101,41 @@
     }
 }
 
-QString SessionsModel::testScenario() const
-{
-    Q_D(const SessionsModel);
-    return d->testScenario;
-}
-
-void SessionsModel::setTestScenario(QString testScenario)
+void SessionsModel::resetEntries()
 {
     Q_D(SessionsModel);
 
-    if (d->testScenario != testScenario) {
-        d->testScenario = testScenario;
-        d->resetEntries();
+    beginResetModel();
+
+    QString sessionMode = MockController::instance()->sessionMode();
+
+    if (sessionMode == "full") {
+        d->sessionItems =
+        {
+            {"ubuntu", "", "Ubuntu", ""},
+            {"ubuntu-2d", "", "Ubuntu 2D", ""},
+            {"gnome", "", "GNOME", ""},
+            {"gnome-classic", "", "GNOME Classic", ""},
+            {"gnome-flashback-compiz", "", "GNOME Flashback (Compiz)", ""},
+            {"gnome-flashback-metacity", "", "GNOME Flashback (Metacity)", ""},
+            {"gnome-wayland", "", "GNOME on Wayland", ""},
+            {"plasma", "", "Plasma", ""},
+            {"kde", "", "KDE" , ""},
+            {"xterm", "", "Recovery Console", ""},
+            {"", "", "Unknown?", ""}
+        };
+    } else if (sessionMode == "single") {
+        d->sessionItems = {{"ubuntu", "", "Ubuntu", ""}};
+    } else {
+        d->sessionItems = {};
     }
+
+    endResetModel();
+}
+
+QObject *SessionsModel::mock()
+{
+    return MockController::instance();
 }
 
 } // namespace QLightDM

=== renamed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h' => 'tests/mocks/liblightdm/MockSessionsModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2015-11-23 22:57:45 +0000
+++ tests/mocks/liblightdm/MockSessionsModel.h	2016-08-25 20:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,55 +18,54 @@
 #ifndef UNITY_MOCK_SESSIONSMODEL_H
 #define UNITY_MOCK_SESSIONSMODEL_H
 
-#include <QtCore/QAbstractListModel>
-#include <QtCore/QString>
+#include <QAbstractListModel>
+#include <QByteArray>
+#include <QHash>
+#include <QString>
 
 namespace QLightDM
 {
 class SessionsModelPrivate;
 
 class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
-    {
-        Q_OBJECT
-
-        Q_ENUMS(SessionModelRoles SessionType)
-
-        // Mock-only API for testing purposes
-        Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario)
-
-    public:
-
-        enum SessionModelRoles {
-            //name is exposed as Qt::DisplayRole
-            //comment is exposed as Qt::TooltipRole
-            KeyRole = Qt::UserRole,
-            IdRole = KeyRole, /** Deprecated */
-            TypeRole
-        };
-
-        enum SessionType {
-            LocalSessions,
-            RemoteSessions
-        };
-
-        explicit SessionsModel(QObject* parent=nullptr); /** Deprecated. Loads local sessions*/
-        explicit SessionsModel(SessionsModel::SessionType, QObject* parent=nullptr);
-        virtual ~SessionsModel();
-
-        QHash<int, QByteArray> roleNames() const override;
-        int rowCount(const QModelIndex& parent) const override;
-        QVariant data(const QModelIndex& index, int role) const override;
-
-        QString testScenario() const;
-        void setTestScenario(QString testScenario);
-
-    protected:
-        SessionsModelPrivate* const d_ptr;
-
-    private:
-        QHash<int, QByteArray> m_roleNames;
-        Q_DECLARE_PRIVATE(SessionsModel)
-    };
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QObject *mock READ mock CONSTANT) // only in mock
+
+    Q_ENUMS(SessionModelRoles SessionType)
+
+public:
+    enum SessionModelRoles {
+        //name is exposed as Qt::DisplayRole
+        //comment is exposed as Qt::TooltipRole
+        KeyRole = Qt::UserRole,
+        IdRole = KeyRole, /** Deprecated */
+        TypeRole
+    };
+
+    enum SessionType {
+        LocalSessions,
+        RemoteSessions
+    };
+
+    explicit SessionsModel(QObject* parent=nullptr); /** Deprecated. Loads local sessions*/
+    explicit SessionsModel(SessionsModel::SessionType, QObject* parent=nullptr);
+    virtual ~SessionsModel();
+
+    QHash<int, QByteArray> roleNames() const override;
+    int rowCount(const QModelIndex& parent) const override;
+    QVariant data(const QModelIndex& index, int role) const override;
+
+    QObject *mock();
+
+private Q_SLOTS:
+    void resetEntries();
+
+private:
+    SessionsModelPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(SessionsModel)
+};
 }
 
 #endif // UNITY_MOCK_SESSIONSMODEL_H

=== renamed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp' => 'tests/mocks/liblightdm/MockUsersModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp	2016-05-24 22:11:21 +0000
+++ tests/mocks/liblightdm/MockUsersModel.cpp	2016-08-25 20:40:06 +0000
@@ -21,21 +21,36 @@
 // 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>
+#include "MockController.h"
+#include "MockUsersModel.h"
+#include <QIcon>
 
 namespace QLightDM
 {
 
-UsersModel::UsersModel(QObject *parent) :
-    QAbstractListModel(parent),
-    d_ptr(new UsersModelPrivate(this))
-{
-    Q_D(UsersModel);
-
+class Entry
+{
+public:
+    QString username;
+    QString real_name;
+    QString background;
+    QString layouts;
+    bool is_active;
+    bool has_messages;
+    QString session;
+    uid_t uid;
+};
+
+class UsersModelPrivate
+{
+public:
+    QList<Entry> entries;
+};
+
+UsersModel::UsersModel(QObject *parent)
+    : QAbstractListModel(parent)
+    , d_ptr(new UsersModelPrivate)
+{
     // Extend roleNames (we want to keep the "display" role)
     QHash<int, QByteArray> roles = roleNames();
     roles[NameRole] = "name";
@@ -48,6 +63,10 @@
     roles[ImagePathRole] = "imagePath";
     roles[UidRole] = "uid";
     setRoleNames(roles);
+
+    connect(MockController::instance(), SIGNAL(userModeChanged()),
+            this, SLOT(resetEntries()));
+    resetEntries();
 }
 
 UsersModel::~UsersModel()
@@ -103,21 +122,57 @@
     }
 }
 
-QString UsersModel::mockMode() const
-{
-    Q_D(const UsersModel);
-    return d->mockMode;
-}
-
-void UsersModel::setMockMode(QString mockMode)
+void UsersModel::resetEntries()
 {
     Q_D(UsersModel);
 
-    if (d->mockMode != mockMode) {
-        d->mockMode = mockMode;
-        Q_EMIT mockModeChanged(mockMode);
-        d->resetEntries();
-    }
+    beginResetModel();
+
+    QString userMode = MockController::instance()->userMode();
+
+    if (userMode == "single") {
+        d->entries = {{"no-password", "No Password", 0, 0, false, false, "ubuntu", 0}};
+    } else if (userMode == "single-passphrase") {
+        d->entries = {{"has-password", "Has Password", 0, 0, false, false, "ubuntu", 0}};
+    } else if (userMode == "single-pin") {
+        d->entries = {{"has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0}};
+    } else if (userMode == "full") {
+        d->entries = {
+            { "has-password",      "Has Password", 0, 0, false, false, "ubuntu", 0 },
+            { "has-pin",           "Has PIN",      0, 0, false, false, "ubuntu", 0 },
+            { "different-prompt",  "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
+            { "no-password",       "No Password", 0, 0, false, false, "ubuntu", 0 },
+            { "auth-error",        "Auth Error", 0, 0, false, false, "ubuntu", 0 },
+            { "two-factor",        "Two Factor", 0, 0, false, false, "ubuntu", 0 },
+            { "info-prompt",       "Info Prompt", 0, 0, false, false, "ubuntu", 0 },
+            { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
+            { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },
+            { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },
+            { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
+            { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
+            { "color-background",  "Color Background", "#dd4814", 0, false, false, "ubuntu", 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, "ubuntu", 0 },
+            { "black-background",  "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
+            { "no-background",     "No Background", "", 0, false, false, "ubuntu", 0 },
+            { "unicode",           "가나다라마", 0, 0, false, false, "ubuntu", 0 },
+            { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0 },
+            { "empty-name",        "", 0, 0, false, false, "ubuntu", 0 },
+        };
+    }
+
+    // Assign uids in a loop, just to avoid having to muck with them when
+    // adding or removing test users.
+    for (int i = 0; i < d->entries.size(); i++) {
+        d->entries[i].uid = i + 1;
+    }
+
+    endResetModel();
+}
+
+QObject *UsersModel::mock()
+{
+    return MockController::instance();
 }
 
 }

=== renamed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.h' => 'tests/mocks/liblightdm/MockUsersModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.h	2016-05-24 22:11:21 +0000
+++ tests/mocks/liblightdm/MockUsersModel.h	2016-08-25 20:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2016 Canonical, Ltd.
  * Copyright (C) 2010-2011 David Edmundson.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,10 +18,9 @@
 #ifndef UNITY_MOCK_USERSMODEL_H
 #define UNITY_MOCK_USERSMODEL_H
 
-#include <QtCore/QString>
-#include <QtCore/QSharedDataPointer>
 #include <QAbstractListModel>
-
+#include <QList>
+#include <QString>
 
 namespace QLightDM
 {
@@ -33,11 +32,7 @@
 
     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);
+    Q_PROPERTY(QObject *mock READ mock CONSTANT) // only in mock
 
 public:
     explicit UsersModel(QObject *parent = 0);
@@ -57,8 +52,10 @@
     int rowCount(const QModelIndex &parent) const override;
     QVariant data(const QModelIndex &index, int role) const override;
 
-    QString mockMode() const;
-    void setMockMode(QString mockMode);
+    QObject *mock();
+
+private Q_SLOTS:
+    void resetEntries();
 
 private:
     UsersModelPrivate * const d_ptr;

=== modified file 'tests/mocks/libusermetrics/UserMetrics.cpp'
--- tests/mocks/libusermetrics/UserMetrics.cpp	2016-05-26 13:15:35 +0000
+++ tests/mocks/libusermetrics/UserMetrics.cpp	2016-08-25 20:40:06 +0000
@@ -288,7 +288,7 @@
         QSharedPointer<UserMetricsData> data(
                 new UserMetricsData("<b>52km</b> travelled", first, firstMonth,
                         ninth, secondMonth, this));
-        m_fakeData.insert("single", data);
+        m_fakeData.insert("has-password", data);
         m_fakeData.insert("has-pin", data);
     }
 
@@ -304,7 +304,7 @@
         QSharedPointer<UserMetricsData> data(
                 new UserMetricsData("<b>33</b> messages today", second,
                         firstMonth, eighth, secondMonth, this));
-        m_fakeData.insert("single", data);
+        m_fakeData.insert("has-password", data);
         m_fakeData.insert("has-pin", data);
     }
 
@@ -321,10 +321,8 @@
         QSharedPointer<UserMetricsData> data(
                 new UserMetricsData("<b>19</b> minutes talk time", eighth,
                         firstMonth, second, secondMonth, this));
-        m_fakeData.insert("single", data);
+        m_fakeData.insert("has-password", data);
         m_fakeData.insert("has-pin", data);
-        // Also use same data for some tablet users
-        m_fakeData.insert("has-password", data);
         m_fakeData.insert("no-password", data);
         m_fakeData.insert("empty-name", data);
     }

=== modified file 'tests/plugins/AccountsService/AccountsServer.cpp'
--- tests/plugins/AccountsService/AccountsServer.cpp	2015-10-26 14:05:14 +0000
+++ tests/plugins/AccountsService/AccountsServer.cpp	2016-08-25 20:40:06 +0000
@@ -40,6 +40,8 @@
     if (QDBusConnection::sessionBus().objectRegisteredAt(path) != nullptr)
         return true;
 
+    m_users.insert(path);
+
     auto props = new PropertiesServer(this);
     new PropertiesAdaptor(props);
     new AccountsUserAdaptor(props);
@@ -52,6 +54,15 @@
     if (QDBusConnection::sessionBus().objectRegisteredAt(path) == nullptr)
         return false;
 
+    m_users.remove(path);
     QDBusConnection::sessionBus().unregisterObject(path);
     return true;
 }
+
+void AccountsServer::RemoveAllUsers()
+{
+    Q_FOREACH(const QString &path, m_users) {
+        m_users.remove(path);
+        QDBusConnection::sessionBus().unregisterObject(path);
+    }
+}

=== modified file 'tests/plugins/AccountsService/AccountsServer.h'
--- tests/plugins/AccountsService/AccountsServer.h	2015-10-26 14:05:14 +0000
+++ tests/plugins/AccountsService/AccountsServer.h	2016-08-25 20:40:06 +0000
@@ -23,6 +23,7 @@
 #include <QDBusContext>
 #include <QDBusObjectPath>
 #include <QObject>
+#include <QSet>
 #include <QString>
 
 class AccountsServer: public QObject, protected QDBusContext
@@ -39,6 +40,10 @@
     // mock only.
     bool AddUser(const QString &user);
     bool RemoveUser(const QString &user);
+    void RemoveAllUsers();
+
+private:
+    QSet<QString> m_users;
 };
 
 #endif

=== modified file 'tests/plugins/AccountsService/client.cpp'
--- tests/plugins/AccountsService/client.cpp	2016-03-31 03:15:03 +0000
+++ tests/plugins/AccountsService/client.cpp	2016-08-25 20:40:06 +0000
@@ -26,6 +26,8 @@
 #include <QDBusReply>
 #include <QDBusMetaType>
 
+#include <glib.h>
+
 template <class T>
 QVariant dbusVariant(const T& value) { return QVariant::fromValue(QDBusVariant(value)); }
 
@@ -62,11 +64,7 @@
 private Q_SLOTS:
 
     void init() {
-        QDBusReply<bool> addReply = QDBusInterface("org.freedesktop.Accounts",
-                                                   "/org/freedesktop/Accounts",
-                                                   "org.freedesktop.Accounts").call("AddUser", QTest::currentTestFunction());
-        QVERIFY(addReply.isValid());
-        QCOMPARE(addReply.value(), true);
+        addUser(QTest::currentTestFunction());
 
         m_userInterface = new QDBusInterface("org.freedesktop.Accounts",
                                              QString("/%1").arg(QTest::currentTestFunction()),
@@ -77,17 +75,46 @@
     }
 
     void cleanup() {
-        QDBusReply<bool> reply = QDBusInterface("org.freedesktop.Accounts",
+        QDBusReply<void> reply = QDBusInterface("org.freedesktop.Accounts",
                                                 "/org/freedesktop/Accounts",
-                                                "org.freedesktop.Accounts").call("RemoveUser", QTest::currentTestFunction());
+                                                "org.freedesktop.Accounts").call("RemoveAllUsers");
         QVERIFY(reply.isValid());
-        QCOMPARE(reply.value(), true);
 
         delete m_userInterface;
         m_spy.clear();
         m_mousePrimaryButtonSpy.clear();
     }
 
+    void addUser(const QString &user)
+    {
+        QDBusReply<bool> addReply = QDBusInterface("org.freedesktop.Accounts",
+                                                   "/org/freedesktop/Accounts",
+                                                   "org.freedesktop.Accounts").call("AddUser", user);
+        QVERIFY(addReply.isValid());
+        QCOMPARE(addReply.value(), true);
+    }
+
+    QVariant getASProperty(const QString &interface, const QString &key, const QString &user = QString())
+    {
+        QString ifaceUser = user;
+        if (ifaceUser.isEmpty())
+            ifaceUser = QTest::currentTestFunction();
+
+        QDBusInterface iface("org.freedesktop.Accounts",
+                             QString("/%1").arg(ifaceUser),
+                             "org.freedesktop.DBus.Properties",
+                             QDBusConnection::sessionBus());
+
+        auto message = iface.call("Get", interface, key);
+        if (message.type() == QDBusMessage::ReplyMessage) {
+            return message.arguments().first().value<QDBusVariant>().variant();
+        }
+        else {
+            qWarning() << "Could not get property" << key << ":" << message.errorMessage();
+            return QVariant();
+        }
+    }
+
     void testInvalids()
     {
         // Test various invalid calls
@@ -323,25 +350,16 @@
         QCOMPARE(message.type(), QDBusMessage::ErrorMessage);
         QCOMPARE(message.errorName(), QStringLiteral("org.freedesktop.DBus.Error.InvalidArgs"));
 
-        message = m_userInterface->call("Get",
-                                        "org.freedesktop.Accounts.User",
-                                        "RealName");
-        QCOMPARE(message.type(), QDBusMessage::ReplyMessage);
-        auto response = message.arguments().first().value<QDBusVariant>().variant().toString();
-        QCOMPARE(response, QStringLiteral(""));
+        auto response = getASProperty("org.freedesktop.Accounts.User", "RealName");
+        QCOMPARE(response.toString(), QStringLiteral(""));
 
         // Now try it via our AS wrapper and confirm it did get through, unlike above
         session.setRealName("Stallman");
 
         QCOMPARE(session.realName(), QStringLiteral("Stallman"));
 
-        message = m_userInterface->call("Get",
-                                        "org.freedesktop.Accounts.User",
-                                        "RealName");
-        QCOMPARE(message.type(), QDBusMessage::ReplyMessage);
-        response = message.arguments().first().value<QDBusVariant>().variant().toString();
-        QCOMPARE(response, QStringLiteral("Stallman"));
-
+        response = getASProperty("org.freedesktop.Accounts.User", "RealName");
+        QCOMPARE(response.toString(), QStringLiteral("Stallman"));
     }
 
     void testAsynchronousChangeForKeymaps()
@@ -367,6 +385,38 @@
         QTRY_COMPARE(session.keymaps(), result);
     }
 
+    void testGreeterMode()
+    {
+        addUser(g_get_user_name());
+        addUser("OtherUser"); // presumably will never conflict with running user
+        AccountsService session(this);
+        QVERIFY(session.greeterMode());
+
+        session.setGreeterMode(false);
+
+        // NOTE: we change real user data here, but it's a harmless change
+        session.setFailedLogins(1);
+        QCOMPARE(session.failedLogins(), 1u);
+        QCOMPARE(getASProperty("com.canonical.unity.AccountsService.Private",
+                               "FailedLogins", session.user()), QVariant(1));
+
+        // This will fail because we aren't the active user
+        session.setUser("OtherUser");
+        session.setFailedLogins(2);
+        QCOMPARE(session.failedLogins(), 2u);
+        QCOMPARE(getASProperty("com.canonical.unity.AccountsService.Private",
+                               "FailedLogins", "OtherUser"), QVariant(0));
+
+        session.setGreeterMode(true);
+
+        // But now a similar call will succeed because we're in greeter mode
+        session.setFailedLogins(3);
+        QCOMPARE(session.failedLogins(), 3u);
+        QCOMPARE(getASProperty("com.canonical.unity.AccountsService.Private",
+                               "FailedLogins", "OtherUser"), QVariant(3));
+
+    }
+
 Q_SIGNALS:
     void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
     void setMousePrimaryButtonCalled(int button);

=== modified file 'tests/plugins/AccountsService/interfaces.xml'
--- tests/plugins/AccountsService/interfaces.xml	2016-03-31 03:15:03 +0000
+++ tests/plugins/AccountsService/interfaces.xml	2016-08-25 20:40:06 +0000
@@ -36,6 +36,7 @@
       <arg name="user" type="s" direction="in" />
       <arg name="success" type="b" direction="out" />
     </method>
+    <method name="RemoveAllUsers"/>
   </interface>
   <interface name="com.ubuntu.AccountsService.Input" />
   <interface name="com.ubuntu.touch.AccountsService.SecurityPrivacy" />

=== removed file 'tests/plugins/LightDM/CMakeLists.txt'
--- tests/plugins/LightDM/CMakeLists.txt	2015-09-28 18:21:40 +0000
+++ tests/plugins/LightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-add_subdirectory(IntegratedLightDM)

=== renamed file 'tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt' => 'tests/plugins/LightDM/CMakeLists.txt'
--- tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt	2016-05-02 21:46:11 +0000
+++ tests/plugins/LightDM/CMakeLists.txt	2016-08-25 20:40:06 +0000
@@ -1,68 +1,46 @@
 add_definitions(
     -DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
     )
+
 include_directories(
-    ${GLIB_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
-    )
-
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM
+    ${CMAKE_SOURCE_DIR}/plugins/Utils
+    )
+
+include_directories(
+    SYSTEM
+    ${GLIB_INCLUDE_DIRS}
+    ${LIBLIGHTDM_INCLUDE_DIRS}
+    )
+
+link_libraries(
+    LightDM-qml
+    ${LIBLIGHTDM_LDFLAGS}
+    )
+
+# DBusTest
 add_executable(GreeterDBusTestExec
     dbus.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
     )
-# This add_dependencies is needed since we're linking with with -L and -l below
-# make seems to work but ninja breaks without it
-add_dependencies(GreeterDBusTestExec MockLightDM)
 qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
-target_link_libraries(GreeterDBusTestExec
-    MockLightDM
-    )
-target_include_directories(GreeterDBusTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM
-    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
-    )
 add_unity8_uitest(GreeterDBus dbus-test-runner
     ARG_PREFIX "--parameter"
     ARGS --task $<TARGET_FILE:GreeterDBusTestExec>
-    DEPENDS MockLightDM
-    IMPORT_PATHS  ${UNITY_MOCKPATH}
+    DEPENDS LightDM-qml;MockLightDM
     LIGHTDM
     )
 
-add_executable(GreeterPamTestExec
-    pam.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp
-    )
-qt5_use_modules(GreeterPamTestExec Concurrent Core Test)
-target_link_libraries(GreeterPamTestExec
-    integratedLightDM
-    )
-
-target_include_directories(GreeterPamTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm
-    )
-add_qmltest_target(testGreeterPam GreeterPamTestExec COMMAND $<TARGET_FILE:GreeterPamTestExec>)
-
 # SessionsModelTest
 add_executable(GreeterSessionsModelTestExec
     sessionsmodel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/SessionsModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     )
-add_dependencies(GreeterSessionsModelTestExec MockLightDM)
 qt5_use_modules(GreeterSessionsModelTestExec Core Test)
-target_link_libraries(GreeterSessionsModelTestExec
-    MockLightDM
-    )
-target_include_directories(GreeterSessionsModelTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM
-    ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
-    )
 add_unity8_uitest(GreeterSessions GreeterSessionsModelTestExec
-    ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
-    DEPENDS MockLightDM
+    DEPENDS LightDM-qml;MockLightDM
     LIGHTDM
     )
 
@@ -72,45 +50,8 @@
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
     )
-# This add_dependencies is needed since we're linking with with -L and -l below
-# make seems to work but ninja breaks without it
-add_dependencies(GreeterUsersModelTestExec MockLightDM)
 qt5_use_modules(GreeterUsersModelTestExec Core Test)
-target_link_libraries(GreeterUsersModelTestExec
-    MockLightDM
-    )
-target_include_directories(GreeterUsersModelTestExec PUBLIC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM
-    ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
-    )
 add_unity8_uitest(GreeterUsers GreeterUsersModelTestExec
-    ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
-    DEPENDS MockLightDM
+    DEPENDS LightDM-qml;MockLightDM
     LIGHTDM
     )
-
-add_executable(GreeterIntegratedTestExec
-    integrated.cpp
-    )
-qt5_use_modules(GreeterIntegratedTestExec Core DBus Quick Test)
-target_link_libraries(GreeterIntegratedTestExec
-    ${GLIB_LIBRARIES}
-    integratedLightDMSession
-    )
-target_include_directories(GreeterIntegratedTestExec PUBLIC
-    ${GLIB_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm
-    )
-add_unity8_unittest(GreeterIntegrated dbus-test-runner
-    ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/IntegratedLightDM/liblightdm/
-    ARG_PREFIX "--parameter"
-    ARGS
-        --task $<TARGET_FILE:mock-server>
-        --task-name server
-        --ignore-return
-        --task $<TARGET_FILE:GreeterIntegratedTestExec>
-        --task-name client
-        --wait-for org.freedesktop.Accounts
-    DEPENDS integratedLightDMSession
-    )

=== removed directory 'tests/plugins/LightDM/IntegratedLightDM'
=== removed file 'tests/plugins/LightDM/IntegratedLightDM/integrated.cpp'
--- tests/plugins/LightDM/IntegratedLightDM/integrated.cpp	2016-05-02 18:43:06 +0000
+++ tests/plugins/LightDM/IntegratedLightDM/integrated.cpp	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "UsersModel.h"
-
-#include <glib.h>
-#include <QDBusInterface>
-#include <QDBusReply>
-#include <QtTest>
-
-class GreeterIntegratedTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-
-    void init()
-    {
-        m_accounts = new QDBusInterface(QStringLiteral("org.freedesktop.Accounts"),
-                                        QStringLiteral("/org/freedesktop/Accounts"),
-                                        QStringLiteral("org.freedesktop.Accounts"),
-                                        QDBusConnection::sessionBus());
-        QDBusReply<bool> addReply = m_accounts->call(QStringLiteral("AddUser"),
-                                                     g_get_user_name());
-        QVERIFY(addReply.isValid());
-        QCOMPARE(addReply.value(), true);
-
-        m_user = new QDBusInterface(QStringLiteral("org.freedesktop.Accounts"),
-                                    QStringLiteral("/%1").arg(g_get_user_name()),
-                                    QStringLiteral("org.freedesktop.DBus.Properties"),
-                                    QDBusConnection::sessionBus());
-
-        m_model = new QLightDM::UsersModel();
-        QVERIFY(m_model);
-    }
-
-    void cleanup()
-    {
-        QDBusReply<bool> addReply = m_accounts->call(QStringLiteral("RemoveUser"),
-                                                     g_get_user_name());
-        QVERIFY(addReply.isValid());
-        QCOMPARE(addReply.value(), true);
-
-        delete m_model;
-        delete m_accounts;
-        delete m_user;
-    }
-
-    void testWatchRealName()
-    {
-        auto index = m_model->index(0, 0);
-
-        QCOMPARE(m_model->data(index, QLightDM::UsersModel::RealNameRole).toString(),
-                 QStringLiteral(""));
-
-        QDBusInterface accountsIface(m_user->service(),
-                                     m_user->path(),
-                                     "org.freedesktop.Accounts.User");
-        QDBusReply<void> reply = accountsIface.call(QStringLiteral("SetRealName"),
-                                                    QStringLiteral("Test User"));
-        QVERIFY(reply.isValid());
-
-        QTRY_COMPARE(m_model->data(index, QLightDM::UsersModel::RealNameRole).toString(),
-                     QStringLiteral("Test User"));
-    }
-
-private:
-    QLightDM::UsersModel *m_model;
-    QDBusInterface *m_accounts;
-    QDBusInterface *m_user;
-};
-
-QTEST_MAIN(GreeterIntegratedTest)
-
-#include "integrated.moc"

=== removed file 'tests/plugins/LightDM/IntegratedLightDM/pam.cpp'
--- tests/plugins/LightDM/IntegratedLightDM/pam.cpp	2016-05-02 18:43:06 +0000
+++ tests/plugins/LightDM/IntegratedLightDM/pam.cpp	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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 "GreeterPrivate.h"
-
-#include <QtTest>
-
-#include <glib.h>
-
-class GreeterPamTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-
-    void init()
-    {
-        m_greeterpriv = new QLightDM::GreeterPrivate();
-    }
-
-    void cleanup()
-    {
-        delete m_greeterpriv;
-        QTRY_COMPARE(QThreadPool::globalInstance()->activeThreadCount(), 0);
-    }
-
-    void testRapidFireAuthentication()
-    {
-        m_greeterpriv->authenticationUser = QString::fromUtf8(g_get_user_name());
-        for (int i = 0; i < 100; i++) {
-            m_greeterpriv->handleAuthenticate();
-        }
-    }
-
-private:
-    QLightDM::GreeterPrivate *m_greeterpriv;
-};
-
-QTEST_GUILESS_MAIN(GreeterPamTest)
-
-#include "pam.moc"

=== renamed file 'tests/plugins/LightDM/IntegratedLightDM/dbus.cpp' => 'tests/plugins/LightDM/dbus.cpp'
=== renamed file 'tests/plugins/LightDM/IntegratedLightDM/greeter.qml' => 'tests/plugins/LightDM/greeter.qml'
--- tests/plugins/LightDM/IntegratedLightDM/greeter.qml	2015-11-07 00:12:17 +0000
+++ tests/plugins/LightDM/greeter.qml	2016-08-25 20:40:06 +0000
@@ -15,13 +15,8 @@
  */
 
 import QtQuick 2.4
-import LightDM.IntegratedLightDM 0.1 as LightDM
+import LightDM 0.1 as LightDM
 
 Item {
     property var greeter: LightDM.Greeter
-    Binding {
-        target: LightDM.Greeter
-        property: "mockMode"
-        value: "full"
-    }
 }

=== renamed file 'tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp' => 'tests/plugins/LightDM/sessionsmodel.cpp'
--- tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp	2016-06-15 15:29:34 +0000
+++ tests/plugins/LightDM/sessionsmodel.cpp	2016-08-25 20:40:06 +0000
@@ -16,10 +16,9 @@
 
 #include "SessionsModel.h"
 
-#include <QLightDM/SessionsModel>
-#include <QtCore/QModelIndex>