Merge lp:~nick-dedekind/unity8/mirCompositor-appMocks into lp:~unity-team/unity8/mirCompositor

[Nick Dedekind]

Fixed up AppManager mock for qtmir surfaces.

Fixed up AppManager mock for qtmir surfaces.

[lp:~nick-dedekind/unity8/mirCompositor-appMocks]

1060. By Nick Dedekind on 2014-07-18

removed qdebug

1061. By Nick Dedekind on 2014-07-18

whitespace

[Daniel d'Andrada (dandrader)]

Would be nice to update the copyright year of the files you changed, like tests/mocks/Unity/Application/ApplicationInfo.h

[Daniel d'Andrada (dandrader)]

review: Approve

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2014-03-20 10:02:52 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2014-07-18 16:28:08 +0000
@@ -15,6 +15,8 @@
  */
 
 #include "ApplicationInfo.h"
+#include "MirSurfaceItem.h"
+#include "SurfaceManager.h"
 
 #include <QGuiApplication>
 #include <QQuickItem>
@@ -24,29 +26,39 @@
 
 ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)
     : ApplicationInfoInterface(appId, parent)
-    ,m_appId(appId)
-    ,m_stage(MainStage)
-    ,m_state(Starting)
-    ,m_focused(false)
-    ,m_fullscreen(false)
-    ,m_windowItem(0)
-    ,m_windowComponent(0)
-    ,m_parentItem(0)
+    , m_appId(appId)
+    , m_stage(MainStage)
+    , m_state(Starting)
+    , m_focused(false)
+    , m_fullscreen(false)
+    , m_windowItem(0)
+    , m_windowComponent(0)
+    , m_parentItem(0)
+    , m_surface(0)
 {
-    QTimer::singleShot(300, this, SLOT(setRunning()));
+    connect(this, &ApplicationInfo::stateChanged, this, &ApplicationInfo::onStateChanged);
 }
 
 ApplicationInfo::ApplicationInfo(QObject *parent)
     : ApplicationInfoInterface(QString(), parent)
-     ,m_stage(MainStage)
-     ,m_state(Starting)
-     ,m_focused(false)
-     ,m_fullscreen(false)
-     ,m_windowItem(0)
-     ,m_windowComponent(0)
-     ,m_parentItem(0)
-{
-    QTimer::singleShot(300, this, SLOT(setRunning()));
+    , m_stage(MainStage)
+    , m_state(Starting)
+    , m_focused(false)
+    , m_fullscreen(false)
+    , m_windowItem(0)
+    , m_windowComponent(0)
+    , m_parentItem(0)
+    , m_surface(0)
+{
+    connect(this, &ApplicationInfo::stateChanged, this, &ApplicationInfo::onStateChanged);
+}
+
+ApplicationInfo::~ApplicationInfo()
+{
+    if (m_surface) {
+        Q_EMIT SurfaceManager::singleton()->surfaceDestroyed(m_surface);
+        m_surface->deleteLater();
+    }
 }
 
 void ApplicationInfo::onWindowComponentStatusChanged(QQmlComponent::Status status)
@@ -55,10 +67,36 @@
         doCreateWindowItem();
 }
 
-void ApplicationInfo::setRunning()
-{
-    m_state = Running;
-    Q_EMIT stateChanged();
+void ApplicationInfo::onStateChanged(State state)
+{
+    if (state == ApplicationInfo::Running) {
+        QTimer::singleShot(1000, this, SLOT(createSurface()));
+    } else if (state == ApplicationInfo::Stopped) {
+        destroySurface();
+    }
+}
+
+void ApplicationInfo::createSurface()
+{
+    if (m_surface || state() == ApplicationInfo::Stopped) return;
+
+    m_surface = new MirSurfaceItem(name(),
+                                   MirSurfaceItem::Normal,
+                                   fullscreen() ? MirSurfaceItem::Fullscreen : MirSurfaceItem::Maximized,
+                                   screenshot());
+    Q_EMIT surfaceChanged(m_surface);
+    Q_EMIT SurfaceManager::singleton()->surfaceCreated(m_surface);
+}
+
+void ApplicationInfo::destroySurface()
+{
+    if (!m_surface) return;
+    MirSurfaceItem* oldSurface = m_surface;
+    m_surface = nullptr;
+
+    Q_EMIT surfaceChanged(nullptr);
+    Q_EMIT SurfaceManager::singleton()->surfaceDestroyed(oldSurface);
+    oldSurface->deleteLater();
 }
 
 void ApplicationInfo::createWindowComponent()

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
--- tests/mocks/Unity/Application/ApplicationInfo.h	2014-03-20 10:02:52 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2014-07-18 16:28:08 +0000
@@ -21,6 +21,7 @@
 #include <QQmlComponent>
 
 class QQuickItem;
+class MirSurfaceItem;
 
 // unity-api
 #include <unity/shell/application/ApplicationInfoInterface.h>
@@ -36,6 +37,7 @@
 
     Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
     Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
+    Q_PROPERTY(MirSurfaceItem* surface READ surface NOTIFY surfaceChanged)
 
     // Only exists in this fake implementation
 
@@ -45,9 +47,10 @@
     // QML component used to represent the application window
     Q_PROPERTY(QString windowQml READ windowQml WRITE setWindowQml NOTIFY windowQmlChanged)
 
- public:
+public:
     ApplicationInfo(QObject *parent = NULL);
     ApplicationInfo(const QString &appId, QObject *parent = NULL);
+    ~ApplicationInfo();
 
     #define IMPLEMENT_PROPERTY(name, Name, type) \
     public: \
@@ -56,11 +59,11 @@
     { \
         if (m_##name != value) { \
             m_##name = value; \
-            Q_EMIT name##Changed(); \
+            Q_EMIT name##Changed(value); \
         } \
     } \
     Q_SIGNALS: \
-    void name##Changed(); \
+    void name##Changed(const type&); \
     private: \
     type m_##name;
 
@@ -78,21 +81,31 @@
 
     #undef IMPLEMENT_PROPERTY
 
- public:
+public:
+    MirSurfaceItem* surface() const { return m_surface; }
+
+Q_SIGNALS:
+    void surfaceChanged(MirSurfaceItem*);
+
+public:
     void showWindow(QQuickItem *parent);
     void hideWindow();
 
- private Q_SLOTS:
+private Q_SLOTS:
     void onWindowComponentStatusChanged(QQmlComponent::Status status);
-    void setRunning();
-
- private:
+    void onStateChanged(State state);
+
+    void createSurface();
+    void destroySurface();
+
+private:
     void createWindowItem();
     void doCreateWindowItem();
     void createWindowComponent();
     QQuickItem *m_windowItem;
     QQmlComponent *m_windowComponent;
     QQuickItem *m_parentItem;
+    MirSurfaceItem* m_surface;
 };
 
 Q_DECLARE_METATYPE(ApplicationInfo*)

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2014-07-10 09:27:19 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2014-07-18 16:28:08 +0000
@@ -16,6 +16,7 @@
 
 #include "ApplicationManager.h"
 #include "ApplicationInfo.h"
+#include "MirSurfaceItem.h"
 
 #include <paths.h>
 
@@ -36,6 +37,9 @@
     , m_sideStage(0)
     , m_rightMargin(0)
 {
+    m_roleNames.insert(RoleSurface, "surface");
+    m_roleNames.insert(RoleFullscreen, "fullscreen");
+
     buildListOfAvailableApplications();
 }
 
@@ -69,6 +73,10 @@
         return app->focused();
     case RoleScreenshot:
         return app->screenshot();
+    case RoleSurface:
+        return QVariant::fromValue(app->surface());
+    case RoleFullscreen:
+        return app->fullscreen();
     default:
         return QVariant();
     }
