Merge lp:~bregma/qtmir/use-ual-info into lp:qtmir

[Stephen M. Webb]

add required param to mock app object ctor to fix ftbfs

fix params to mock object ctor

[lp:~bregma/qtmir/use-ual-info]

445. By Michael Terry on 2016-02-18

Merge from trunk

446. By Michael Terry on 2016-02-18

Remove leftover junk file from merge

447. By Michael Terry on 2016-02-18

And another

448. By Stephen M. Webb on 2016-03-02

synch with trunk

Unmerged revisions

448. By Stephen M. Webb on 2016-03-02

synch with trunk

=== modified file 'debian/control'
--- debian/control	2016-02-03 16:40:09 +0000
+++ debian/control	2016-03-02 00:44:09 +0000
@@ -19,7 +19,7 @@
                libqt5sensors5-dev,
                libqtdbusmock1-dev (>= 0.2),
                libqtdbustest1-dev (>= 0.2),
-               libubuntu-app-launch2-dev,
+               libubuntu-app-launch2-dev (>= 0.9),
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
                libunity-api-dev (>= 7.106),
 
=== modified file 'src/modules/Unity/Application/CMakeLists.txt'
--- src/modules/Unity/Application/CMakeLists.txt	2016-02-11 11:52:06 +0000
+++ src/modules/Unity/Application/CMakeLists.txt	2016-03-02 00:44:09 +0000
@@ -27,7 +27,6 @@
     application.cpp
     ../../../common/abstractdbusservicemonitor.cpp
     ../../../common/debughelpers.cpp
-    desktopfilereader.cpp
     plugin.cpp
     applicationscreenshotprovider.cpp
     dbuswindowstack.cpp
@@ -41,6 +40,7 @@
     session.cpp
     sessionmanager.cpp
     sharedwakelock.cpp
+    upstart/applicationinfo.cpp
     upstart/taskcontroller.cpp
     timer.cpp
     timesource.cpp
@@ -54,6 +54,7 @@
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
 # Feed the automoc monster
     session_interface.h
+    applicationinfo.h
     taskcontroller.h
     settings_interface.h
     )
 
=== modified file 'src/modules/Unity/Application/application.cpp'
--- src/modules/Unity/Application/application.cpp	2016-02-12 00:07:09 +0000
+++ src/modules/Unity/Application/application.cpp	2016-03-02 00:44:09 +0000
@@ -16,8 +16,8 @@
 
 // local
 #include "application.h"
+#include "applicationinfo.h"
 #include "application_manager.h"
-#include "desktopfilereader.h"
 #include "session.h"
 #include "sharedwakelock.h"
 #include "timer.h"
@@ -38,14 +38,14 @@
 {
 
 Application::Application(const QSharedPointer<SharedWakelock>& sharedWakelock,
-                         DesktopFileReader *desktopFileReader,
+                         ApplicationInfo *appInfo,
                          const QStringList &arguments,
                          ApplicationManager *parent)
-    : ApplicationInfoInterface(desktopFileReader->appId(), parent)
+    : ApplicationInfoInterface(appInfo->appId(), parent)
     , m_sharedWakelock(sharedWakelock)
-    , m_desktopData(desktopFileReader)
+    , m_appInfo(appInfo)
     , m_pid(0)
-    , m_stage((desktopFileReader->stageHint() == "SideStage") ? Application::SideStage : Application::MainStage)
+    , m_stage(Application::MainStage)
     , m_state(InternalState::Starting)
     , m_focused(false)
     , m_arguments(arguments)
@@ -55,17 +55,14 @@
     , m_closeTimer(nullptr)
     , m_exemptFromLifecycle(false)
 {
-    qCDebug(QTMIR_APPLICATIONS) << "Application::Application - appId=" << desktopFileReader->appId();
+    qCDebug(QTMIR_APPLICATIONS) << "Application::Application - appId=" << appInfo->appId();
 
     // Because m_state is InternalState::Starting
     acquireWakelock();
 
-    // FIXME(greyback) need to save long appId internally until ubuntu-app-launch can hide it from us
-    m_longAppId = desktopFileReader->file().remove(QRegExp(".desktop$")).split('/').last();
-
-    m_supportedOrientations = m_desktopData->supportedOrientations();
-
-    m_rotatesWindowContents = m_desktopData->rotatesWindowContents();
+    m_supportedOrientations = m_appInfo->supportedOrientations();
+
+    m_rotatesWindowContents = m_appInfo->rotatesWindowContents();
 
     setCloseTimer(new Timer);
 }
@@ -102,7 +99,7 @@
         m_session->setApplication(nullptr);
         delete m_session;
     }
-    delete m_desktopData;
+    delete m_appInfo;
     delete m_closeTimer;
 }
 
@@ -124,64 +121,37 @@
 
 bool Application::isValid() const
 {
-    return m_desktopData->loaded();
-}
-
-QString Application::desktopFile() const
-{
-    return m_desktopData->file();
+    return !appId().isEmpty();
 }
 
 QString Application::appId() const
 {
-    return m_desktopData->appId();
+    return m_appInfo->appId();
 }
 
 QString Application::name() const
 {
-    return m_desktopData->name();
+    return m_appInfo->name();
 }
 
 QString Application::comment() const
 {
-    return m_desktopData->comment();
+    return m_appInfo->comment();
 }
 
 QUrl Application::icon() const
 {
-    QString iconString = m_desktopData->icon();
-    QString pathString = m_desktopData->path();
-
-    if (QFileInfo(iconString).exists()) {
-        return QUrl(iconString);
-    } else if (QFileInfo(pathString + '/' + iconString).exists()) {
-        return QUrl(pathString + '/' + iconString);
-    } else {
-        return QUrl("image://theme/" + iconString);
-    }
+    return m_appInfo->icon();
 }
 
 QString Application::splashTitle() const
 {
-    return m_desktopData->splashTitle();
+    return m_appInfo->splashTitle();
 }
 
 QUrl Application::splashImage() const
 {
-    if (m_desktopData->splashImage().isEmpty()) {
-        return QUrl();
-    } else {
-        QFileInfo imageFileInfo(m_desktopData->path(), m_desktopData->splashImage());
-        if (imageFileInfo.exists()) {
-            return QUrl::fromLocalFile(imageFileInfo.canonicalFilePath());
-        } else {
-            qCWarning(QTMIR_APPLICATIONS)
-                << QString("Application(%1).splashImage file does not exist: \"%2\". Ignoring it.")
-                    .arg(appId()).arg(imageFileInfo.absoluteFilePath());
-
-            return QUrl();
-        }
-    }
+    return m_appInfo->splashImage();
 }
 
 QColor Application::colorFromString(const QString &colorString, const char *colorName) const
@@ -236,37 +206,27 @@
 
 bool Application::splashShowHeader() const
 {
-    QString showHeader = m_desktopData->splashShowHeader();
-    if (showHeader.toLower() == "true") {
-        return true;
-    } else {
-        return false;
-    }
+    return m_appInfo->splashShowHeader();
 }
 
 QColor Application::splashColor() const
 {
-    QString colorStr = m_desktopData->splashColor();
+    QString colorStr = m_appInfo->splashColor();
     return colorFromString(colorStr, "splashColor");
 }
 
 QColor Application::splashColorHeader() const
 {
-    QString colorStr = m_desktopData->splashColorHeader();
+    QString colorStr = m_appInfo->splashColorHeader();
     return colorFromString(colorStr, "splashColorHeader");
 }
 
 QColor Application::splashColorFooter() const
 {
-    QString colorStr = m_desktopData->splashColorFooter();
+    QString colorStr = m_appInfo->splashColorFooter();
     return colorFromString(colorStr, "splashColorFooter");
 }
 
-QString Application::exec() const
-{
-    return m_desktopData->exec();
-}
-
 Application::Stage Application::stage() const
 {
     return m_stage;
@@ -690,7 +650,7 @@
 
 bool Application::isTouchApp() const
 {
-    return m_desktopData->isTouchApp();
+    return m_appInfo->isTouchApp();
 }
 
 bool Application::exemptFromLifecycle() const
@@ -709,11 +669,6 @@
     }
 }
 
-QString Application::longAppId() const
-{
-    return m_longAppId;
-}
-
 Qt::ScreenOrientations Application::supportedOrientations() const
 {
     return m_supportedOrientations;
 
=== modified file 'src/modules/Unity/Application/application.h'
--- src/modules/Unity/Application/application.h	2016-02-11 11:54:59 +0000
+++ src/modules/Unity/Application/application.h	2016-03-02 00:44:09 +0000
@@ -40,7 +40,7 @@
 {
 
 class ApplicationManager;
-class DesktopFileReader;
+class ApplicationInfo;
 class Session;
 class SharedWakelock;
 class AbstractTimer;
@@ -49,8 +49,6 @@
 {
     Q_OBJECT
 
-    Q_PROPERTY(QString desktopFile READ desktopFile CONSTANT)
-    Q_PROPERTY(QString exec READ exec CONSTANT)
     Q_PROPERTY(bool fullscreen READ fullscreen NOTIFY fullscreenChanged)
     Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
     Q_PROPERTY(SessionInterface* session READ session NOTIFY sessionChanged DESIGNABLE false)
@@ -82,7 +80,7 @@
     };
 
     Application(const QSharedPointer<SharedWakelock>& sharedWakelock,
-                DesktopFileReader *desktopFileReader,
+                ApplicationInfo *appInfo,
                 const QStringList &arguments,
                 ApplicationManager *parent);
     virtual ~Application();
@@ -124,8 +122,6 @@
     bool canBeResumed() const;
 
     bool isValid() const;
-    QString desktopFile() const;
-    QString exec() const;
     bool fullscreen() const;
 
     Stages supportedStages() const;
@@ -156,7 +152,6 @@
 
 private:
 
-    QString longAppId() const;
     void acquireWakelock() const;
     void releaseWakelock() const;
     void setPid(pid_t pid);
@@ -175,8 +170,7 @@
     void doClose();
 
     QSharedPointer<SharedWakelock> m_sharedWakelock;
-    DesktopFileReader* m_desktopData;
-    QString m_longAppId;
+    ApplicationInfo *m_appInfo;
     pid_t m_pid;
     Stage m_stage;
     Stages m_supportedStages;
 
=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2016-02-11 11:54:59 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2016-03-02 00:44:09 +0000
@@ -17,7 +17,7 @@
 // local
 #include "application_manager.h"
 #include "application.h"
-#include "desktopfilereader.h"
+#include "applicationinfo.h"
 #include "dbuswindowstack.h"
 #include "session.h"
 #include "sharedwakelock.h"
@@ -125,7 +125,6 @@
     SessionAuthorizer *sessionAuthorizer = static_cast<SessionAuthorizer*>(nativeInterface->nativeResourceForIntegration("SessionAuthorizer"));
 
     QSharedPointer<TaskController> taskController(new upstart::TaskController());
-    QSharedPointer<DesktopFileReader::Factory> fileReaderFactory(new DesktopFileReader::Factory());
     QSharedPointer<ProcInfo> procInfo(new ProcInfo());
     QSharedPointer<SharedWakelock> sharedWakelock(new SharedWakelock);
     QSharedPointer<Settings> settings(new Settings());
@@ -139,7 +138,6 @@
                                              mirServer,
                                              taskController,
                                              sharedWakelock,
-                                             fileReaderFactory,
                                              procInfo,
                                              settings
                                          );
@@ -178,7 +176,6 @@
         const QSharedPointer<MirServer>& mirServer,
         const QSharedPointer<TaskController>& taskController,
         const QSharedPointer<SharedWakelock>& sharedWakelock,
-        const QSharedPointer<DesktopFileReader::Factory>& desktopFileReaderFactory,
         const QSharedPointer<ProcInfo>& procInfo,
         const QSharedPointer<SettingsInterface>& settings,
         QObject *parent)
@@ -187,7 +184,6 @@
     , m_focusedApplication(nullptr)
     , m_dbusWindowStack(new DBusWindowStack(this))
     , m_taskController(taskController)
-    , m_desktopFileReaderFactory(desktopFileReaderFactory)
     , m_procInfo(procInfo)
     , m_sharedWakelock(sharedWakelock)
     , m_settings(settings)
