Merge lp:~mterry/unity8/demo-users into lp:unity8

[Michael Terry]

Expand greeter demo support to include listing multiple users and specifying individual passwords and names.

Expand greeter demo support to include listing multiple users and specifying individual passwords and names.

I did not bother with providing backwards support for previous password-specifying support. Not that it would be hard, but I don't want to spend time making our dumb demo support smart. And no actual users are using that support anyway.

This branch lets us do things like:

"""
$ cat ~/.unity8-greeter-demo
[General]
users=andy,cimi,tony,guest

[cimi]
name=Andrea Cimitan
password=pin
passwordValue=1234

[tony]
password=keyboard
passwordValue=password
"""

I also dropped some leftover infographic mock files that aren't used anywhere.

** Checklist **

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

 * 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:664
http://jenkins.qa.ubuntu.com/job/unity8-ci/2161/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2719
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2485/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1034
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/683
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/685
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/685/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/683
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2721
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2721/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2486
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2486/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4922/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3451

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:664
http://jenkins.qa.ubuntu.com/job/unity8-ci/2201/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2819
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/723
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/725
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/725/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/723
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2470
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2821
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2821/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2572
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2572/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4998
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3539

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:664
http://jenkins.qa.ubuntu.com/job/unity8-ci/2202/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2820/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2572/console
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1075/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/724/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/726
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/726/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/724
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2822/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2573/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Small thing
  Q_FOREACH(QString user, users)
to
  Q_FOREACH(const QString &user, users)

review: Needs Fixing

[lp:~mterry/unity8/demo-users]

665. By Michael Terry on 2014-02-04

Make foreach loop work on const strings

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:665
http://jenkins.qa.ubuntu.com/job/unity8-ci/2222/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2875
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2620
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1093
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/744
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/746
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/746/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/744
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2520
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2877
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2877/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2621
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2621/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5047
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3599

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

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

* Did CI run pass? If not, please explain why.
No, network tests still broken

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:665
http://jenkins.qa.ubuntu.com/job/unity8-ci/2255/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2974
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2707
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/777
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/779
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/779/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/777
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2613
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2976
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2976/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2708
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2708/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5131
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3707

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:665
http://jenkins.qa.ubuntu.com/job/unity8-ci/2256/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2975
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/784
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/784/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2977
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2977/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2715
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2715/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5138
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3716

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:665
http://jenkins.qa.ubuntu.com/job/unity8-ci/2262/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2986
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2719
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1133/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/786
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/786/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2624
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2988
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2988/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2720
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2720/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5142
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3721

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/mocks/LightDM/demo/GreeterPrivate.cpp'
--- tests/mocks/LightDM/demo/GreeterPrivate.cpp	2013-09-04 17:26:48 +0000
+++ tests/mocks/LightDM/demo/GreeterPrivate.cpp	2014-02-04 14:38:10 +0000
@@ -36,6 +36,7 @@
     Q_Q(Greeter);
 
     QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
+    settings.beginGroup(authenticationUser);
     QVariant password = settings.value("password", "none");
 
     if (password == "pin") {
@@ -53,6 +54,7 @@
     Q_Q(Greeter);
 
     QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
+    settings.beginGroup(authenticationUser);
     QVariant password = settings.value("password", "none");
 
     QString passwordValue;

=== removed file 'tests/mocks/LightDM/demo/InfographicModelPrivate.cpp'
--- tests/mocks/LightDM/demo/InfographicModelPrivate.cpp	2013-07-15 15:14:03 +0000
+++ tests/mocks/LightDM/demo/InfographicModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,91 +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: Pete Woods <[e-mail]>
- */
-
-#include "../InfographicModelPrivate.h"
-
-namespace QLightDM
-{
-
-void InfographicModelPrivate::generateFakeData()
-{
-    std::default_random_engine generator;
-    std::normal_distribution<qreal> distribution(0.5, 0.2);
-    auto rand = std::bind(distribution, generator);
-
-    QColor orange(QColor::fromRgbF(0.9, 0.3, 0.1, 1.0));
-    QColor yellow(QColor::fromRgbF(1.0, 0.6, 0.0, 1.0));
-    QColor red(QColor::fromRgbF(0.8, 0.0, 0.0, 1.0));
-    QColor darkPurple(QColor::fromRgbF(0.5, 0.2, 0.3, 1.0));
-    QColor lightPurple(QColor::fromRgbF(0.8, 0.1, 0.8, 1.0));
-    QColor pink(QColor::fromRgbF(0.75, 0.13, 0.75));
-
-    InfographicColorTheme orangeTheme(yellow, orange, red);
-    InfographicColorTheme yellowTheme(orange, yellow, orange);
-    InfographicColorTheme redTheme(red, red, red);
-    InfographicColorTheme darkPurpleTheme(lightPurple, darkPurple, pink);
-    InfographicColorTheme lightPurpleTheme(lightPurple, lightPurple,
-            lightPurple);
-    InfographicColorTheme pinkTheme(lightPurple, pink, darkPurple);
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>52km</b> travelled", yellowTheme, firstMonth,
-                        orangeTheme, secondMonth, this));
-        m_fakeData.insert("phablet", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>33</b> messages today", pinkTheme,
-                        firstMonth, orangeTheme, secondMonth, this));
-        m_fakeData.insert("phablet", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>69</b> minutes talk time", darkPurpleTheme,
-                        firstMonth, redTheme, secondMonth, this));
-        m_fakeData.insert("phablet", data);
-    }
-}
-
-}

