Merge lp:~josharenson/unity8/fix-session-icon into lp:unity8

[Josh Arenson]

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.

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

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

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

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

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

PASSED: Continuous integration, rev:2659
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2419/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3173
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1810
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1810
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1810
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3201
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3057/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3057
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3057/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Tested, seems to work well.

Is this something that we can autotest?

review: Needs Information

[Josh Arenson (josharenson)]

> Tested, seems to work well.
>
> Is this something that we can autotest?

There are some existing tests for the session icons. I think the level of effort to test this small issue would be very high, if even possible. The information for this field is delivered from AccountService via LightDM and thus, would likely require substantial updates to the mocks. Perhaps I'm overthinking this...

 It may be a good candidate for an autopilot test, however. If you disagree, lets discuss in person.

[Albert Astals Cid (aacid)]

talked in person, agreed that Josh will evaluate how hard is to add an autotest for the Greeter in which we have two users, set the last used session of user2 to be X (non default) and then while moving to user2 we check that the selected session is the one we set.

[lp:~josharenson/unity8/fix-session-icon]

2581. By Josh Arenson on 2016-10-21

Correct a null parent

2582. By Josh Arenson on 2016-10-21

Return the correct role for the user session name

2583. By Josh Arenson on 2016-11-08

Add a test

2584. By Josh Arenson on 2016-11-15

Complete weird test

2585. By Josh Arenson on 2016-11-16

Fix whitespace

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-10-24 11:34:08 +0000
+++ CMakeLists.txt	2016-11-08 23:03:16 +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)
 pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2)
 
=== modified file 'cmake/modules/QmlTest.cmake'
--- cmake/modules/QmlTest.cmake	2016-03-04 15:07:31 +0000
+++ cmake/modules/QmlTest.cmake	2016-11-08 23:03:16 +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 'data/unity8.conf'
--- data/unity8.conf	2016-06-27 18:42:23 +0000
+++ data/unity8.conf	2016-11-08 23:03:16 +0000
@@ -15,23 +15,23 @@
     # Tell unity-mir to raise SIGSTOP after we start
     initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
 
-    if [ -n "$MIR_SOCKET" ]; then
+    if [ -n "$(initctl get-env --global MIR_SERVER_HOST_SOCKET)" ]; then
         # FIXME Create an autopilot test that makes sure start+stop and restart
         #       work fine at least 2 times
-        # Save original value of MIR_SOCKET in case we are stopped,
+        # Save original value of MIR_SERVER_HOST_SOCKET in case we are stopped,
         # as we modify the variable for future jobs, including ourself.
-        UNITY_MIR_SOCKET=$(initctl get-env --global MIR_SOCKET)
+        UNITY_MIR_SOCKET=$(initctl get-env --global MIR_SERVER_HOST_SOCKET)
         initctl set-env --global UNITY_MIR_SOCKET=$UNITY_MIR_SOCKET
 
+        # Point all future jobs in this session to our Mir socket instead of
+        # unity-system-compositor's socket.
+        MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket
+        initctl set-env --global MIR_SERVER_HOST_SOCKET=$MIR_SERVER_FILE
+        gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SERVER_HOST_SOCKET': '$MIR_SERVER_FILE'}"
+
         # Point unity8 at unity-system-compositor
-        MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket
         initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE
         initctl set-env MIR_SERVER_HOST_SOCKET=$UNITY_MIR_SOCKET
-
-        # Point all future jobs in this session to our Mir socket instead of
-        # unity-system-compositor's socket.
-        initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
-        gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
     fi
 
     # Remove the normal and trusted sockets if still there
@@ -65,7 +65,7 @@
 exec ${BINARY:-unity8} --mode=$MODE $ARGS
 
 post-start script
-    # If no MIR_SOCKET was defined on launch, we try to set one here
+    # If no MIR_SERVER_HOST_SOCKET was defined on launch, we try to set one here
     if [ -z "$(initctl get-env --global UNITY_MIR_SOCKET)" ]; then
         if [ -S "$XDG_RUNTIME_DIR/mir_socket" ]; then
             mir_socket=$XDG_RUNTIME_DIR/mir_socket
@@ -74,7 +74,7 @@
         fi
 
         if [ -n "$mir_socket" ]; then
-            initctl set-env --global MIR_SOCKET="$mir_socket"
+            initctl set-env --global MIR_SERVER_HOST_SOCKET="$mir_socket"
         fi
     fi
 
