a3d32fa836
When debugging modifier_only_shortcut_test in _waylandonly mode I saw that it was failing, among other things, because some aspects were not initialised. This changes every test we have to run the new Test::initWaylandWorkspace() that calls waylandServer()->initWorkspace() but also makes sure that WaylandServer::initialized is emitted before we proceed.
129 lines
4.3 KiB
C++
129 lines
4.3 KiB
C++
/*
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
SPDX-FileCopyrightText: 2017 Martin Flöser <mgraesslin@kde.org>
|
|
|
|
SPDX-License-Identifier: GPL-2.0-or-later
|
|
*/
|
|
|
|
#include "kwin_wayland_test.h"
|
|
|
|
#include "main.h"
|
|
#include "platform.h"
|
|
#include "virtualkeyboard_dbus.h"
|
|
#include "wayland_server.h"
|
|
|
|
#include <QTest>
|
|
#include <QDBusConnection>
|
|
#include <QDBusMessage>
|
|
#include <QDBusPendingReply>
|
|
#include <QSignalSpy>
|
|
|
|
#include <virtualkeyboardinterface.h>
|
|
|
|
using KWin::VirtualKeyboardDBus;
|
|
using namespace KWin;
|
|
using namespace KWin::Test;
|
|
|
|
static const QString s_socketName = QStringLiteral("wayland_test_kwin_virtualkeyboarddbus-0");
|
|
|
|
class VirtualKeyboardDBusTest : public QObject
|
|
{
|
|
Q_OBJECT
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void testEnabled();
|
|
void testRequestEnabled_data();
|
|
void testRequestEnabled();
|
|
void cleanup();
|
|
};
|
|
|
|
void VirtualKeyboardDBusTest::initTestCase()
|
|
{
|
|
QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.kwin.testvirtualkeyboard"));
|
|
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
|
|
QVERIFY(applicationStartedSpy.isValid());
|
|
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
|
|
QVERIFY(waylandServer()->init(s_socketName));
|
|
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
|
|
|
|
static_cast<WaylandTestApplication *>(kwinApp())->setInputMethodServerToStart("internal");
|
|
kwinApp()->start();
|
|
QVERIFY(applicationStartedSpy.wait());
|
|
Test::initWaylandWorkspace();
|
|
|
|
QVERIFY(setupWaylandConnection(AdditionalWaylandInterface::Seat |
|
|
AdditionalWaylandInterface::InputMethodV1 |
|
|
AdditionalWaylandInterface::TextInputManagerV2 |
|
|
AdditionalWaylandInterface::TextInputManagerV3));
|
|
}
|
|
|
|
void VirtualKeyboardDBusTest::cleanup()
|
|
{
|
|
Test::destroyWaylandConnection();
|
|
}
|
|
|
|
void VirtualKeyboardDBusTest::testEnabled()
|
|
{
|
|
VirtualKeyboardDBus dbus(KWin::InputMethod::self());
|
|
OrgKdeKwinVirtualKeyboardInterface iface(QStringLiteral("org.kde.kwin.testvirtualkeyboard"), QStringLiteral("/VirtualKeyboard"), QDBusConnection::sessionBus());
|
|
QSignalSpy helperChangedSpy(&iface, &OrgKdeKwinVirtualKeyboardInterface::enabledChanged);
|
|
QVERIFY(helperChangedSpy.isValid());
|
|
|
|
QCOMPARE(dbus.isEnabled(), false);
|
|
QCOMPARE(dbus.property("enabled").toBool(), false);
|
|
QSignalSpy enabledChangedSpy(&dbus, &VirtualKeyboardDBus::enabledChanged);
|
|
QVERIFY(enabledChangedSpy.isValid());
|
|
|
|
QVERIFY(iface.isValid());
|
|
QCOMPARE(iface.enabled(), false);
|
|
|
|
dbus.setEnabled(true);
|
|
QCOMPARE(enabledChangedSpy.count(), 1);
|
|
QVERIFY(helperChangedSpy.wait());
|
|
QCOMPARE(helperChangedSpy.count(), 1);
|
|
QCOMPARE(dbus.isEnabled(), true);
|
|
QCOMPARE(dbus.property("enabled").toBool(), true);
|
|
QCOMPARE(iface.enabled(), true);
|
|
|
|
// setting again to enabled should not change anything
|
|
dbus.setEnabled(true);
|
|
QCOMPARE(enabledChangedSpy.count(), 1);
|
|
|
|
// back to false
|
|
dbus.setEnabled(false);
|
|
QCOMPARE(enabledChangedSpy.count(), 2);
|
|
QVERIFY(helperChangedSpy.wait());
|
|
QCOMPARE(helperChangedSpy.count(), 2);
|
|
QCOMPARE(dbus.isEnabled(), false);
|
|
QCOMPARE(dbus.property("enabled").toBool(), false);
|
|
QCOMPARE(iface.enabled(), false);
|
|
}
|
|
|
|
void VirtualKeyboardDBusTest::testRequestEnabled_data()
|
|
{
|
|
QTest::addColumn<QString>("method");
|
|
QTest::addColumn<bool>("expectedResult");
|
|
|
|
QTest::newRow("enable") << QStringLiteral("setEnabled") << true;
|
|
QTest::newRow("disable") << QStringLiteral("setEnabled") << false;
|
|
}
|
|
|
|
void VirtualKeyboardDBusTest::testRequestEnabled()
|
|
{
|
|
QFETCH(QString, method);
|
|
QFETCH(bool, expectedResult);
|
|
|
|
VirtualKeyboardDBus dbus(KWin::InputMethod::self());
|
|
QSignalSpy activateRequestedSpy(&dbus, &VirtualKeyboardDBus::enabledChanged);
|
|
QVERIFY(activateRequestedSpy.isValid());
|
|
OrgKdeKwinVirtualKeyboardInterface iface(QStringLiteral("org.kde.kwin.testvirtualkeyboard"), QStringLiteral("/VirtualKeyboard"), QDBusConnection::sessionBus());
|
|
|
|
iface.setEnabled(expectedResult);
|
|
QCOMPARE(activateRequestedSpy.count(), 1);
|
|
QCOMPARE(iface.enabled(), expectedResult);
|
|
}
|
|
|
|
WAYLANDTEST_MAIN(VirtualKeyboardDBusTest)
|
|
#include "test_virtualkeyboard_dbus.moc"
|