@@ -89,6 +97,17 @@
     return nullptr;
 }
 
+QModelIndex ApplicationManager::findIndex(ApplicationInfo* application)
+{
+    for (int i = 0; i < m_runningApplications.size(); ++i) {
+        if (m_runningApplications.at(i) == application) {
+            return index(i);
+        }
+    }
+
+    return QModelIndex();
+}
+
 void ApplicationManager::add(ApplicationInfo *application) {
     if (!application) {
         return;
@@ -100,6 +119,12 @@
     Q_EMIT applicationAdded(application->appId());
     Q_EMIT countChanged();
     Q_EMIT focusRequested(application->appId());
+
+    connect(application, &ApplicationInfo::surfaceChanged, this, [application, this]() {
+        QModelIndex appIndex = findIndex(application);
+        if (!appIndex.isValid()) return;
+        Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleSurface);
+    });
 }
 
 void ApplicationManager::remove(ApplicationInfo *application) {
@@ -111,6 +136,7 @@
         Q_EMIT applicationRemoved(application->appId());
         Q_EMIT countChanged();
     }
+    disconnect(application, &ApplicationInfo::surfaceChanged, this, 0);
 }
 
 void ApplicationManager::move(int from, int to) {
@@ -180,6 +206,7 @@
         application->setStage(ApplicationInfo::MainStage);
     }
     add(application);
