Merge lp:~mzanetti/unity8/launcher-follow-unity-api into lp:unity8

[Michael Zanetti]

change launcher backend implementation to follow launcher API defined in lp:unity-api

This changes the launcher plugin in plugins/Unity/ to follow the launcher API defined in lp:unity-api:

-> move plugin from plugins/Unity to plugins/Unity/Launcher/ (because the API dictates to import Unity.Launcher 0.1)
-> change the mock implementation in tests/qmltests/plugins/ to follow the same API and move to /test/mocks/Unity/Launcher/
-> Adjust the UI code to load the LauncherModel as a singleton to reflect the API changes

The plugin in tests/mocks/ is meant to stay and feed the UI tests for the launcher with some mock data.

The plugin in plugins/ is the one that will be extended to be the real thing. It is subject to be removed to a separate project/repository in the short to mid-term.

[lp:~mzanetti/unity8/launcher-follow-unity-api]

31. By Michael Zanetti on 2013-07-02

remove debug print from cmakelists.txt

32. By Michael Zanetti on 2013-07-02

find unity-shell-launcher instead of libunity-api

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/unity8-ci/57/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/327/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/565/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 libboost1.53-dev : Conflicts: libboost1.49-dev but 1.49.0-4 is to be installed.

So this waits for https://code.launchpad.net/~saviq/unity-api/any-boost/+merge/172525 to be released, right?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/unity8-ci/63/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/578/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/336/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/580/console

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

> libboost1.53-dev : Conflicts: libboost1.49-dev but 1.49.0-4 is to be
> installed.
>
> So this waits for https://code.launchpad.net/~saviq/unity-api/any-
> boost/+merge/172525 to be released, right?

Oh right, yes. Has a dependency on that one. Unfortunately setting a prerequisite branch doesn't help much in this case. So I guess we just have to wait.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/unity8-ci/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/580/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/582/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/unity8-ci/76/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/620/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/355/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/622/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

CMake Error at tests/mocks/Unity/Launcher/CMakeLists.txt:23 (add_library):
  Cannot find source file:

    /home/mzanetti/Development/unity-api/include/unity/shell/launcher/LauncherModelInterface.h

review: Needs Fixing

[lp:~mzanetti/unity8/launcher-follow-unity-api]

33. By Michael Zanetti on 2013-07-03

use real unity-api api also for tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/unity8-ci/87/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/366
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/86
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/86/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/634
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/634/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/570

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

superseeded by https://code.launchpad.net/~unity-team/unity8/launcher-backend/+merge/173189

review: Needs Resubmitting

Unmerged revisions

=== modified file 'Launcher/Launcher.qml'
--- Launcher/Launcher.qml	2013-07-01 21:13:41 +0000
+++ Launcher/Launcher.qml	2013-07-03 08:52:27 +0000
@@ -19,6 +19,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Gestures 0.1
 import Unity 0.1
+import Unity.Launcher 0.1
 
 Item {
     id: root
@@ -96,10 +97,6 @@
         }
     }
 
-    LauncherModel {
-        id: launcherModel
-    }
-
     MouseArea {
         id: launcherDragArea
         enabled: root.state == "visible"
@@ -152,7 +149,7 @@
             bottom: parent.bottom
         }
         x: -width
-        model: launcherModel
+        model: LauncherModel
 
         property bool animate: true
 

=== modified file 'Launcher/LauncherPanel.qml'
--- Launcher/LauncherPanel.qml	2013-06-25 13:25:45 +0000
+++ Launcher/LauncherPanel.qml	2013-07-03 08:52:27 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Unity 0.1
+import Unity.Launcher 0.1
 import "../Components/ListItems"
 
 Item {
@@ -139,7 +140,7 @@
                     maxAngle: 60
 
                     onClicked: {
-                        root.applicationSelected(launcherModel.get(index).desktopFile);
+                        root.applicationSelected(LauncherModel.get(index).desktopFile);
                     }
                 }
 

=== modified file 'debian/control'
--- debian/control	2013-06-20 07:58:53 +0000
+++ debian/control	2013-07-03 08:52:27 +0000
@@ -13,6 +13,7 @@
                libpulse-dev,
                libqt5v8-5-private-dev,
                libunity-core-6.0-dev (<< 7.80),
+               libunity-api-dev,
                libxcb1-dev,
                pkg-config,
                python3,

=== modified file 'plugins/Unity/CMakeLists.txt'
--- plugins/Unity/CMakeLists.txt	2013-06-06 10:37:13 +0000
+++ plugins/Unity/CMakeLists.txt	2013-07-03 08:52:27 +0000
@@ -19,7 +19,6 @@
     categoryfilter.cpp
     plugin.cpp
     bottombarvisibilitycommunicatorshell.cpp
