From 0ff8a6b14d2668ced57e83219b541cb9b70caae2 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 13 Dec 2018 09:58:50 +0100 Subject: Add client test for data device Change-Id: Id89ec40a3f484808385401829a09a43781a1bed7 Reviewed-by: Paul Olav Tvete --- tests/auto/client/client.pro | 1 + tests/auto/client/datadevicev1/datadevicev1.pro | 4 + .../auto/client/datadevicev1/tst_datadevicev1.cpp | 111 +++++++++++++++++++++ tests/auto/client/shared/coreprotocol.cpp | 1 + tests/auto/client/shared/coreprotocol.h | 4 + tests/auto/client/shared/datadevice.cpp | 70 +++++++++++++ tests/auto/client/shared/datadevice.h | 85 ++++++++++++++++ tests/auto/client/shared/mockcompositor.h | 1 + tests/auto/client/shared/shared.pri | 2 + 9 files changed, 279 insertions(+) create mode 100644 tests/auto/client/datadevicev1/datadevicev1.pro create mode 100644 tests/auto/client/datadevicev1/tst_datadevicev1.cpp create mode 100644 tests/auto/client/shared/datadevice.cpp create mode 100644 tests/auto/client/shared/datadevice.h diff --git a/tests/auto/client/client.pro b/tests/auto/client/client.pro index a8e81e463..e99db20ba 100644 --- a/tests/auto/client/client.pro +++ b/tests/auto/client/client.pro @@ -2,6 +2,7 @@ TEMPLATE=subdirs SUBDIRS += \ client \ + datadevicev1 \ fullscreenshellv1 \ iviapplication \ output \ diff --git a/tests/auto/client/datadevicev1/datadevicev1.pro b/tests/auto/client/datadevicev1/datadevicev1.pro new file mode 100644 index 000000000..b3c687c4d --- /dev/null +++ b/tests/auto/client/datadevicev1/datadevicev1.pro @@ -0,0 +1,4 @@ +include (../shared/shared.pri) + +TARGET = tst_datadevicev1 +SOURCES += tst_datadevicev1.cpp diff --git a/tests/auto/client/datadevicev1/tst_datadevicev1.cpp b/tests/auto/client/datadevicev1/tst_datadevicev1.cpp new file mode 100644 index 000000000..9b42cb280 --- /dev/null +++ b/tests/auto/client/datadevicev1/tst_datadevicev1.cpp @@ -0,0 +1,111 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "mockcompositor.h" + +#include +#include + +//TODO: move? +#include + +using namespace MockCompositor; + +constexpr int dataDeviceVersion = 1; + +class DataDeviceCompositor : public DefaultCompositor { +public: + explicit DataDeviceCompositor() + { + exec([this] { + m_config.autoConfigure = true; + add(dataDeviceVersion); + }); + } + DataDevice *dataDevice() { return get()->dataDevice(); } +}; + +class tst_datadevicev1 : public QObject, private DataDeviceCompositor +{ + Q_OBJECT +private slots: + void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); } + void initTestCase(); + void pasteAscii(); +}; + +void tst_datadevicev1::initTestCase() +{ + QCOMPOSITOR_TRY_VERIFY(pointer()); + QCOMPOSITOR_TRY_VERIFY(!pointer()->resourceMap().empty()); + QCOMPOSITOR_TRY_COMPARE(pointer()->resourceMap().first()->version(), 4); + + QCOMPOSITOR_TRY_VERIFY(keyboard()); + + QCOMPOSITOR_TRY_VERIFY(dataDevice()); + QCOMPOSITOR_TRY_COMPARE(dataDevice()->resource()->version(), dataDeviceVersion); +} + +void tst_datadevicev1::pasteAscii() +{ + class Window : public QRasterWindow { + public: + void mousePressEvent(QMouseEvent *) override { m_text = QGuiApplication::clipboard()->text(); } + QString m_text; + }; + + Window window; + window.resize(64, 64); + window.show(); + + QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial); + exec([&] { + auto *offer = new DataOffer(client(), dataDeviceVersion); // Cleaned up by destroy_resource + connect(offer, &DataOffer::receive, [](QString mimeType, int fd) { + QFile file; + file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle); + QCOMPARE(mimeType, "text/plain"); + file.write(QByteArray("normal ascii")); + file.close(); + }); + dataDevice()->sendDataOffer(offer); + offer->send_offer("text/plain"); + dataDevice()->sendSelection(offer); + + auto *surface = xdgSurface()->m_surface; + keyboard()->sendEnter(surface); // Need to set keyboard focus according to protocol + + pointer()->sendEnter(surface, {32, 32}); + pointer()->sendButton(client(), BTN_LEFT, 1); + pointer()->sendButton(client(), BTN_LEFT, 0); + }); + QTRY_COMPARE(window.m_text, "normal ascii"); +} + +QCOMPOSITOR_TEST_MAIN(tst_datadevicev1) +#include "tst_datadevicev1.moc" diff --git a/tests/auto/client/shared/coreprotocol.cpp b/tests/auto/client/shared/coreprotocol.cpp index 16494d789..54725e812 100644 --- a/tests/auto/client/shared/coreprotocol.cpp +++ b/tests/auto/client/shared/coreprotocol.cpp @@ -27,6 +27,7 @@ ****************************************************************************/ #include "coreprotocol.h" +#include "datadevice.h" namespace MockCompositor { diff --git a/tests/auto/client/shared/coreprotocol.h b/tests/auto/client/shared/coreprotocol.h index da171c202..11b35eb4d 100644 --- a/tests/auto/client/shared/coreprotocol.h +++ b/tests/auto/client/shared/coreprotocol.h @@ -42,6 +42,7 @@ class Keyboard; class CursorRole; class ShmPool; class ShmBuffer; +class DataDevice; class Buffer : public QObject, public QtWaylandServer::wl_buffer { @@ -249,6 +250,9 @@ public: Keyboard* m_keyboard = nullptr; QVector m_oldKeyboards; + DataDevice *dataDevice() { return m_dataDevice.data(); } + QScopedPointer m_dataDevice; + uint m_capabilities = 0; protected: diff --git a/tests/auto/client/shared/datadevice.cpp b/tests/auto/client/shared/datadevice.cpp new file mode 100644 index 000000000..c136c7596 --- /dev/null +++ b/tests/auto/client/shared/datadevice.cpp @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "datadevice.h" + +namespace MockCompositor { + +void DataDeviceManager::data_device_manager_get_data_device(Resource *resource, uint32_t id, wl_resource *seatResource) +{ + auto *seat = fromResource(seatResource); + QVERIFY(seat); + QVERIFY(!seat->m_dataDevice); + seat->m_dataDevice.reset(new DataDevice(resource->client(), id, resource->version())); +} + +DataDevice::~DataDevice() +{ + // If the client hasn't deleted the wayland object, just ignore subsequent events + if (auto *r = resource()->handle) + wl_resource_set_implementation(r, nullptr, nullptr, nullptr); +} + +void DataDevice::sendDataOffer(DataOffer *offer) +{ + wl_data_device::send_data_offer(offer->resource()->handle); +} + +void DataDevice::sendSelection(DataOffer *offer) +{ + wl_data_device::send_selection(offer->resource()->handle); +} + +void DataOffer::data_offer_destroy_resource(Resource *resource) +{ + Q_UNUSED(resource); + delete this; +} + +void DataOffer::data_offer_receive(Resource *resource, const QString &mime_type, int32_t fd) +{ + Q_UNUSED(resource); + emit receive(mime_type, fd); +} + +} // namespace MockCompositor diff --git a/tests/auto/client/shared/datadevice.h b/tests/auto/client/shared/datadevice.h new file mode 100644 index 000000000..4613db776 --- /dev/null +++ b/tests/auto/client/shared/datadevice.h @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MOCKCOMPOSITOR_DATADEVICE_H +#define MOCKCOMPOSITOR_DATADEVICE_H + +//TODO: need this? +#include "coreprotocol.h" + +namespace MockCompositor { + +class DataOffer; + +class DataDeviceManager : public Global, public QtWaylandServer::wl_data_device_manager +{ + Q_OBJECT +public: + explicit DataDeviceManager(CoreCompositor *compositor, int version = 1) + : QtWaylandServer::wl_data_device_manager(compositor->m_display, version) + {} + QVector m_dataDevices; + +protected: + void data_device_manager_get_data_device(Resource *resource, uint32_t id, ::wl_resource *seatResource) override; +}; + +class DataDevice : public QtWaylandServer::wl_data_device +{ +public: + explicit DataDevice(::wl_client *client, int id, int version) + : QtWaylandServer::wl_data_device(client, id, version) + {} + ~DataDevice() override; + void send_data_offer(::wl_resource *resource) = delete; + void sendDataOffer(DataOffer *offer); + void send_selection(::wl_resource *resource) = delete; + void sendSelection(DataOffer *offer); +}; + +class DataOffer : public QObject, public QtWaylandServer::wl_data_offer +{ + Q_OBJECT +public: + explicit DataOffer(::wl_client *client, int version) + : QtWaylandServer::wl_data_offer (client, 0, version) + {} + +signals: + void receive(QString mimeType, int fd); + +protected: + void data_offer_destroy_resource(Resource *resource) override; + void data_offer_receive(Resource *resource, const QString &mime_type, int32_t fd) override; +// void data_offer_accept(Resource *resource, uint32_t serial, const QString &mime_type) override; +// void data_offer_destroy(Resource *resource) override; +}; + +} // namespace MockCompositor + +#endif // MOCKCOMPOSITOR_DATADEVICE_H diff --git a/tests/auto/client/shared/mockcompositor.h b/tests/auto/client/shared/mockcompositor.h index a6515c04c..ddbd7f342 100644 --- a/tests/auto/client/shared/mockcompositor.h +++ b/tests/auto/client/shared/mockcompositor.h @@ -31,6 +31,7 @@ #include "corecompositor.h" #include "coreprotocol.h" +#include "datadevice.h" #include "xdgshell.h" #include diff --git a/tests/auto/client/shared/shared.pri b/tests/auto/client/shared/shared.pri index 3376c73bc..303e13046 100644 --- a/tests/auto/client/shared/shared.pri +++ b/tests/auto/client/shared/shared.pri @@ -11,11 +11,13 @@ INCLUDEPATH += ../shared HEADERS += \ $$PWD/corecompositor.h \ $$PWD/coreprotocol.h \ + $$PWD/datadevice.h \ $$PWD/mockcompositor.h \ $$PWD/xdgshell.h SOURCES += \ $$PWD/corecompositor.cpp \ $$PWD/coreprotocol.cpp \ + $$PWD/datadevice.cpp \ $$PWD/mockcompositor.cpp \ $$PWD/xdgshell.cpp -- cgit v1.2.3