=== modified file 'tests/mocks/LightDM/demo/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/demo/UsersModelPrivate.cpp	2013-07-15 15:14:03 +0000
+++ tests/mocks/LightDM/demo/UsersModelPrivate.cpp	2014-02-04 14:38:10 +0000
@@ -18,16 +18,24 @@
 
 #include "../UsersModelPrivate.h"
 
+#include <QDir>
+#include <QSettings>
+#include <QStringList>
+
 namespace QLightDM
 {
 
 UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
   : q_ptr(parent)
 {
-    entries =
+    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
+    QStringList users = settings.value("users", QStringList() << "phablet").toStringList();
+
+    Q_FOREACH(const QString &user, users)
     {
-        { "phablet", "Guest", 0, 0, false, false, 0, 0 },
-    };
+        QString name = settings.value(user + "/name", user[0].toUpper() + user.mid(1)).toString();
+        entries.append({user, name, 0, 0, false, false, 0, 0});
+    }
 }
 
 }

=== removed file 'tests/mocks/LightDM/full/InfographicModelPrivate.cpp'
--- tests/mocks/LightDM/full/InfographicModelPrivate.cpp	2013-06-05 22:03:08 +0000
+++ tests/mocks/LightDM/full/InfographicModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,182 +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: Pete Woods <[e-mail]>
- */
-
-#include "../InfographicModelPrivate.h"
-
-namespace QLightDM
-{
-
-void InfographicModelPrivate::generateFakeData()
-{
-    std::default_random_engine generator;
-    std::normal_distribution<qreal> distribution(0.5, 0.2);
-    auto rand = std::bind(distribution, generator);
-
-    QColor orange = QColor::fromRgbF(0.9, 0.3, 0.1, 1.0);
-    QColor yellow = QColor::fromRgbF(1.0, 0.6, 0.0, 1.0);
-    QColor red = QColor::fromRgbF(0.8, 0.0, 0.0, 1.0);
-    QColor darkPurple = QColor::fromRgbF(0.5, 0.2, 0.3, 1.0);
-    QColor lightPurple = QColor::fromRgbF(0.8, 0.1, 0.8, 1.0);
-    QColor pink(QColor::fromRgbF(0.75, 0.13, 0.75));
-
-    InfographicColorTheme orangeTheme(orange, orange, orange);
-    InfographicColorTheme yellowTheme(yellow, yellow, yellow);
-    InfographicColorTheme redTheme(red, red, red);
-    InfographicColorTheme darkPurpleTheme(darkPurple, darkPurple, darkPurple);
-    InfographicColorTheme lightPurpleTheme(lightPurple, lightPurple,
-            lightPurple);
-    InfographicColorTheme pinkTheme(pink, pink, pink);
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>5km</b> travelled", yellowTheme,
-                        firstMonth, orangeTheme, secondMonth, this));
-        m_fakeData.insert("has-password", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>33</b> messages today", pinkTheme,
-                        firstMonth, orangeTheme, secondMonth, this));
-        m_fakeData.insert("has-password", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>19</b> minutes talk time", orangeTheme,
-                        firstMonth, redTheme, secondMonth, this));
-        m_fakeData.insert("has-password", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>5km</b> travelled", redTheme,
-                        firstMonth, darkPurpleTheme, secondMonth, this));
-        m_fakeData.insert("no-password", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>33</b> messages today",
-                        lightPurpleTheme, firstMonth, darkPurpleTheme,
-                        secondMonth, this));
-        m_fakeData.insert("no-password", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant());
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>19</b> minutes talk time", orangeTheme,
-                        firstMonth, redTheme, secondMonth, this));
-        m_fakeData.insert("no-password", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 29)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>5km</b> travelled", redTheme,
-                        firstMonth, darkPurpleTheme, secondMonth, this));
-        m_fakeData.insert("empty-name", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 29)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>33</b> messages today", yellowTheme,
-                        firstMonth, orangeTheme, secondMonth, this));
-        m_fakeData.insert("empty-name", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 29)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant());
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>19</b> minutes talk time", pinkTheme,
-                        firstMonth, orangeTheme, secondMonth, this));
-        m_fakeData.insert("empty-name", data);
-    }
-}
-
-}