-    launchermodel.cpp
     )
 
 add_library(Unity-qml MODULE
@@ -47,3 +46,6 @@
 install(FILES qmldir
     DESTINATION ${SHELL_APP_DIR}/plugins/Unity
     )
+
+
+add_subdirectory(Launcher)

=== added directory 'plugins/Unity/Launcher'
=== added file 'plugins/Unity/Launcher/CMakeLists.txt'
--- plugins/Unity/Launcher/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/CMakeLists.txt	2013-07-03 08:52:27 +0000
@@ -0,0 +1,36 @@
+# Dependencies
+include(FindPkgConfig)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${LAUNCHER_API_INCLUDEDIR}
+)
+
+set(QMLLAUNCHERPLUGIN_SRC
+    plugin.cpp
+    launchermodel.cpp
+    launcheritem.cpp
+    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
+    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
+    )
+
+add_library(UnityLauncher-qml MODULE
+    ${QMLLAUNCHERPLUGIN_SRC}
+    )
+
+qt5_use_modules(UnityLauncher-qml Qml)
+
+# copy qmldir file into build directory for shadow builds
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+    )
+
+install(TARGETS UnityLauncher-qml
+    DESTINATION ${SHELL_APP_DIR}/plugins/Unity/Launcher/
+    )
+
+install(FILES qmldir
+    DESTINATION ${SHELL_APP_DIR}/plugins/Unity/Launcher/
+    )

=== added file 'plugins/Unity/Launcher/launcheritem.cpp'
--- plugins/Unity/Launcher/launcheritem.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/launcheritem.cpp	2013-07-03 08:52:27 +0000
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michael Zanetti <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "launcheritem.h"
+
+LauncherItem::LauncherItem(const QString &desktopFile, const QString &name, const QString &icon, QObject *parent) :
+    LauncherItemInterface(parent),
+    m_desktopFile(desktopFile),
+    m_name(name),
+    m_icon(icon),
+    m_favorite(false),
+    m_running(false),
+    m_recent(false),
+    m_progress(-1),
+    m_count(0)
+{
+
+}
+
+QString LauncherItem::desktopFile() const
+{
+    return m_desktopFile;
+}
+
+QString LauncherItem::name() const
+{
+    return m_name;
+}
+
+QString LauncherItem::icon() const
+{
+    return m_icon;
+}
+
+bool LauncherItem::favorite() const
+{
+    return m_favorite;
+}
+
+void LauncherItem::setFavorite(bool favorite)
+{
+    if (m_favorite != favorite) {
+        m_favorite = favorite;
+        Q_EMIT favoriteChanged(favorite);
+    }
+}
+
+bool LauncherItem::running() const
+{
+    return m_running;
+}
+
+void LauncherItem::setRunning(bool running)
+{
+    if (m_running != running) {
+        m_running = running;
+        Q_EMIT runningChanged(running);
+    }
+}
+
+bool LauncherItem::recent() const
+{
+    return m_recent;
+}
+
+void LauncherItem::setRecent(bool recent)
+{
+    if (m_recent != recent) {
+        m_recent = recent;
+        Q_EMIT recentChanged(recent);
+    }
+}
+
+int LauncherItem::progress() const
+{
+    return m_progress;
+}
+
+void LauncherItem::setProgress(int progress)
+{
+    if (m_progress != progress) {
+        m_progress = progress;
+        Q_EMIT progressChanged(progress);
+    }
+}
+
+int LauncherItem::count() const
+{
+    return m_count;
+}
+
+void LauncherItem::setCount(int count)
+{
+    if (m_count != count) {
+        m_count = count;
+        Q_EMIT countChanged(count);
+    }
+}

=== added file 'plugins/Unity/Launcher/launcheritem.h'
--- plugins/Unity/Launcher/launcheritem.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/launcheritem.h	2013-07-03 08:52:27 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michael Zanetti <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LAUNCHERITEM_H
+#define LAUNCHERITEM_H
+
+#include <unity/shell/launcher/LauncherItemInterface.h>
+
+using namespace unity::shell::launcher;
+
+class LauncherItem: public LauncherItemInterface
+{
+    Q_OBJECT
+public:
+    LauncherItem(const QString &desktopFile, const QString &name, const QString &icon, QObject *parent = 0);
+
+    QString desktopFile() const;
+
+    QString name() const;
+    QString icon() const;
+
+    bool favorite() const;
+    void setFavorite(bool favorite);
+
+    bool running() const;
+    void setRunning(bool running);
+
+    bool recent() const;
+    void setRecent(bool recent);
+
+    int progress() const;
+    void setProgress(int progress);
+
+    int count() const;
+    void setCount(int count);
+
+Q_SIGNALS:
+    void favoriteChanged(bool favorite);
+    void runningChanged(bool running);
+
+private:
+    QString m_desktopFile;
+    QString m_name;
+    QString m_icon;
+    bool m_favorite;
+    bool m_running;
+    bool m_recent;
+    int m_progress;
+    int m_count;
+};
+
+#endif // LAUNCHERITEM_H