@@ -383,17 +379,18 @@
     if (application) {
         application->setArguments(arguments);
     } else {
+        auto appInfo = m_taskController->getInfoForApp(appId);
+        if (!appInfo) {
+            qWarning() << "Unable to instantiate application with appId" << appId;
+            return nullptr;
+        }
+
         application = new Application(
                     m_sharedWakelock,
-                    m_desktopFileReaderFactory->createInstance(appId, m_taskController->findDesktopFileForAppId(appId)),
+                    appInfo,
                     arguments,
                     this);
 
-        if (!application->isValid()) {
-            qWarning() << "Unable to instantiate application with appId" << appId;
-            return nullptr;
-        }
-
         // override stage if necessary
         if (application->stage() == Application::SideStage && flags.testFlag(ApplicationManager::ForceMainStage)) {
             application->setStage(Application::MainStage);
@@ -411,17 +408,17 @@
 
     Application *application = findApplication(appId);
     if (!application) { // then shell did not start this application, so ubuntu-app-launch must have - add to list
+        auto appInfo = m_taskController->getInfoForApp(appId);
+        if (!appInfo) {
+            qWarning() << "Unable to instantiate application with appId" << appId;
+            return;
+        }
+
         application = new Application(
                     m_sharedWakelock,
-                    m_desktopFileReaderFactory->createInstance(appId, m_taskController->findDesktopFileForAppId(appId)),
+                    appInfo,
                     QStringList(),
                     this);
-
-        if (!application->isValid()) {
-            qWarning() << "Unable to instantiate application with appId" << appId;
-            return;
-        }
-
         add(application);
         Q_EMIT focusRequested(appId);
     }
@@ -606,36 +603,27 @@
         return;
     }
 
-    qCDebug(QTMIR_APPLICATIONS) << "Process supplied desktop_file_hint, loading:" << desktopFileName;
-
     // Guess appId from the desktop file hint
     const QString appId = toShortAppIdIfPossible(desktopFileName.split('/').last().remove(QRegExp(".desktop$")));
 
-    // FIXME: right now we support --desktop_file_hint=appId for historical reasons. So let's try that in
-    // case we didn't get an existing .desktop file path
-    DesktopFileReader* desktopData;
-    if (QFileInfo::exists(desktopFileName)) {
-        desktopData = m_desktopFileReaderFactory->createInstance(appId, QFileInfo(desktopFileName));
-    } else {
-        qCDebug(QTMIR_APPLICATIONS) << "Unable to find file:" << desktopFileName
-                                    << "so will search standard paths for one named" << appId << ".desktop";
-        desktopData = m_desktopFileReaderFactory->createInstance(appId, m_taskController->findDesktopFileForAppId(appId));
-    }
-
-    if (!desktopData->loaded()) {
-        delete desktopData;
+    qCDebug(QTMIR_APPLICATIONS) << "Process supplied desktop_file_hint, loading:" << appId;
+
+    ApplicationInfo* appInfo;
+    appInfo = m_taskController->getInfoForApp(appId);
+
+    if (!appInfo) {
         qCritical() << "ApplicationManager REJECTED connection from app with pid" << pid
-                    << "as the file specified by the desktop_file_hint argument could not be opened";
+                    << "as the app specified by the desktop_file_hint argument could not be found";
         return;
     }
 
     // some naughty applications use a script to launch the actual application. Check for the
     // case where shell actually launched the script.
-    Application *application = findApplication(desktopData->appId());
+    Application *application = findApplication(appInfo->appId());
     if (application && application->state() == Application::Starting) {
         qCDebug(QTMIR_APPLICATIONS) << "Process with pid" << pid << "appeared, attaching to existing entry"
                                     << "in application list with appId:" << application->appId();
-        delete desktopData;
+        delete appInfo;
         application->setPid(pid);
         authorized = true;
         return;
@@ -650,12 +638,12 @@
     }
 
     qCDebug(QTMIR_APPLICATIONS) << "New process with pid" << pid << "appeared, adding new application to the"
-                                << "application list with appId:" << desktopData->appId();
+                                << "application list with appId:" << appInfo->appId();
 
     QStringList arguments(info->asStringList());
     application = new Application(
         m_sharedWakelock,
-        desktopData,
+        appInfo,
         arguments,
         this);
     application->setPid(pid);
@@ -742,7 +730,6 @@
     connect(application, &Application::stageChanged, this, [this](Application::Stage) { onAppDataChanged(RoleStage); });
 
     QString appId = application->appId();
-    QString longAppId = application->longAppId();
     QStringList arguments = application->arguments();
 
     // The connection is queued as a workaround an issue in the PhoneStage animation that
@@ -755,7 +742,7 @@
             Qt::QueuedConnection);
 
     connect(application, &Application::stopProcessRequested, this, [=]() {
-        if (!m_taskController->stop(application->longAppId()) && application->pid() > 0) {
+        if (!m_taskController->stop(appId) && application->pid() > 0) {
             qWarning() << "FAILED to ask Upstart to stop application with appId" << appId
                        << "Sending SIGTERM to process:" << appId;
             kill(application->pid(), SIGTERM);
@@ -763,8 +750,8 @@
         }
     });
 
-    connect(application, &Application::suspendProcessRequested, this, [=]() { m_taskController->suspend(longAppId); } );
-    connect(application, &Application::resumeProcessRequested, this, [=]() { m_taskController->resume(longAppId); } );
+    connect(application, &Application::suspendProcessRequested, this, [=]() { m_taskController->suspend(appId); } );
+    connect(application, &Application::resumeProcessRequested, this, [=]() { m_taskController->resume(appId); } );
 
     connect(application, &Application::stopped, this, [=]() {
         remove(application);
 
=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2016-02-11 11:54:59 +0000
+++ src/modules/Unity/Application/application_manager.h	2016-03-02 00:44:09 +0000
@@ -29,7 +29,6 @@
 
 // local
 #include "application.h"
-#include "desktopfilereader.h"
 #include "taskcontroller.h"
 
 namespace mir {
@@ -85,7 +84,6 @@
             const QSharedPointer<MirServer> &mirServer,
             const QSharedPointer<TaskController> &taskController,
             const QSharedPointer<SharedWakelock> &sharedWakelock,
-            const QSharedPointer<DesktopFileReader::Factory> &desktopFileReaderFactory,
             const QSharedPointer<ProcInfo> &processInfo,
             const QSharedPointer<SettingsInterface> &settings,
             QObject *parent = 0);
@@ -159,7 +157,6 @@
     Application* m_focusedApplication;
     DBusWindowStack* m_dbusWindowStack;
     QSharedPointer<TaskController> m_taskController;
-    QSharedPointer<DesktopFileReader::Factory> m_desktopFileReaderFactory;
     QSharedPointer<ProcInfo> m_procInfo;
     QSharedPointer<SharedWakelock> m_sharedWakelock;
     QSharedPointer<SettingsInterface> m_settings;
 
=== added file 'src/modules/Unity/Application/applicationinfo.h'
--- src/modules/Unity/Application/applicationinfo.h	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/applicationinfo.h	2016-03-02 00:44:09 +0000
@@ -0,0 +1,59 @@
+/*
+ * 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 Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef APPLICATION_INFO_H
+#define APPLICATION_INFO_H
+
+#include <QColor>
+#include <QObject>
+#include <QString>
+#include <QUrl>
+
+namespace qtmir
+{
+
+class ApplicationInfo : public QObject
+{
+    Q_OBJECT
+
+public:
+    ApplicationInfo(const ApplicationInfo&) = delete;
+    virtual ~ApplicationInfo() = default;
+
+    ApplicationInfo& operator=(const ApplicationInfo&) = delete;
+
+    virtual QString appId() const = 0;
+    virtual QString name() const = 0;
+    virtual QString comment() const = 0;
+    virtual QUrl icon() const = 0;
+    virtual QString splashTitle() const = 0;
+    virtual QUrl splashImage() const = 0;
+    virtual bool splashShowHeader() const = 0;
+    virtual QString splashColor() const = 0;
+    virtual QString splashColorHeader() const = 0;
+    virtual QString splashColorFooter() const = 0;
+    virtual Qt::ScreenOrientations supportedOrientations() const = 0;
+    virtual bool rotatesWindowContents() const = 0;
+    virtual bool isTouchApp() const = 0;
+
+protected:
+    ApplicationInfo() = default;
+};
+
+} // namespace qtmir
+
+#endif // APPLICATION_INFO_H
 
=== modified file 'src/modules/Unity/Application/dbuswindowstack.cpp'
--- src/modules/Unity/Application/dbuswindowstack.cpp	2015-08-11 12:08:32 +0000
+++ src/modules/Unity/Application/dbuswindowstack.cpp	2016-03-02 00:44:09 +0000
@@ -49,7 +49,7 @@
     const Application *app = appMgr->findApplicationWithPid(pid);
     if (app) {
         res.app_id = app->appId();
-        res.desktop_file = app->desktopFile();
+        res.desktop_file = "";
     }
     return res;
 }
 
=== removed file 'src/modules/Unity/Application/desktopfilereader.cpp'
--- src/modules/Unity/Application/desktopfilereader.cpp	2015-11-19 12:55:57 +0000
+++ src/modules/Unity/Application/desktopfilereader.cpp	1970-01-01 00:00:00 +0000
@@ -1,320 +0,0 @@
-/*
- * Copyright (C) 2013-2015 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// local
-#include "desktopfilereader.h"
-#include "gscopedpointer.h"
-#include "logging.h"
-
-// Qt
-#include <QFile>
-#include <QLocale>
-
-// GIO
-#include <gio/gdesktopappinfo.h>
-
-namespace qtmir
-{
-
-
-DesktopFileReader* DesktopFileReader::Factory::createInstance(const QString &appId, const QFileInfo& fi)
-{
-    return new DesktopFileReader(appId, fi);
-}
-
-typedef GObjectScopedPointer<GAppInfo> GAppInfoPointer;
-
-class DesktopFileReaderPrivate
-{
-public:
-    DesktopFileReaderPrivate(DesktopFileReader *parent):
-            q_ptr( parent )
-    {}
-
-    QString getKey(const char *key) const
-    {
-        if (!loaded()) return QString();
-
-        return QString::fromUtf8(g_desktop_app_info_get_string((GDesktopAppInfo*)appInfo.data(), key));
-    }
-
-    bool loaded() const
-    {
-        return !appInfo.isNull();
-    }
-
-    DesktopFileReader * const q_ptr;
-    Q_DECLARE_PUBLIC(DesktopFileReader)
-
-    QString appId;
-    QString file;
-    GAppInfoPointer appInfo; // GAppInfo is actually implemented by GDesktopAppInfo
-};
-
-
-DesktopFileReader::DesktopFileReader(const QString &appId, const QFileInfo &desktopFile)
-    : d_ptr(new DesktopFileReaderPrivate(this))
-{
-    Q_D(DesktopFileReader);
-    qCDebug(QTMIR_APPLICATIONS) << "Loading desktop file" << desktopFile.absoluteFilePath()
-            << "for appId" << appId;
-
-    d->appId = appId;
-    d->file = desktopFile.absoluteFilePath();
-    d->appInfo.reset((GAppInfo*) g_desktop_app_info_new_from_filename(d->file.toUtf8().constData()));
-
-    if (!d->loaded()) {
-        if (!desktopFile.exists()) {
-            qCWarning(QTMIR_APPLICATIONS) << "Desktop file for appId:" << appId << "at:" << d->file
-                                          << "does not exist";
-        } else {
-            qCWarning(QTMIR_APPLICATIONS) << "Desktop file for appId:" << appId << "at:" << d->file
-                                      << "is not valid - check its syntax, and that the binary specified"
-                                      << "by the Exec line is installed!";
-        }
-    }
-}
-
-DesktopFileReader::~DesktopFileReader()
-{
-    delete d_ptr;
-}
-
-QString DesktopFileReader::file() const
-{
-    Q_D(const DesktopFileReader);
-    return d->file;
-}
-
-QString DesktopFileReader::appId() const
-{
-    Q_D(const DesktopFileReader);
-    return d->appId;
-}
-
-QString DesktopFileReader::name() const
-{
-    Q_D(const DesktopFileReader);
-    if (!d->loaded()) return QString();
-
-    return QString::fromUtf8(g_app_info_get_name(d->appInfo.data()));
-}
-
-QString DesktopFileReader::comment() const
-{
-    Q_D(const DesktopFileReader);
-    if (!d->loaded()) return QString();
-
-    return QString::fromUtf8(g_app_info_get_description(d->appInfo.data()));
-}
-
-QString DesktopFileReader::icon() const
-{
-    Q_D(const DesktopFileReader);
-    return d->getKey("Icon");
-}
-
-QString DesktopFileReader::exec() const
-{
-    Q_D(const DesktopFileReader);
-    if (!d->loaded()) return QString();
-
-    return QString::fromUtf8(g_app_info_get_commandline(d->appInfo.data()));
-}
-
-QString DesktopFileReader::path() const
-{
-    Q_D(const DesktopFileReader);
-    return d->getKey("Path");
-}
-
-QString DesktopFileReader::stageHint() const
-{
-    Q_D(const DesktopFileReader);
-    return d->getKey("X-Ubuntu-StageHint");
-}
-
-QString DesktopFileReader::splashTitle() const
-{
-    Q_D(const DesktopFileReader);
-    if (!d->loaded()) return QString();
-
-    /* Sadly GDesktopAppInfo only considers Name, GenericName, Comments and Keywords to be keys
-     * which can have locale-specific entries. So we need to work to make X-Ubuntu-Splash-Title
-     * locale-aware, by generating a locale-correct key name and seeing if that exists. If yes,
-     * get the value and return it. Else fallback to the non-localized value.
-     */
-    GDesktopAppInfo *info = (GDesktopAppInfo*)d->appInfo.data();
-    QLocale defaultLocale;
-    QStringList locales = defaultLocale.uiLanguages();
-
-    QString keyTemplate("X-Ubuntu-Splash-Title[%1]");
-    for (QString locale: locales) {
-        // Desktop files use local specifiers with underscore separators but Qt uses hyphens
-        locale = locale.replace('-', '_');
-        const char* key = keyTemplate.arg(locale).toUtf8().constData();
-        if (g_desktop_app_info_has_key(info, key)) {
-            return d->getKey(key);
-        }
-    }
-
-    // Fallback to the non-localized string, if available
-    return d->getKey("X-Ubuntu-Splash-Title");
-}
-
-QString DesktopFileReader::splashImage() const
-{
-    Q_D(const DesktopFileReader);
-    return d->getKey("X-Ubuntu-Splash-Image");
-}
-
-QString DesktopFileReader::splashShowHeader() const
-{
-    Q_D(const DesktopFileReader);
-    return d->getKey("X-Ubuntu-Splash-Show-Header");
-}
-
-QString DesktopFileReader::splashColor() const
-{
-    Q_D(const DesktopFileReader);
-    return d->getKey("X-Ubuntu-Splash-Color");
-}
-
-QString DesktopFileReader::splashColorHeader() const
-{
-    Q_D(const DesktopFileReader);
-    return d->getKey("X-Ubuntu-Splash-Color-Header");
-}
-
-QString DesktopFileReader::splashColorFooter() const
-{
-    Q_D(const DesktopFileReader);
-    return d->getKey("X-Ubuntu-Splash-Color-Footer");
-}
-
-Qt::ScreenOrientations DesktopFileReader::supportedOrientations() const
-{
-    Q_D(const DesktopFileReader);
-    Qt::ScreenOrientations result;
-
-    if (!parseOrientations(d->getKey("X-Ubuntu-Supported-Orientations"), result)) {
-        qCWarning(QTMIR_APPLICATIONS) << d->file << "has an invalid X-Ubuntu-Supported-Orientations entry.";
-    }
-
-    return result;
-}
-
-bool DesktopFileReader::rotatesWindowContents() const
-{
-    Q_D(const DesktopFileReader);
-    bool result;
-
-    if (!parseBoolean(d->getKey("X-Ubuntu-Rotates-Window-Contents"), result)) {
-        qCWarning(QTMIR_APPLICATIONS) << d->file << "has an invalid X-Ubuntu-Rotates-Window-Contents entry.";
-    }
-
-    return result;
-}
-
-bool DesktopFileReader::isTouchApp() const
-{
-    Q_D(const DesktopFileReader);
-    bool result;
-
-    if (!parseBoolean(d->getKey("X-Ubuntu-Touch"), result)) {
-        qCWarning(QTMIR_APPLICATIONS) << d->file << "has an invalid X-Ubuntu-Touch entry.";
-    }
-
-    return result;
-}
-
-bool DesktopFileReader::parseOrientations(const QString &rawString, Qt::ScreenOrientations &result)
-{
-    // Default to all orientations
-    result = Qt::PortraitOrientation | Qt::LandscapeOrientation
-        | Qt::InvertedPortraitOrientation | Qt::InvertedLandscapeOrientation;
-
-    if (rawString.isEmpty()) {
-        return true;
-    }
-
-    Qt::ScreenOrientations parsedOrientations = 0;
-    bool ok = true;
-
-    QStringList orientationsList = rawString
-            .simplified()
-            .replace(QChar(','), ";")
-            .remove(QChar(' '))
-            .remove(QChar('-'))
-            .remove(QChar('_'))
-            .toLower()
-            .split(";");
-
-    for (int i = 0; i < orientationsList.count() && ok; ++i) {
-        const QString &orientationString = orientationsList.at(i);
-        if (orientationString.isEmpty()) {
-            // skip it
-            continue;
-        }
-
-        if (orientationString == "portrait") {
-            parsedOrientations |= Qt::PortraitOrientation;
-        } else if (orientationString == "landscape") {
-            parsedOrientations |= Qt::LandscapeOrientation;
-        } else if (orientationString == "invertedportrait") {
-            parsedOrientations |= Qt::InvertedPortraitOrientation;
-        } else if (orientationString == "invertedlandscape") {
-            parsedOrientations |= Qt::InvertedLandscapeOrientation;
-        } else if (orientationsList.count() == 1 && orientationString == "primary") {
-            // Special case: primary orientation must be alone
-            // There's no sense in supporting primary orientation + other orientations
-            // like "primary,landscape"
-            parsedOrientations = Qt::PrimaryOrientation;
-        } else {
-            ok = false;
-        }
-    }
-
-    if (ok) {
-        result = parsedOrientations;
-    }
-
-    return ok;
-}
-
-bool DesktopFileReader::parseBoolean(const QString &rawString, bool &result)
-{
-    QString cookedString = rawString.trimmed().toLower();
-
-    result = cookedString == "y"
-          || cookedString == "1"
-          || cookedString == "yes"
-          || cookedString == "true";
-
-    return result || rawString.isEmpty()
-        || cookedString == "n"
-        || cookedString == "0"
-        || cookedString == "no"
-        || cookedString == "false";
-}
-
-bool DesktopFileReader::loaded() const
-{
-    Q_D(const DesktopFileReader);
-    return d->loaded();
-}
-
-} // namespace qtmir
 
=== removed file 'src/modules/Unity/Application/desktopfilereader.h'
--- src/modules/Unity/Application/desktopfilereader.h	2015-09-28 20:11:39 +0000
+++ src/modules/Unity/Application/desktopfilereader.h	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2013-2015 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef DESKTOPFILEREADER_H
-#define DESKTOPFILEREADER_H
-
-#include <QString>
-#include <QFileInfo>
-
-namespace qtmir
-{
-
-class DesktopFileReaderPrivate;
-class DesktopFileReader {
-public:
-    class Factory
-    {
-    public:
-        Factory() = default;
-        virtual ~Factory() = default;
-
-        Factory(const Factory&) = delete;
-
-        Factory& operator=(const Factory&) = delete;
-
-        virtual DesktopFileReader* createInstance(const QString &appId, const QFileInfo& fi);
-    };
-
-    virtual ~DesktopFileReader();
-
-    virtual QString file() const;
-    virtual QString appId() const;
-    virtual QString name() const;
-    virtual QString comment() const;
-    virtual QString icon() const;
-    virtual QString exec() const;
-    virtual QString path() const;
-    virtual QString stageHint() const;
-    virtual QString splashTitle() const;
-    virtual QString splashImage() const;
-    virtual QString splashShowHeader() const;
-    virtual QString splashColor() const;
-    virtual QString splashColorHeader() const;
-    virtual QString splashColorFooter() const;
-    virtual Qt::ScreenOrientations supportedOrientations() const;
-    virtual bool rotatesWindowContents() const;
-    virtual bool isTouchApp() const;
-    virtual bool loaded() const;
-
-    static bool parseOrientations(const QString &rawString, Qt::ScreenOrientations &result);
-    static bool parseBoolean(const QString &rawString, bool &result);
-
-protected:
-    DesktopFileReader() : d_ptr(nullptr) {}
-    DesktopFileReader(const QString &appId, const QFileInfo &desktopFile);
-
-    DesktopFileReaderPrivate * const d_ptr;
-
-private:
-    Q_DECLARE_PRIVATE(DesktopFileReader)
-};
-
-} // namespace qtmir
-
-#endif // DESKTOPFILEREADER_H
 
=== modified file 'src/modules/Unity/Application/taskcontroller.h'
--- src/modules/Unity/Application/taskcontroller.h	2016-02-11 11:52:06 +0000
+++ src/modules/Unity/Application/taskcontroller.h	2016-03-02 00:44:09 +0000
@@ -21,11 +21,12 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QFileInfo>
 
 namespace qtmir
 {
 
+class ApplicationInfo;
+
 class TaskController : public QObject
 {
     Q_OBJECT
@@ -42,7 +43,6 @@
 
     TaskController& operator=(const TaskController&) = delete;
 
-    virtual pid_t primaryPidForAppId(const QString &appId) = 0;
     virtual bool appIdHasProcessId(const QString &appId, pid_t pid) = 0;
 
     virtual bool stop(const QString &appId) = 0;
@@ -51,7 +51,7 @@
     virtual bool suspend(const QString &appId) = 0;
     virtual bool resume(const QString &appId) = 0;
 
-    virtual QFileInfo findDesktopFileForAppId(const QString &appId) const = 0;
+    virtual qtmir::ApplicationInfo *getInfoForApp(const QString &appId) const = 0;
 
 Q_SIGNALS:
     void processStarting(const QString &appId);
 
=== added file 'src/modules/Unity/Application/upstart/applicationinfo.cpp'
--- src/modules/Unity/Application/upstart/applicationinfo.cpp	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/upstart/applicationinfo.cpp	2016-03-02 00:44:09 +0000
@@ -0,0 +1,109 @@
+/*
+ * 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 Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "applicationinfo.h"
+
+namespace qtmir
+{
+namespace upstart
+{
+
+ApplicationInfo::ApplicationInfo(const QString &appId, std::shared_ptr<ubuntu::app_launch::Application::Info> info)
+    : qtmir::ApplicationInfo(),
+      m_appId(appId),
+      m_info(info)
+{
+}
+
+QString ApplicationInfo::appId() const
+{
+    return m_appId;
+}
+
+QString ApplicationInfo::name() const
+{
+    return QString::fromStdString(m_info->name().value());
+}
+
+QString ApplicationInfo::comment() const
+{
+    return QString::fromStdString(m_info->description().value());
+}
+
+QUrl ApplicationInfo::icon() const
+{
+    return QUrl::fromLocalFile(QString::fromStdString(m_info->iconPath().value()));
+}
+
+QString ApplicationInfo::splashTitle() const
+{
+    return QString::fromStdString(m_info->splash().title.value());
+}
+
+QUrl ApplicationInfo::splashImage() const
+{
+    return QUrl::fromLocalFile(QString::fromStdString(m_info->splash().image.value()));
+}
+
+bool ApplicationInfo::splashShowHeader() const
+{
+    return m_info->splash().showHeader.value();
+}
+
+QString ApplicationInfo::splashColor() const
+{
+    return QString::fromStdString(m_info->splash().backgroundColor.value());
+}
+
+QString ApplicationInfo::splashColorHeader() const
+{
+    return QString::fromStdString(m_info->splash().headerColor.value());
+}
+
+QString ApplicationInfo::splashColorFooter() const
+{
+    return QString::fromStdString(m_info->splash().footerColor.value());
+}
+
+Qt::ScreenOrientations ApplicationInfo::supportedOrientations() const
+{
+    Qt::ScreenOrientations response = 0;
+    auto orientations = m_info->supportedOrientations();
+    if (orientations.portrait)
+        response |= Qt::PortraitOrientation;
+    if (orientations.landscape)
+        response |= Qt::LandscapeOrientation;
+    if (orientations.invertedPortrait)
+        response |= Qt::InvertedPortraitOrientation;
+    if (orientations.invertedLandscape)
+        response |= Qt::InvertedLandscapeOrientation;
+    return response;
+}
+
+bool ApplicationInfo::rotatesWindowContents() const
+{
+    return m_info->rotatesWindowContents().value();
+}
+
+
+bool ApplicationInfo::isTouchApp() const
+{
+    return m_info->supportsUbuntuLifecycle().value();
+}
+
+} // namespace upstart
+} // namespace qtmir
 
=== added file 'src/modules/Unity/Application/upstart/applicationinfo.h'
--- src/modules/Unity/Application/upstart/applicationinfo.h	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/upstart/applicationinfo.h	2016-03-02 00:44:09 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef UPSTART_APPLICATION_INFO_H
+#define UPSTART_APPLICATION_INFO_H
+
+#include "../applicationinfo.h"
+
+#include <ubuntu-app-launch/application.h>
+
+namespace qtmir
+{
+namespace upstart
+{
+
+class ApplicationInfo : public qtmir::ApplicationInfo
+{
+public:
+    ApplicationInfo(const QString &appId, std::shared_ptr<ubuntu::app_launch::Application::Info> info);
+
+    QString appId() const override;
+    QString name() const override;
+    QString comment() const override;
+    QUrl icon() const override;
+    QString splashTitle() const override;
+    QUrl splashImage() const override;
+    bool splashShowHeader() const override;
+    QString splashColor() const override;
+    QString splashColorHeader() const override;
+    QString splashColorFooter() const override;
+    Qt::ScreenOrientations supportedOrientations() const override;
+    bool rotatesWindowContents() const override;
+    bool isTouchApp() const override;
+
+private:
+    QString m_appId;
+    std::shared_ptr<ubuntu::app_launch::Application::Info> m_info;
+};
+
+} // namespace upstart
+} // namespace qtmir
+
+#endif // UPSTART_APPLICATION_INFO_H
 
=== modified file 'src/modules/Unity/Application/upstart/taskcontroller.cpp'
--- src/modules/Unity/Application/upstart/taskcontroller.cpp	2016-02-11 11:52:06 +0000
+++ src/modules/Unity/Application/upstart/taskcontroller.cpp	2016-03-02 00:44:09 +0000
@@ -15,6 +15,7 @@
  *
  */
 
+#include "applicationinfo.h"
 #include "taskcontroller.h"
 
 // qtmir
@@ -27,6 +28,9 @@
 extern "C" {
     #include "ubuntu-app-launch.h"
 }
+#include <ubuntu-app-launch/registry.h>
+
+namespace ual = ubuntu::app_launch;
 
 namespace qtmir
 {
@@ -35,6 +39,7 @@
 
 struct TaskController::Private
 {
+    std::shared_ptr<ual::Registry> registry;
     UbuntuAppLaunchAppObserver preStartCallback = nullptr;
     UbuntuAppLaunchAppObserver startedCallback = nullptr;
     UbuntuAppLaunchAppObserver stopCallback = nullptr;
@@ -63,39 +68,14 @@
     }
 }
 
-/**
- * @brief toLongAppIdIfPossible
- * @param shortAppId - any string that you think is a short appId
- * @return if valid short appId was input, the corresponding long appId is returned. If a long appId was
- * entered, it is returned unchanged. Anything else is also returned unchanged.
- */
-QString toLongAppIdIfPossible(const QString &shortAppId) {
-    if (ubuntu_app_launch_app_id_parse(shortAppId.toLatin1().constData(), nullptr, nullptr, nullptr)) {
-        // then we got a long appId after all, just return it
-        return shortAppId;
-    } else {
-        // try to parse the string in the form "$package_$application"
-        QRegExp shortAppIdMask("[a-z0-9][a-z0-9+.-]+_[a-zA-Z0-9+.-]+");
-        if (!shortAppIdMask.exactMatch(shortAppId)) {
-            // input string not a short appId, so just return it unchanged
-            return shortAppId;
-        }
-
-        // ask upstart for the long appId corresponding to this short appId
-        QStringList parts = shortAppId.split("_");
-        gchar *longAppId;
-        longAppId = ubuntu_app_launch_triplet_to_app_id(parts.first().toLatin1().constData(),
-                                                         parts.last().toLatin1().constData(),
-                                                         nullptr);
-        if (longAppId == nullptr) {
-            // was unable to construct a long appId from the short appId, return input unchanged
-            return shortAppId;
-        } else {
-            QString appId(longAppId);
-            g_free(longAppId);
-            return appId;
-        }
+std::shared_ptr<ual::Application> createApp(const QString &inputAppId, std::shared_ptr<ual::Registry> registry)
+{
+    auto appId = ual::AppID::find(inputAppId.toStdString());
+    if (appId.empty()) {
+        qCDebug(QTMIR_APPLICATIONS) << "ApplicationController::createApp could not find appId" << inputAppId;
+        return {};
     }
+    return ual::Application::create(appId, registry);
 }
 
 } // namespace
@@ -104,6 +84,8 @@
     : qtmir::TaskController(),
       impl(new Private())
 {
+    impl->registry = std::make_shared<ual::Registry>();
+
     impl->preStartCallback = [](const gchar * appId, gpointer userData) {
         auto thiz = static_cast<TaskController*>(userData);
         Q_EMIT(thiz->processStarting(toShortAppIdIfPossible(appId)));
@@ -166,91 +148,91 @@
     ubuntu_app_launch_observer_delete_app_failed(impl->failureCallback, this);
 }
 
-pid_t TaskController::primaryPidForAppId(const QString& appId)
-{
-    GPid pid = ubuntu_app_launch_get_primary_pid(toLongAppIdIfPossible(appId).toLatin1().constData());
-    if (!pid)
-        qDebug() << "TaskController::primaryPidForAppId FAILED to get PID for appId=" << appId;
-
-    return pid;
-}
-
 bool TaskController::appIdHasProcessId(const QString& appId, pid_t pid)
 {
-    return ubuntu_app_launch_pid_in_app_id(pid, toLongAppIdIfPossible(appId).toLatin1().constData());
+    auto app = createApp(appId, impl->registry);
+    if (!app) {
+        return false;
+    }
+
+    for (auto &instance: app->instances()) {
+        if (instance->hasPid(pid)) {
+            return true;
+        }
+    }
+
+    return false;
 }
 
 bool TaskController::stop(const QString& appId)
 {
-    auto result = ubuntu_app_launch_stop_application(toLongAppIdIfPossible(appId).toLatin1().constData());
-    if (!result)
-        qDebug() << "TaskController::stopApplication FAILED to stop appId=" << appId;
-
-    return result;
+    auto app = createApp(appId, impl->registry);
+    if (!app) {
+        return false;
+    }
+
+    for (auto &instance: app->instances()) {
+        instance->stop();
+    }
+
+    return true;
 }
 
 bool TaskController::start(const QString& appId, const QStringList& arguments)
 {
+    auto app = createApp(appId, impl->registry);
+    if (!app) {
+        return false;
+    }
+
     // Convert arguments QStringList into format suitable for ubuntu-app-launch
-    // The last item should be null, which is done by g_new0, we just don't fill it.
-    auto upstartArgs = g_new0(gchar *, arguments.length() + 1);
-
-    for (int i=0; i<arguments.length(); i++) {
-        upstartArgs[i] = g_strdup(arguments.at(i).toUtf8().data());
+    std::vector<ual::Application::URL> urls;
+    for (auto &arg: arguments) {
+        urls.emplace_back(ual::Application::URL::from_raw(arg.toStdString()));
     }
 
-    auto result = ubuntu_app_launch_start_application(
-                toLongAppIdIfPossible(appId).toLatin1().constData(),
-                static_cast<const gchar * const *>(upstartArgs));
-
-    g_strfreev(upstartArgs);
-
-    if (!result)
-        qDebug() << "TaskController::start FAILED to start appId" << appId;
-
-    return result;
+    app->launch(urls);
+
+    return true;
 }
 
 bool TaskController::suspend(const QString& appId)
 {
-    auto result = ubuntu_app_launch_pause_application(toLongAppIdIfPossible(appId).toLatin1().constData());
-    if (!result)
-        qDebug() << "TaskController::pauseApplication FAILED to pause appId=" << appId;
-
-    return result;
+    auto app = createApp(appId, impl->registry);
+    if (!app) {
+        return false;
+    }
+
+    for (auto &instance: app->instances()) {
+        instance->pause();
+    }
+
+    return true;
 }
 
 bool TaskController::resume(const QString& appId)
 {
-    auto result = ubuntu_app_launch_resume_application(toLongAppIdIfPossible(appId).toLatin1().constData());
-    if (!result)
-        qDebug() << "TaskController::resumeApplication FAILED to resume appId=" << appId;
-
-    return result;
+    auto app = createApp(appId, impl->registry);
+    if (!app) {
+        return false;
+    }
+
+    for (auto &instance: app->instances()) {
+        instance->resume();
+    }
+
+    return true;
 }
 
-
-QFileInfo TaskController::findDesktopFileForAppId(const QString &appId) const
+qtmir::ApplicationInfo *TaskController::getInfoForApp(const QString &appId) const
 {
-    qCDebug(QTMIR_APPLICATIONS) << "TaskController::desktopFilePathForAppId - appId=" << appId;
-
-    // Search for the correct desktop file using a simple heuristic
-    int dashPos = -1;
-    QString helper = toLongAppIdIfPossible(appId);
-    QString desktopFile;
-
-    do {
-        if (dashPos != -1) {
-            helper = helper.replace(dashPos, 1, '/');
-        }
-
-        desktopFile = QStandardPaths::locate(QStandardPaths::ApplicationsLocation, QString("%1.desktop").arg(helper));
-        if (!desktopFile.isEmpty()) return desktopFile;
-
-        dashPos = helper.indexOf("-");
-    } while (dashPos != -1);
-
-    return QFileInfo();
+    auto app = createApp(appId, impl->registry);
+    if (!app || !app->info()) {
+        return nullptr;
+    }
+
+    QString shortAppId = toShortAppIdIfPossible(QString::fromStdString(std::string(app->appId())));
+    return new qtmir::upstart::ApplicationInfo(shortAppId, app->info());
 }
 
 } // namespace upstart
 
=== modified file 'src/modules/Unity/Application/upstart/taskcontroller.h'
--- src/modules/Unity/Application/upstart/taskcontroller.h	2016-02-11 11:52:06 +0000
+++ src/modules/Unity/Application/upstart/taskcontroller.h	2016-03-02 00:44:09 +0000
@@ -31,7 +31,6 @@
     TaskController();
     ~TaskController();
 
-    pid_t primaryPidForAppId(const QString& appId) override;
     bool appIdHasProcessId(const QString& appId, pid_t pid) override;
 
     bool stop(const QString& appId) override;
@@ -40,7 +39,7 @@
     bool suspend(const QString& appId) override;
     bool resume(const QString& appId) override;
 
-    QFileInfo findDesktopFileForAppId(const QString &appId) const override;
+    qtmir::ApplicationInfo *getInfoForApp(const QString &appId) const override;
 
 private:
     struct Private;
 
=== modified file 'tests/framework/CMakeLists.txt'
--- tests/framework/CMakeLists.txt	2016-02-11 11:52:06 +0000
+++ tests/framework/CMakeLists.txt	2016-03-02 00:44:09 +0000
@@ -10,11 +10,10 @@
 )
 
 set(QTMIR_TEST_PRIVATE_SRC
-    fake_desktopfilereader.cpp
+    fake_application_info.cpp
     fake_mirsurface.cpp
     fake_session.cpp
-    mock_task_controller.cpp
-    mock_desktop_file_reader.cpp
+    mock_application_info.cpp
     mock_display.cpp
     mock_display_configuration.cpp
     mock_gl_display_buffer.cpp
@@ -28,6 +27,7 @@
     mock_settings.cpp
     mock_shared_wakelock.cpp
     mock_surface.cpp
+    mock_task_controller.cpp
     stub_input_channel.cpp
     stub_scene_surface.cpp
     qtmir_test.cpp
 
=== renamed file 'tests/framework/fake_desktopfilereader.cpp' => 'tests/framework/fake_application_info.cpp'
--- tests/framework/fake_desktopfilereader.cpp	2016-02-11 11:52:06 +0000
+++ tests/framework/fake_application_info.cpp	2016-03-02 00:44:09 +0000
@@ -14,63 +14,53 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fake_desktopfilereader.h"
+#include "fake_application_info.h"
 
 #include <QDebug>
 
 namespace qtmir
 {
 
-FakeDesktopFileReader::FakeDesktopFileReader(const QString &appId)
-    : DesktopFileReader()
+FakeApplicationInfo::FakeApplicationInfo(const QString &appId)
+    : ApplicationInfo()
     , m_appId(appId)
 {
 }
 
-FakeDesktopFileReader::FakeDesktopFileReader()
-	: DesktopFileReader()
+FakeApplicationInfo::FakeApplicationInfo()
+	: ApplicationInfo()
 	, m_appId("foo-app")
 {
 }
 
-FakeDesktopFileReader::~FakeDesktopFileReader()
+FakeApplicationInfo::~FakeApplicationInfo()
 {
 }
 
-QString FakeDesktopFileReader::file() const { return m_appId + ".desktop"; }
-
-QString FakeDesktopFileReader::appId() const { return m_appId; }
-
-QString FakeDesktopFileReader::name() const { return QString(); }
-
-QString FakeDesktopFileReader::comment() const { return QString(); }
-
-QString FakeDesktopFileReader::icon() const { return QString(); }
-
-QString FakeDesktopFileReader::exec() const { return QString(); }
-
-QString FakeDesktopFileReader::path() const { return QString(); }
-
-QString FakeDesktopFileReader::stageHint() const { return QString(); }
-
-QString FakeDesktopFileReader::splashTitle() const { return QString(); }
-
-QString FakeDesktopFileReader::splashImage() const { return QString(); }
-
-QString FakeDesktopFileReader::splashShowHeader() const { return QString(); }
-
-QString FakeDesktopFileReader::splashColor() const { return QString(); }
-
-QString FakeDesktopFileReader::splashColorHeader() const { return QString(); }
-
-QString FakeDesktopFileReader::splashColorFooter() const { return QString(); }
-
-Qt::ScreenOrientations FakeDesktopFileReader::supportedOrientations() const { return Qt::PortraitOrientation; }
-
-bool FakeDesktopFileReader::rotatesWindowContents() const { return false; }
-
-bool FakeDesktopFileReader::isTouchApp() const { return true; }
-
-bool FakeDesktopFileReader::loaded() const { return true; }
+QString FakeApplicationInfo::appId() const { return m_appId; }
+
+QString FakeApplicationInfo::name() const { return QString(); }
+
+QString FakeApplicationInfo::comment() const { return QString(); }
+
+QUrl FakeApplicationInfo::icon() const { return QUrl(); }
+
+QString FakeApplicationInfo::splashTitle() const { return QString(); }
+
+QUrl FakeApplicationInfo::splashImage() const { return QUrl(); }
+
+bool FakeApplicationInfo::splashShowHeader() const { return false; }
+
+QString FakeApplicationInfo::splashColor() const { return QString(); }
+
+QString FakeApplicationInfo::splashColorHeader() const { return QString(); }
+
+QString FakeApplicationInfo::splashColorFooter() const { return QString(); }
+
+Qt::ScreenOrientations FakeApplicationInfo::supportedOrientations() const { return Qt::PortraitOrientation; }
+
+bool FakeApplicationInfo::rotatesWindowContents() const { return false; }
+
+bool FakeApplicationInfo::isTouchApp() const { return true; }
 
 } // namespace qtmir
 
=== renamed file 'tests/framework/fake_desktopfilereader.h' => 'tests/framework/fake_application_info.h'
--- tests/framework/fake_desktopfilereader.h	2016-02-11 11:52:06 +0000
+++ tests/framework/fake_application_info.h	2016-03-02 00:44:09 +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 Lesser General Public License version 3, as published by
@@ -14,42 +14,37 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FAKE_DESKTOPFILEREADER_H
-#define FAKE_DESKTOPFILEREADER_H
+#ifndef FAKE_APPLICATION_INFO_H
+#define FAKE_APPLICATION_INFO_H
 
-#include <Unity/Application/desktopfilereader.h>
+#include <Unity/Application/applicationinfo.h>
 
 namespace qtmir {
 
-class FakeDesktopFileReader : public qtmir::DesktopFileReader
+class FakeApplicationInfo : public ApplicationInfo
 {
 public:
-    FakeDesktopFileReader(const QString &appId);
-    FakeDesktopFileReader();
-    virtual ~FakeDesktopFileReader();
+    FakeApplicationInfo(const QString &appId);
+    FakeApplicationInfo();
+    virtual ~FakeApplicationInfo();
 
-    QString file() const override;
     QString appId() const override;
     QString name() const override;
     QString comment() const override;
-    QString icon() const override;
-    QString exec() const override;
-    QString path() const override;
-    QString stageHint() const override;
+    QUrl icon() const override;
     QString splashTitle() const override;
-    QString splashImage() const override;
-    QString splashShowHeader() const override;
+    QUrl splashImage() const override;
+    bool splashShowHeader() const override;
     QString splashColor() const override;
     QString splashColorHeader() const override;
     QString splashColorFooter() const override;
     Qt::ScreenOrientations supportedOrientations() const override;
     bool rotatesWindowContents() const override;
     bool isTouchApp() const override;
-    bool loaded() const override;
 
     QString m_appId;
 };
 
 } // namespace qtmir
 
-#endif // FAKE_DESKTOPFILEREADER_H
+#endif // FAKE_APPLICATION_INFO_H
 
=== renamed file 'tests/framework/mock_desktop_file_reader.cpp' => 'tests/framework/mock_application_info.cpp'
--- tests/framework/mock_desktop_file_reader.cpp	2015-11-11 10:43:36 +0000
+++ tests/framework/mock_application_info.cpp	2016-03-02 00:44:09 +0000
@@ -14,104 +14,33 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mock_desktop_file_reader.h"
+#include "mock_application_info.h"
 
 namespace qtmir
 {
 
-MockDesktopFileReader::MockDesktopFileReader(const QString &appId, const QFileInfo &fileInfo)
-    : DesktopFileReader(appId, fileInfo)
-{
-    using namespace ::testing;
-
-    ON_CALL(*this, file()).WillByDefault(Invoke(this, &MockDesktopFileReader::doFile));
-    ON_CALL(*this, appId()).WillByDefault(Invoke(this, &MockDesktopFileReader::doAppId));
-    ON_CALL(*this, name()).WillByDefault(Invoke(this, &MockDesktopFileReader::doName));
-    ON_CALL(*this, comment()).WillByDefault(Invoke(this, &MockDesktopFileReader::doComment));
-    ON_CALL(*this, icon()).WillByDefault(Invoke(this, &MockDesktopFileReader::doIcon));
-    ON_CALL(*this, exec()).WillByDefault(Invoke(this, &MockDesktopFileReader::doExec));
-    ON_CALL(*this, path()).WillByDefault(Invoke(this, &MockDesktopFileReader::doPath));
-    ON_CALL(*this, stageHint()).WillByDefault(Invoke(this, &MockDesktopFileReader::doStageHint));
-    ON_CALL(*this, isTouchApp()).WillByDefault(Invoke(this, &MockDesktopFileReader::doIsTouchApp));
-    ON_CALL(*this, loaded()).WillByDefault(Invoke(this, &MockDesktopFileReader::doLoaded));
-}
-
-MockDesktopFileReader::~MockDesktopFileReader()
-{
-}
-
-QString MockDesktopFileReader::doFile() const
-{
-    return DesktopFileReader::file();
-}
-
-QString MockDesktopFileReader::doAppId() const
-{
-    return DesktopFileReader::appId();
-}
-
-QString MockDesktopFileReader::doName() const
-{
-    return DesktopFileReader::name();
-}
-
-QString MockDesktopFileReader::doComment() const
-{
-    return DesktopFileReader::comment();
-}
-
-QString MockDesktopFileReader::doIcon() const
-{
-    return DesktopFileReader::icon();
-}
-
-QString MockDesktopFileReader::doExec() const
-{
-    return DesktopFileReader::exec();
-}
-
-QString MockDesktopFileReader::doPath() const
-{
-    return DesktopFileReader::path();
-}
-
-QString MockDesktopFileReader::doStageHint() const
-{
-    return DesktopFileReader::stageHint();
-}
-
-bool MockDesktopFileReader::doIsTouchApp() const
-{
-    return DesktopFileReader::isTouchApp();
-}
-
-bool MockDesktopFileReader::doLoaded() const
-{
-    return DesktopFileReader::loaded();
-}
-
-
-MockDesktopFileReaderFactory::MockDesktopFileReaderFactory()
-{
-    using namespace ::testing;
-    ON_CALL(*this, createInstance(_, _))
-            .WillByDefault(
-                Invoke(
-                    this,
-                    &MockDesktopFileReaderFactory::doCreateInstance));
-}
-
-MockDesktopFileReaderFactory::~MockDesktopFileReaderFactory()
-{
-}
-
-qtmir::DesktopFileReader *MockDesktopFileReaderFactory::doCreateInstance(const QString &appId, const QFileInfo &fi)
-{
-    using namespace ::testing;
-    auto instance = new NiceMock<MockDesktopFileReader>(appId, fi);
-    ON_CALL(*instance, loaded()).WillByDefault(Return(true));
-
-    return instance;
+MockApplicationInfo::MockApplicationInfo(const QString &appId)
+    : ApplicationInfo()
+{
+    using namespace ::testing;
+
+    ON_CALL(*this, appId()).WillByDefault(Return(appId));
+    ON_CALL(*this, name()).WillByDefault(Return(QString()));
+    ON_CALL(*this, comment()).WillByDefault(Return(QString()));
+    ON_CALL(*this, icon()).WillByDefault(Return(QUrl()));
+    ON_CALL(*this, splashTitle()).WillByDefault(Return(QString()));
+    ON_CALL(*this, splashImage()).WillByDefault(Return(QUrl()));
+    ON_CALL(*this, splashShowHeader()).WillByDefault(Return(false));
+    ON_CALL(*this, splashColor()).WillByDefault(Return(QString()));
+    ON_CALL(*this, splashColorHeader()).WillByDefault(Return(QString()));
+    ON_CALL(*this, splashColorFooter()).WillByDefault(Return(QString()));
+    ON_CALL(*this, supportedOrientations()).WillByDefault(Return(Qt::PrimaryOrientation));
+    ON_CALL(*this, rotatesWindowContents()).WillByDefault(Return(false));
+    ON_CALL(*this, isTouchApp()).WillByDefault(Return(true));
+}
+
+MockApplicationInfo::~MockApplicationInfo()
+{
 }
 
 } // namespace qtmir
 
=== renamed file 'tests/framework/mock_desktop_file_reader.h' => 'tests/framework/mock_application_info.h'
--- tests/framework/mock_desktop_file_reader.h	2015-11-11 10:43:36 +0000
+++ tests/framework/mock_application_info.h	2016-03-02 00:44:09 +0000
@@ -14,54 +14,36 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MOCK_DESKTOP_FILE_READER_H
-#define MOCK_DESKTOP_FILE_READER_H
+#ifndef MOCK_APPLICATION_INFO_H
+#define MOCK_APPLICATION_INFO_H
 
-#include <Unity/Application/desktopfilereader.h>
+#include <Unity/Application/applicationinfo.h>
 
 #include <gmock/gmock.h>
 
 namespace qtmir
 {
 
-struct MockDesktopFileReader : public qtmir::DesktopFileReader
+struct MockApplicationInfo : public qtmir::ApplicationInfo
 {
-    MockDesktopFileReader(const QString &appId, const QFileInfo& fileInfo);
-    virtual ~MockDesktopFileReader();
+    MockApplicationInfo(const QString &appId);
+    virtual ~MockApplicationInfo();
 
-    MOCK_CONST_METHOD0(file, QString());
-    MOCK_CONST_METHOD0(appId, QString ());
+    MOCK_CONST_METHOD0(appId, QString());
     MOCK_CONST_METHOD0(name, QString());
     MOCK_CONST_METHOD0(comment, QString());
-    MOCK_CONST_METHOD0(icon, QString());
-    MOCK_CONST_METHOD0(exec, QString());
-    MOCK_CONST_METHOD0(path, QString());
-    MOCK_CONST_METHOD0(stageHint, QString());
+    MOCK_CONST_METHOD0(icon, QUrl());
+    MOCK_CONST_METHOD0(splashTitle, QString());
+    MOCK_CONST_METHOD0(splashImage, QUrl());
+    MOCK_CONST_METHOD0(splashShowHeader, bool());
+    MOCK_CONST_METHOD0(splashColor, QString());
+    MOCK_CONST_METHOD0(splashColorHeader, QString());
+    MOCK_CONST_METHOD0(splashColorFooter, QString());
+    MOCK_CONST_METHOD0(supportedOrientations, Qt::ScreenOrientations());
+    MOCK_CONST_METHOD0(rotatesWindowContents, bool());
     MOCK_CONST_METHOD0(isTouchApp, bool());
-    MOCK_CONST_METHOD0(loaded, bool());
-
-    QString doFile() const;
-    QString doAppId() const;
-    QString doName() const;
-    QString doComment() const;
-    QString doIcon() const;
-    QString doExec() const;
-    QString doPath() const;
-    QString doStageHint() const;
-    bool doIsTouchApp() const;
-    bool doLoaded() const;
-};
-
-struct MockDesktopFileReaderFactory : public qtmir::DesktopFileReader::Factory
-{
-    MockDesktopFileReaderFactory();
-    virtual ~MockDesktopFileReaderFactory();
-
-    virtual qtmir::DesktopFileReader* doCreateInstance(const QString &appId, const QFileInfo &fi);
-
-    MOCK_METHOD2(createInstance, qtmir::DesktopFileReader*(const QString &appId, const QFileInfo &fi));
 };
 
 } // namespace qtmir
 
-#endif // MOCK_DESKTOP_FILE_READER_H
+#endif // MOCK_APPLICATION_INFO_H
 
=== modified file 'tests/framework/mock_task_controller.cpp'
--- tests/framework/mock_task_controller.cpp	2016-02-11 11:52:06 +0000
+++ tests/framework/mock_task_controller.cpp	2016-03-02 00:44:09 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "mock_application_info.h"
 #include "mock_task_controller.h"
 
 namespace qtmir
@@ -22,17 +23,14 @@
 MockTaskController::MockTaskController()
 {
     using namespace ::testing;
-    ON_CALL(*this, primaryPidForAppId(_))
-            .WillByDefault(
-                Invoke(this, &MockTaskController::doPrimaryPidForAppId));
 
     ON_CALL(*this, appIdHasProcessId(_, _))
             .WillByDefault(
                 Invoke(this, &MockTaskController::doAppIdHasProcessId));
 
-    ON_CALL(*this, findDesktopFileForAppId(_))
+    ON_CALL(*this, getInfoForApp(_))
             .WillByDefault(
-                Invoke(this, &MockTaskController::doFindDesktopFileForAppId));
+                Invoke(this, &MockTaskController::doGetInfoForApp));
 
     ON_CALL(*this, stop(_))
             .WillByDefault(
@@ -56,15 +54,6 @@
 
 }
 
-pid_t MockTaskController::doPrimaryPidForAppId(const QString &appId)
-{
-    auto it = children.find(appId);
-    if (it == children.end())
-        return -1;
-
-    return it->pid();
-}
-
 
 bool MockTaskController::doAppIdHasProcessId(const QString &appId, pid_t pid)
 {
@@ -76,10 +65,9 @@
 }
 
 
-QFileInfo MockTaskController::doFindDesktopFileForAppId(const QString &appId) const
+qtmir::ApplicationInfo *MockTaskController::doGetInfoForApp(const QString& appId) const
 {
-    QString path = QString("/usr/share/applications/%1.desktop").arg(appId);
-    return QFileInfo(path);
+    return new testing::NiceMock<MockApplicationInfo>(appId);
 }
 
 
 
=== modified file 'tests/framework/mock_task_controller.h'
--- tests/framework/mock_task_controller.h	2016-02-11 11:52:06 +0000
+++ tests/framework/mock_task_controller.h	2016-03-02 00:44:09 +0000
@@ -31,20 +31,17 @@
     MockTaskController();
     virtual ~MockTaskController();
 
-    MOCK_METHOD1(primaryPidForAppId, pid_t(const QString& appId));
     MOCK_METHOD2(appIdHasProcessId, bool(const QString&, pid_t));
-    MOCK_CONST_METHOD1(findDesktopFileForAppId, QFileInfo(const QString &appId));
+    MOCK_CONST_METHOD1(getInfoForApp, qtmir::ApplicationInfo *(const QString &));
 
     MOCK_METHOD1(stop, bool(const QString&));
     MOCK_METHOD2(start, bool(const QString&, const QStringList&));
     MOCK_METHOD1(suspend, bool(const QString&));
     MOCK_METHOD1(resume, bool(const QString&));
 
-    pid_t doPrimaryPidForAppId(const QString& appId);
-
     bool doAppIdHasProcessId(const QString& appId, pid_t pid);
 
-    QFileInfo doFindDesktopFileForAppId(const QString& appId) const;
+    qtmir::ApplicationInfo *doGetInfoForApp(const QString& appId) const;
 
     bool doStop(const QString& appId);
 
 
=== modified file 'tests/framework/qtmir_test.cpp'
--- tests/framework/qtmir_test.cpp	2016-02-11 11:52:06 +0000
+++ tests/framework/qtmir_test.cpp	2016-03-02 00:44:09 +0000
@@ -123,7 +123,6 @@
     , applicationManager(mirServer,
                          taskControllerSharedPointer,
                          QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
-                         QSharedPointer<DesktopFileReader::Factory>(&desktopFileReaderFactory,[](DesktopFileReader::Factory*){}),
                          QSharedPointer<ProcInfo>(&procInfo,[](ProcInfo *){}),
                          QSharedPointer<MockSettings>(&settings,[](MockSettings *){}))
     , sessionManager(mirServer, &applicationManager)
@@ -143,14 +142,6 @@
     ON_CALL(*taskController,appIdHasProcessId(appId, procId)).WillByDefault(Return(true));
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    EXPECT_CALL(desktopFileReaderFactory, createInstance(appId, _))
-            .Times(1)
-            .WillOnce(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
             .Times(1)
             .WillOnce(Return(true));
@@ -167,7 +158,6 @@
     sessionManager.onSessionStarting(appSession);
 
     Mock::VerifyAndClearExpectations(taskController);
-    Mock::VerifyAndClearExpectations(&desktopFileReaderFactory);
     return application;
 }
 
 
=== modified file 'tests/framework/qtmir_test.h'
--- tests/framework/qtmir_test.h	2016-02-11 11:52:06 +0000
+++ tests/framework/qtmir_test.h	2016-03-02 00:44:09 +0000
@@ -32,7 +32,6 @@
 #include <Unity/Application/proc_info.h>
 #include <mirserver.h>
 
-#include "mock_desktop_file_reader.h"
 #include "mock_proc_info.h"
 #include "mock_mir_session.h"
 #include "mock_prompt_session_manager.h"
@@ -67,7 +66,6 @@
     QSharedPointer<qtmir::TaskController> taskControllerSharedPointer{new testing::NiceMock<qtmir::MockTaskController>};
     testing::NiceMock<qtmir::MockTaskController> *taskController{static_cast<testing::NiceMock<qtmir::MockTaskController>*>(taskControllerSharedPointer.data())};
     testing::NiceMock<MockProcInfo> procInfo;
-    testing::NiceMock<MockDesktopFileReaderFactory> desktopFileReaderFactory;
     testing::NiceMock<MockSharedWakelock> sharedWakelock;
     testing::NiceMock<MockSettings> settings;
     std::shared_ptr<StubPromptSessionManager> promptSessionManager;
 
=== modified file 'tests/modules/Application/application_test.cpp'
--- tests/modules/Application/application_test.cpp	2015-10-15 14:40:58 +0000
+++ tests/modules/Application/application_test.cpp	2016-03-02 00:44:09 +0000
@@ -19,8 +19,9 @@
 
 #include "qtmir_test.h"
 
-#include <fake_desktopfilereader.h>
+#include <fake_application_info.h>
 #include <fake_session.h>
+#include <mock_application_info.h>
 #include <mock_session.h>
 
 #include <QScopedPointer>
@@ -41,7 +42,7 @@
 
     QScopedPointer<Application> application(new Application(
             QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
-            new FakeDesktopFileReader, QStringList(), nullptr));
+            new FakeApplicationInfo(), QStringList(), nullptr));
 
     application->setProcessState(Application::ProcessRunning);
 
@@ -79,7 +80,7 @@
 
     QScopedPointer<Application> application(new Application(
             QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
-            new FakeDesktopFileReader, QStringList(), nullptr));
+            new FakeApplicationInfo(), QStringList(), nullptr));
     NiceMock<MockSession> *session = new NiceMock<MockSession>;
 
     // Get it running and then suspend it
@@ -106,7 +107,7 @@
 
     QScopedPointer<Application> application(new Application(
             QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
-            new FakeDesktopFileReader, QStringList(), nullptr));
+            new FakeApplicationInfo(), QStringList(), nullptr));
     NiceMock<MockSession> *session = new NiceMock<MockSession>;
 
     // Get it running, suspend it, and finally stop it
@@ -140,12 +141,12 @@
     EXPECT_CALL(sharedWakelock, acquire(_)).Times(0);
     EXPECT_CALL(sharedWakelock, release(_)).Times(0);
 
-    FakeDesktopFileReader *desktopFileReader = new FakeDesktopFileReader;
-    desktopFileReader->m_appId = QString("unity8-dash");
+    auto applicationInfo = new FakeApplicationInfo();
+    applicationInfo->m_appId = QString("unity8-dash");
 
     QScopedPointer<Application> application(new Application(
             QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
-            desktopFileReader, QStringList(), nullptr));
+            applicationInfo, QStringList(), nullptr));
 
     application->setProcessState(Application::ProcessRunning);
 