+    application->setState(ApplicationInfo::Running);
 
     return application;
 }
@@ -193,6 +220,7 @@
     if (application->appId() == focusedApplicationId()) {
         unfocusCurrentApplication();
     }
+    application->setState(ApplicationInfo::Stopped);
     remove(application);
     return true;
 }
@@ -213,7 +241,6 @@
         return false;
     }
 
-    application->setScreenshot(QString("image://application/%1/%2").arg(appId).arg(QDateTime::currentMSecsSinceEpoch()));
     QModelIndex appIndex = index(idx);
     Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleScreenshot);
     return true;
@@ -352,6 +379,9 @@
         "}").arg(qmlDirectory())
             .arg(application->icon().toString());
     application->setImageQml(imageQml);
+
+    application->setScreenshot(QString("file://%1/Dash/graphics/phone/screenshots/[e-mail]").arg(qmlDirectory())
+                                                                                             .arg(application->icon().toString()));
 }
 
 void ApplicationManager::buildListOfAvailableApplications()
@@ -363,7 +393,6 @@
     application->setName("Dialer");
     application->setIcon(QUrl("dialer"));
     application->setStage(ApplicationInfo::SideStage);
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     generateQmlStrings(application);
     m_availableApplications.append(application);
 
@@ -372,7 +401,6 @@
     application->setName("Camera");
     application->setIcon(QUrl("camera"));
     application->setFullscreen(true);
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     generateQmlStrings(application);
     m_availableApplications.append(application);
 
@@ -380,7 +408,6 @@
     application->setAppId("gallery-app");
     application->setName("Gallery");
     application->setIcon(QUrl("gallery"));
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     generateQmlStrings(application);
     m_availableApplications.append(application);
 
@@ -389,7 +416,6 @@
     application->setName("Facebook");
     application->setIcon(QUrl("facebook"));
     application->setStage(ApplicationInfo::SideStage);
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     generateQmlStrings(application);
     m_availableApplications.append(application);
 
@@ -398,7 +424,6 @@
     application->setFullscreen(true);
     application->setName("Browser");
     application->setIcon(QUrl("browser"));
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     generateQmlStrings(application);
     m_availableApplications.append(application);
 
@@ -407,7 +432,6 @@
     application->setName("Twitter");
     application->setIcon(QUrl("twitter"));
     application->setStage(ApplicationInfo::SideStage);
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     generateQmlStrings(application);
     m_availableApplications.append(application);
 
@@ -415,7 +439,6 @@
     application->setAppId("gmail-webapp");
     application->setName("GMail");
     application->setIcon(QUrl("gmail"));
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
@@ -423,7 +446,6 @@
     application->setName("Weather");
     application->setIcon(QUrl("weather"));
     application->setStage(ApplicationInfo::SideStage);
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     generateQmlStrings(application);
     m_availableApplications.append(application);
 