=== added file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2013-07-03 08:52:27 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michael Zanetti <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "launchermodel.h"
+#include "launcheritem.h"
+
+LauncherModel::LauncherModel(QObject *parent): LauncherModelInterface(parent)
+{
+    // FIXME: Dummy data... Aggregate real data from backends
+
+    // Fake favorites
+    LauncherItem *item = new LauncherItem("/usr/share/applications/phone-app.desktop", "Phone", "phone-app");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/camera-app.desktop", "Camera", "camera");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/gallery-app.desktop", "Gallery", "gallery");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/webbrowser-app.desktop", "Browser", "browser");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/notes-app.desktop", "Notepad", "notepad");
+    m_list.append(item);
+    item = new LauncherItem("/usr/share/applications/ubuntu-calendar-app.desktop","Calendar", "calendar");
+    m_list.append(item);
+}
+
+LauncherModel::~LauncherModel()
+{
+    while (!m_list.empty()) {
+        m_list.takeFirst()->deleteLater();
+    }
+}
+
+int LauncherModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+    return m_list.count();
+}
+
+QVariant LauncherModel::data(const QModelIndex &index, int role) const
+{
+    LauncherItem *item = m_list.at(index.row());
+    switch(role) {
+    case RoleName:
+        return item->name();
+    case RoleIcon:
+        return item->icon();
+    case RoleFavorite:
+        return item->favorite();
+    }
+
+    return QVariant();
+}
+
+unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
+{
+    if (index < 0 || index >= m_list.count()) {
+        return 0;
+    }
+    return m_list.at(index);
+}
+
+void LauncherModel::move(int oldIndex, int newIndex)
+{
+    beginMoveRows(QModelIndex(), oldIndex, oldIndex, QModelIndex(), newIndex);
+    m_list.move(oldIndex, newIndex);
+    endMoveRows();
+}
+
+QHash<int, QByteArray> LauncherModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles.insert(RoleDesktopFile, "desktopFile");
+    roles.insert(RoleName, "name");
+    roles.insert(RoleIcon, "icon");
+    roles.insert(RoleFavorite, "favorite");
+    roles.insert(RoleRunning, "runnng");
+    return roles;
+}

=== added file 'plugins/Unity/Launcher/launchermodel.h'
--- plugins/Unity/Launcher/launchermodel.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/launchermodel.h	2013-07-03 08:52:27 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michael Zanetti <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LAUNCHERMODELH
+#define LAUNCHERMODEL_H
+
+#include <unity/shell/launcher/LauncherModelInterface.h>
+
+#include <QAbstractListModel>
+
+class LauncherItem;
+
+using namespace unity::shell::launcher;
+
+class LauncherModel: public LauncherModelInterface
+{
+   Q_OBJECT
+
+public:
+    LauncherModel(QObject *parent = 0);
+    ~LauncherModel();
+
+    int rowCount(const QModelIndex &parent) const;
+
+    QVariant data(const QModelIndex &index, int role) const;
+
+    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const;
+    Q_INVOKABLE void move(int oldIndex, int newIndex);
+
+    QHash<int, QByteArray> roleNames() const;
+
+private:
+    QList<LauncherItem*> m_list;
+};
+
+#endif // LAUNCHERMODEL_H

=== added file 'plugins/Unity/Launcher/plugin.cpp'
--- plugins/Unity/Launcher/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/plugin.cpp	2013-07-03 08:52:27 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Zanetti <[e-mail]>
+ */
+
+// Qt
+#include <QtQml>
+
+// self
+#include "plugin.h"
+
+// local
+#include "launchermodel.h"
+#include "launcheritem.h"
+
+
+using namespace unity::shell::launcher;
+
+static QObject* modelProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
+{
+    return new LauncherModel();
+}
+void UnityLauncherPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Unity.Launcher"));
+
+    qmlRegisterUncreatableType<LauncherModelInterface>(uri, 0, 1, "LauncherModelInterface", "Abstract Interface. Cannot be instantiated.");
+    qmlRegisterUncreatableType<LauncherItemInterface>(uri, 0, 1, "LauncherItemInterface", "Abstract Interface. Cannot be instantiated.");
+
+    qmlRegisterSingletonType<LauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);
+    qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create new Launcher Items in QML. Get them from the LauncherModel.");
+}

=== added file 'plugins/Unity/Launcher/plugin.h'
--- plugins/Unity/Launcher/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/plugin.h	2013-07-03 08:52:27 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef UNITY_LAUNCHER_PLUGIN_H
+#define UNITY_LAUNCHER_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class UnityLauncherPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif

=== added file 'plugins/Unity/Launcher/qmldir'
--- plugins/Unity/Launcher/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Launcher/qmldir	2013-07-03 08:52:27 +0000
@@ -0,0 +1,2 @@
+module Unity.Launcher
+plugin UnityLauncher-qml

