diff --git a/src/wayland/autotests/client/CMakeLists.txt b/src/wayland/autotests/client/CMakeLists.txt
index 888c4b99d4..828acf96a6 100644
--- a/src/wayland/autotests/client/CMakeLists.txt
+++ b/src/wayland/autotests/client/CMakeLists.txt
@@ -1,43 +1,3 @@
-########################################################
-# Test WaylandConnectionThread
-########################################################
-set( testWaylandConnectionThread_SRCS
-        test_wayland_connection_thread.cpp
-    )
-add_executable(testWaylandConnectionThread ${testWaylandConnectionThread_SRCS})
-target_link_libraries( testWaylandConnectionThread Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
-add_test(NAME kwayland-testWaylandConnectionThread COMMAND testWaylandConnectionThread)
-ecm_mark_as_test(testWaylandConnectionThread)
-
-########################################################
-# Test WaylandRegistry
-########################################################
-set( testWaylandRegistry_SRCS
-        test_wayland_registry.cpp
-    )
-add_executable(testWaylandRegistry ${testWaylandRegistry_SRCS})
-target_link_libraries( testWaylandRegistry Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
-add_test(NAME kwayland-testWaylandRegistry COMMAND testWaylandRegistry)
-ecm_mark_as_test(testWaylandRegistry)
-
-########################################################
-# Test WaylandFullscreenShell
-########################################################
-if(Wayland_VERSION VERSION_GREATER "1.4.0")
-  find_program(WESTON_EXECUTABLE weston DOC "Path to the weston executable.")
-  if(WESTON_EXECUTABLE)
-    set( testWaylandFullscreenShell_SRCS
-            test_wayland_fullscreen_shell.cpp
-        )
-    add_executable(testWaylandFullscreenShell ${testWaylandFullscreenShell_SRCS})
-    target_link_libraries( testWaylandFullscreenShell Qt5::Test KF5::WaylandClient Wayland::Client)
-    add_test(NAME kwayland-testWaylandFullscreenShell COMMAND testWaylandFullscreenShell)
-    ecm_mark_as_test(testWaylandFullscreenShell)
-  else()
-    message(STATUS "The weston executable was not found. Some autotests will not be executed.")
-  endif()
-endif()
-
 ########################################################
 # Test WaylandOutput
 ########################################################
diff --git a/src/wayland/autotests/client/test_wayland_connection_thread.cpp b/src/wayland/autotests/client/test_wayland_connection_thread.cpp
deleted file mode 100644
index cbacb7f308..0000000000
--- a/src/wayland/autotests/client/test_wayland_connection_thread.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
-    SPDX-FileCopyrightText: 2014 Martin Gräßlin <mgraesslin@kde.org>
-
-    SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-*/
-// Qt
-#include <QtTest>
-// KWin
-#include "KWayland/Client/connection_thread.h"
-#include "KWayland/Client/event_queue.h"
-#include "KWayland/Client/registry.h"
-#include "../../src/server/display.h"
-// Wayland
-#include <wayland-client-protocol.h>
-// system
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
-
-class TestWaylandConnectionThread : public QObject
-{
-    Q_OBJECT
-public:
-    explicit TestWaylandConnectionThread(QObject *parent = nullptr);
-private Q_SLOTS:
-    void init();
-    void cleanup();
-
-    void testInitConnectionNoThread();
-    void testConnectionFailure();
-    void testConnectionThread();
-    void testConnectFd();
-    void testConnectFdNoSocketName();
-
-private:
-    KWaylandServer::Display *m_display;
-};
-
-static const QString s_socketName = QStringLiteral("kwin-test-wayland-connection-0");
-
-TestWaylandConnectionThread::TestWaylandConnectionThread(QObject *parent)
-    : QObject(parent)
-    , m_display(nullptr)
-{
-}
-
-void TestWaylandConnectionThread::init()
-{
-    using namespace KWaylandServer;
-    delete m_display;
-    m_display = new Display(this);
-    m_display->setSocketName(s_socketName);
-    m_display->start();
-    QVERIFY(m_display->isRunning());
-    m_display->createShm();
-}
-
-void TestWaylandConnectionThread::cleanup()
-{
-    delete m_display;
-    m_display = nullptr;
-}
-
-void TestWaylandConnectionThread::testInitConnectionNoThread()
-{
-    QVERIFY(KWayland::Client::ConnectionThread::connections().isEmpty());
-    QScopedPointer<KWayland::Client::ConnectionThread> connection(new KWayland::Client::ConnectionThread);
-    QVERIFY(KWayland::Client::ConnectionThread::connections().contains(connection.data()));
-    QCOMPARE(connection->socketName(), QStringLiteral("wayland-0"));
-    connection->setSocketName(s_socketName);
-    QCOMPARE(connection->socketName(), s_socketName);
-
-    QSignalSpy connectedSpy(connection.data(), SIGNAL(connected()));
-    QSignalSpy failedSpy(connection.data(), SIGNAL(failed()));
-    connection->initConnection();
-    QVERIFY(connectedSpy.wait());
-    QCOMPARE(connectedSpy.count(), 1);
-    QCOMPARE(failedSpy.count(), 0);
-    QVERIFY(connection->display());
-
-    connection.reset();
-    QVERIFY(KWayland::Client::ConnectionThread::connections().isEmpty());
-}
-
-void TestWaylandConnectionThread::testConnectionFailure()
-{
-    QScopedPointer<KWayland::Client::ConnectionThread> connection(new KWayland::Client::ConnectionThread);
-    connection->setSocketName(QStringLiteral("kwin-test-socket-does-not-exist"));
-
-    QSignalSpy connectedSpy(connection.data(), SIGNAL(connected()));
-    QSignalSpy failedSpy(connection.data(), SIGNAL(failed()));
-    connection->initConnection();
-    QVERIFY(failedSpy.wait());
-    QCOMPARE(connectedSpy.count(), 0);
-    QCOMPARE(failedSpy.count(), 1);
-    QVERIFY(!connection->display());
-}
-
-static void registryHandleGlobal(void *data, struct wl_registry *registry,
-                                 uint32_t name, const char *interface, uint32_t version)
-{
-    Q_UNUSED(data)
-    Q_UNUSED(registry)
-    Q_UNUSED(name)
-    Q_UNUSED(interface)
-    Q_UNUSED(version)
-}
-
-static void registryHandleGlobalRemove(void *data, struct wl_registry *registry, uint32_t name)
-{
-    Q_UNUSED(data)
-    Q_UNUSED(registry)
-    Q_UNUSED(name)
-}
-
-static const struct wl_registry_listener s_registryListener = {
-    registryHandleGlobal,
-    registryHandleGlobalRemove
-};
-
-void TestWaylandConnectionThread::testConnectionThread()
-{
-    KWayland::Client::ConnectionThread *connection = new KWayland::Client::ConnectionThread;
-    connection->setSocketName(s_socketName);
-
-    QThread *connectionThread = new QThread(this);
-    connection->moveToThread(connectionThread);
-    connectionThread->start();
-
-    QSignalSpy connectedSpy(connection, SIGNAL(connected()));
-    QVERIFY(connectedSpy.isValid());
-    QSignalSpy failedSpy(connection, SIGNAL(failed()));
-    QVERIFY(failedSpy.isValid());
-    connection->initConnection();
-    QVERIFY(connectedSpy.wait());
-    QCOMPARE(connectedSpy.count(), 1);
-    QCOMPARE(failedSpy.count(), 0);
-    QVERIFY(connection->display());
-
-    // now we have the connection ready, let's get some events
-    QSignalSpy eventsSpy(connection, SIGNAL(eventsRead()));
-    QVERIFY(eventsSpy.isValid());
-    wl_display *display = connection->display();
-    QScopedPointer<KWayland::Client::EventQueue> queue(new KWayland::Client::EventQueue);
-    queue->setup(display);
-    QVERIFY(queue->isValid());
-    connect(connection, &KWayland::Client::ConnectionThread::eventsRead, queue.data(), &KWayland::Client::EventQueue::dispatch, Qt::QueuedConnection);
-
-    wl_registry *registry = wl_display_get_registry(display);
-    wl_proxy_set_queue((wl_proxy*)registry, *(queue.data()));
-
-    wl_registry_add_listener(registry, &s_registryListener, this);
-    wl_display_flush(display);
-
-    if (eventsSpy.isEmpty()) {
-        QVERIFY(eventsSpy.wait());
-    }
-    QVERIFY(!eventsSpy.isEmpty());
-
-    wl_registry_destroy(registry);
-    queue.reset();
-
-    connection->deleteLater();
-    connectionThread->quit();
-    connectionThread->wait();
-    delete connectionThread;
-}
-
-void TestWaylandConnectionThread::testConnectFd()
-{
-    using namespace KWayland::Client;
-    using namespace KWaylandServer;
-    int sv[2];
-    QVERIFY(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) >= 0);
-    auto c = m_display->createClient(sv[0]);
-    QVERIFY(c);
-    QSignalSpy disconnectedSpy(c, &ClientConnection::disconnected);
-    QVERIFY(disconnectedSpy.isValid());
-
-    ConnectionThread *connection = new ConnectionThread;
-    QSignalSpy connectedSpy(connection, SIGNAL(connected()));
-    QVERIFY(connectedSpy.isValid());
-    connection->setSocketFd(sv[1]);
-
-    QThread *connectionThread = new QThread(this);
-    connection->moveToThread(connectionThread);
-    connectionThread->start();
-    connection->initConnection();
-    QVERIFY(connectedSpy.wait());
-
-    // create the Registry
-    QScopedPointer<Registry> registry(new Registry);
-    QSignalSpy announcedSpy(registry.data(), SIGNAL(interfacesAnnounced()));
-    QVERIFY(announcedSpy.isValid());
-    registry->create(connection);
-    QScopedPointer<EventQueue> queue(new EventQueue);
-    queue->setup(connection);
-    registry->setEventQueue(queue.data());
-    registry->setup();
-    QVERIFY(announcedSpy.wait());
-
-    registry.reset();
-    queue.reset();
-    connection->deleteLater();
-    connectionThread->quit();
-    connectionThread->wait();
-    delete connectionThread;
-
-    c->destroy();
-    QCOMPARE(disconnectedSpy.count(), 1);
-}
-
-void TestWaylandConnectionThread::testConnectFdNoSocketName()
-{
-    delete m_display;
-    m_display = nullptr;
-    using namespace KWayland::Client;
-    using namespace KWaylandServer;
-
-    Display display;
-    display.start(Display::StartMode::ConnectClientsOnly);
-    QVERIFY(display.isRunning());
-
-    int sv[2];
-    QVERIFY(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) >= 0);
-    QVERIFY(display.createClient(sv[0]));
-
-    ConnectionThread *connection = new ConnectionThread;
-    QSignalSpy connectedSpy(connection, SIGNAL(connected()));
-    QVERIFY(connectedSpy.isValid());
-    connection->setSocketFd(sv[1]);
-
-    QThread *connectionThread = new QThread(this);
-    connection->moveToThread(connectionThread);
-    connectionThread->start();
-    connection->initConnection();
-    QVERIFY(connectedSpy.wait());
-
-    // create the Registry
-    QScopedPointer<Registry> registry(new Registry);
-    QSignalSpy announcedSpy(registry.data(), SIGNAL(interfacesAnnounced()));
-    QVERIFY(announcedSpy.isValid());
-    registry->create(connection);
-    QScopedPointer<EventQueue> queue(new EventQueue);
-    queue->setup(connection);
-    registry->setEventQueue(queue.data());
-    registry->setup();
-    QVERIFY(announcedSpy.wait());
-
-    registry.reset();
-    queue.reset();
-    connection->deleteLater();
-    connectionThread->quit();
-    connectionThread->wait();
-    delete connectionThread;
-}
-
-QTEST_GUILESS_MAIN(TestWaylandConnectionThread)
-#include "test_wayland_connection_thread.moc"
diff --git a/src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp b/src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp
deleted file mode 100644
index e536615eff..0000000000
--- a/src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-    SPDX-FileCopyrightText: 2014 Martin Gräßlin <mgraesslin@kde.org>
-
-    SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-*/
-// Qt
-#include <QtTest>
-// KWin
-#include "KWayland/Client/connection_thread.h"
-#include "KWayland/Client/registry.h"
-#include "KWayland/Client/fullscreen_shell.h"
-// Wayland
-#include <wayland-client-protocol.h>
-
-class TestWaylandFullscreenShell : public QObject
-{
-    Q_OBJECT
-public:
-    explicit TestWaylandFullscreenShell(QObject *parent = nullptr);
-private Q_SLOTS:
-    void init();
-    void cleanup();
-
-    void testRegistry();
-    void testRegistryCreate();
-
-    // TODO: add tests for removal - requires more control over the compositor
-
-private:
-    QProcess *m_westonProcess;
-};
-
-static const QString s_socketName = QStringLiteral("kwin-test-wayland-fullscreen-shell-0");
-
-TestWaylandFullscreenShell::TestWaylandFullscreenShell(QObject *parent)
-    : QObject(parent)
-    , m_westonProcess(nullptr)
-{
-}
-
-void TestWaylandFullscreenShell::init()
-{
-    QVERIFY(!m_westonProcess);
-    // starts weston
-    m_westonProcess = new QProcess(this);
-    m_westonProcess->setProgram(QStringLiteral("weston"));
-
-    m_westonProcess->setArguments(QStringList({QStringLiteral("--socket=%1").arg(s_socketName),
-                                               QStringLiteral("--backend=headless-backend.so"),
-                                               QStringLiteral("--shell=fullscreen-shell.so")}));
-    m_westonProcess->start();
-    QVERIFY(m_westonProcess->waitForStarted());
-    QTest::qWait(500);
-
-    // wait for the socket to appear
-    QDir runtimeDir(qgetenv("XDG_RUNTIME_DIR"));
-    if (runtimeDir.exists(s_socketName)) {
-        return;
-    }
-    QFileSystemWatcher *socketWatcher = new QFileSystemWatcher(QStringList({runtimeDir.absolutePath()}), this);
-    QSignalSpy socketSpy(socketWatcher, SIGNAL(directoryChanged(QString)));
-
-    // limit to maximum of 10 waits
-    for (int i = 0; i < 10; ++i) {
-        QVERIFY(socketSpy.wait());
-        if (runtimeDir.exists(s_socketName)) {
-            delete socketWatcher;
-            return;
-        }
-    }
-}
-
-void TestWaylandFullscreenShell::cleanup()
-{
-    // terminates weston
-    m_westonProcess->terminate();
-    QVERIFY(m_westonProcess->waitForFinished());
-    delete m_westonProcess;
-    m_westonProcess = nullptr;
-}
-
-void TestWaylandFullscreenShell::testRegistry()
-{
-    if (m_westonProcess->state() != QProcess::Running) {
-        QSKIP("This test requires a running wayland server");
-    }
-    KWayland::Client::ConnectionThread connection;
-    QSignalSpy connectedSpy(&connection, SIGNAL(connected()));
-    connection.setSocketName(s_socketName);
-    connection.initConnection();
-    QVERIFY(connectedSpy.wait());
-
-    KWayland::Client::Registry registry;
-    QSignalSpy interfacesAnnouncedSpy(&registry, &KWayland::Client::Registry::interfaceAnnounced);
-    QVERIFY(interfacesAnnouncedSpy.isValid());
-    QSignalSpy announced(&registry, SIGNAL(fullscreenShellAnnounced(quint32,quint32)));
-    registry.create(connection.display());
-    QVERIFY(registry.isValid());
-    registry.setup();
-    wl_display_flush(connection.display());
-    QVERIFY(interfacesAnnouncedSpy.wait());
-
-    if (!registry.hasInterface(KWayland::Client::Registry::Interface::FullscreenShell)) {
-        QSKIP("Weston does not have fullscreen shell support");
-    }
-    QCOMPARE(announced.count(), 1);
-
-    KWayland::Client::FullscreenShell fullscreenShell;
-    QVERIFY(!fullscreenShell.isValid());
-    QVERIFY(!fullscreenShell.hasCapabilityArbitraryModes());
-    QVERIFY(!fullscreenShell.hasCapabilityCursorPlane());
-
-    fullscreenShell.setup(registry.bindFullscreenShell(announced.first().first().value<quint32>(), 1));
-    QVERIFY(fullscreenShell.isValid());
-}
-
-void TestWaylandFullscreenShell::testRegistryCreate()
-{    if (m_westonProcess->state() != QProcess::Running) {
-        QSKIP("This test requires a running wayland server");
-    }
-    KWayland::Client::ConnectionThread connection;
-    QSignalSpy connectedSpy(&connection, SIGNAL(connected()));
-    connection.setSocketName(s_socketName);
-    connection.initConnection();
-    QVERIFY(connectedSpy.wait());
-
-    KWayland::Client::Registry registry;
-    QSignalSpy interfacesAnnouncedSpy(&registry, &KWayland::Client::Registry::interfaceAnnounced);
-    QVERIFY(interfacesAnnouncedSpy.isValid());
-    QSignalSpy announced(&registry, SIGNAL(fullscreenShellAnnounced(quint32,quint32)));
-    registry.create(connection.display());
-    QVERIFY(registry.isValid());
-    registry.setup();
-    wl_display_flush(connection.display());
-    QVERIFY(interfacesAnnouncedSpy.wait());
-
-    if (!registry.hasInterface(KWayland::Client::Registry::Interface::FullscreenShell)) {
-        QSKIP("Weston does not have fullscreen shell support");
-    }
-    QCOMPARE(announced.count(), 1);
-
-    KWayland::Client::FullscreenShell *fullscreenShell = registry.createFullscreenShell(announced.first().first().value<quint32>(), 1, &registry);
-    QVERIFY(fullscreenShell->isValid());
-}
-
-QTEST_GUILESS_MAIN(TestWaylandFullscreenShell)
-#include "test_wayland_fullscreen_shell.moc"
diff --git a/src/wayland/autotests/client/test_wayland_registry.cpp b/src/wayland/autotests/client/test_wayland_registry.cpp
deleted file mode 100644
index eddcc2b02c..0000000000
--- a/src/wayland/autotests/client/test_wayland_registry.cpp
+++ /dev/null
@@ -1,807 +0,0 @@
-/*
-    SPDX-FileCopyrightText: 2014 Martin Gräßlin <mgraesslin@kde.org>
-
-    SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-*/
-// Qt
-#include <QtTest>
-// KWin
-#include "KWayland/Client/blur.h"
-#include "KWayland/Client/contrast.h"
-#include "KWayland/Client/compositor.h"
-#include "KWayland/Client/connection_thread.h"
-#include "KWayland/Client/dpms.h"
-#include "KWayland/Client/event_queue.h"
-#include "KWayland/Client/registry.h"
-#include "KWayland/Client/output.h"
-#include "KWayland/Client/pointerconstraints.h"
-#include "KWayland/Client/pointergestures.h"
-#include "KWayland/Client/idleinhibit.h"
-#include "KWayland/Client/seat.h"
-#include "KWayland/Client/relativepointer.h"
-#include "KWayland/Client/server_decoration.h"
-#include "KWayland/Client/surface.h"
-#include "KWayland/Client/subcompositor.h"
-#include "KWayland/Client/xdgshell.h"
-#include "../../src/server/compositor_interface.h"
-#include "../../src/server/datadevicemanager_interface.h"
-#include "../../src/server/display.h"
-#include "../../src/server/dpms_interface.h"
-#include "../../src/server/idleinhibit_interface.h"
-#include "../../src/server/output_interface.h"
-#include "../../src/server/seat_interface.h"
-#include "../../src/server/blur_interface.h"
-#include "../../src/server/contrast_interface.h"
-#include "../../src/server/server_decoration_interface.h"
-#include "../../src/server/slide_interface.h"
-#include "../../src/server/subcompositor_interface.h"
-#include "../../src/server/outputmanagement_interface.h"
-#include "../../src/server/outputdevice_interface.h"
-#include "../../src/server/pointerconstraints_interface.h"
-#include "../../src/server/pointergestures_interface.h"
-#include "../../src/server/textinput_interface.h"
-#include "../../src/server/xdgshell_interface.h"
-#include "../../src/server/relativepointer_interface.h"
-// Wayland
-#include <wayland-client-protocol.h>
-#include <wayland-dpms-client-protocol.h>
-#include <wayland-idle-inhibit-unstable-v1-client-protocol.h>
-// #include <wayland-server-decoration-client-protocol.h>
-// #include <wayland-text-input-v0-client-protocol.h>
-// #include <wayland-text-input-v2-client-protocol.h>
-#include <wayland-relativepointer-unstable-v1-client-protocol.h>
-#include <wayland-pointer-gestures-unstable-v1-client-protocol.h>
-#include <wayland-pointer-constraints-unstable-v1-client-protocol.h>
-
-class TestWaylandRegistry : public QObject
-{
-    Q_OBJECT
-public:
-    explicit TestWaylandRegistry(QObject *parent = nullptr);
-private Q_SLOTS:
-    void init();
-    void cleanup();
-
-    void testCreate();
-    void testBindCompositor();
-    void testBindOutput();
-    void testBindShm();
-    void testBindSeat();
-    void testBindSubCompositor();
-    void testBindDataDeviceManager();
-    void testBindBlurManager();
-    void testBindContrastManager();
-    void testBindSlideManager();
-    void testBindDpmsManager();
-    void testBindRelativePointerManagerUnstableV1();
-    void testBindPointerGesturesUnstableV1();
-    void testBindPointerConstraintsUnstableV1();
-    void testBindIdleIhibitManagerUnstableV1();
-    void testGlobalSync();
-    void testGlobalSyncThreaded();
-    void testRemoval();
-    void testOutOfSyncRemoval();
-    void testDestroy();
-    void testAnnounceMultiple();
-    void testAnnounceMultipleOutputDevices();
-
-private:
-    KWaylandServer::Display *m_display;
-    KWaylandServer::CompositorInterface *m_compositor;
-    KWaylandServer::OutputInterface *m_output;
-    KWaylandServer::OutputDeviceInterface *m_outputDevice;
-    KWaylandServer::SeatInterface *m_seat;
-    KWaylandServer::SubCompositorInterface *m_subcompositor;
-    KWaylandServer::DataDeviceManagerInterface *m_dataDeviceManager;
-    KWaylandServer::OutputManagementInterface *m_outputManagement;
-    KWaylandServer::ServerSideDecorationManagerInterface *m_serverSideDecorationManager;
-    KWaylandServer::TextInputManagerInterface *m_textInputManagerV0;
-    KWaylandServer::TextInputManagerInterface *m_textInputManagerV2;
-    KWaylandServer::RelativePointerManagerInterface *m_relativePointerV1;
-    KWaylandServer::PointerGesturesInterface *m_pointerGesturesV1;
-    KWaylandServer::PointerConstraintsInterface *m_pointerConstraintsV1;
-    KWaylandServer::BlurManagerInterface *m_blur;
-    KWaylandServer::ContrastManagerInterface *m_contrast;
-    KWaylandServer::IdleInhibitManagerInterface *m_idleInhibit;
-
-};
-
-static const QString s_socketName = QStringLiteral("kwin-test-wayland-registry-0");
-
-TestWaylandRegistry::TestWaylandRegistry(QObject *parent)
-    : QObject(parent)
-    , m_display(nullptr)
-    , m_compositor(nullptr)
-    , m_output(nullptr)
-    , m_outputDevice(nullptr)
-    , m_seat(nullptr)
-    , m_subcompositor(nullptr)
-    , m_dataDeviceManager(nullptr)
-    , m_outputManagement(nullptr)
-    , m_serverSideDecorationManager(nullptr)
-    , m_textInputManagerV0(nullptr)
-    , m_textInputManagerV2(nullptr)
-    , m_relativePointerV1(nullptr)
-    , m_pointerGesturesV1(nullptr)
-    , m_pointerConstraintsV1(nullptr)
-    , m_blur(nullptr)
-    , m_contrast(nullptr)
-    , m_idleInhibit(nullptr)
-{
-}
-
-void TestWaylandRegistry::init()
-{
-    m_display = new KWaylandServer::Display();
-    m_display->setSocketName(s_socketName);
-    m_display->start();
-    m_display->createShm();
-    m_compositor = m_display->createCompositor();
-    m_compositor->create();
-    m_output = m_display->createOutput();
-    m_output->create();
-    m_seat = m_display->createSeat();
-    m_seat->create();
-    m_subcompositor = m_display->createSubCompositor();
-    m_subcompositor->create();
-    m_dataDeviceManager = m_display->createDataDeviceManager();
-    m_dataDeviceManager->create();
-    m_outputManagement = m_display->createOutputManagement();
-    m_outputManagement->create();
-    m_outputDevice = m_display->createOutputDevice();
-    m_outputDevice->create();
-    QVERIFY(m_outputManagement->isValid());
-    m_blur = m_display->createBlurManager(this);
-    m_contrast = m_display->createContrastManager(this);
-    m_contrast->create();
-    m_display->createSlideManager(this)->create();
-    m_display->createDpmsManager()->create();
-    m_serverSideDecorationManager = m_display->createServerSideDecorationManager();
-    m_serverSideDecorationManager->create();
-    m_textInputManagerV0 = m_display->createTextInputManager(KWaylandServer::TextInputInterfaceVersion::UnstableV0);
-    QCOMPARE(m_textInputManagerV0->interfaceVersion(), KWaylandServer::TextInputInterfaceVersion::UnstableV0);
-    m_textInputManagerV0->create();
-    m_textInputManagerV2 = m_display->createTextInputManager(KWaylandServer::TextInputInterfaceVersion::UnstableV2);
-    QCOMPARE(m_textInputManagerV2->interfaceVersion(), KWaylandServer::TextInputInterfaceVersion::UnstableV2);
-    m_textInputManagerV2->create();
-    m_relativePointerV1 = m_display->createRelativePointerManager(KWaylandServer::RelativePointerInterfaceVersion::UnstableV1);
-    m_relativePointerV1->create();
-    QCOMPARE(m_relativePointerV1->interfaceVersion(), KWaylandServer::RelativePointerInterfaceVersion::UnstableV1);
-    m_pointerGesturesV1 = m_display->createPointerGestures(KWaylandServer::PointerGesturesInterfaceVersion::UnstableV1);
-    m_pointerGesturesV1->create();
-    QCOMPARE(m_pointerGesturesV1->interfaceVersion(), KWaylandServer::PointerGesturesInterfaceVersion::UnstableV1);
-    m_pointerConstraintsV1 = m_display->createPointerConstraints(KWaylandServer::PointerConstraintsInterfaceVersion::UnstableV1);
-    m_pointerConstraintsV1->create();
-    QCOMPARE(m_pointerConstraintsV1->interfaceVersion(), KWaylandServer::PointerConstraintsInterfaceVersion::UnstableV1);
-    m_idleInhibit = m_display->createIdleInhibitManager(KWaylandServer::IdleInhibitManagerInterfaceVersion::UnstableV1);
-    m_idleInhibit->create();
-    QCOMPARE(m_idleInhibit->interfaceVersion(), KWaylandServer::IdleInhibitManagerInterfaceVersion::UnstableV1);
-}
-
-void TestWaylandRegistry::cleanup()
-{
-    delete m_display;
-    m_display = nullptr;
-}
-
-void TestWaylandRegistry::testCreate()
-{
-    KWayland::Client::ConnectionThread connection;
-    QSignalSpy connectedSpy(&connection, SIGNAL(connected()));
-    connection.setSocketName(s_socketName);
-    connection.initConnection();
-    QVERIFY(connectedSpy.wait());
-
-    KWayland::Client::Registry registry;
-    QVERIFY(!registry.isValid());
-    registry.create(connection.display());
-    QVERIFY(registry.isValid());
-    registry.release();
-    QVERIFY(!registry.isValid());
-}
-
-#define TEST_BIND(iface, signalName, bindMethod, destroyFunction) \
-    KWayland::Client::ConnectionThread connection; \
-    QSignalSpy connectedSpy(&connection, SIGNAL(connected())); \
-    connection.setSocketName(s_socketName); \
-    connection.initConnection(); \
-    QVERIFY(connectedSpy.wait()); \
-    \
-    KWayland::Client::Registry registry; \
-    /* before registry is created, we cannot bind the interface*/ \
-    QVERIFY(!registry.bindMethod(0, 0)); \
-    \
-    QVERIFY(!registry.isValid()); \
-    registry.create(&connection); \
-    QVERIFY(registry.isValid()); \
-    /* created but not yet connected still results in no bind */ \
-    QVERIFY(!registry.bindMethod(0, 0)); \
-    /* interface information should be empty */ \
-    QVERIFY(registry.interfaces(iface).isEmpty()); \
-    QCOMPARE(registry.interface(iface).name, 0u); \
-    QCOMPARE(registry.interface(iface).version, 0u); \
-    \
-    /* now let's register */ \
-    QSignalSpy announced(&registry, signalName); \
-    QVERIFY(announced.isValid()); \
-    registry.setup(); \
-    wl_display_flush(connection.display()); \
-    QVERIFY(announced.wait()); \
-    const quint32 name = announced.first().first().value<quint32>(); \
-    const quint32 version = announced.first().last().value<quint32>(); \
-    QCOMPARE(registry.interfaces(iface).count(), 1); \
-    QCOMPARE(registry.interfaces(iface).first().name, name); \
-    QCOMPARE(registry.interfaces(iface).first().version, version); \
-    QCOMPARE(registry.interface(iface).name, name); \
-    QCOMPARE(registry.interface(iface).version, version); \
-    \
-    /* registry should know about the interface now */ \
-    QVERIFY(registry.hasInterface(iface)); \
-    QVERIFY(!registry.bindMethod(name+1, version)); \
-    QVERIFY(registry.bindMethod(name, version+1)); \
-    auto *c = registry.bindMethod(name, version); \
-    QVERIFY(c); \
-    destroyFunction(c); \
-
-void TestWaylandRegistry::testBindCompositor()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::Compositor, SIGNAL(compositorAnnounced(quint32,quint32)), bindCompositor, wl_compositor_destroy)
-}
-
-void TestWaylandRegistry::testBindOutput()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::Output, SIGNAL(outputAnnounced(quint32,quint32)), bindOutput, wl_output_destroy)
-}
-
-void TestWaylandRegistry::testBindSeat()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::Seat, SIGNAL(seatAnnounced(quint32,quint32)), bindSeat, wl_seat_destroy)
-}
-
-void TestWaylandRegistry::testBindShm()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::Shm, SIGNAL(shmAnnounced(quint32,quint32)), bindShm, wl_shm_destroy)
-}
-
-void TestWaylandRegistry::testBindSubCompositor()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::SubCompositor, SIGNAL(subCompositorAnnounced(quint32,quint32)), bindSubCompositor, wl_subcompositor_destroy)
-}
-
-void TestWaylandRegistry::testBindDataDeviceManager()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::DataDeviceManager, SIGNAL(dataDeviceManagerAnnounced(quint32,quint32)), bindDataDeviceManager, wl_data_device_manager_destroy)
-}
-
-void TestWaylandRegistry::testBindBlurManager()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::Blur, SIGNAL(blurAnnounced(quint32,quint32)), bindBlurManager, free)
-}
-
-void TestWaylandRegistry::testBindContrastManager()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::Contrast, SIGNAL(contrastAnnounced(quint32,quint32)), bindContrastManager, free)
-}
-
-void TestWaylandRegistry::testBindSlideManager()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::Slide, SIGNAL(slideAnnounced(quint32,quint32)), bindSlideManager, free)
-}
-
-void TestWaylandRegistry::testBindDpmsManager()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::Dpms, SIGNAL(dpmsAnnounced(quint32,quint32)), bindDpmsManager, org_kde_kwin_dpms_manager_destroy)
-}
-
-void TestWaylandRegistry::testBindRelativePointerManagerUnstableV1()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::RelativePointerManagerUnstableV1, SIGNAL(relativePointerManagerUnstableV1Announced(quint32,quint32)), bindRelativePointerManagerUnstableV1, zwp_relative_pointer_manager_v1_destroy)
-}
-
-void TestWaylandRegistry::testBindPointerGesturesUnstableV1()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::PointerGesturesUnstableV1, SIGNAL(pointerGesturesUnstableV1Announced(quint32,quint32)), bindPointerGesturesUnstableV1, zwp_pointer_gestures_v1_destroy)
-}
-
-void TestWaylandRegistry::testBindPointerConstraintsUnstableV1()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::PointerConstraintsUnstableV1, SIGNAL(pointerConstraintsUnstableV1Announced(quint32,quint32)), bindPointerConstraintsUnstableV1, zwp_pointer_constraints_v1_destroy)
-}
-
-void TestWaylandRegistry::testBindIdleIhibitManagerUnstableV1()
-{
-    TEST_BIND(KWayland::Client::Registry::Interface::IdleInhibitManagerUnstableV1, SIGNAL(idleInhibitManagerUnstableV1Announced(quint32,quint32)), bindIdleInhibitManagerUnstableV1, zwp_idle_inhibit_manager_v1_destroy)
-}
-
-#undef TEST_BIND
-
-void TestWaylandRegistry::testRemoval()
-{
-    using namespace KWayland::Client;
-    KWayland::Client::ConnectionThread connection;
-    QSignalSpy connectedSpy(&connection, SIGNAL(connected()));
-    connection.setSocketName(s_socketName);
-    connection.initConnection();
-    QVERIFY(connectedSpy.wait());
-    connect(QCoreApplication::eventDispatcher(), &QAbstractEventDispatcher::aboutToBlock, &connection,
-        [&connection] {
-            wl_display_flush(connection.display());
-        }
-    );
-
-    KWayland::Client::Registry registry;
-    QSignalSpy shmAnnouncedSpy(&registry, SIGNAL(shmAnnounced(quint32,quint32)));
-    QVERIFY(shmAnnouncedSpy.isValid());
-    QSignalSpy compositorAnnouncedSpy(&registry, SIGNAL(compositorAnnounced(quint32,quint32)));
-    QVERIFY(compositorAnnouncedSpy.isValid());
-    QSignalSpy outputAnnouncedSpy(&registry, SIGNAL(outputAnnounced(quint32,quint32)));
-    QVERIFY(outputAnnouncedSpy.isValid());
-    QSignalSpy outputDeviceAnnouncedSpy(&registry, SIGNAL(outputDeviceAnnounced(quint32,quint32)));
-    QVERIFY(outputDeviceAnnouncedSpy.isValid());
-    QSignalSpy seatAnnouncedSpy(&registry, SIGNAL(seatAnnounced(quint32,quint32)));
-    QVERIFY(seatAnnouncedSpy.isValid());
-    QSignalSpy subCompositorAnnouncedSpy(&registry, SIGNAL(subCompositorAnnounced(quint32,quint32)));
-    QVERIFY(subCompositorAnnouncedSpy.isValid());
-    QSignalSpy outputManagementAnnouncedSpy(&registry, SIGNAL(outputManagementAnnounced(quint32,quint32)));
-    QVERIFY(outputManagementAnnouncedSpy.isValid());
-    QSignalSpy serverSideDecorationManagerAnnouncedSpy(&registry, &Registry::serverSideDecorationManagerAnnounced);
-    QVERIFY(serverSideDecorationManagerAnnouncedSpy.isValid());
-    QSignalSpy blurAnnouncedSpy(&registry, &Registry::blurAnnounced);
-    QVERIFY(blurAnnouncedSpy.isValid());
-    QSignalSpy idleInhibitManagerUnstableV1AnnouncedSpy(&registry, &Registry::idleInhibitManagerUnstableV1Announced);
-    QVERIFY(idleInhibitManagerUnstableV1AnnouncedSpy.isValid());
-
-    QVERIFY(!registry.isValid());
-    registry.create(connection.display());
-    registry.setup();
-
-    QVERIFY(shmAnnouncedSpy.wait());
-    QVERIFY(!compositorAnnouncedSpy.isEmpty());
-    QVERIFY(!outputAnnouncedSpy.isEmpty());
-    QVERIFY(!outputDeviceAnnouncedSpy.isEmpty());
-    QVERIFY(!seatAnnouncedSpy.isEmpty());
-    QVERIFY(!subCompositorAnnouncedSpy.isEmpty());
-    QVERIFY(!outputManagementAnnouncedSpy.isEmpty());
-    QVERIFY(!serverSideDecorationManagerAnnouncedSpy.isEmpty());
-    QVERIFY(!blurAnnouncedSpy.isEmpty());
-    QVERIFY(!idleInhibitManagerUnstableV1AnnouncedSpy.isEmpty());
-
-
-    QVERIFY(registry.hasInterface(KWayland::Client::Registry::Interface::Compositor));
-    QVERIFY(registry.hasInterface(KWayland::Client::Registry::Interface::Output));
-    QVERIFY(registry.hasInterface(KWayland::Client::Registry::Interface::OutputDevice));
-    QVERIFY(registry.hasInterface(KWayland::Client::Registry::Interface::Seat));
-    QVERIFY(registry.hasInterface(KWayland::Client::Registry::Interface::Shm));
-    QVERIFY(registry.hasInterface(KWayland::Client::Registry::Interface::SubCompositor));
-    QVERIFY(!registry.hasInterface(KWayland::Client::Registry::Interface::FullscreenShell));
-    QVERIFY(registry.hasInterface(KWayland::Client::Registry::Interface::OutputManagement));
-    QVERIFY(registry.hasInterface(KWayland::Client::Registry::Interface::ServerSideDecorationManager));
-    QVERIFY(registry.hasInterface(KWayland::Client::Registry::Interface::Blur));
-    QVERIFY(registry.hasInterface(KWayland::Client::Registry::Interface::IdleInhibitManagerUnstableV1));
-
-    QVERIFY(!registry.interfaces(KWayland::Client::Registry::Interface::Compositor).isEmpty());
-    QVERIFY(!registry.interfaces(KWayland::Client::Registry::Interface::Output).isEmpty());
-    QVERIFY(!registry.interfaces(KWayland::Client::Registry::Interface::OutputDevice).isEmpty());
-    QVERIFY(!registry.interfaces(KWayland::Client::Registry::Interface::Seat).isEmpty());
-    QVERIFY(!registry.interfaces(KWayland::Client::Registry::Interface::Shm).isEmpty());
-    QVERIFY(!registry.interfaces(KWayland::Client::Registry::Interface::SubCompositor).isEmpty());
-    QVERIFY(registry.interfaces(KWayland::Client::Registry::Interface::FullscreenShell).isEmpty());
-    QVERIFY(!registry.interfaces(KWayland::Client::Registry::Interface::OutputManagement).isEmpty());
-    QVERIFY(!registry.interfaces(KWayland::Client::Registry::Interface::ServerSideDecorationManager).isEmpty());
-    QVERIFY(!registry.interfaces(KWayland::Client::Registry::Interface::Blur).isEmpty());
-    QVERIFY(!registry.interfaces(KWayland::Client::Registry::Interface::IdleInhibitManagerUnstableV1).isEmpty());
-
-    QSignalSpy seatRemovedSpy(&registry, SIGNAL(seatRemoved(quint32)));
-    QVERIFY(seatRemovedSpy.isValid());
-
-    Seat *seat = registry.createSeat(registry.interface(Registry::Interface::Seat).name, registry.interface(Registry::Interface::Seat).version, &registry);
-    Output *output = registry.createOutput(registry.interface(Registry::Interface::Output).name, registry.interface(Registry::Interface::Output).version, &registry);
-    Compositor *compositor = registry.createCompositor(registry.interface(Registry::Interface::Compositor).name, registry.interface(Registry::Interface::Compositor).version, &registry);
-    SubCompositor *subcompositor = registry.createSubCompositor(registry.interface(Registry::Interface::SubCompositor).name, registry.interface(Registry::Interface::SubCompositor).version, &registry);
-    ServerSideDecorationManager *serverSideDeco = registry.createServerSideDecorationManager(registry.interface(Registry::Interface::ServerSideDecorationManager).name, registry.interface(Registry::Interface::ServerSideDecorationManager).version, &registry);
-    BlurManager *blurManager = registry.createBlurManager(registry.interface(Registry::Interface::Blur).name, registry.interface(Registry::Interface::Blur).version, &registry);
-    auto idleInhibitManager = registry.createIdleInhibitManager(registry.interface(Registry::Interface::IdleInhibitManagerUnstableV1).name, registry.interface(Registry::Interface::IdleInhibitManagerUnstableV1).version, &registry);
-
-    connection.flush();
-    m_display->dispatchEvents();
-    QSignalSpy seatObjectRemovedSpy(seat, &Seat::removed);
-    QVERIFY(seatObjectRemovedSpy.isValid());
-    QSignalSpy outputObjectRemovedSpy(output, &Output::removed);
-    QVERIFY(outputObjectRemovedSpy.isValid());
-    QSignalSpy compositorObjectRemovedSpy(compositor, &Compositor::removed);
-    QVERIFY(compositorObjectRemovedSpy.isValid());
-    QSignalSpy subcompositorObjectRemovedSpy(subcompositor, &SubCompositor::removed);
-    QVERIFY(subcompositorObjectRemovedSpy.isValid());
-    QSignalSpy idleInhibitManagerObjectRemovedSpy(idleInhibitManager, &IdleInhibitManager::removed);
-    QVERIFY(idleInhibitManagerObjectRemovedSpy.isValid());
-
-    delete m_seat;
-    QVERIFY(seatRemovedSpy.wait());
-    QCOMPARE(seatRemovedSpy.first().first(), seatAnnouncedSpy.first().first());
-    QVERIFY(!registry.hasInterface(KWayland::Client::Registry::Interface::Seat));
-    QVERIFY(registry.interfaces(KWayland::Client::Registry::Interface::Seat).isEmpty());
-    QCOMPARE(seatObjectRemovedSpy.count(), 1);
-
-    QSignalSpy outputRemovedSpy(&registry, SIGNAL(outputRemoved(quint32)));
-    QVERIFY(outputRemovedSpy.isValid());
-
-    delete m_output;
-    QVERIFY(outputRemovedSpy.wait());
-    QCOMPARE(outputRemovedSpy.first().first(), outputAnnouncedSpy.first().first());
-    QVERIFY(!registry.hasInterface(KWayland::Client::Registry::Interface::Output));
-    QVERIFY(registry.interfaces(KWayland::Client::Registry::Interface::Output).isEmpty());
-    QCOMPARE(outputObjectRemovedSpy.count(), 1);
-
-    QSignalSpy outputDeviceRemovedSpy(&registry, SIGNAL(outputDeviceRemoved(quint32)));
-    QVERIFY(outputDeviceRemovedSpy.isValid());
-
-    delete m_outputDevice;
-    QVERIFY(outputDeviceRemovedSpy.wait());
-    QCOMPARE(outputDeviceRemovedSpy.first().first(), outputDeviceAnnouncedSpy.first().first());
-    QVERIFY(!registry.hasInterface(KWayland::Client::Registry::Interface::OutputDevice));
-    QVERIFY(registry.interfaces(KWayland::Client::Registry::Interface::OutputDevice).isEmpty());
-
-    QSignalSpy compositorRemovedSpy(&registry, SIGNAL(compositorRemoved(quint32)));
-    QVERIFY(compositorRemovedSpy.isValid());
-
-    delete m_compositor;
-    QVERIFY(compositorRemovedSpy.wait());
-    QCOMPARE(compositorRemovedSpy.first().first(), compositorAnnouncedSpy.first().first());
-    QVERIFY(!registry.hasInterface(KWayland::Client::Registry::Interface::Compositor));
-    QVERIFY(registry.interfaces(KWayland::Client::Registry::Interface::Compositor).isEmpty());
-    QCOMPARE(compositorObjectRemovedSpy.count(), 1);
-
-    QSignalSpy subCompositorRemovedSpy(&registry, SIGNAL(subCompositorRemoved(quint32)));
-    QVERIFY(subCompositorRemovedSpy.isValid());
-
-    delete m_subcompositor;
-    QVERIFY(subCompositorRemovedSpy.wait());
-    QCOMPARE(subCompositorRemovedSpy.first().first(), subCompositorAnnouncedSpy.first().first());
-    QVERIFY(!registry.hasInterface(KWayland::Client::Registry::Interface::SubCompositor));
-    QVERIFY(registry.interfaces(KWayland::Client::Registry::Interface::SubCompositor).isEmpty());
-    QCOMPARE(subcompositorObjectRemovedSpy.count(), 1);
-
-    QSignalSpy outputManagementRemovedSpy(&registry, SIGNAL(outputManagementRemoved(quint32)));
-    QVERIFY(outputManagementRemovedSpy.isValid());
-
-    delete m_outputManagement;
-    QVERIFY(outputManagementRemovedSpy.wait());
-    QCOMPARE(outputManagementRemovedSpy.first().first(), outputManagementAnnouncedSpy.first().first());
-    QVERIFY(!registry.hasInterface(KWayland::Client::Registry::Interface::OutputManagement));
-    QVERIFY(registry.interfaces(KWayland::Client::Registry::Interface::OutputManagement).isEmpty());
-
-    QSignalSpy serverSideDecoManagerRemovedSpy(&registry, &Registry::serverSideDecorationManagerRemoved);
-    QVERIFY(serverSideDecoManagerRemovedSpy.isValid());
-    QSignalSpy serverSideDecoManagerObjectRemovedSpy(serverSideDeco, &ServerSideDecorationManager::removed);
-    QVERIFY(serverSideDecoManagerObjectRemovedSpy.isValid());
-
-    delete m_serverSideDecorationManager;
-    QVERIFY(serverSideDecoManagerRemovedSpy.wait());
-    QCOMPARE(serverSideDecoManagerRemovedSpy.first().first(), serverSideDecorationManagerAnnouncedSpy.first().first());
-    QVERIFY(!registry.hasInterface(KWayland::Client::Registry::Interface::ServerSideDecorationManager));
-    QVERIFY(registry.interfaces(KWayland::Client::Registry::Interface::ServerSideDecorationManager).isEmpty());
-    QCOMPARE(serverSideDecoManagerObjectRemovedSpy.count(), 1);
-
-    QSignalSpy blurRemovedSpy(&registry, &Registry::blurRemoved);
-    QVERIFY(blurRemovedSpy.isValid());
-    QSignalSpy blurObjectRemovedSpy(blurManager, &BlurManager::removed);
-    QVERIFY(blurObjectRemovedSpy.isValid());
-
-    delete m_blur;
-    QVERIFY(blurRemovedSpy.wait());
-    QCOMPARE(blurRemovedSpy.first().first(), blurRemovedSpy.first().first());
-    QVERIFY(!registry.hasInterface(KWayland::Client::Registry::Interface::Blur));
-    QVERIFY(registry.interfaces(KWayland::Client::Registry::Interface::Blur).isEmpty());
-    QCOMPARE(blurObjectRemovedSpy.count(), 1);
-
-    QSignalSpy idleInhibitManagerUnstableV1RemovedSpy(&registry, &Registry::idleInhibitManagerUnstableV1Removed);
-    QVERIFY(idleInhibitManagerUnstableV1RemovedSpy.isValid());
-    delete m_idleInhibit;
-    QVERIFY(idleInhibitManagerUnstableV1RemovedSpy.wait());
-    QCOMPARE(idleInhibitManagerUnstableV1RemovedSpy.first().first(), idleInhibitManagerUnstableV1AnnouncedSpy.first().first());
-    QVERIFY(registry.interfaces(KWayland::Client::Registry::Interface::IdleInhibitManagerUnstableV1).isEmpty());
-    QCOMPARE(idleInhibitManagerObjectRemovedSpy.count(), 1);
-
-    // cannot test shmRemoved as there is no functionality for it
-
-    // verify everything has been removed only once
-    QCOMPARE(seatObjectRemovedSpy.count(), 1);
-    QCOMPARE(outputObjectRemovedSpy.count(), 1);
-    QCOMPARE(compositorObjectRemovedSpy.count(), 1);
-    QCOMPARE(subcompositorObjectRemovedSpy.count(), 1);
-    QCOMPARE(serverSideDecoManagerObjectRemovedSpy.count(), 1);
-    QCOMPARE(blurObjectRemovedSpy.count(), 1);
-    QCOMPARE(idleInhibitManagerObjectRemovedSpy.count(), 1);
-}
-
-void TestWaylandRegistry::testOutOfSyncRemoval()
-{
-    //This tests the following sequence of events
-    //server announces global
-    //client binds to that global
-
-    //server removes the global
-    //(simultaneously) the client legimitely uses the bound resource to the global
-    //client then gets the server events...it should no-op, not be a protocol error
-
-    using namespace KWayland::Client;
-    KWayland::Client::ConnectionThread connection;
-    QSignalSpy connectedSpy(&connection, SIGNAL(connected()));
-    connection.setSocketName(s_socketName);
-    connection.initConnection();
-    QVERIFY(connectedSpy.wait());
-    connect(QCoreApplication::eventDispatcher(), &QAbstractEventDispatcher::aboutToBlock, &connection,
-        [&connection] {
-            wl_display_flush(connection.display());
-        }
-    );
-
-    KWayland::Client::Registry registry;
-    QVERIFY(!registry.isValid());
-    registry.create(connection.display());
-    registry.setup();
-    QSignalSpy blurAnnouncedSpy(&registry, &Registry::blurAnnounced);
-    QSignalSpy contrastAnnouncedSpy(&registry, &Registry::blurAnnounced);
-
-    blurAnnouncedSpy.wait();
-    contrastAnnouncedSpy.wait();
-    BlurManager *blurManager = registry.createBlurManager(registry.interface(Registry::Interface::Blur).name, registry.interface(Registry::Interface::Blur).version, &registry);
-    ContrastManager *contrastManager = registry.createContrastManager(registry.interface(Registry::Interface::Contrast).name, registry.interface(Registry::Interface::Contrast).version, &registry);
-
-    connection.flush();
-    m_display->dispatchEvents();
-
-    QScopedPointer<Compositor> compositor(registry.createCompositor(registry.interface(Registry::Interface::Compositor).name,
-                                             registry.interface(Registry::Interface::Compositor).version));
-    QScopedPointer<Surface> surface(compositor->createSurface());
-    QVERIFY(surface);
-
-    //remove blur
-    QSignalSpy blurRemovedSpy(&registry, &Registry::blurRemoved);
-
-    delete m_blur;
-
-    //client hasn't processed the event yet
-    QVERIFY(blurRemovedSpy.count() == 0);
-
-    //use the in the client
-    blurManager->createBlur(surface.data(), nullptr);
-
-    //now process events,
-    QVERIFY(blurRemovedSpy.wait());
-    QVERIFY(blurRemovedSpy.count() == 1);
-
-    //remove background contrast
-    QSignalSpy contrastRemovedSpy(&registry, &Registry::contrastRemoved);
-
-    delete m_contrast;
-
-    //client hasn't processed the event yet
-    QVERIFY(contrastRemovedSpy.count() == 0);
-
-    //use the in the client
-    contrastManager->createContrast(surface.data(), nullptr);
-
-    //now process events,
-    QVERIFY(contrastRemovedSpy.wait());
-    QVERIFY(contrastRemovedSpy.count() == 1);
-
-}
-
-void TestWaylandRegistry::testDestroy()
-{
-    using namespace KWayland::Client;
-    KWayland::Client::ConnectionThread connection;
-    QSignalSpy connectedSpy(&connection, SIGNAL(connected()));
-    connection.setSocketName(s_socketName);
-    connection.initConnection();
-    QVERIFY(connectedSpy.wait());
-
-    Registry registry;
-    QSignalSpy seatAnnouncedSpy(&registry, SIGNAL(seatAnnounced(quint32,quint32)));
-
-    QVERIFY(!registry.isValid());
-    registry.create(&connection);
-    registry.setup();
-    QVERIFY(registry.isValid());
-
-    //create some arbitrary Interface
-    seatAnnouncedSpy.wait();
-    QScopedPointer<Seat> seat(registry.createSeat(registry.interface(Registry::Interface::Seat).name,
-                                                  registry.interface(Registry::Interface::Seat).version,
-                                                  &registry));
-
-
-    QSignalSpy connectionDiedSpy(&connection, SIGNAL(connectionDied()));
-    QSignalSpy registryDiedSpy(&registry, SIGNAL(registryDestroyed()));
-
-    QVERIFY(connectionDiedSpy.isValid());
-    QVERIFY(registryDiedSpy.isValid());
-
-    delete m_display;
-    m_display = nullptr;
-    QVERIFY(connectionDiedSpy.wait());
-
-    QVERIFY(connectionDiedSpy.count() == 1);
-    QVERIFY(registryDiedSpy.count() == 1);
-
-    // now the registry should be destroyed;
-    QVERIFY(!registry.isValid());
-
-    // calling destroy again should not fail
-    registry.destroy();
-    seat->destroy();
-}
-
-void TestWaylandRegistry::testGlobalSync()
-{
-    using namespace KWayland::Client;
-    ConnectionThread connection;
-    connection.setSocketName(s_socketName);
-    QSignalSpy connectedSpy(&connection, SIGNAL(connected()));
-    connection.initConnection();
-    QVERIFY(connectedSpy.wait());
-
-    Registry registry;
-    QSignalSpy syncSpy(&registry, SIGNAL(interfacesAnnounced()));
-    // Most simple case: don't even use the ConnectionThread,
-    // just its display.
-    registry.create(connection.display());
-    registry.setup();
-    QVERIFY(syncSpy.wait());
-    QCOMPARE(syncSpy.count(), 1);
-    registry.destroy();
-}
-
-void TestWaylandRegistry::testGlobalSyncThreaded()
-{
-    // More complex case, use a ConnectionThread, in a different Thread,
-    // and our own EventQueue
-    using namespace KWayland::Client;
-    ConnectionThread connection;
-    connection.setSocketName(s_socketName);
-    QThread thread;
-    connection.moveToThread(&thread);
-    thread.start();
-
-    QSignalSpy connectedSpy(&connection, SIGNAL(connected()));
-    connection.initConnection();
-
-    QVERIFY(connectedSpy.wait());
-    EventQueue queue;
-    queue.setup(&connection);
-
-    Registry registry;
-    QSignalSpy syncSpy(&registry, SIGNAL(interfacesAnnounced()));
-    registry.setEventQueue(&queue);
-    registry.create(&connection);
-    registry.setup();
-
-    QVERIFY(syncSpy.wait());
-    QCOMPARE(syncSpy.count(), 1);
-    registry.destroy();
-
-    thread.quit();
-    thread.wait();
-}
-
-void TestWaylandRegistry::testAnnounceMultiple()
-{
-    using namespace KWayland::Client;
-    ConnectionThread connection;
-    connection.setSocketName(s_socketName);
-    QSignalSpy connectedSpy(&connection, &ConnectionThread::connected);
-    QVERIFY(connectedSpy.isValid());
-    connection.initConnection();
-    QVERIFY(connectedSpy.wait());
-    connect(QCoreApplication::eventDispatcher(), &QAbstractEventDispatcher::aboutToBlock, &connection,
-            [&connection] {
-                wl_display_flush(connection.display());
-            }
-    );
-
-    Registry registry;
-    QSignalSpy syncSpy(&registry, &Registry::interfacesAnnounced);
-    QVERIFY(syncSpy.isValid());
-    // Most simple case: don't even use the ConnectionThread,
-    // just its display.
-    registry.create(connection.display());
-    registry.setup();
-    QVERIFY(syncSpy.wait());
-    QCOMPARE(syncSpy.count(), 1);
-
-    // we should have one output now
-    QCOMPARE(registry.interfaces(Registry::Interface::Output).count(), 1);
-
-    QSignalSpy outputAnnouncedSpy(&registry, &Registry::outputAnnounced);
-    QVERIFY(outputAnnouncedSpy.isValid());
-    m_display->createOutput()->create();
-    QVERIFY(outputAnnouncedSpy.wait());
-    QCOMPARE(registry.interfaces(Registry::Interface::Output).count(), 2);
-    QCOMPARE(registry.interfaces(Registry::Interface::Output).last().name, outputAnnouncedSpy.first().first().value<quint32>());
-    QCOMPARE(registry.interfaces(Registry::Interface::Output).last().version, outputAnnouncedSpy.first().last().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::Output).name, outputAnnouncedSpy.first().first().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::Output).version, outputAnnouncedSpy.first().last().value<quint32>());
-
-    auto output = m_display->createOutput();
-    output->create();
-    QVERIFY(outputAnnouncedSpy.wait());
-    QCOMPARE(registry.interfaces(Registry::Interface::Output).count(), 3);
-    QCOMPARE(registry.interfaces(Registry::Interface::Output).last().name, outputAnnouncedSpy.last().first().value<quint32>());
-    QCOMPARE(registry.interfaces(Registry::Interface::Output).last().version, outputAnnouncedSpy.last().last().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::Output).name, outputAnnouncedSpy.last().first().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::Output).version, outputAnnouncedSpy.last().last().value<quint32>());
-
-    QSignalSpy outputRemovedSpy(&registry, &Registry::outputRemoved);
-    QVERIFY(outputRemovedSpy.isValid());
-    delete output;
-    QVERIFY(outputRemovedSpy.wait());
-    QCOMPARE(outputRemovedSpy.first().first().value<quint32>(), outputAnnouncedSpy.last().first().value<quint32>());
-    QCOMPARE(registry.interfaces(Registry::Interface::Output).count(), 2);
-    QCOMPARE(registry.interfaces(Registry::Interface::Output).last().name, outputAnnouncedSpy.first().first().value<quint32>());
-    QCOMPARE(registry.interfaces(Registry::Interface::Output).last().version, outputAnnouncedSpy.first().last().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::Output).name, outputAnnouncedSpy.first().first().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::Output).version, outputAnnouncedSpy.first().last().value<quint32>());
-}
-
-void TestWaylandRegistry::testAnnounceMultipleOutputDevices()
-{
-    using namespace KWayland::Client;
-    ConnectionThread connection;
-    connection.setSocketName(s_socketName);
-    QSignalSpy connectedSpy(&connection, &ConnectionThread::connected);
-    QVERIFY(connectedSpy.isValid());
-    connection.initConnection();
-    QVERIFY(connectedSpy.wait());
-    connect(QCoreApplication::eventDispatcher(), &QAbstractEventDispatcher::aboutToBlock, &connection,
-            [&connection] {
-                wl_display_flush(connection.display());
-            }
-    );
-
-    Registry registry;
-    QSignalSpy syncSpy(&registry, &Registry::interfacesAnnounced);
-    QVERIFY(syncSpy.isValid());
-    // Most simple case: don't even use the ConnectionThread,
-    // just its display.
-    registry.create(connection.display());
-    registry.setup();
-    QVERIFY(syncSpy.wait());
-    QCOMPARE(syncSpy.count(), 1);
-
-    // we should have one output now
-    QCOMPARE(registry.interfaces(Registry::Interface::OutputDevice).count(), 1);
-
-    QSignalSpy outputDeviceAnnouncedSpy(&registry, &Registry::outputDeviceAnnounced);
-    QVERIFY(outputDeviceAnnouncedSpy.isValid());
-    m_display->createOutputDevice()->create();
-    QVERIFY(outputDeviceAnnouncedSpy.wait());
-    QCOMPARE(registry.interfaces(Registry::Interface::OutputDevice).count(), 2);
-    QCOMPARE(registry.interfaces(Registry::Interface::OutputDevice).last().name, outputDeviceAnnouncedSpy.first().first().value<quint32>());
-    QCOMPARE(registry.interfaces(Registry::Interface::OutputDevice).last().version, outputDeviceAnnouncedSpy.first().last().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::OutputDevice).name, outputDeviceAnnouncedSpy.first().first().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::OutputDevice).version, outputDeviceAnnouncedSpy.first().last().value<quint32>());
-
-    auto outputDevice = m_display->createOutputDevice();
-    outputDevice->create();
-    QVERIFY(outputDeviceAnnouncedSpy.wait());
-    QCOMPARE(registry.interfaces(Registry::Interface::OutputDevice).count(), 3);
-    QCOMPARE(registry.interfaces(Registry::Interface::OutputDevice).last().name, outputDeviceAnnouncedSpy.last().first().value<quint32>());
-    QCOMPARE(registry.interfaces(Registry::Interface::OutputDevice).last().version, outputDeviceAnnouncedSpy.last().last().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::OutputDevice).name, outputDeviceAnnouncedSpy.last().first().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::OutputDevice).version, outputDeviceAnnouncedSpy.last().last().value<quint32>());
-
-    QSignalSpy outputDeviceRemovedSpy(&registry, &Registry::outputDeviceRemoved);
-    QVERIFY(outputDeviceRemovedSpy.isValid());
-    delete outputDevice;
-    QVERIFY(outputDeviceRemovedSpy.wait());
-    QCOMPARE(outputDeviceRemovedSpy.first().first().value<quint32>(), outputDeviceAnnouncedSpy.last().first().value<quint32>());
-    QCOMPARE(registry.interfaces(Registry::Interface::OutputDevice).count(), 2);
-    QCOMPARE(registry.interfaces(Registry::Interface::OutputDevice).last().name, outputDeviceAnnouncedSpy.first().first().value<quint32>());
-    QCOMPARE(registry.interfaces(Registry::Interface::OutputDevice).last().version, outputDeviceAnnouncedSpy.first().last().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::OutputDevice).name, outputDeviceAnnouncedSpy.first().first().value<quint32>());
-    QCOMPARE(registry.interface(Registry::Interface::OutputDevice).version, outputDeviceAnnouncedSpy.first().last().value<quint32>());
-}
-
-QTEST_GUILESS_MAIN(TestWaylandRegistry)
-#include "test_wayland_registry.moc"