@@ -183,7 +184,7 @@
 
     QScopedPointer<Application> application(new Application(
             QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
-            new FakeDesktopFileReader, QStringList(), nullptr));
+            new FakeApplicationInfo(), QStringList(), nullptr));
 
     application->setProcessState(Application::ProcessRunning);
 
@@ -218,7 +219,7 @@
 
     QScopedPointer<Application> application(new Application(
             QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
-            new FakeDesktopFileReader, QStringList(), nullptr));
+            new FakeApplicationInfo(), QStringList(), nullptr));
 
     application->setProcessState(Application::ProcessRunning);
 
@@ -250,7 +251,7 @@
 
     QScopedPointer<Application> application(new Application(
             QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
-            new FakeDesktopFileReader, QStringList(), nullptr));
+            new FakeApplicationInfo(), QStringList(), nullptr));
 
     application->setProcessState(Application::ProcessRunning);
 
@@ -292,14 +293,14 @@
 {
     using namespace ::testing;
 
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(QString(), QFileInfo());
+    auto mockApplicationInfo = new NiceMock<MockApplicationInfo>("foo-app");
     QScopedPointer<Application> application(new Application(
             QSharedPointer<MockSharedWakelock>(&sharedWakelock, [](MockSharedWakelock *){}),
-            mockDesktopFileReader, QStringList(), nullptr));
+            mockApplicationInfo, QStringList(), nullptr));
 