=== removed file 'plugins/Unity/launchermodel.cpp'
--- plugins/Unity/launchermodel.cpp	2013-06-05 22:03:08 +0000
+++ plugins/Unity/launchermodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Michael Zanetti <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "launchermodel.h"
-
-LauncherModel::LauncherModel(QObject *parent): QAbstractListModel(parent)
-{
-    // FIXME: Dummy data... Aggregate real data from backends
-
-    // Fake favorites
-    LauncherItem *item = new LauncherItem("/usr/share/applications/phone-app.desktop", "Phone", "phone-app");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/camera-app.desktop", "Camera", "camera");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/gallery-app.desktop", "Gallery", "gallery");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/webbrowser-app.desktop", "Browser", "browser");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/notes-app.desktop", "Notepad", "notepad");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/ubuntu-calendar-app.desktop","Calendar", "calendar");
-    m_list.append(item);
-}
-
-LauncherModel::~LauncherModel()
-{
-    while (!m_list.empty()) {
-        m_list.takeFirst()->deleteLater();
-    }
-}
-
-int LauncherModel::rowCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent)
-    return m_list.count();
-}
-
-QVariant LauncherModel::data(const QModelIndex &index, int role) const
-{
-    LauncherItem *item = m_list.at(index.row());
-    switch(role) {
-    case RoleName:
-        return item->name();
-    case RoleIcon:
-        return item->icon();
-    case RoleFavorite:
-        return item->favorite();
-    }
-
-    return QVariant();
-}
-
-LauncherItem *LauncherModel::get(int index) const
-{
-    if (index < 0 || index >= m_list.count()) {
-        return 0;
-    }
-    return m_list.at(index);
-}
-
-void LauncherModel::move(int oldIndex, int newIndex)
-{
-    beginMoveRows(QModelIndex(), oldIndex, oldIndex, QModelIndex(), newIndex);
-    m_list.move(oldIndex, newIndex);
-    endMoveRows();
-}
-
-QHash<int, QByteArray> LauncherModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles.insert(RoleDesktopFile, "desktopFile");
-    roles.insert(RoleName, "name");
-    roles.insert(RoleIcon, "icon");
-    roles.insert(RoleFavorite, "favorite");
-    roles.insert(RoleRunning, "runnng");
-    return roles;
-}
-
-
-LauncherItem::LauncherItem(const QString &desktopFile, const QString &name, const QString &icon, QObject *parent):
-    QObject(parent),
-    m_desktopFile(desktopFile),
-    m_name(name),
-    m_icon(icon),
-    m_favorite(false)
-{
-
-}
-
-QString LauncherItem::desktopFile() const
-{
-    return m_desktopFile;
-}
-
-QString LauncherItem::name() const
-{
-    return m_name;
-}
-
-QString LauncherItem::icon() const
-{
-    return m_icon;
-}
-
-bool LauncherItem::favorite() const
-{
-    return m_favorite;
-}
-
-void LauncherItem::setFavorite(bool favorite)
-{
-    if (m_favorite != favorite) {
-        m_favorite = favorite;
-        Q_EMIT favoriteChanged(m_favorite);
-    }
-}
-
-bool LauncherItem::running() const
-{
-    return m_running;
-}
-
-void LauncherItem::setRunning(bool running)
-{
-    if (m_running != running) {
-        m_running = running;
-        Q_EMIT runningChanged(running);
-    }
-}

=== removed file 'plugins/Unity/launchermodel.h'
--- plugins/Unity/launchermodel.h	2013-06-05 22:03:08 +0000
+++ plugins/Unity/launchermodel.h	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Michael Zanetti <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QAbstractListModel>
-
-class LauncherItem;
-
-class LauncherModel: public QAbstractListModel
-{
-   Q_OBJECT
-
-public:
-    enum Roles {
-        RoleDesktopFile = Qt::UserRole,
-        RoleName,
-        RoleIcon,
-        RoleFavorite,
-        RoleRunning
-    };
-
-    LauncherModel(QObject *parent = 0);
-    ~LauncherModel();
-
-    int rowCount(const QModelIndex &parent) const;
-
-    QVariant data(const QModelIndex &index, int role) const;
-
-    Q_INVOKABLE LauncherItem* get(int index) const;
-    Q_INVOKABLE void move(int oldIndex, int newIndex);
-
-    QHash<int, QByteArray> roleNames() const;
-
-private:
-    QList<LauncherItem*> m_list;
-};
-
-class LauncherItem: public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString desktopFile READ desktopFile CONSTANT)
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(QString icon READ icon CONSTANT)
-    Q_PROPERTY(bool favorite READ favorite WRITE setFavorite NOTIFY favoriteChanged)
-    Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged)
-
-public:
-    LauncherItem(const QString &desktopFile, const QString &name, const QString &icon, QObject *parent = 0);
-
-    QString desktopFile() const;
-
-    QString name() const;
-    QString icon() const;
-
-    bool favorite() const;
-    void setFavorite(bool favorite);
-
-    bool running() const;
-    void setRunning(bool running);
-
-Q_SIGNALS:
-    void favoriteChanged(bool favorite);
-    void runningChanged(bool running);
-
-private:
-    QString m_desktopFile;
-    QString m_name;
-    QString m_icon;
-    bool m_favorite;
-    bool m_running;
-};

