From acb08e276d11b8ec03a8885511fce8b02738bdb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 22 Sep 2014 10:24:21 +0200 Subject: [PATCH] Add unit test for Client::Compositor::destroy --- src/wayland/autotests/client/CMakeLists.txt | 11 ++ .../autotests/client/test_compositor.cpp | 140 ++++++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 src/wayland/autotests/client/test_compositor.cpp diff --git a/src/wayland/autotests/client/CMakeLists.txt b/src/wayland/autotests/client/CMakeLists.txt index 85db993949..c7dc316003 100644 --- a/src/wayland/autotests/client/CMakeLists.txt +++ b/src/wayland/autotests/client/CMakeLists.txt @@ -89,3 +89,14 @@ add_executable(testShmPool ${testShmPool_SRCS}) target_link_libraries( testShmPool Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) add_test(kwayland-testShmPool testShmPool) ecm_mark_as_test(testShmPool) + +######################################################## +# Test Compositor +######################################################## +set( testCompositor_SRCS + test_compositor.cpp + ) +add_executable(testCompositor ${testCompositor_SRCS}) +target_link_libraries( testCompositor Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) +add_test(kwayland-testCompositor testCompositor) +ecm_mark_as_test(testCompositor) diff --git a/src/wayland/autotests/client/test_compositor.cpp b/src/wayland/autotests/client/test_compositor.cpp new file mode 100644 index 0000000000..aaac11dab6 --- /dev/null +++ b/src/wayland/autotests/client/test_compositor.cpp @@ -0,0 +1,140 @@ +/******************************************************************** +Copyright 2014 Martin Gräßlin + +This library 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; either +version 2.1 of the License, or (at your option) version 3, or any +later version accepted by the membership of KDE e.V. (or its +successor approved by the membership of KDE e.V.), which shall +act as a proxy defined in Section 6 of version 3 of the license. + +This library 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 library. If not, see . +*********************************************************************/ +// Qt +#include +// KWin +#include "../../src/client/compositor.h" +#include "../../src/client/connection_thread.h" +#include "../../src/client/surface.h" +#include "../../src/client/registry.h" +#include "../../src/client/shm_pool.h" +#include "../../src/server/buffer_interface.h" +#include "../../src/server/compositor_interface.h" +#include "../../src/server/display.h" +#include "../../src/server/surface_interface.h" + +class TestCompositor : public QObject +{ + Q_OBJECT +public: + explicit TestCompositor(QObject *parent = nullptr); +private Q_SLOTS: + void init(); + void cleanup(); + + void testDestroy(); + +private: + KWayland::Server::Display *m_display; + KWayland::Server::CompositorInterface *m_compositorInterface; + KWayland::Client::ConnectionThread *m_connection; + KWayland::Client::Compositor *m_compositor; + QThread *m_thread; +}; + +static const QString s_socketName = QStringLiteral("kwayland-test-wayland-compositor-0"); + +TestCompositor::TestCompositor(QObject *parent) + : QObject(parent) + , m_display(nullptr) + , m_compositorInterface(nullptr) + , m_connection(nullptr) + , m_compositor(nullptr) + , m_thread(nullptr) +{ +} + +void TestCompositor::init() +{ + using namespace KWayland::Server; + delete m_display; + m_display = new Display(this); + m_display->setSocketName(s_socketName); + m_display->start(); + QVERIFY(m_display->isRunning()); + + // setup connection + m_connection = new KWayland::Client::ConnectionThread; + QSignalSpy connectedSpy(m_connection, SIGNAL(connected())); + m_connection->setSocketName(s_socketName); + + m_thread = new QThread(this); + m_connection->moveToThread(m_thread); + m_thread->start(); + + m_connection->initConnection(); + QVERIFY(connectedSpy.wait()); + + KWayland::Client::Registry registry; + QSignalSpy compositorSpy(®istry, SIGNAL(compositorAnnounced(quint32,quint32))); + registry.create(m_connection->display()); + QVERIFY(registry.isValid()); + registry.setup(); + + // here we need a shm pool + m_compositorInterface = m_display->createCompositor(m_display); + QVERIFY(m_compositorInterface); + m_compositorInterface->create(); + QVERIFY(m_compositorInterface->isValid()); + + QVERIFY(compositorSpy.wait()); + m_compositor = registry.createCompositor(compositorSpy.first().first().value(), compositorSpy.first().last().value(), this); +} + +void TestCompositor::cleanup() +{ + if (m_compositor) { + delete m_compositor; + m_compositor = nullptr; + } + if (m_thread) { + m_thread->quit(); + m_thread->wait(); + delete m_thread; + m_thread = nullptr; + } + delete m_connection; + m_connection = nullptr; + + delete m_display; + m_display = nullptr; +} + +void TestCompositor::testDestroy() +{ + using namespace KWayland::Client; + connect(m_connection, &ConnectionThread::connectionDied, m_compositor, &Compositor::destroy); + QVERIFY(m_compositor->isValid()); + + QSignalSpy connectionDiedSpy(m_connection, SIGNAL(connectionDied())); + QVERIFY(connectionDiedSpy.isValid()); + delete m_display; + m_display = nullptr; + QVERIFY(connectionDiedSpy.wait()); + + // now the pool should be destroyed; + QVERIFY(!m_compositor->isValid()); + + // calling destroy again should not fail + m_compositor->destroy(); +} + +QTEST_MAIN(TestCompositor) +#include "test_compositor.moc"