-    ON_CALL(*mockDesktopFileReader, isTouchApp()).WillByDefault(Return(true));
+    ON_CALL(*mockApplicationInfo, isTouchApp()).WillByDefault(Return(true));
     ASSERT_TRUE(application->isTouchApp());
 
-    ON_CALL(*mockDesktopFileReader, isTouchApp()).WillByDefault(Return(false));
+    ON_CALL(*mockApplicationInfo, isTouchApp()).WillByDefault(Return(false));
     ASSERT_FALSE(application->isTouchApp());
 }
 
=== modified file 'tests/modules/ApplicationManager/application_manager_test.cpp'
--- tests/modules/ApplicationManager/application_manager_test.cpp	2016-02-12 00:07:09 +0000
+++ tests/modules/ApplicationManager/application_manager_test.cpp	2016-03-02 00:44:09 +0000
@@ -23,8 +23,8 @@
 #include <Unity/Application/applicationscreenshotprovider.h>
 #include <Unity/Application/timer.h>
 
-#include <fake_desktopfilereader.h>
 #include <fake_mirsurface.h>
+#include <mock_application_info.h>
 #include <mock_surface.h>
 #include <qtmir_test.h>
 
@@ -152,9 +152,7 @@
     const QString shortAppId("com.canonical.test_test");
 
     EXPECT_CALL(*taskController, start(_, _)).Times(1);