=== modified file 'plugins/Unity/plugin.cpp'
--- plugins/Unity/plugin.cpp	2013-06-06 15:55:43 +0000
+++ plugins/Unity/plugin.cpp	2013-07-03 08:52:27 +0000
@@ -29,7 +29,6 @@
 #include "categories.h"
 #include "categoryfilter.h"
 #include "bottombarvisibilitycommunicatorshell.h"
-#include "launchermodel.h"
 
 // libqtdee
 #include "deelistmodel.h"
@@ -45,8 +44,6 @@
     qmlRegisterType<Categories>(uri, 0, 1, "Categories");
     qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
     qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
-    qmlRegisterType<LauncherModel>(uri, 0, 1, "LauncherModel");
-    qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create new Launcher Items in QML. Get them from the LauncherModel.");
     qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");
 }
 

=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2013-06-05 22:03:08 +0000
+++ tests/mocks/CMakeLists.txt	2013-07-03 08:52:27 +0000
@@ -1,2 +1,3 @@
 add_subdirectory(LightDM)
 add_subdirectory(Ubuntu)
+add_subdirectory(Unity)

=== added directory 'tests/mocks/Unity'
=== added file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/CMakeLists.txt	2013-07-03 08:52:27 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(Launcher)

=== added directory 'tests/mocks/Unity/Launcher'
=== added file 'tests/mocks/Unity/Launcher/CMakeLists.txt'
--- tests/mocks/Unity/Launcher/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Launcher/CMakeLists.txt	2013-07-03 08:52:27 +0000
@@ -0,0 +1,38 @@
+set(CMAKE_AUTOMOC ON)
+
+include(FindPkgConfig)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Quick REQUIRED)
+
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${LAUNCHER_API_INCLUDEDIR}
+)
+
+set(MockLauncherModel_SOURCES
+    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
+    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
+    plugin.cpp
+    MockLauncherModel.cpp
+    MockLauncherItem.cpp
+)
+
+add_library(MockLauncherPlugin MODULE ${MockLauncherModel_SOURCES})
+
+qt5_use_modules(MockLauncherPlugin Core Quick)
+
+# copy files into build directory for shadow builds
+add_custom_target(LauncherPluginQmlDirFile ALL
+    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS qmldir
+)
+
+install(TARGETS MockLauncherPlugin
+    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/Unity/Launcher
+    )
+
+install(FILES qmldir
+    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/Unity/Launcher
+    )

=== added file 'tests/mocks/Unity/Launcher/MockLauncherItem.cpp'
--- tests/mocks/Unity/Launcher/MockLauncherItem.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2013-07-03 08:52:27 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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/>.
+ *
+ * Authors:
+ *      Michael Zanetti <[e-mail]>
+ */
+
+#include "MockLauncherItem.h"
+
+using namespace unity::shell::launcher;
+
+MockLauncherItem::MockLauncherItem(const QString& desktopFile, const QString& name, const QString& icon, QObject* parent):
+    LauncherItemInterface(parent),
+    m_desktopFile(desktopFile),
+    m_name(name),
+    m_icon(icon),
+    m_favorite(false),
+    m_running(false),
+    m_recent(false),
+    m_progress(8),
+    m_count(8)
+{
+
+}
+
+QString MockLauncherItem::desktopFile() const
+{
+    return m_desktopFile;
+}
+
+QString MockLauncherItem::name() const
+{
+    return m_name;
+}
+
+QString MockLauncherItem::icon() const
+{
+    return m_icon;
+}
+
+bool MockLauncherItem::favorite() const
+{
+    return m_favorite;
+}
+
+void MockLauncherItem::setFavorite(bool favorite)
+{
+    if (m_favorite != favorite)
+    {
+        m_favorite = favorite;
+        Q_EMIT favoriteChanged(m_favorite);
+    }
+}
+
+bool MockLauncherItem::running() const
+{
+    return m_running;
+}
+
+void MockLauncherItem::setRunning(bool running)
+{
+    if (m_running != running)
+    {
+        m_running = running;
+        Q_EMIT runningChanged(running);
+    }
+}
+
+bool MockLauncherItem::recent() const
+{
+    return m_recent;
+}
+
+void MockLauncherItem::setRecent(bool recent)
+{
+    if (m_recent != recent)
+    {
+        m_recent = recent;
+        Q_EMIT recentChanged(recent);
+    }
+}
+
+int MockLauncherItem::progress() const
+{
+    return m_progress;
+}
+
+void MockLauncherItem::setProgress(int progress)
+{
+    if (m_progress != progress)
+    {
+        m_progress = progress;
+        Q_EMIT progressChanged(progress);
+    }
+}
+
+int MockLauncherItem::count() const
+{
+    return m_count;
+}
+
+void MockLauncherItem::setCount(int count)
+{
+    if (m_count != count)
+    {
+        m_count = count;
+        Q_EMIT countChanged(count);
+    }
+}

