yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[autotests] Add test case for changing keyboard layout through DBus

Browse source 
Calls setLayout of org.kde.KeyboardLayouts.
This commit is contained in:
Martin Gräßlin 2017-01-31 19:42:55 +01:00
parent 551d4a8a5d
commit d33c96af5e
1 changed files with 59 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
autotests/integration/keyboard_layout_test.cpp
View file

@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QDBusConnection> #include <QDBusConnection>
#include <QDBusMessage> #include <QDBusMessage>
#include <QDBusPendingCall>
using namespace KWin; using namespace KWin;
using namespace KWayland::Client; using namespace KWayland::Client;
@ -41,8 +42,19 @@ private Q_SLOTS:
void cleanup(); void cleanup();
void testReconfigure(); void testReconfigure();
void testChangeLayoutThroughDBus();
private:
void reconfigureLayouts();
}; };
void KeyboardLayoutTest::reconfigureLayouts()
{
// create DBus signal to reload
QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/Layouts"), QStringLiteral("org.kde.keyboard"), QStringLiteral("reloadConfig"));
QDBusConnection::sessionBus().send(message);
}
void KeyboardLayoutTest::initTestCase() void KeyboardLayoutTest::initTestCase()
{ {
QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated); QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
@ -84,9 +96,7 @@ void KeyboardLayoutTest::testReconfigure()
layoutGroup.writeEntry("LayoutList", QStringLiteral("de,us")); layoutGroup.writeEntry("LayoutList", QStringLiteral("de,us"));
layoutGroup.sync(); layoutGroup.sync();
// create DBus signal to reload reconfigureLayouts();
QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/Layouts"), QStringLiteral("org.kde.keyboard"), QStringLiteral("reloadConfig"));
QDBusConnection::sessionBus().send(message);
// now we should have two layouts // now we should have two layouts
QTRY_COMPARE(xkb->numberOfLayouts(), 2u); QTRY_COMPARE(xkb->numberOfLayouts(), 2u);
// default layout is German // default layout is German
@ -99,5 +109,51 @@ void KeyboardLayoutTest::testReconfigure()
QCOMPARE(layouts[1], QStringLiteral("English (US)")); QCOMPARE(layouts[1], QStringLiteral("English (US)"));
} }
void KeyboardLayoutTest::testChangeLayoutThroughDBus()
{
// this test verifies that the layout can be changed through DBus
// first configure layouts
KConfigGroup layoutGroup = kwinApp()->kxkbConfig()->group("Layout");
layoutGroup.writeEntry("LayoutList", QStringLiteral("de,us,de(neo)"));
layoutGroup.sync();
reconfigureLayouts();
// now we should have two layouts
auto xkb = input()->keyboard()->xkb();
QTRY_COMPARE(xkb->numberOfLayouts(), 3u);
// default layout is German
xkb->switchToLayout(0);
QCOMPARE(xkb->layoutName(), QStringLiteral("German"));
// now change through DBus to english
auto changeLayout = [] (const QString &layoutName) {
QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.keyboard"), QStringLiteral("/Layouts"), QStringLiteral("org.kde.KeyboardLayouts"), QStringLiteral("setLayout"));
msg << layoutName;
return QDBusConnection::sessionBus().asyncCall(msg);
};
auto reply = changeLayout(QStringLiteral("English (US)"));
reply.waitForFinished();
QVERIFY(!reply.isError());
QCOMPARE(reply.reply().arguments().first().toBool(), true);
QCOMPARE(xkb->layoutName(), QStringLiteral("English (US)"));
// switch to a layout which does not exist
reply = changeLayout(QStringLiteral("French"));
QVERIFY(!reply.isError());
QCOMPARE(reply.reply().arguments().first().toBool(), false);
QCOMPARE(xkb->layoutName(), QStringLiteral("English (US)"));
// switch to another layout should work
reply = changeLayout(QStringLiteral("German"));
QVERIFY(!reply.isError());
QCOMPARE(reply.reply().arguments().first().toBool(), true);
QCOMPARE(xkb->layoutName(), QStringLiteral("German"));
// switching to same layout should also work
reply = changeLayout(QStringLiteral("German"));
QVERIFY(!reply.isError());
QCOMPARE(reply.reply().arguments().first().toBool(), true);
QCOMPARE(xkb->layoutName(), QStringLiteral("German"));
}
WAYLANDTEST_MAIN(KeyboardLayoutTest) WAYLANDTEST_MAIN(KeyboardLayoutTest)
#include "keyboard_layout_test.moc" #include "keyboard_layout_test.moc"