-    EXPECT_CALL(*taskController, findDesktopFileForAppId(shortAppId)).Times(1);
-
-    EXPECT_CALL(desktopFileReaderFactory, createInstance(_, _)).Times(1);
+    EXPECT_CALL(*taskController, getInfoForApp(shortAppId)).Times(1);
 
     auto application = applicationManager.startApplication(
                 shortAppId,
@@ -172,9 +170,7 @@
     const QString shortAppId("com.canonical.test_test");
 
     EXPECT_CALL(*taskController, start(_, _)).Times(1);
-    EXPECT_CALL(*taskController, findDesktopFileForAppId(shortAppId)).Times(1);
-
-    EXPECT_CALL(desktopFileReaderFactory, createInstance(_, _)).Times(1);
+    EXPECT_CALL(*taskController, getInfoForApp(shortAppId)).Times(1);
 
     auto application = applicationManager.startApplication(
                 longAppId,
@@ -299,28 +295,6 @@
     EXPECT_EQ(second_session, the_app->session()->session());
 }
 
-TEST_F(ApplicationManagerTests,DISABLED_upstart_launching_sidestage_app_on_phone_forced_into_mainstage)
-{
-    using namespace ::testing;
-    QString appId("sideStage");
-
-    EXPECT_CALL(*taskController, findDesktopFileForAppId(appId)).Times(1);
-
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, stageHint()).WillByDefault(Return("SideStage"));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
-    // mock upstart launching an app which reports itself as sidestage, but we're on phone
-    applicationManager.onProcessStarting(appId);
-
-    // ensure the app stage is overridden to be main stage
-    Application* theApp = applicationManager.findApplication(appId);
-    ASSERT_NE(theApp, nullptr);
-    EXPECT_EQ(Application::MainStage, theApp->stage());
-}
-
 TEST_F(ApplicationManagerTests,two_session_on_one_application_after_starting)
 {
     using namespace ::testing;
@@ -473,12 +447,12 @@
     const QString name("Test App");
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    ON_CALL(*mockDesktopFileReader, name()).WillByDefault(Return(name));
+    auto mockApplicationInfo = new NiceMock<MockApplicationInfo>(appId);
+    ON_CALL(*mockApplicationInfo, name()).WillByDefault(Return(name));
 
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
+    EXPECT_CALL(*taskController, getInfoForApp(appId))
+        .Times(1)
+        .WillOnce(Return(mockApplicationInfo));
 
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
@@ -518,12 +492,12 @@
     const QString name("Test App");
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    ON_CALL(*mockDesktopFileReader, name()).WillByDefault(Return(name));
+    auto mockApplicationInfo = new NiceMock<MockApplicationInfo>(appId);
+    ON_CALL(*mockApplicationInfo, name()).WillByDefault(Return(name));
 
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
+    EXPECT_CALL(*taskController, getInfoForApp(appId))
+        .Times(1)
+        .WillOnce(Return(mockApplicationInfo));
 
     QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
     QSignalSpy addedSpy(&applicationManager, SIGNAL(applicationAdded(const QString &)));
@@ -567,12 +541,12 @@
         .Times(1)
         .WillOnce(Return(cmdLine));
 
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    ON_CALL(*mockDesktopFileReader, name()).WillByDefault(Return(name));
+    auto mockApplicationInfo = new NiceMock<MockApplicationInfo>(appId);
+    ON_CALL(*mockApplicationInfo, name()).WillByDefault(Return(name));
 
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
+    EXPECT_CALL(*taskController, getInfoForApp(appId))
+        .Times(1)
+        .WillOnce(Return(mockApplicationInfo));
 
     QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
     QSignalSpy addedSpy(&applicationManager, SIGNAL(applicationAdded(const QString &)));
@@ -632,35 +606,6 @@
 }
 
 /*
- * Test that an application launched via the command line with the --desktop_file_hint but an incorrect
- * desktop file specified is rejected
- */
-TEST_F(ApplicationManagerTests,appDoesNotStartWhenUsingBadDesktopFileHintFile)
-{
-    using namespace ::testing;
-    const QString appId("testAppId");
-    const QString badDesktopFile = QString("%1.desktop").arg(appId);
-    const pid_t procId = 5551;
-    QByteArray cmdLine("/usr/bin/testApp --desktop_file_hint=");
-    cmdLine = cmdLine.append(badDesktopFile);
-
-    // Set up Mocks & signal watcher
-    EXPECT_CALL(procInfo,command_line(procId))
-        .Times(1)
-        .WillOnce(Return(cmdLine));
-
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(false));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
-    // Mir requests authentication for an application that was started, should fail
-    bool authed = true;
-    applicationManager.authorizeSession(procId, authed);
-    EXPECT_EQ(authed, false);
-}
-
-/*
  * Test that if TaskController synchronously calls back processStarted, that ApplicationManager
  * does not add the app to the model twice.
  */