=== added file 'tests/mocks/Unity/Launcher/MockLauncherItem.h'
--- tests/mocks/Unity/Launcher/MockLauncherItem.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherItem.h	2013-07-03 08:52:27 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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/>.
+ *
+ * Authors:
+ *      Michael Zanetti <[e-mail]>
+ */
+
+#ifndef MOCKLAUNCHERITEM_H
+#define MOCKLAUNCHERITEM_H
+
+#include <unity/shell/launcher/LauncherItemInterface.h>
+
+using namespace unity::shell::launcher;
+
+class MockLauncherItem: public LauncherItemInterface
+{
+    Q_OBJECT
+public:
+    MockLauncherItem(const QString& desktopFile, const QString& name, const QString& icon, QObject* parent = 0);
+
+    QString desktopFile() const;
+
+    QString name() const;
+    QString icon() const;
+
+    bool favorite() const;
+    void setFavorite(bool favorite);
+
+    bool running() const;
+    void setRunning(bool running);
+
+    bool recent() const;
+    void setRecent(bool recent);
+
+    int progress() const;
+    void setProgress(int progress);
+
+    int count() const;
+    void setCount(int count);
+
+private:
+    QString m_desktopFile;
+    QString m_name;
+    QString m_icon;
+    bool m_favorite;
+    bool m_running;
+    bool m_recent;
+    int m_progress;
+    int m_count;
+};
+
+#endif // MOCKLAUNCHERITEM_H

=== added file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
--- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2013-07-03 08:52:27 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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/>.
+ *
+ * Authors:
+ *      Michael Zanetti <[e-mail]>
+ */
+
+#include "MockLauncherModel.h"
+#include "MockLauncherItem.h"
+
+MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(parent)
+{
+    LauncherItemInterface *item = new MockLauncherItem("/usr/share/applications/phone-app.desktop", "Phone", "phone-app");
+    m_list.append(item);
+    item = new MockLauncherItem("/usr/share/applications/camera-app.desktop", "Camera", "camera");
+    m_list.append(item);
+    item = new MockLauncherItem("/usr/share/applications/gallery-app.desktop", "Gallery", "gallery");
+    m_list.append(item);
+    item = new MockLauncherItem("/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook");
+    m_list.append(item);
+    item = new MockLauncherItem("/usr/share/applications/webbrowser-app.desktop", "Browser", "browser");
+    m_list.append(item);
+    item = new MockLauncherItem("/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter");
+    m_list.append(item);
+    item = new MockLauncherItem("/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail");
+    m_list.append(item);
+    item = new MockLauncherItem("/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather");
+    m_list.append(item);
+    item = new MockLauncherItem("/usr/share/applications/notes-app.desktop", "Notepad", "notepad");
+    m_list.append(item);
+    item = new MockLauncherItem("/usr/share/applications/ubuntu-calendar-app.desktop","Calendar", "calendar");
+    m_list.append(item);
+}
+
+MockLauncherModel::~MockLauncherModel()
+{
+    while (!m_list.empty())
+    {
+        m_list.takeFirst()->deleteLater();
+    }
+}
+
+// cppcheck-suppress unusedFunction
+int MockLauncherModel::rowCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent)
+    return m_list.count();
+}
+
+QVariant MockLauncherModel::data(const QModelIndex& index, int role) const
+{
+    LauncherItemInterface *item = m_list.at(index.row());
+    switch(role)
+    {
+    case RoleDesktopFile:
+        return item->desktopFile();
+    case RoleName:
+        return item->name();
+    case RoleIcon:
+        return item->icon();
+    case RoleFavorite:
+        return item->favorite();
+    case RoleRunning:
+        return item->running();
+    case RoleRecent:
+        return item->recent();
+    case RoleProgress:
+        return item->progress();
+    case RoleCount:
+        return item->count();
+    }
+
+    return QVariant();
+}
+
+unity::shell::launcher::LauncherItemInterface *MockLauncherModel::get(int index) const
+{
+    if (index < 0 || index >= m_list.count())
+    {
+        return 0;
+    }
+    return m_list.at(index);
+}
+
+void MockLauncherModel::move(int oldIndex, int newIndex)
+{
+    beginMoveRows(QModelIndex(), oldIndex, oldIndex, QModelIndex(), newIndex);
+    m_list.move(oldIndex, newIndex);
+    endMoveRows();
+}

=== added file 'tests/mocks/Unity/Launcher/MockLauncherModel.h'
--- tests/mocks/Unity/Launcher/MockLauncherModel.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherModel.h	2013-07-03 08:52:27 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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/>.
+ *
+ * Authors:
+ *      Michael Zanetti <[e-mail]>
+ */
+
+#ifndef MOCKLAUNCHERMODEL_H
+#define MOCKLAUNCHERMODEL_H
+
+#include <unity/shell/launcher/LauncherModelInterface.h>
+
+using namespace unity::shell::launcher;
+
+class MockLauncherModel: public LauncherModelInterface
+{
+   Q_OBJECT
+
+public:
+    MockLauncherModel(QObject* parent = 0);
+    ~MockLauncherModel();
+
+    int rowCount(const QModelIndex& parent) const;
+
+    QVariant data(const QModelIndex& index, int role) const;
+
+    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const;
+    Q_INVOKABLE void move(int oldIndex, int newIndex);
+private:
+    QList<LauncherItemInterface*> m_list;
+};
+
+#endif // MOCKLAUNCHERMODEL_H