=== removed file 'tests/mocks/LightDM/single-passphrase/InfographicModelPrivate.cpp'
--- tests/mocks/LightDM/single-passphrase/InfographicModelPrivate.cpp	2013-06-06 12:18:34 +0000
+++ tests/mocks/LightDM/single-passphrase/InfographicModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,61 +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: Pete Woods <[e-mail]>
- */
-
-#include "../InfographicModelPrivate.h"
-
-namespace QLightDM
-{
-
-void InfographicModelPrivate::generateFakeData()
-{
-    std::default_random_engine generator;
-    std::normal_distribution<qreal> distribution(0.5, 0.2);
-    auto rand = std::bind(distribution, generator);
-
-    QColor orange = QColor::fromRgbF(0.9, 0.3, 0.1, 1.0);
-    QColor yellow = QColor::fromRgbF(1.0, 0.6, 0.0, 1.0);
-    QColor red = QColor::fromRgbF(0.8, 0.0, 0.0, 1.0);
-    QColor darkPurple = QColor::fromRgbF(0.5, 0.2, 0.3, 1.0);
-    QColor lightPurple = QColor::fromRgbF(0.8, 0.1, 0.8, 1.0);
-    QColor pink(QColor::fromRgbF(0.75, 0.13, 0.75));
-
-    InfographicColorTheme orangeTheme(orange, orange, orange);
-    InfographicColorTheme yellowTheme(yellow, yellow, yellow);
-    InfographicColorTheme redTheme(red, red, red);
-    InfographicColorTheme darkPurpleTheme(darkPurple, darkPurple, darkPurple);
-    InfographicColorTheme lightPurpleTheme(lightPurple, lightPurple,
-            lightPurple);
-    InfographicColorTheme pinkTheme(pink, pink, pink);
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>5km</b> travelled", yellowTheme,
-                        firstMonth, orangeTheme, secondMonth, this));
-        m_fakeData.insert("has-pin", data);
-    }
-}
-
-}

=== removed file 'tests/mocks/LightDM/single-pin/InfographicModelPrivate.cpp'
--- tests/mocks/LightDM/single-pin/InfographicModelPrivate.cpp	2013-06-06 12:18:34 +0000
+++ tests/mocks/LightDM/single-pin/InfographicModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,61 +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: Pete Woods <[e-mail]>
- */
-
-#include "../InfographicModelPrivate.h"
-
-namespace QLightDM
-{
-
-void InfographicModelPrivate::generateFakeData()
-{
-    std::default_random_engine generator;
-    std::normal_distribution<qreal> distribution(0.5, 0.2);
-    auto rand = std::bind(distribution, generator);
-
-    QColor orange = QColor::fromRgbF(0.9, 0.3, 0.1, 1.0);
-    QColor yellow = QColor::fromRgbF(1.0, 0.6, 0.0, 1.0);
-    QColor red = QColor::fromRgbF(0.8, 0.0, 0.0, 1.0);
-    QColor darkPurple = QColor::fromRgbF(0.5, 0.2, 0.3, 1.0);
-    QColor lightPurple = QColor::fromRgbF(0.8, 0.1, 0.8, 1.0);
-    QColor pink(QColor::fromRgbF(0.75, 0.13, 0.75));
-
-    InfographicColorTheme orangeTheme(orange, orange, orange);
-    InfographicColorTheme yellowTheme(yellow, yellow, yellow);
-    InfographicColorTheme redTheme(red, red, red);
-    InfographicColorTheme darkPurpleTheme(darkPurple, darkPurple, darkPurple);
-    InfographicColorTheme lightPurpleTheme(lightPurple, lightPurple,
-            lightPurple);
-    InfographicColorTheme pinkTheme(pink, pink, pink);
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>5km</b> travelled", yellowTheme,
-                        firstMonth, orangeTheme, secondMonth, this));
-        m_fakeData.insert("has-pin", data);
-    }
-}
-
-}

=== removed file 'tests/mocks/LightDM/single/InfographicModelPrivate.cpp'
--- tests/mocks/LightDM/single/InfographicModelPrivate.cpp	2013-06-05 22:03:08 +0000
+++ tests/mocks/LightDM/single/InfographicModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,28 +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: Pete Woods <[e-mail]>
- */
-
-#include "../InfographicModelPrivate.h"
-
-namespace QLightDM
-{
-
-void InfographicModelPrivate::generateFakeData()
-{
-}
-
-}