@@ -82,7 +82,7 @@
 end script
 
 post-stop script
-    initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
+    initctl set-env --global MIR_SERVER_HOST_SOCKET=$UNITY_MIR_SOCKET
     initctl unset-env --global UNITY_MIR_SOCKET
     initctl unset-env --global MIR_SERVER_PROMPT_FILE
     initctl emit application-end
 
=== modified file 'debian/rules'
--- debian/rules	2016-08-11 17:55:45 +0000
+++ debian/rules	2016-11-08 23:03:16 +0000
@@ -36,8 +36,3 @@
 # use private lib directories
 override_dh_makeshlibs:
 	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
-
-override_dh_shlibdeps:
-	# Some mock libraries link against liblightdm-qt5-3.so which we want to
-	# avoid, since we only really link against our mock one, not the system one.
-	dh_shlibdeps -XlibMockLightDM-qml.so -XlibMockAccountsService-qml.so
 
=== modified file 'plugins/AccountsService/AccountsService.cpp'
--- plugins/AccountsService/AccountsService.cpp	2016-08-11 06:25:34 +0000
+++ plugins/AccountsService/AccountsService.cpp	2016-11-08 23:03:16 +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-11-08 23:03:16 +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-11-08 23:03:16 +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-07-28 15:34:29 +0000
+++ plugins/LightDM/Greeter.cpp	2016-11-08 23:03:16 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2015 Canonical, Ltd.
+ * 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
@@ -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-07-28 15:34:29 +0000
+++ plugins/LightDM/Greeter.h	2016-11-08 23:03:16 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012,2013,2015 Canonical, Ltd.
+ * Copyright (C) 2012-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
@@ -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-07-28 15:34:29 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	1970-01-01 00:00:00 +0000
@@ -1,179 +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;
-}
-
-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	2016-07-28 15:34:29 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h	1970-01-01 00:00:00 +0000
@@ -1,108 +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_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 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-07-05 13:52:07 +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-15 20:28:58 +0000
+++ plugins/LightDM/SessionsModel.cpp	2016-11-08 23:03:16 +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
@@ -111,6 +111,11 @@
     }
 }
 
+QObject *SessionsModel::mock()
+{
+    return m_model->property("mock").value<QObject*>();
+}
+
 SessionsModel::SessionsModel(QObject* parent)
   : UnitySortFilterProxyModelQML(parent)
 {
@@ -120,7 +125,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-24 00:25:27 +0000
+++ plugins/LightDM/SessionsModel.h	2016-11-08 23:03:16 +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
@@ -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-11-08 23:03:16 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,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
@@ -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-11-08 23:03:16 +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	2016-06-16 17:23:24 +0000
+++ plugins/LightDM/plugin.cpp	2016-11-08 23:03:16 +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-11-08 23:03:16 +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-11-08 23:03:16 +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-11-08 23:03:16 +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-11-08 23:03:16 +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-11-08 23:03:16 +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-19 21:47:32 +0000
+++ qml/Greeter/FullLightDMImpl.qml	1970-01-01 00:00:00 +0000
@@ -1,30 +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 sessions: LightDM.Sessions
-    property var sessionRoles: LightDM.SessionRoles
-    property var users: LightDM.Users
-    property var userRoles: LightDM.UserRoles
-
-}
 
=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2016-09-22 10:33:39 +0000
+++ qml/Greeter/Greeter.qml	2016-11-08 23:03:16 +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 {
@@ -51,7 +51,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
@@ -137,26 +137,21 @@
     }
 
     function sessionToStart() {
-        for (var i = 0; i < LightDMService.sessions.count; i++) {
-            var session = LightDMService.sessions.data(i,
-                LightDMService.sessionRoles.KeyRole);
+        for (var i = 0; i < LightDM.Sessions.count; i++) {
+            var session = LightDM.Sessions.data(i, LightDM.SessionRoles.KeyRole);
             if (loader.item.sessionToStart === session) {
                 return session;
             }
         }
 
-        if (loader.item.sessionToStart === LightDMService.greeter.defaultSession) {
-            return LightDMService.greeter.defaultSession;
-        } else {
-            return "ubuntu"; // The default / fallback
-        }
+        return LightDM.Greeter.defaultSession;
     }
 
     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
@@ -184,8 +179,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;
                 }
             }