=== added file 'tests/mocks/Unity/Launcher/plugin.cpp'
--- tests/mocks/Unity/Launcher/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Launcher/plugin.cpp	2013-07-03 08:52:27 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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/>.
+ *
+ * Authors:
+ *      Michael Zanetti <[e-mail]>
+ */
+
+#include "plugin.h"
+#include "MockLauncherModel.h"
+#include "MockLauncherItem.h"
+
+#include <unity/shell/launcher/LauncherModelInterface.h>
+#include <unity/shell/launcher/LauncherItemInterface.h>
+
+#include <QtQml/qqml.h>
+
+using namespace unity::shell::launcher;
+
+static QObject* modelProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
+{
+    return new MockLauncherModel();
+}
+
+// cppcheck-suppress unusedFunction
+void TestLauncherPlugin::registerTypes(const char* uri)
+{
+    // @uri Unity.Launcher
+    qmlRegisterUncreatableType<LauncherModelInterface>(uri, 0, 1, "LauncherModelInterface", "Abstract Interface. Cannot be instantiated.");
+    qmlRegisterUncreatableType<LauncherItemInterface>(uri, 0, 1, "LauncherItemInterface", "Abstract Interface. Cannot be instantiated.");
+
+    qmlRegisterSingletonType<MockLauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);
+    qmlRegisterUncreatableType<MockLauncherItem>(uri, 0, 1, "LauncherItem", "Can't create LauncherItems in QML. Get them from the LauncherModel");
+}

=== added file 'tests/mocks/Unity/Launcher/plugin.h'
--- tests/mocks/Unity/Launcher/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Launcher/plugin.h	2013-07-03 08:52:27 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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/>.
+ *
+ * Authors:
+ *      Michael Zanetti <[e-mail]>
+ */
+
+
+#ifndef TESTLAUNCHER_PLUGIN_H
+#define TESTLAUNCHER_PLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class TestLauncherPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char* uri);
+};
+
+#endif // TESTLAUNCHER_PLUGIN_H

=== added file 'tests/mocks/Unity/Launcher/qmldir'
--- tests/mocks/Unity/Launcher/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Launcher/qmldir	2013-07-03 08:52:27 +0000
@@ -0,0 +1,2 @@
+module Unity.Launcher
+plugin MockLauncherPlugin

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-07-01 08:00:40 +0000
+++ tests/qmltests/CMakeLists.txt	2013-07-03 08:52:27 +0000
@@ -57,7 +57,7 @@
                                   ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
 add_qml_test(Hud Hud)
 add_qml_test(Hud Result)
-add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
+add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins/ ${CMAKE_BINARY_DIR}/tests/mocks/ ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Notifications Notifications IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
 add_qml_test(Panel IndicatorRow)
 add_qml_test(Panel Indicators)

=== modified file 'tests/qmltests/plugins/Unity/CMakeLists.txt'
--- tests/qmltests/plugins/Unity/CMakeLists.txt	2013-06-12 15:03:07 +0000
+++ tests/qmltests/plugins/Unity/CMakeLists.txt	2013-07-03 08:52:27 +0000
@@ -25,7 +25,6 @@
   fake_scope.cpp
   fake_scopes.cpp
   fake_unity_plugin.cpp
-  fake_launchermodel.cpp
 )
 
 add_library(FakeUnityQml MODULE ${UnityQML_SOURCES})