@@ -432,7 +454,6 @@
     application->setName("Notepad");
     application->setIcon(QUrl("notepad"));
     application->setStage(ApplicationInfo::SideStage);
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
@@ -440,7 +461,6 @@
     application->setName("Calendar");
     application->setIcon(QUrl("calendar"));
     application->setStage(ApplicationInfo::SideStage);
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
@@ -448,21 +468,18 @@
     application->setName("Media Player");
     application->setIcon(QUrl("mediaplayer-app"));
     application->setFullscreen(true);
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("evernote");
     application->setName("Evernote");
     application->setIcon(QUrl("evernote"));
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("map");
     application->setName("Map");
     application->setIcon(QUrl("map"));
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     generateQmlStrings(application);
     m_availableApplications.append(application);
 
@@ -470,28 +487,24 @@
     application->setAppId("pinterest");
     application->setName("Pinterest");
     application->setIcon(QUrl("pinterest"));
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("soundcloud");
     application->setName("SoundCloud");
     application->setIcon(QUrl("soundcloud"));
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("wikipedia");
     application->setName("Wikipedia");
     application->setIcon(QUrl("wikipedia"));
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("youtube");
     application->setName("YouTube");
     application->setIcon(QUrl("youtube"));
-    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     m_availableApplications.append(application);
 }
 

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
--- tests/mocks/Unity/Application/ApplicationManager.h	2014-03-11 11:14:10 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.h	2014-07-18 16:28:08 +0000
@@ -53,6 +53,10 @@
     ApplicationManager(QObject *parent = NULL);
     virtual ~ApplicationManager();
 
+    enum MoreRoles {
+        RoleSurface = RoleScreenshot+1,
+        RoleFullscreen,
+    };
     enum Role {
         Dash, Default, Indicators, Notifications, Greeter, Launcher, OnScreenKeyboard,
         ShutdownDialog
@@ -108,6 +112,8 @@
     int rightMargin() const;
     void setRightMargin(int rightMargin);
 
+    QModelIndex findIndex(ApplicationInfo* application);
+
  Q_SIGNALS:
     void keyboardHeightChanged();
     void keyboardVisibleChanged();

=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
--- tests/mocks/Unity/Application/CMakeLists.txt	2014-06-26 08:26:58 +0000
+++ tests/mocks/Unity/Application/CMakeLists.txt	2014-07-18 16:28:08 +0000
@@ -6,6 +6,8 @@
     ApplicationImage.cpp
     ApplicationManager.cpp
     ApplicationScreenshotProvider.cpp
+    MirSurfaceItem.cpp
+    SurfaceManager.cpp
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
 )

=== added file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2014-07-18 16:28:08 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MirSurfaceItem.h"
+
+#include <QPainter>
+
+MirSurfaceItem::MirSurfaceItem(const QString& name,
+                               MirSurfaceItem::Type type,
+                               MirSurfaceItem::State state,
+                               const QUrl& screenshot,
+                               QQuickItem *parent)
+    : QQuickPaintedItem(parent)
+    , m_name(name)
+    , m_type(type)
+    , m_state(state)
+    , m_img(screenshot.isLocalFile() ? screenshot.toLocalFile() : screenshot.toString())
+{
+    setFillColor(Qt::white);
+}
+
+void MirSurfaceItem::paint(QPainter * painter)
+{
+    if (!m_img.isNull()) {
+        painter->drawImage(contentsBoundingRect(), m_img, QRect(QPoint(0,0), m_img.size()));
+    }
+}

