2017-10-06 19:22:50 +00:00
|
|
|
/********************************************************************
|
|
|
|
KWin - the KDE window manager
|
|
|
|
This file is part of the KDE project.
|
|
|
|
|
|
|
|
Copyright (C) 2017 Martin Flöser <mgraesslin@kde.org>
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*********************************************************************/
|
2018-06-05 10:52:57 +00:00
|
|
|
#include <QTest>
|
2017-10-06 19:22:50 +00:00
|
|
|
#include <QDBusConnection>
|
|
|
|
#include <QDBusMessage>
|
|
|
|
#include <QDBusPendingReply>
|
|
|
|
#include <QSignalSpy>
|
|
|
|
|
|
|
|
#include "../virtualkeyboard_dbus.h"
|
|
|
|
|
|
|
|
using KWin::VirtualKeyboardDBus;
|
|
|
|
|
|
|
|
class VirtualKeyboardDBusTest : public QObject
|
|
|
|
{
|
|
|
|
Q_OBJECT
|
|
|
|
private Q_SLOTS:
|
|
|
|
void initTestCase();
|
|
|
|
void testEnabled();
|
|
|
|
void testRequestEnabled_data();
|
|
|
|
void testRequestEnabled();
|
|
|
|
};
|
|
|
|
|
|
|
|
class DbusPropertyHelper : public QObject
|
|
|
|
{
|
|
|
|
Q_OBJECT
|
|
|
|
public:
|
|
|
|
DbusPropertyHelper()
|
|
|
|
: QObject(nullptr)
|
|
|
|
{
|
|
|
|
QDBusConnection::sessionBus().connect(
|
|
|
|
QStringLiteral("org.kde.kwin.testvirtualkeyboard"),
|
|
|
|
QStringLiteral("/VirtualKeyboard"),
|
|
|
|
QStringLiteral("org.kde.kwin.VirtualKeyboard"),
|
|
|
|
QStringLiteral("enabledChanged"),
|
|
|
|
this,
|
|
|
|
SLOT(slotEnabledChanged()));
|
|
|
|
}
|
Run clang-tidy with modernize-use-override check
Summary:
Currently code base of kwin can be viewed as two pieces. One is very
ancient, and the other one is more modern, which uses new C++ features.
The main problem with the ancient code is that it was written before
C++11 era. So, no override or final keywords, lambdas, etc.
Quite recently, KDE compiler settings were changed to show a warning if
a virtual method has missing override keyword. As you might have already
guessed, this fired back at us because of that ancient code. We had
about 500 new compiler warnings.
A "solution" was proposed to that problem - disable -Wno-suggest-override
and the other similar warning for clang. It's hard to call a solution
because those warnings are disabled not only for the old code, but also
for new. This is not what we want!
The main argument for not actually fixing the problem was that git
history will be screwed as well because of human factor. While good git
history is a very important thing, we should not go crazy about it and
block every change that somehow alters git history. git blame allows to
specify starting revision for a reason.
The other argument (human factor) can be easily solved by using tools
such as clang-tidy. clang-tidy is a clang-based linter for C++. It can
be used for various things, e.g. fixing coding style(e.g. add missing
braces to if statements, readability-braces-around-statements check),
or in our case add missing override keywords.
Test Plan: Compiles.
Reviewers: #kwin, davidedmundson
Reviewed By: #kwin, davidedmundson
Subscribers: davidedmundson, apol, romangg, kwin
Tags: #kwin
Differential Revision: https://phabricator.kde.org/D22371
2019-07-22 16:52:26 +00:00
|
|
|
~DbusPropertyHelper() override = default;
|
2017-10-06 19:22:50 +00:00
|
|
|
|
|
|
|
Q_SIGNALS:
|
|
|
|
void enabledChanged();
|
|
|
|
|
|
|
|
private Q_SLOTS:
|
|
|
|
void slotEnabledChanged() {
|
|
|
|
emit enabledChanged();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
void VirtualKeyboardDBusTest::initTestCase()
|
|
|
|
{
|
|
|
|
QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.kwin.testvirtualkeyboard"));
|
|
|
|
}
|
|
|
|
|
|
|
|
void VirtualKeyboardDBusTest::testEnabled()
|
|
|
|
{
|
|
|
|
VirtualKeyboardDBus dbus;
|
|
|
|
DbusPropertyHelper helper;
|
|
|
|
QSignalSpy helperChangedSpy(&helper, &DbusPropertyHelper::enabledChanged);
|
|
|
|
QVERIFY(helperChangedSpy.isValid());
|
|
|
|
|
|
|
|
QCOMPARE(dbus.isEnabled(), false);
|
|
|
|
QCOMPARE(dbus.property("enabled").toBool(), false);
|
|
|
|
QSignalSpy enabledChangedSpy(&dbus, &VirtualKeyboardDBus::enabledChanged);
|
|
|
|
QVERIFY(enabledChangedSpy.isValid());
|
|
|
|
|
|
|
|
auto readProperty = [] (bool enabled) {
|
|
|
|
const QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kwin.testvirtualkeyboard"),
|
|
|
|
QStringLiteral("/VirtualKeyboard"),
|
|
|
|
QStringLiteral("org.kde.kwin.VirtualKeyboard"),
|
|
|
|
QStringLiteral("isEnabled"));
|
|
|
|
const auto reply = QDBusConnection::sessionBus().call(message);
|
|
|
|
QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);
|
|
|
|
QCOMPARE(reply.arguments().count(), 1);
|
|
|
|
QCOMPARE(reply.arguments().first().toBool(), enabled);
|
|
|
|
};
|
|
|
|
readProperty(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);
|
|
|
|
readProperty(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);
|
|
|
|
readProperty(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
void VirtualKeyboardDBusTest::testRequestEnabled_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<QString>("method");
|
|
|
|
QTest::addColumn<bool>("expectedResult");
|
|
|
|
|
|
|
|
QTest::newRow("enable") << QStringLiteral("enable") << true;
|
|
|
|
QTest::newRow("disable") << QStringLiteral("disable") << false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void VirtualKeyboardDBusTest::testRequestEnabled()
|
|
|
|
{
|
|
|
|
VirtualKeyboardDBus dbus;
|
|
|
|
QSignalSpy activateRequestedSpy(&dbus, &VirtualKeyboardDBus::activateRequested);
|
|
|
|
QVERIFY(activateRequestedSpy.isValid());
|
|
|
|
QFETCH(QString, method);
|
|
|
|
const QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kwin.testvirtualkeyboard"),
|
|
|
|
QStringLiteral("/VirtualKeyboard"),
|
|
|
|
QStringLiteral("org.kde.kwin.VirtualKeyboard"),
|
|
|
|
method);
|
|
|
|
QDBusConnection::sessionBus().asyncCall(message);
|
|
|
|
QTRY_COMPARE(activateRequestedSpy.count(), 1);
|
|
|
|
QTEST(activateRequestedSpy.first().first().toBool(), "expectedResult");
|
|
|
|
}
|
|
|
|
|
|
|
|
QTEST_GUILESS_MAIN(VirtualKeyboardDBusTest)
|
|
|
|
#include "test_virtualkeyboard_dbus.moc"
|