1 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/client/shared/mockcompositor.h b/tests/auto/client/shared/mockcompositor.h
index 5fe51c896..34c20943a 100644
--- a/tests/auto/client/shared/mockcompositor.h
+++ b/tests/auto/client/shared/mockcompositor.h
@@ -30,6 +30,7 @@
 #define MOCKCOMPOSITOR_H
 
 #include "mockxdgshellv6.h"
+#include "mockiviapplication.h"
 
 #include <pthread.h>
 #include <qglobal.h>
@@ -54,6 +55,7 @@ class Seat;
 class DataDeviceManager;
 class Surface;
 class Output;
+class IviApplication;
 class WlShell;
 class XdgShellV6;
 
@@ -72,6 +74,7 @@ public:
     QVector<Surface *> surfaces() const;
     QVector<Output *> outputs() const;
 
+    IviApplication *iviApplication() const;
     XdgShellV6 *xdgShellV6() const;
 
     void addSurface(Surface *surface);
@@ -99,6 +102,7 @@ public:
     static void sendSurfaceEnter(void *data, const QList<QVariant> &parameters);
     static void sendSurfaceLeave(void *data, const QList<QVariant> &parameters);
     static void sendShellSurfaceConfigure(void *data, const QList<QVariant> &parameters);
+    static void sendIviSurfaceConfigure(void *data, const QList<QVariant> &parameters);
     static void sendXdgToplevelV6Configure(void *data, const QList<QVariant> &parameters);
 
 public:
@@ -108,6 +112,7 @@ private:
     static void bindCompositor(wl_client *client, void *data, uint32_t version, uint32_t id);
     static Surface *resolveSurface(const QVariant &v);
     static Output *resolveOutput(const QVariant &v);
+    static IviSurface *resolveIviSurface(const QVariant &v);
     static XdgToplevelV6 *resolveToplevel(const QVariant &v);
 
     void initShm();
@@ -128,6 +133,7 @@ private:
     QScopedPointer<DataDeviceManager> m_data_device_manager;
     QVector<Surface *> m_surfaces;
     QVector<Output *> m_outputs;
+    QScopedPointer<IviApplication> m_iviApplication;
     QScopedPointer<WlShell> m_wlShell;
     QScopedPointer<XdgShellV6> m_xdgShellV6;
 };
@@ -153,6 +159,22 @@ private:
 
 Q_DECLARE_METATYPE(QSharedPointer<MockSurface>)
 
+class MockIviSurface
+{
+public:
+    Impl::IviSurface *handle() const { return m_iviSurface; }
+    const uint iviId;
+
+private:
+    MockIviSurface(Impl::IviSurface *iviSurface) : iviId(iviSurface->iviId()), m_iviSurface(iviSurface) {}
+    friend class Impl::Compositor;
+    friend class Impl::IviSurface;
+
+    Impl::IviSurface *m_iviSurface;
+};
+
+Q_DECLARE_METATYPE(QSharedPointer<MockIviSurface>)
+
 class MockXdgToplevelV6
 {
 public:
@@ -211,11 +233,13 @@ public:
     void sendSurfaceEnter(const QSharedPointer<MockSurface> &surface, QSharedPointer<MockOutput> &output);
     void sendSurfaceLeave(const QSharedPointer<MockSurface> &surface, QSharedPointer<MockOutput> &output);
     void sendShellSurfaceConfigure(const QSharedPointer<MockSurface> surface, const QSize &size = QSize(0, 0));
+    void sendIviSurfaceConfigure(const QSharedPointer<MockIviSurface> iviSurface, const QSize &size);
     void sendXdgToplevelV6Configure(const QSharedPointer<MockXdgToplevelV6> toplevel, const QSize &size = QSize(0, 0));
     void waitForStartDrag();
 
     QSharedPointer<MockSurface> surface();
     QSharedPointer<MockOutput> output(int index = 0);
+    QSharedPointer<MockIviSurface> iviSurface(int index = 0);
     QSharedPointer<MockXdgToplevelV6> xdgToplevelV6(int index = 0);
 
     void lock();