=== removed file 'tests/qmltests/plugins/Unity/fake_launchermodel.cpp'
--- tests/qmltests/plugins/Unity/fake_launchermodel.cpp	2013-06-05 22:03:08 +0000
+++ tests/qmltests/plugins/Unity/fake_launchermodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Michael Zanetti <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "launchermodel.h"
-
-LauncherModel::LauncherModel(QObject *parent): QAbstractListModel(parent)
-{
-    LauncherItem *item = new LauncherItem("/usr/share/applications/phone-app.desktop", "Phone", "phone-app");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/camera-app.desktop", "Camera", "camera");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/gallery-app.desktop", "Gallery", "gallery");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/webbrowser-app.desktop", "Browser", "browser");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/notes-app.desktop", "Notepad", "notepad");
-    m_list.append(item);
-    item = new LauncherItem("/usr/share/applications/ubuntu-calendar-app.desktop","Calendar", "calendar");
-    m_list.append(item);
-}
-
-LauncherModel::~LauncherModel()
-{
-    while (!m_list.empty()) {
-        m_list.takeFirst()->deleteLater();
-    }
-}
-
-int LauncherModel::rowCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent)
-    return m_list.count();
-}
-
-QVariant LauncherModel::data(const QModelIndex &index, int role) const
-{
-    LauncherItem *item = m_list.at(index.row());
-    switch(role) {
-    case RoleName:
-        return item->name();
-    case RoleIcon:
-        return item->icon();
-    case RoleFavorite:
-        return item->favorite();
-    }
-
-    return QVariant();
-}
-
-LauncherItem *LauncherModel::get(int index) const
-{
-    if (index < 0 || index >= m_list.count()) {
-        return 0;
-    }
-    return m_list.at(index);
-}
-
-void LauncherModel::move(int oldIndex, int newIndex)
-{
-    beginMoveRows(QModelIndex(), oldIndex, oldIndex, QModelIndex(), newIndex);
-    m_list.move(oldIndex, newIndex);
-    endMoveRows();
-}
-
-QHash<int, QByteArray> LauncherModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles.insert(RoleDesktopFile, "desktopFile");
-    roles.insert(RoleName, "name");
-    roles.insert(RoleIcon, "icon");
-    roles.insert(RoleFavorite, "favorite");
-    roles.insert(RoleRunning, "runnng");
-    return roles;
-}
-
-
-LauncherItem::LauncherItem(const QString &desktopFile, const QString &name, const QString &icon, QObject *parent):
-    QObject(parent),
-    m_desktopFile(desktopFile),
-    m_name(name),
-    m_icon(icon),
-    m_favorite(false)
-{
-
-}
-
-QString LauncherItem::desktopFile() const
-{
-    return m_desktopFile;
-}
-
-QString LauncherItem::name() const
-{
-    return m_name;
-}
-
-QString LauncherItem::icon() const
-{
-    return m_icon;
-}
-
-bool LauncherItem::favorite() const
-{
-    return m_favorite;
-}
-
-void LauncherItem::setFavorite(bool favorite)
-{
-    if (m_favorite != favorite) {
-        m_favorite = favorite;
-        Q_EMIT favoriteChanged(m_favorite);
-    }
-}
-
-bool LauncherItem::running() const
-{
-    return m_running;
-}
-
-void LauncherItem::setRunning(bool running)
-{
-    if (m_running != running) {
-        m_running = running;
-        Q_EMIT runningChanged(running);
-    }
-}

=== removed file 'tests/qmltests/plugins/Unity/fake_launchermodel.h'
--- tests/qmltests/plugins/Unity/fake_launchermodel.h	2013-06-05 22:03:08 +0000
+++ tests/qmltests/plugins/Unity/fake_launchermodel.h	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Michael Zanetti <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QAbstractListModel>
-
-class LauncherItem;
-
-class LauncherModel: public QAbstractListModel
-{
-   Q_OBJECT
-
-public:
-    enum Roles {
-        RoleDesktopFile = Qt::UserRole,
-        RoleName,
-        RoleIcon,
-        RoleFavorite,
-        RoleRunning
-    };
-
-    LauncherModel(QObject *parent = 0);
-    ~LauncherModel();
-
-    int rowCount(const QModelIndex &parent) const;
-
-    QVariant data(const QModelIndex &index, int role) const;
-
-    Q_INVOKABLE LauncherItem* get(int index) const;
-    Q_INVOKABLE void move(int oldIndex, int newIndex);
-
-    QHash<int, QByteArray> roleNames() const;
-
-private:
-    QList<LauncherItem*> m_list;
-};
-
-class LauncherItem: public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString desktopFile READ desktopFile CONSTANT)
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(QString icon READ icon CONSTANT)
-    Q_PROPERTY(bool favorite READ favorite WRITE setFavorite NOTIFY favoriteChanged)
-    Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged)
-
-public:
-    LauncherItem(const QString &desktopFile, const QString &name, const QString &icon, QObject *parent = 0);
-
-    QString desktopFile() const;
-
-    QString name() const;
-    QString icon() const;
-
-    bool favorite() const;
-    void setFavorite(bool favorite);
-
-    bool running() const;
-    void setRunning(bool running);
-
-Q_SIGNALS:
-    void favoriteChanged(bool favorite);
-    void runningChanged(bool running);
-
-private:
-    QString m_desktopFile;
-    QString m_name;
-    QString m_icon;
-    bool m_favorite;
-    bool m_running;
-};

=== modified file 'tests/qmltests/plugins/Unity/fake_unity_plugin.cpp'
--- tests/qmltests/plugins/Unity/fake_unity_plugin.cpp	2013-06-12 15:03:07 +0000
+++ tests/qmltests/plugins/Unity/fake_unity_plugin.cpp	2013-07-03 08:52:27 +0000
@@ -23,7 +23,6 @@
 #include "fake_scopes.h"
 #include "categories.h"
 #include "categoryfilter.h"
-#include "fake_launchermodel.h"
 
 // External
 #include <glib-object.h>
@@ -41,6 +40,4 @@
     qmlRegisterType<Scope>(uri, 0, 1, "Scope");
     qmlRegisterType<Categories>(uri, 0, 1, "Categories");
     qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
-    qmlRegisterType<LauncherModel>(uri, 0, 1, "LauncherModel");
-    qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create");
 }