@@ -671,12 +616,12 @@
     const QString name("Test App");
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    ON_CALL(*mockDesktopFileReader, name()).WillByDefault(Return(name));
+    auto mockApplicationInfo = new NiceMock<MockApplicationInfo>(appId);
+    ON_CALL(*mockApplicationInfo, name()).WillByDefault(Return(name));
 
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
+    EXPECT_CALL(*taskController, getInfoForApp(appId))
+        .Times(1)
+        .WillOnce(Return(mockApplicationInfo));
 
     ON_CALL(*taskController, start(appId, _))
         .WillByDefault(Invoke(
@@ -751,12 +696,6 @@
     const QString appId("testAppId");
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -789,12 +728,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -833,12 +766,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -869,17 +796,9 @@
 {
     using namespace ::testing;
     const QString appId("testAppId");
-    const QString desktopFilePath("testAppId.desktop");
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    ON_CALL(*mockDesktopFileReader, file()).WillByDefault(Return(desktopFilePath));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -917,12 +836,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -960,12 +873,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1006,12 +913,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1051,12 +952,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1102,12 +997,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1160,12 +1049,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1213,12 +1096,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1252,12 +1129,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1294,7 +1165,6 @@
 {
     using namespace ::testing;
     const QString appId("testAppId");
-    const QString name("Test App");
     const pid_t procId = 5551;
     QByteArray cmdLine("/usr/bin/testApp --desktop_file_hint=");
     cmdLine = cmdLine.append(appId);
@@ -1304,13 +1174,6 @@
         .Times(1)
         .WillOnce(Return(cmdLine));
 
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    ON_CALL(*mockDesktopFileReader, name()).WillByDefault(Return(name));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     // Mir requests authentication for an application that was started
     bool authed = true;
     applicationManager.authorizeSession(procId, authed);
@@ -1348,12 +1211,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1407,13 +1264,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    ON_CALL(*mockDesktopFileReader, file()).WillByDefault(Return(appId + ".desktop"));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1465,12 +1315,6 @@
     ON_CALL(*taskController,appIdHasProcessId(_, procId2)).WillByDefault(Return(false));
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1525,12 +1369,6 @@
     ON_CALL(*taskController,appIdHasProcessId(_, procId2)).WillByDefault(Return(false));
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1583,12 +1421,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1636,13 +1468,6 @@
     std::condition_variable cv;
     bool done = false;
 
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    ON_CALL(*mockDesktopFileReader, file()).WillByDefault(Return(desktopFilePath));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1753,12 +1578,6 @@
     const quint64 procId = 12345;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
             .Times(1)
             .WillOnce(Return(true));
@@ -1821,12 +1640,6 @@
     const quint64 procId = 12345;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
             .Times(1)
             .WillOnce(Return(true));
@@ -1863,13 +1676,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    ON_CALL(*mockDesktopFileReader, file()).WillByDefault(Return(appId + ".desktop"));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1908,12 +1714,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -1957,12 +1757,6 @@
     const pid_t procId = 5551;
 
     // Set up Mocks & signal watcher
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -2032,13 +1826,6 @@
     const QString appId("testAppId");
     quint64 procId = 5551;
 
-    auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
-    ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
-    ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
-    ON_CALL(*mockDesktopFileReader, file()).WillByDefault(Return(appId + ".desktop"));
-
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -2085,11 +1872,6 @@
     const QString appId("testAppId");
     quint64 procId = 5551;
 
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _))
-        .WillByDefault(Invoke(
-            [](const QString &appId, const QFileInfo&) { return new FakeDesktopFileReader(appId); }
-        ));
-
     EXPECT_CALL(*taskController, start(appId, _))
         .Times(1)
         .WillOnce(Return(true));
@@ -2186,11 +1968,6 @@
     ON_CALL(procInfo,command_line(procId)).WillByDefault(Return(QByteArray("/usr/bin/testAppId")));
     ON_CALL(*taskController,appIdHasProcessId(appId, procId)).WillByDefault(Return(true));
 
-    ON_CALL(desktopFileReaderFactory, createInstance(appId, _))
-        .WillByDefault(Invoke(
-            [](const QString &appId, const QFileInfo&) { return new FakeDesktopFileReader(appId); }
-        ));
-
     auto app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
     applicationManager.onProcessStarting(appId);
     std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
 
=== modified file 'tests/modules/CMakeLists.txt'
--- tests/modules/CMakeLists.txt	2016-02-11 11:52:06 +0000
+++ tests/modules/CMakeLists.txt	2016-03-02 00:44:09 +0000
@@ -1,6 +1,5 @@
 add_subdirectory(Application)
 add_subdirectory(ApplicationManager)
-add_subdirectory(DesktopFileReader)
 add_subdirectory(General)
 add_subdirectory(SharedWakelock)
 add_subdirectory(SessionManager)
 
=== removed directory 'tests/modules/DesktopFileReader'
=== removed file 'tests/modules/DesktopFileReader/CMakeLists.txt'
--- tests/modules/DesktopFileReader/CMakeLists.txt	2015-09-30 15:45:17 +0000
+++ tests/modules/DesktopFileReader/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-add_definitions(-DTEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
-
-set(
-  DESKTOP_FILE_READER_TEST_SOURCES
-  desktopfilereader_test.cpp
-)
-
-include_directories(
-  ${CMAKE_SOURCE_DIR}/src/modules
-)
-
-add_executable(desktop_file_reader_test ${DESKTOP_FILE_READER_TEST_SOURCES})
-
-target_link_libraries(
-  desktop_file_reader_test
-  
-  unityapplicationplugin
-
-  ${GTEST_BOTH_LIBRARIES}
-)
-
-add_test(DesktopFileReader desktop_file_reader_test)
 
=== removed file 'tests/modules/DesktopFileReader/calculator.desktop'
--- tests/modules/DesktopFileReader/calculator.desktop	2014-10-06 22:37:55 +0000
+++ tests/modules/DesktopFileReader/calculator.desktop	1970-01-01 00:00:00 +0000
@@ -1,227 +0,0 @@
-[Desktop Entry]
-Name=Calculator
-Name[am]=መደመሪያ
-Name[ar]=الآلة الحاسبة
-Name[ast]=Calculadora
-Name[az]=Kalkulyator
-Name[be]=Калькулятар
-Name[bg]=Калкулатор
-Name[br]=Jederez
-Name[bs]=Kalkulator
-Name[ca]=Calculadora
-Name[cs]=Kalkulačka
-Name[cy]=Cyfrifiannell
-Name[da]=Lommeregner
-Name[de]=Taschenrechner
-Name[el]=Αριθμομηχανή
-Name[en_AU]=Calculator
-Name[en_CA]=Calculator
-Name[en_GB]=Calculator
-Name[es]=Calculadora
-Name[eu]=Kalkulagailua
-Name[fa]=ماشین‌حساب
-Name[fi]=Laskin
-Name[fr]=Calculatrice
-Name[gd]=An t-àireamhair
-Name[gl]=Calculadora
-Name[gu]=કેલ્ક્યુલેટર
-Name[he]=מחשבון
-Name[hi]=कैलकुलेटर
-Name[hu]=Számológép
-Name[id]=Kalkulator
-Name[is]=Reiknivél
-Name[it]=Calcolatrice
-Name[ja]=電卓
-Name[km]=ម៉ាស៊ីន​គិត​លេខ
-Name[ko]=계산기
-Name[lv]=Kalkulators
-Name[mr]=गणनयंत्र
-Name[ms]=Kalkulator
-Name[my]=ဂဏန်းတွက်စက်
-Name[nb]=Kalkulator
-Name[ne]=क्याल्कुलेटर
-Name[nl]=Rekenmachine
-Name[pa]=ਕੈਲਕੂਲੇਟਰ
-Name[pl]=Kalkulator
-Name[pt]=Calculadora
-Name[pt_BR]=Calculadora
-Name[ro]=Calculator
-Name[ru]=Калькулятор
-Name[sa]=सङ्कलकम्
-Name[shn]=ၸၢၵ်ႈၼပ့်သွၼ်
-Name[sl]=Računalo
-Name[sr]=Калкулатор
-Name[sv]=Kalkylator
-Name[ta]=கணிப்பான்
-Name[te]=గణన పరికరం
-Name[tr]=Hesap Makinesi
-Name[ug]=ھېسابلىغۇچ
-Name[uk]=Калькулятор
-Name[zh_CN]=计算器
-Name[zh_HK]=計數機
-Name[zh_TW]=計算機
-Comment=A simple calculator for Ubuntu.
-Comment[am]=ለ ኡቡንቱ ቀላል መደመሪያ
-Comment[ar]=آلة حاسبة بسيطة لأوبونتو.
-Comment[ast]=Una calculadora cenciella pa Ubuntu.
-Comment[az]=Ubuntu üçün sadә kalkulyator.
-Comment[br]=Ur jederez eeun evit Ubuntu.
-Comment[ca]=Una calculadora simple per a l'Ubuntu.
-Comment[cy]=Cyfrifiannell hawdd ar gyfer Ubuntu.
-Comment[da]=En simpel lommeregner til Ubuntu.
-Comment[de]=Ein einfach Tachenrechner für Ubuntu.
-Comment[el]=Μια απλή αριθμομηχανή για το Ubuntu
-Comment[en_AU]=A simple calculator for Ubuntu.
-Comment[en_GB]=A simple calculator for Ubuntu.
-Comment[es]=Una calculadora sencilla para Ubuntu.
-Comment[eu]=Ubunturako kalkulagailu sinplea.
-Comment[fa]=یک ماشین حساب ساده برای اوبونتو.
-Comment[fi]=Laskin Ubuntulle.
-Comment[fr]=Une calculatrice simple pour Ubuntu.
-Comment[gd]=Àireamhair simplidh airson Ubuntu.
-Comment[gl]=Calculadora sinxela para Ubuntu.
-Comment[he]=מחשבון פשוט לאובונטו.
-Comment[hu]=Egyszerű számológép Ubuntuhoz.
-Comment[is]=Einföld reiknivél
-Comment[it]=Una semplice calcolatrice per Ubuntu.
-Comment[ja]=Ubuntu用のシンプルな電卓です。
-Comment[km]=ម៉ាស៊ីន​គិត​លេខ​ធម្មតា​សម្រាប់ Ubuntu ។
-Comment[ko]=우분투를 위한 간단한 계산기
-Comment[lv]=Vienkāršs kalkulators priekš Ubuntu
-Comment[nb]=En enkel kalkulator for Ubuntu.
-Comment[ne]=Ubuntu को लागि एक सरल कैलकुलेटर।
-Comment[nl]=Een eenvoudige rekenmachine voor Ubuntu.
-Comment[pa]=ਉਬੰਤੂ ਲਈ ਇੱਕ ਸਧਾਰਨ ਕੈਲਕੂਲੇਟਰ
-Comment[pl]=Prosty kalkulator dla Ubuntu
-Comment[pt]=Uma calculadora simples para o Ubuntu.
-Comment[pt_BR]=Uma simples calculadora para Ubuntu
-Comment[ro]=Un calculator simplu pentru Ubuntu.
-Comment[ru]=Простой калькулятор для Ubuntu
-Comment[sa]=Ubuntu इत्यस्मा एकं सरलं सङ्कलकम्।
-Comment[sl]=Preprost kalkulator za Ubuntu.
-Comment[sr]=Једноставан калкулатор за Убунту
-Comment[sv]=En enkel kalkylator för Ubuntu.
-Comment[tr]=Ubuntu için sade bir hesap makinesi.
-Comment[ug]=ئاددىي ھېسابلىغۇچى
-Comment[uk]=Простий калькулятор для Ubuntu.
-Comment[zh_CN]=Ubuntu 简易计算器
-Comment[zh_TW]=Ubuntu 簡易計算機。
-Keywords=math;addition;subtraction;multiplication;division;
-Keywords[am]=ሂሳብ;መደመሪያ;መቀነሻ;ማባዣ;ማካፈያ;
-Keywords[ar]=رياضة;ياضيات;حساب;حسابات;جمع;طرح;ضرب;قسمة;
-Keywords[ast]=matemática;suma;resta;multiplicación;división;
-Keywords[az]=riyaziyyat;әlavә etmә;çıxma;vurma;bölmә;toplama;
-Keywords[br]=matematikoù;sammadenn;lamadenn;lieskementadenn;rannadenn;
-Keywords[ca]=suma;resta;calculadora;multiplica;divideix
-Keywords[da]=matematik;plus;minus;gange;dividere;beregning;lommeregner;
-Keywords[de]=Mathe;Mathematik;Multiplikation;Subtraktion;Addition;Division;
-Keywords[en_AU]=math;addition;subtraction;multiplication;division;
-Keywords[en_GB]=maths;addition;subtraction;multiplication;division;
-Keywords[es]=matemática;suma;resta;multiplicación;división;
-Keywords[eu]=matematikak;gehitu;kendu;biderkatu;zatitu;
-Keywords[fa]=حساب;جمع;تفریق;ضرب;تقسیم
-Keywords[fi]=math;addition;subtraction;multiplication;division;matematiikka;lisäys;vähennys;kertaus;jakaminen;
-Keywords[fr]=math;addition;soustraction;multiplication;division;
-Keywords[gd]=math;addition;subtraction;multiplication;division;matamataig;roinneadh;toirt air falbh;cur ris;iomadadh
-Keywords[gl]=matemáticas;suma;resta;multiplicación;división;
-Keywords[he]=מתמטיקה;חשבון;חיבור;חיסור;כפל;חילוק;
-Keywords[hu]=számolás;összeadás;kivonás;szorzás;osztás;
-Keywords[is]=reikna;samlagning;frádráttur;margföldun;deiling
-Keywords[it]=matematica;addizioni;sottrazioni;moltiplicazioni;divisioni;
-Keywords[ja]=math;addition;subtraction;multiplication;division;計算;電卓;足し算;引き算;かけ算;わり算;
-Keywords[km]=math;addition;subtraction;multiplication;division;
-Keywords[ko]=수학;덧셈;뺄셈;곱셈;나눗셈;
-Keywords[nb]=matte;addisjon;subtraksjon;multiplikasjon;divisjon;
-Keywords[ne]=गणित; जोड्; घटाउ; गुणन; विभाजन;
-Keywords[nl]=math;addition;subtraction;multiplication;division;optellen;aftrekken;vermenigvuldigen;delen;
-Keywords[pa]=ਹਿਸਾਬ;ਜੋੜ;ਘਟਾਉ;ਗੁਣਾ;ਭਾਗ;
-Keywords[pl]=liczenie;dodawanie;odejmowanie;mnożenie;dzielenie;
-Keywords[pt]=matemática;soma;subtracção;multiplicação;divisão;
-Keywords[pt_BR]=matemática;adição;subtração;multiplicação;divisão
-Keywords[ro]=matematică;adunare;scădere;înmulțire;împărțire
-Keywords[ru]=математика;сложение;умножение;деление;
-Keywords[sa]=गणितम्;योजनम्;वियोजनम्;गुणनम्;विभाजनम्;
-Keywords[sl]=matematika;seštevanje;odštevanje;množenje;deljenje;
-Keywords[sr]=математика;сабирање;одузимање;множење;дељење;рачунање;дигитрон;
-Keywords[sv]=matematik;addition;substraktion;multiplikation;division
-Keywords[tr]=matematik;ekleme;çıkarma;çarpma;bölme;toplama
-Keywords[ug]=ماتېماتىكا;قوشۇش;ئېلىش;كۆپەيتىش;بۆلۈش;
-Keywords[uk]=math;addition;subtraction;multiplication;division;математика;додавання;віднімання;множення;ділення;калькулятор;
-Keywords[zh_CN]=数学;加;减;乘;除;
-Keywords[zh_TW]=math;addition;subtraction;multiplication;division;數學;加;減;乘;除;
-Type=Application
-Terminal=false
-Exec=yes -p com.ubuntu.calculator_calculator_1.3.329 -- qmlscene -qt5 ubuntu-calculator-app.qml
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Default-Department-ID=accessories
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator
-X-Ubuntu-Old-Icon=[e-mail]
-X-Ubuntu-Application-ID=com.ubuntu.calculator_calculator_1.3.329
-X-Ubuntu-Splash-Show-Header=True
-X-Ubuntu-Splash-Color=#aabbcc
-X-Ubuntu-Splash-Color-Header=purple
-X-Ubuntu-Splash-Color-Footer=#deadbeefda
-X-Ubuntu-Splash-Image=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]
-X-Ubuntu-Splash-Title=Calculator 2.0
-X-Ubuntu-Splash-Title[am]=መደመሪያ 2.0
-X-Ubuntu-Splash-Title[ar]=الآلة  2.0الحاسبة
-X-Ubuntu-Splash-Title[ast]=Calculadora 2.0
-X-Ubuntu-Splash-Title[az]=Kalkulyator 2.0
-X-Ubuntu-Splash-Title[be]=Калькулятар 2.0
-X-Ubuntu-Splash-Title[bg]=Калкулатор 2.0
-X-Ubuntu-Splash-Title[br]=Jederez 2.0
-X-Ubuntu-Splash-Title[bs]=Kalkulator 2.0
-X-Ubuntu-Splash-Title[ca]=Calculadora 2.0
-X-Ubuntu-Splash-Title[cs]=Kalkulačka 2.0
-X-Ubuntu-Splash-Title[cy]=Cyfrifiannell 2.0
-X-Ubuntu-Splash-Title[da]=Lommeregner 2.0
-X-Ubuntu-Splash-Title[de]=Taschenrechner 2.0
-X-Ubuntu-Splash-Title[el]=Αριθμομηχανή 2.0
-X-Ubuntu-Splash-Title[en_AU]=Calculator 2.0
-X-Ubuntu-Splash-Title[en_CA]=Calculator 2.0
-X-Ubuntu-Splash-Title[en_GB]=Calculator 2.0
-X-Ubuntu-Splash-Title[es]=Calculadora 2.0
-X-Ubuntu-Splash-Title[eu]=Kalkulagailua 2.0
-X-Ubuntu-Splash-Title[fa]= 2.0ماشین‌حساب
-X-Ubuntu-Splash-Title[fi]=Laskin 2.0
-X-Ubuntu-Splash-Title[fr]=Calculatrice 2.0
-X-Ubuntu-Splash-Title[gd]=An t-àireamhair 2.0
-X-Ubuntu-Splash-Title[gl]=Calculadora 2.0
-X-Ubuntu-Splash-Title[gu]=કેલ્ક્યુલેટર 2.0
-X-Ubuntu-Splash-Title[he]= 2.0מחשבון
-X-Ubuntu-Splash-Title[hi]=कैलकुलेटर 2.0
-X-Ubuntu-Splash-Title[hu]=Számológép 2.0
-X-Ubuntu-Splash-Title[id]=Kalkulator 2.0
-X-Ubuntu-Splash-Title[is]=Reiknivél 2.0
-X-Ubuntu-Splash-Title[it]=Calcolatrice 2.0
-X-Ubuntu-Splash-Title[ja]=電卓 2.0
-X-Ubuntu-Splash-Title[km]=ម៉ាស៊ីន​គិត​លេខ 2.0
-X-Ubuntu-Splash-Title[ko]=계산기 2.0
-X-Ubuntu-Splash-Title[lv]=Kalkulators 2.0
-X-Ubuntu-Splash-Title[mr]=गणनयंत्र 2.0
-X-Ubuntu-Splash-Title[ms]=Kalkulator 2.0
-X-Ubuntu-Splash-Title[my]=ဂဏန်းတွက်စက် 2.0
-X-Ubuntu-Splash-Title[nb]=Kalkulator 2.0
-X-Ubuntu-Splash-Title[ne]=क्याल्कुलेटर 2.0
-X-Ubuntu-Splash-Title[nl]=Rekenmachine 2.0
-X-Ubuntu-Splash-Title[pa]=ਕੈਲਕੂਲੇਟਰ 2.0
-X-Ubuntu-Splash-Title[pl]=Kalkulator 2.0
-X-Ubuntu-Splash-Title[pt]=Calculadora 2.0
-X-Ubuntu-Splash-Title[pt_BR]=Calculadora 2.0
-X-Ubuntu-Splash-Title[ro]=Calculator 2.0
-X-Ubuntu-Splash-Title[ru]=Калькулятор 2.0
-X-Ubuntu-Splash-Title[sa]=सङ्कलकम् 2.0
-X-Ubuntu-Splash-Title[shn]=ၸၢၵ်ႈၼပ့်သွၼ် 2.0
-X-Ubuntu-Splash-Title[sl]=Računalo 2.0
-X-Ubuntu-Splash-Title[sr]=Калкулатор 2.0
-X-Ubuntu-Splash-Title[sv]=Kalkylator 2.0
-X-Ubuntu-Splash-Title[ta]=கணிப்பான் 2.0
-X-Ubuntu-Splash-Title[te]=గణన పరికరం 2.0
-X-Ubuntu-Splash-Title[tr]=Hesap Makinesi 2.0
-X-Ubuntu-Splash-Title[ug]= 2.0ھېسابلىغۇچ
-X-Ubuntu-Splash-Title[uk]=Калькулятор 2.0
-X-Ubuntu-Splash-Title[zh_CN]=计算器 2.0
-X-Ubuntu-Splash-Title[zh_HK]=計數機 2.0
-X-Ubuntu-Splash-Title[zh_TW]=計算機 2.0
 
=== removed file 'tests/modules/DesktopFileReader/desktopfilereader_test.cpp'
--- tests/modules/DesktopFileReader/desktopfilereader_test.cpp	2015-09-28 20:11:39 +0000
+++ tests/modules/DesktopFileReader/desktopfilereader_test.cpp	1970-01-01 00:00:00 +0000
@@ -1,200 +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 Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <Unity/Application/desktopfilereader.h>
-
-#include <gtest/gtest.h>
-
-#include <QDir>
-#include <QFileInfo>
-#include <QLocale>
-#include <QtGlobal>
-#include <QString>
-
-using namespace qtmir;
-
-namespace {
-    static void setLocale(const char *locale)
-    {
-        qputenv("LANGUAGE", locale);
-        qputenv("LC_ALL", locale); // set these for GIO
-        QLocale::setDefault(QString(locale)); // set for Qt
-    }
-}
-
-TEST(DesktopFileReader, testReadsDesktopFile)
-{
-    using namespace ::testing;
-    setLocale("C");
-
-    QFileInfo fileInfo(QString(TEST_SOURCE_DIR) + "/calculator.desktop");
-    DesktopFileReader::Factory readerFactory;
-    DesktopFileReader *reader = readerFactory.createInstance("calculator", fileInfo);
-
-    EXPECT_EQ(reader->loaded(), true);
-    EXPECT_EQ(reader->appId(), "calculator");
-    EXPECT_EQ(reader->name(), "Calculator");
-    EXPECT_EQ(reader->exec(), "yes -p com.ubuntu.calculator_calculator_1.3.329 -- qmlscene -qt5 ubuntu-calculator-app.qml");
-    EXPECT_EQ(reader->icon(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]");
-    EXPECT_EQ(reader->path(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator");
-    EXPECT_EQ(reader->comment(), "A simple calculator for Ubuntu.");
-    EXPECT_EQ(reader->stageHint(), "SideStage");
-    EXPECT_EQ(reader->splashColor(), "#aabbcc");
-    EXPECT_EQ(reader->splashColorFooter(), "#deadbeefda");
-    EXPECT_EQ(reader->splashColorHeader(), "purple");
-    EXPECT_EQ(reader->splashImage(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]");
-    EXPECT_EQ(reader->splashShowHeader(), "True");
-    EXPECT_EQ(reader->splashTitle(), "Calculator 2.0");
-    EXPECT_EQ(reader->isTouchApp(), true);
-}
-
-TEST(DesktopFileReader, testReadsLocalizedDesktopFile)
-{
-    using namespace ::testing;
-    setLocale("de");
-
-    QFileInfo fileInfo(QString(TEST_SOURCE_DIR) + "/calculator.desktop");
-    DesktopFileReader::Factory readerFactory;
-    DesktopFileReader *reader = readerFactory.createInstance("calculator", fileInfo);
-
-    EXPECT_EQ(reader->loaded(), true);
-    EXPECT_EQ(reader->appId(), "calculator");
-    EXPECT_EQ(reader->name(), "Taschenrechner");
-    EXPECT_EQ(reader->exec(), "yes -p com.ubuntu.calculator_calculator_1.3.329 -- qmlscene -qt5 ubuntu-calculator-app.qml");
-    EXPECT_EQ(reader->icon(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]");
-    EXPECT_EQ(reader->path(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator");
-    EXPECT_EQ(reader->comment(), "Ein einfach Tachenrechner für Ubuntu.");
-    EXPECT_EQ(reader->stageHint(), "SideStage");
-    EXPECT_EQ(reader->splashColor(), "#aabbcc");
-    EXPECT_EQ(reader->splashColorFooter(), "#deadbeefda");
-    EXPECT_EQ(reader->splashColorHeader(), "purple");
-    EXPECT_EQ(reader->splashImage(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]");
-    EXPECT_EQ(reader->splashShowHeader(), "True");
-    EXPECT_EQ(reader->splashTitle(), "Taschenrechner 2.0");
-    EXPECT_EQ(reader->isTouchApp(), true);
-}
-
-TEST(DesktopFileReader, testMissingDesktopFile)
-{
-    using namespace ::testing;
-    setLocale("C");
-
-    QFileInfo fileInfo(QString(TEST_SOURCE_DIR) + "/missing.desktop");
-    DesktopFileReader::Factory readerFactory;
-    DesktopFileReader *reader = readerFactory.createInstance("calculator", fileInfo);
-
-    EXPECT_EQ(reader->loaded(), false);
-    EXPECT_EQ(reader->appId(), "calculator");
-    EXPECT_EQ(reader->name(), "");
-    EXPECT_EQ(reader->exec(), "");
-    EXPECT_EQ(reader->icon(), "");
-    EXPECT_EQ(reader->path(), "");
-    EXPECT_EQ(reader->comment(), "");
-    EXPECT_EQ(reader->stageHint(), "");
-    EXPECT_EQ(reader->splashColor(), "");
-    EXPECT_EQ(reader->splashColorFooter(), "");
-    EXPECT_EQ(reader->splashColorHeader(), "");
-    EXPECT_EQ(reader->splashImage(), "");
-    EXPECT_EQ(reader->splashShowHeader(), "");
-    EXPECT_EQ(reader->splashTitle(), "");
-    EXPECT_EQ(reader->isTouchApp(), false);
-}
-
-TEST(DesktopFileReader, testUTF8Characters)
-{
-    using namespace ::testing;
-    setLocale("zh_CN");
-
-    QFileInfo fileInfo(QString(TEST_SOURCE_DIR) + "/calculator.desktop");
-    DesktopFileReader::Factory readerFactory;
-    DesktopFileReader *reader = readerFactory.createInstance("calculator", fileInfo);
-
-    EXPECT_EQ(reader->loaded(), true);
-    EXPECT_EQ(reader->appId(), "calculator");
-    EXPECT_EQ(reader->name(), "计算器");
-    EXPECT_EQ(reader->comment(), "Ubuntu 简易计算器");
-    EXPECT_EQ(reader->splashTitle(), "计算器 2.0");
-}
-
-TEST(DesktopFileReader, parseOrientations)
-{
-    using namespace ::testing;
-
-    const Qt::ScreenOrientations defaultOrientations = Qt::PortraitOrientation | Qt::LandscapeOrientation
-        | Qt::InvertedPortraitOrientation | Qt::InvertedLandscapeOrientation;
-    bool ok;
-    Qt::ScreenOrientations orientations;
-
-    ok = DesktopFileReader::parseOrientations(QString(), orientations);
-    ASSERT_TRUE(ok);
-    EXPECT_EQ(defaultOrientations, orientations);
-
-    ok = DesktopFileReader::parseOrientations("An invalid string!", orientations);
-    ASSERT_FALSE(ok);
-    EXPECT_EQ(defaultOrientations, orientations);
-
-    ok = DesktopFileReader::parseOrientations("landscape", orientations);
-    ASSERT_TRUE(ok);
-    EXPECT_EQ(Qt::LandscapeOrientation, orientations);
-
-    ok = DesktopFileReader::parseOrientations("   InvertedPortrait  , Portrait ", orientations);
-    ASSERT_TRUE(ok);
-    EXPECT_EQ(Qt::InvertedPortraitOrientation | Qt::PortraitOrientation, orientations);
-
-    ok = DesktopFileReader::parseOrientations(",inverted-landscape, inverted_portrait, ", orientations);
-    ASSERT_TRUE(ok);
-    EXPECT_EQ(Qt::InvertedPortraitOrientation | Qt::InvertedLandscapeOrientation, orientations);
-
-    ok = DesktopFileReader::parseOrientations(",inverted-landscape, some-invalid-text, ", orientations);
-    ASSERT_FALSE(ok);
-    EXPECT_EQ(defaultOrientations, orientations);
-
-    ok = DesktopFileReader::parseOrientations("landscape;portrait", orientations);
-    ASSERT_TRUE(ok);
-    EXPECT_EQ(Qt::PortraitOrientation | Qt::LandscapeOrientation, orientations);
-
-    ok = DesktopFileReader::parseOrientations("primary", orientations);
-    ASSERT_TRUE(ok);
-    EXPECT_EQ(Qt::PrimaryOrientation, orientations);
-
-    ok = DesktopFileReader::parseOrientations("landscpe,primary", orientations);
-    ASSERT_FALSE(ok);
-    EXPECT_EQ(defaultOrientations, orientations);
-}
-
-TEST(DesktopFileReader, parseBoolean)
-{
-    using namespace ::testing;
-
-    bool ok;
-    bool boolean;
-
-    ok = DesktopFileReader::parseBoolean(QString(), boolean);
-    ASSERT_TRUE(ok);
-    EXPECT_FALSE(boolean);
-
-    ok = DesktopFileReader::parseBoolean("  Yes ", boolean);
-    ASSERT_TRUE(ok);
-    EXPECT_TRUE(boolean);
-
-    ok = DesktopFileReader::parseBoolean("False", boolean);
-    ASSERT_TRUE(ok);
-    EXPECT_FALSE(boolean);
-
-    ok = DesktopFileReader::parseBoolean("Hello World!", boolean);
-    ASSERT_FALSE(ok);
-    EXPECT_FALSE(boolean);
-}