=== added file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
--- tests/mocks/Unity/Application/MirSurfaceItem.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2014-07-18 16:28:08 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MIRSURFACEITEM_H
+#define MIRSURFACEITEM_H
+
+#include <QQuickPaintedItem>
+#include <QImage>
+
+class MirSurfaceItem : public QQuickPaintedItem
+{
+    Q_OBJECT
+    Q_ENUMS(Type)
+    Q_ENUMS(State)
+
+    Q_PROPERTY(Type type READ type NOTIFY typeChanged)
+    Q_PROPERTY(State state READ state NOTIFY stateChanged)
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+
+public:
+    enum Type {
+        Normal,
+        Utility,
+        Dialog,
+        Overlay,
+        Freestyle,
+        Popover,
+        InputMethod,
+    };
+
+    enum State {
+        Unknown,
+        Restored,
+        Minimized,
+        Maximized,
+        VertMaximized,
+        /* SemiMaximized, */
+        Fullscreen,
+    };
+
+    explicit MirSurfaceItem(const QString& name,
+                            Type type,
+                            State state,
+                            const QUrl& screenshot,
+                            QQuickItem *parent = 0);
+
+    //getters
+    Type type() const { return m_type; }
+    State state() const { return m_state; }
+    QString name() const { return m_name; }
+
+    Q_INVOKABLE void release() {}
+
+    void paint(QPainter * painter) override;
+
+Q_SIGNALS:
+    void typeChanged(Type);
+    void stateChanged(State);
+    void nameChanged(QString);
+
+private:
+
+    const QString m_name;
+    const Type m_type;
+    const State m_state;
+    const QImage m_img;
+};
+
+Q_DECLARE_METATYPE(MirSurfaceItem*)
+
+#endif // MIRSURFACEITEM_H

=== added file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
--- tests/mocks/Unity/Application/SurfaceManager.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/SurfaceManager.cpp	2014-07-18 16:28:08 +0000
@@ -0,0 +1,16 @@
+#include "SurfaceManager.h"
+
+SurfaceManager *SurfaceManager::the_surface_manager = nullptr;
+
+SurfaceManager *SurfaceManager::singleton()
+{
+    if (!the_surface_manager) {
+        the_surface_manager = new SurfaceManager();
+    }
+    return the_surface_manager;
+}
+
+SurfaceManager::SurfaceManager(QObject *parent) :
+    QObject(parent)
+{
+}

=== added file 'tests/mocks/Unity/Application/SurfaceManager.h'
--- tests/mocks/Unity/Application/SurfaceManager.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/SurfaceManager.h	2014-07-18 16:28:08 +0000
@@ -0,0 +1,26 @@
+#ifndef SURFACEMANAGER_H
+#define SURFACEMANAGER_H
+
+#include <QObject>
+
+class MirSurfaceItem;
+
+class SurfaceManager : public QObject
+{
+    Q_OBJECT
+public:
+    explicit SurfaceManager(QObject *parent = 0);
+
+    static SurfaceManager *singleton();
+
+Q_SIGNALS:
+    void countChanged();
+    void surfaceCreated(MirSurfaceItem *surface);
+    void surfaceDestroyed(MirSurfaceItem *surface);
+
+private:
+    static SurfaceManager *the_surface_manager;
+
+};
+
+#endif // SURFACEMANAGER_H

=== modified file 'tests/mocks/Unity/Application/plugin.cpp'
--- tests/mocks/Unity/Application/plugin.cpp	2014-01-20 11:34:59 +0000
+++ tests/mocks/Unity/Application/plugin.cpp	2014-07-18 16:28:08 +0000
@@ -19,6 +19,8 @@
 #include "ApplicationImage.h"
 #include "ApplicationManager.h"
 #include "ApplicationScreenshotProvider.h"
+#include "MirSurfaceItem.h"
+#include "SurfaceManager.h"
 
 #include <qqml.h>
 #include <QQmlEngine>
@@ -34,14 +36,25 @@
     return s_appManager;
 }
 
+static QObject* surfaceManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+    return SurfaceManager::singleton();
+}
+
 void FakeUnityApplicationQmlPlugin::registerTypes(const char *uri)
 {
+    qRegisterMetaType<MirSurfaceItem*>("MirSurfaceItem*");
+
     qmlRegisterUncreatableType<unity::shell::application::ApplicationManagerInterface>(uri, 0, 1, "ApplicationManagerInterface", "Abstract interface. Cannot be created in QML");
     qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
+    qmlRegisterSingletonType<SurfaceManager>(uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
 
     qmlRegisterUncreatableType<unity::shell::application::ApplicationInfoInterface>(uri, 0, 1, "ApplicationInfoInterface", "Abstract interface. Cannot be created in QML");
     qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
 
+    qmlRegisterUncreatableType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem", "MirSurfaceItem can't be instantiated from QML");
+
     qmlRegisterType<ApplicationImage>(uri, 0, 1, "ApplicationImage");
 }