@@ -194,17 +189,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(false /* forceShow */);
             }
             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() {
@@ -212,18 +207,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(root.sessionToStart())) {
-                sessionStarted();
-                hideView();
-            } else if (loader.item) {
+            var success = LightDM.Greeter.startSessionSync(root.sessionToStart());
+            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) {
@@ -236,6 +235,7 @@
 
         function checkForcedUnlock(hideNow) {
             if (forcedUnlock && shown) {
+                d.waiting = false;
                 hideView();
                 if (hideNow) {
                     root.hideNow(); // skip hide animation
@@ -382,7 +382,7 @@
             root.lockedApp = "";
             item.forceActiveFocus();
             d.selectUser(d.currentIndex, true);
-            LightDMService.infographic.readyForDataChange();
+            LightDM.Infographic.readyForDataChange();
         }
 
         Connections {
@@ -392,7 +392,7 @@
             }
             onResponded: {
                 if (root.locked) {
-                    LightDMService.greeter.respond(response);
+                    LightDM.Greeter.respond(response);
                 } else {
                     d.login();
                 }
@@ -469,18 +469,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
@@ -498,12 +498,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++;
                 }
 
@@ -524,7 +524,7 @@
                 }
 
                 loader.item.notifyAuthenticationFailed();
-                if (!LightDMService.greeter.promptless) {
+                if (!LightDM.Greeter.promptless) {
                     d.selectUser(d.currentIndex, false);
                 }
             }
@@ -543,20 +543,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 {
@@ -606,7 +606,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-19 21:47:32 +0000
+++ qml/Greeter/IntegratedLightDMImpl.qml	1970-01-01 00:00:00 +0000
@@ -1,29 +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 sessions: LightDM.Sessions
-    property var sessionRoles: LightDM.SessionRoles
-    property var users: LightDM.Users
-    property var userRoles: LightDM.UserRoles
-}
 
=== removed file 'qml/Greeter/LightDMService.qml'
--- qml/Greeter/LightDMService.qml	2015-11-19 21:47:32 +0000
+++ qml/Greeter/LightDMService.qml	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/>.
- */
-
-/**
- * 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 sessions: d.valid ? loader.item.sessions : null
-    property var sessionRoles: d.valid ? loader.item.sessionRoles : 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
-    }
-}
 
=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2016-09-22 10:33:39 +0000
+++ qml/Greeter/LoginList.qml	2016-11-08 23:03:16 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.4
 import QtGraphicalEffects 1.0
 import Ubuntu.Components 1.3
+import LightDM 0.1 as LightDM
 import "../Components"
-import "." 0.1
 
 StyledItem {
     id: root
@@ -165,7 +165,7 @@
         }
 
         delegate: Item {
-            width: parent.width
+            width: userList.width
             height: root.cellHeight
 
             readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)
@@ -255,8 +255,8 @@
 
         readonly property alias icon: badge.source
 
-        visible: LightDMService.sessions.count > 1 &&
-            !LightDMService.users.data(userList.currentIndex, LightDMService.userRoles.LoggedInRole)
+        visible: LightDM.Sessions.count > 1 &&
+            !LightDM.Users.data(userList.currentIndex, LightDM.UserRoles.LoggedInRole)
 
         height: units.gu(3.5)
         width: units.gu(3.5)
@@ -287,7 +287,7 @@
             anchors.margins: units.dp(3)
             keyColor: "#ffffff" // icon providers give us white icons
             color: theme.palette.normal.raisedSecondaryText
-            source: LightDMService.sessions.iconUrl(root.currentSession)
+            source: LightDM.Sessions.iconUrl(root.currentSession)
         }
 
         Keys.onReturnPressed: {
@@ -302,9 +302,9 @@
         // Refresh the icon path if looking at different places at runtime
         // this is mainly for testing
         Connections {
-            target: LightDMService.sessions
+            target: LightDM.Sessions
             onIconSearchDirectoriesChanged: {
-                badge.source = LightDMService.sessions.iconUrl(root.currentSession)
+                badge.source = LightDM.Sessions.iconUrl(root.currentSession)
             }
         }
     }
 
=== modified file 'qml/Greeter/NarrowView.qml'
--- qml/Greeter/NarrowView.qml	2016-08-30 20:23:15 +0000
+++ qml/Greeter/NarrowView.qml	2016-11-08 23:03:16 +0000
@@ -34,7 +34,7 @@
     property alias alphanumeric: loginList.alphanumeric
     property alias userModel: loginList.model
     property alias infographicModel: coverPage.infographicModel
-    property string sessionToStart
+    property alias sessionToStart: loginList.currentSession
     property bool waiting
     readonly property bool fullyShown: coverPage.showProgress === 1 || lockscreen.shown
     readonly property bool required: coverPage.required || lockscreen.required
 
=== modified file 'qml/Greeter/SessionsList.qml'
--- qml/Greeter/SessionsList.qml	2016-09-13 17:13:27 +0000
+++ qml/Greeter/SessionsList.qml	2016-11-08 23:03:16 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3
-import "." 0.1
+import LightDM 0.1 as LightDM
 import "../Components"
 
 Item {
@@ -43,8 +43,8 @@
     }
 
     function currentKey() {
-        var session = LightDMService.sessions.data(
-            sessionsList.currentIndex, LightDMService.sessionRoles.KeyRole)
+        var session = LightDM.Sessions.data(
+            sessionsList.currentIndex, LightDM.SessionRoles.KeyRole)
         return session;
     }
 
@@ -111,7 +111,7 @@
 
             boundsBehavior: Flickable.StopAtBounds
 
-            model: LightDMService.sessions
+            model: LightDM.Sessions
             header: ListItemLayout {
                 id: header
 
 
=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2016-09-07 17:13:38 +0000
+++ qml/Greeter/WideView.qml	2016-11-08 23:03:16 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import "." 0.1
+import LightDM 0.1 as LightDM
 
 FocusScope {
     id: root
@@ -125,6 +125,8 @@
             id: loginList
             objectName: "loginList"
 
+            property int selectedUserIndex: 0
+
             width: units.gu(40)
             anchors {
                 left: parent.left
@@ -139,9 +141,14 @@
             Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }
 
             model: root.userModel
-            currentSession: LightDMService.greeter.defaultSession
+            currentSession: LightDM.Users.data(selectedUserIndex,
+                LightDM.UserRoles.SessionRole);
             onResponded: root.responded(response)
-            onSelected: root.selected(index)
+            onSelected: {
+                LightDM.Users.mock.currentUsername = currentUser;
+                root.selected(index)
+                selectedUserIndex = index;
+            }
             onSessionChooserButtonClicked: parent.state = "SessionsList"
 
             Keys.forwardTo: [sessionChooserLoader.item]
 
=== 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-10-03 11:15:27 +0000
+++ qml/Shell.qml	2016-11-08 23:03:16 +0000
@@ -27,6 +27,7 @@
 import GlobalShortcut 1.0 // has to be before Utils, because of WindowInputFilter
 import GSettings 1.0
 import ImageCache 0.1
+import LightDM 0.1 as LightDM
 import Utils 0.1
 import Powerd 0.1
 import SessionBroadcast 0.1
@@ -201,6 +202,12 @@
         value: ApplicationManager
     }
 
+    Binding {
+        target: AccountsService
+        property: "greeterMode"
+        value: shell.mode === "greeter"
+    }
+
     Component.onCompleted: {
         finishStartUpTimer.start();
     }
@@ -430,7 +437,7 @@
         if (shell.mode === "greeter") {
             SessionBroadcast.requestHomeShown(AccountsService.user);
         } else {
-            var animate = !LightDMService.greeter.active && !stages.shown;
+            var animate = !LightDM.Greeter.active && !stages.shown;
             dash.setCurrentScope(0, animate, false);
             ApplicationManager.requestFocusApplication("unity8-dash");
         }
@@ -488,7 +495,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-08-22 15:39:16 +0000
+++ tests/CMakeLists.txt	2016-11-08 23:03:16 +0000
@@ -45,8 +45,8 @@
 
     set(ld_paths)
     list(APPEND ld_paths
+        ${UNITY_MOCKPATH}/liblightdm
         ${UNITY_MOCKPATH}/libusermetrics
-        ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
     )
 
     string(REPLACE ";" ":" ld_library_path "${ld_paths}")
 
=== 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-11-08 23:03:16 +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-11-08 23:03:16 +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-08-04 14:05:54 +0000
+++ tests/mocks/AccountsService/AccountsService.cpp	2016-11-08 23:03:16 +0000
@@ -15,7 +15,8 @@
  */
 
 #include "AccountsService.h"
-#include "MockUsersModel.h"
+#include "MockController.h"
+#include "UsersModel.h"
 
 #include <QLightDM/UsersModel>
 #include <paths.h>
@@ -26,6 +27,7 @@
     m_enableLauncherWhileLocked(true),
     m_enableIndicatorsWhileLocked(true),
     m_backgroundFile(),
+    m_greeterMode(true),
     m_statsWelcomeScreen(true),
     m_failedLogins(0),
     m_failedFingerprintLogins(0),
@@ -33,9 +35,8 @@
     m_demoEdgesCompleted(),
     m_hereEnabled(false),
     m_hereLicensePath(""),
-    m_usersModel(new MockUsersModel(this))
+    m_usersModel(new UsersModel(this))
 {
-    m_usersModel->setMockMode("full");
 }
 
 QString AccountsService::user() const
@@ -51,6 +52,19 @@
     Q_EMIT backgroundFileChanged();
 }
 
+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-08-30 13:43:08 +0000
+++ tests/mocks/AccountsService/AccountsService.h	2016-11-08 23:03:16 +0000
@@ -22,7 +22,7 @@
 #include <QStringList>
 #include <QVariant>
 
-class MockUsersModel;
+class UsersModel;
 
 class AccountsService: public QObject
 {
@@ -32,6 +32,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
@@ -99,6 +103,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;
@@ -133,6 +139,7 @@
 
 Q_SIGNALS:
     void userChanged();
+    void greeterModeChanged();
     void demoEdgesChanged();
     void demoEdgesCompletedChanged();
     void enableFingerprintIdentificationChanged();
@@ -155,6 +162,7 @@
     bool m_enableIndicatorsWhileLocked;
     QString m_backgroundFile;
     QString m_user;
+    bool m_greeterMode;
     bool m_statsWelcomeScreen;
     uint m_failedLogins;
     uint m_failedFingerprintLogins;
@@ -165,7 +173,7 @@
     QString m_realName;
     QStringList m_kbdMap;
     QString m_email;
-    MockUsersModel *m_usersModel;
+    UsersModel *m_usersModel;
 };
 
 #endif
 
=== modified file 'tests/mocks/AccountsService/CMakeLists.txt'
--- tests/mocks/AccountsService/CMakeLists.txt	2016-08-04 14:05:54 +0000
+++ tests/mocks/AccountsService/CMakeLists.txt	2016-11-08 23:03:16 +0000
@@ -2,13 +2,17 @@
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/LightDM
     ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
+    ${CMAKE_SOURCE_DIR}/tests/mocks/liblightdm
+    )
+
+include_directories(
+    SYSTEM
+    ${LIBLIGHTDM_INCLUDE_DIRS}
     )
 
 add_library(MockAccountsService-qml MODULE
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
-    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp
     AccountsService.cpp
     plugin.cpp
     )
 
=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2016-06-29 18:05:44 +0000
+++ tests/mocks/CMakeLists.txt	2016-11-08 23:03:16 +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	2016-07-13 20:24:24 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp	1970-01-01 00:00:00 +0000
@@ -1,66 +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>
-
-
-int MockSessionsModel::numSessions() const
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    return qSessionsModel->numSessions();
-}
-
-int MockSessionsModel::numAvailableSessions() const
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    return qSessionsModel->numAvailableSessions();
-}
-
-QString MockSessionsModel::testScenario() const
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    return qSessionsModel->testScenario();
-}
-
-void MockSessionsModel::setNumSessions(const int numSessions)
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    if (qSessionsModel->numSessions() != numSessions) {
-        qSessionsModel->setNumSessions(numSessions);
-        Q_EMIT numSessionsChanged();
-    }
-}
-
-void MockSessionsModel::setTestScenario(const QString testScenario)
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    if (qSessionsModel->testScenario() != testScenario) {
-        qSessionsModel->setTestScenario(testScenario);
-        Q_EMIT testScenarioChanged();
-    }
-}
 
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h	2016-07-13 20:24:24 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h	1970-01-01 00:00:00 +0000
@@ -1,44 +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(int numAvailableSessions READ numAvailableSessions CONSTANT)
-    Q_PROPERTY(int numSessions READ numSessions WRITE setNumSessions NOTIFY numSessionsChanged)
-    Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario NOTIFY testScenarioChanged)
-
-public:
-    int numAvailableSessions() const;
-    int numSessions() const;
-    QString testScenario() const;
-    void setNumSessions(const int numSessions);
-    void setTestScenario(const QString testScenario);
-
-Q_SIGNALS:
-    void numSessionsChanged();
-    void testScenarioChanged();
-
-};
-
-#endif // MOCK_UNITY_SESSIONSMODEL_H
 
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp	2016-08-04 14:05:54 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp	1970-01-01 00:00:00 +0000
@@ -1,44 +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>
-
-MockUsersModel::MockUsersModel(QObject* parent)
-    : UsersModel(parent)
-{
-}
-
-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	2016-08-04 14:05:54 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h	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/>.
- *
- */
-
-#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:
-    explicit MockUsersModel(QObject* parent=0);
-
-    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-07-13 20:24:24 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,83 +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"
-#include <QDebug>
-namespace QLightDM
-{
-
-SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
-    : testScenario("singleSession")
-    , m_availableSessions(
-        {
-            {"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?", ""}
-        })
-    , q_ptr(parent)
-{
-    numSessions = numAvailableSessions();
-    resetEntries();
-}
-
-int SessionsModelPrivate::numAvailableSessions() const
-{
-    return m_availableSessions.length();
-}
-
-void SessionsModelPrivate::resetEntries()
-{
-    Q_Q(SessionsModel);
-
-    q->beginResetModel();
-        if (testScenario == "multipleSessions") {
-            resetEntries_multipleSessions(numSessions);
-        } else if (testScenario == "noSessions") {
-            resetEntries_noSessions();
-        } else {
-            resetEntries_singleSession();
-        }
-    q->endResetModel();
-}
-
-void SessionsModelPrivate::resetEntries_multipleSessions(int numSessions)
-{
-    sessionItems.clear();
-    for (int i = 0; i < numSessions; i++) {
-        sessionItems.append(m_availableSessions.value(i));
-    }
-}
-
-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-07-13 20:24:24 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	1970-01-01 00:00:00 +0000
@@ -1,63 +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;
-
-    int numAvailableSessions() const;
-
-    QList<SessionItem> sessionItems;
-    int numSessions;
-    QString testScenario;
-
-    void resetEntries();
-protected:
-    SessionsModel* const q_ptr;
-
-private:
-    const QList<SessionItem> m_availableSessions;
-    void resetEntries_multipleSessions(int numSessions);
-    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-08-30 13:46:17 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,124 +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"
-
-#include <QDir>
-
-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;
-    }
-
-    // Assign backgrounds
-    QDir backgroundDir("/usr/share/backgrounds");
-    QStringList backgrounds = backgroundDir.entryList(QDir::Files);
-    if (!backgrounds.empty()) {
-        for (int i = 0; i < entries.size(); i++) {
-            if (entries[i].background.isNull()) {
-                entries[i].background = backgroundDir.filePath(backgrounds[i % backgrounds.size()]);
-            }
-        }
-    }
-
-    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", "#E95420", 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 },
-        { "active",            "Active Account", 0, 0, true, 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	2016-06-16 17:23:24 +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<QLightDM::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-11-08 23:03:16 +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-11-08 23:03:16 +0000
@@ -0,0 +1,148 @@
+/*
+ * 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_fullSessions(
+        {
+            {"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?"}
+        })
+{
+    m_userMode = qgetenv("LIBLIGHTDM_MOCK_MODE");
+    if (m_userMode.isEmpty()) {
+        m_userMode = "full";
+    }
+    m_sessionMode = "full";
+    m_numSessions = numFullSessions();
+}
+
+MockController::~MockController()
+{
+    m_instance = nullptr;
+}
+
+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();
+    }
+}
+
+QString MockController::sessionName() const
+{
+    return QString("INVALID - Please read directly from the UserModel");
+}
+
+void MockController::setSessionName(const QString &sessionName)
+{
+        // Let the user model deal with this
+        Q_EMIT sessionNameChanged(sessionName, m_currentUsername);
+}
+
+QString MockController::currentUsername() const
+{
+    return m_currentUsername;
+}
+
+void MockController::setCurrentUsername(const QString &username)
+{
+    if (m_currentUsername != username) {
+        m_currentUsername = username;
+        Q_EMIT currentUsernameChanged();
+    }
+}
+
+const QList<MockController::SessionItem> &MockController::fullSessionItems() const
+{
+    return m_fullSessions;
+}
+
+int MockController::numFullSessions() const
+{
+    return m_fullSessions.size();
+}
+
+int MockController::numSessions() const
+{
+    return m_numSessions;
+}
+
+void MockController::setNumSessions(int numSessions)
+{
+    if (m_numSessions != numSessions) {
+        m_numSessions = numSessions;
+        Q_EMIT numSessionsChanged();
+    }
+}
+
+}
 
=== 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-11-08 23:03:16 +0000
@@ -0,0 +1,98 @@
+/*
+ * 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)
+
+    // This would be best as a Q_INVOKABLE, but using a property allows for
+    // keeping the mock cleaner
+    Q_PROPERTY(QString sessionName READ sessionName WRITE setSessionName NOTIFY sessionNameChanged)
+    Q_PROPERTY(QString currentUsername READ currentUsername WRITE setCurrentUsername NOTIFY currentUsernameChanged)
+
+    Q_PROPERTY(int numAvailableSessions READ numFullSessions CONSTANT)
+    Q_PROPERTY(int numSessions READ numSessions WRITE setNumSessions NOTIFY numSessionsChanged)
+
+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);
+
+    QString sessionName() const;
+    void setSessionName(const QString &sessionName);
+
+    QString currentUsername() const;
+    void setCurrentUsername(const QString &userIndex);
+
+    class SessionItem
+    {
+    public:
+        QString key;
+        QString name;
+    };
+    int numFullSessions() const;
+    const QList<SessionItem> &fullSessionItems() const;
+
+    int numSessions() const;
+    void setNumSessions(int numSessions);
+
+Q_SIGNALS:
+    void currentUsernameChanged();
+    void selectUserHintChanged();
+    void userModeChanged();
+    void sessionModeChanged();
+    void sessionNameChanged(const QString &sessionName, const QString &username);
+    void numSessionsChanged();
+
+private:
+    explicit MockController(QObject* parent=0);
+
+    QString m_currentUsername;
+    QString m_sessionName;
+    QString m_selectUserHint;
+    QString m_userMode;
+    QString m_sessionMode;
+    QList<SessionItem> m_fullSessions;
+    int m_numSessions;
+};
+}
+
+#endif
 
=== renamed file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp' => 'tests/mocks/liblightdm/MockGreeter.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-07-28 15:34:29 +0000
+++ tests/mocks/liblightdm/MockGreeter.cpp	2016-11-08 23:03:16 +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;
 }
 
@@ -71,14 +82,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
@@ -114,6 +118,7 @@
 bool Greeter::isAuthenticated() const
 {
     Q_D(const Greeter);
+
     return d->authenticated;
 }
 
@@ -129,13 +134,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()
@@ -161,6 +195,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;
 }
 
@@ -168,7 +212,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()
@@ -181,21 +248,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-07-28 15:34:29 +0000
+++ tests/mocks/liblightdm/MockGreeter.h	2016-11-08 23:03:16 +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
 {
@@ -44,8 +43,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 {
@@ -68,7 +66,6 @@
     bool showRemoteLoginHint() const;
     bool hasGuestAccountHint() const;
     QString selectUserHint() const;
-    void setSelectUserHint(const QString &selectUserHint); // only in mock
     bool selectGuestHint() const;
     QString autologinUserHint() const;
     bool autologinGuestHint() const;
@@ -79,8 +76,7 @@
     QString authenticationUser() const;
     QString hostname() const;
 
-    QString mockMode() const;
-    void setMockMode(QString mockMode);
+    QObject *mock();
 
 public Q_SLOTS:
     bool connectSync();
@@ -98,15 +94,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-07-13 20:24:24 +0000
+++ tests/mocks/liblightdm/MockSessionsModel.cpp	2016-11-08 23:03:16 +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,34 @@
 // 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 SessionsModelPrivate
+{
+public:
+    QHash<int, QByteArray> roleNames;
+    QList<MockController::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(), &MockController::sessionModeChanged,
+            this, &SessionsModel::resetEntries);
+    connect(MockController::instance(), &MockController::numSessionsChanged,
+            this, &SessionsModel::resetEntries);
+    resetEntries();
 }
 
 SessionsModel::~SessionsModel()
@@ -66,7 +78,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,42 +94,29 @@
     }
 }
 
-int SessionsModel::numSessions() const
-{
-    Q_D(const SessionsModel);
-    return d->numSessions;
-}
-
-int SessionsModel::numAvailableSessions() const
-{
-    Q_D(const SessionsModel);
-    return d->numAvailableSessions();
-}
-
-QString SessionsModel::testScenario() const
-{
-    Q_D(const SessionsModel);
-    return d->testScenario;
-}
-
-void SessionsModel::setNumSessions(int numSessions)
-{
-    Q_D(SessionsModel);
-
-    if (d->numSessions != numSessions) {
-        d->numSessions = numSessions;
-        d->resetEntries();
-    }
-}
-
-void SessionsModel::setTestScenario(QString testScenario)
-{
-    Q_D(SessionsModel);
-
-    if (d->testScenario != testScenario) {
-        d->testScenario = testScenario;
-        d->resetEntries();
-    }
+void SessionsModel::resetEntries()
+{
+    Q_D(SessionsModel);
+
+    beginResetModel();
+
+    QString sessionMode = MockController::instance()->sessionMode();
+
+    if (sessionMode == "full") {
+        d->sessionItems = MockController::instance()->fullSessionItems();
+        d->sessionItems = d->sessionItems.mid(0, MockController::instance()->numSessions());
+    } else if (sessionMode == "single") {
+        d->sessionItems = {MockController::instance()->fullSessionItems()[0]};
+    } 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	2016-07-13 20:24:24 +0000
+++ tests/mocks/liblightdm/MockSessionsModel.h	2016-11-08 23:03:16 +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,8 +18,10 @@
 #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
 {
@@ -29,10 +31,11 @@
     {
         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
@@ -54,17 +57,13 @@
         int rowCount(const QModelIndex& parent) const override;
         QVariant data(const QModelIndex& index, int role) const override;
 
-        int numSessions() const;
-        int numAvailableSessions() const;
-        QString testScenario() const;
-        void setNumSessions(int numSessions);
-        void setTestScenario(QString testScenario);
+        QObject *mock();
 
-    protected:
-        SessionsModelPrivate* const d_ptr;
+    private Q_SLOTS:
+        void resetEntries();
 
     private:
-        QHash<int, QByteArray> m_roleNames;
+        SessionsModelPrivate *d_ptr;
         Q_DECLARE_PRIVATE(SessionsModel)
     };
 }
 
=== 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-11-08 23:03:16 +0000
@@ -21,21 +21,37 @@
 // 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 <QDir>
+#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 +64,12 @@
     roles[ImagePathRole] = "imagePath";
     roles[UidRole] = "uid";
     setRoleNames(roles);
+
+    connect(MockController::instance(), &MockController::userModeChanged,
+            this, &UsersModel::resetEntries);
+    connect(MockController::instance(), &MockController::sessionNameChanged,
+            this, &UsersModel::setCurrentSessionName);
+    resetEntries();
 }
 
 UsersModel::~UsersModel()
@@ -55,6 +77,21 @@
     delete d_ptr;
 }
 
+void UsersModel::setCurrentSessionName(const QString &sessionName, const QString &username)
+{
+    Q_D(UsersModel);
+
+    for (auto &entry : d->entries) {
+        if (username == entry.username) {
+            entry.session = sessionName;
+
+            // Since the incides are mangled, there is no easy way to emit dataChanged
+            // and that doesn't matter for the limited use of this function
+            return;
+        }
+    }
+}
+
 int UsersModel::rowCount(const QModelIndex &parent) const
 {
     Q_D(const UsersModel);
@@ -103,21 +140,69 @@
     }
 }
 
-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, false, false, "ubuntu", 0}};
+    } else if (userMode == "single-passphrase") {
+        d->entries = {{"has-password", "Has Password", "", 0, false, false, "ubuntu", 0}};
+    } else if (userMode == "single-pin") {
+        d->entries = {{"has-pin", "Has PIN", "", 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", "#E95420", 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 },
+            { "active",            "Active Account", 0, 0, true, 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;
+    }
+
+    // Assign backgrounds
+    QDir backgroundDir("/usr/share/backgrounds");
+    QStringList backgrounds = backgroundDir.entryList(QDir::Files);
+    if (!backgrounds.empty()) {
+        for (int i = 0; i < d->entries.size(); i++) {
+            if (d->entries[i].background.isNull()) {
+                d->entries[i].background = backgroundDir.filePath(backgrounds[i % backgrounds.size()]);
+            }
+        }
+    }
+
+    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-11-08 23:03:16 +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,12 @@
     int rowCount(const QModelIndex &parent) const override;
     QVariant data(const QModelIndex &index, int role) const override;
 
-    QString mockMode() const;
-    void setMockMode(QString mockMode);
+    void setCurrentSessionName(const QString &sessionName, const QString &username);
+
+    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-11-08 23:03:16 +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-11-08 23:03:16 +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-11-08 23:03:16 +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-11-08 23:03:16 +0000