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

autotests: Fix TestDbusInterface

Browse source 
Activities had been exposed via the dbus interface in
6eda92a0fd.
This commit is contained in:
Vlad Zahorodnii 2021-02-01 09:30:58 +02:00
parent 99947c8bd8
commit 21eee7de18
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
autotests/integration/dbus_interface_test.cpp
View file

@ -120,7 +120,7 @@ void TestDbusInterface::testGetWindowInfoXdgShellClient()
QVERIFY(!reply.isError()); QVERIFY(!reply.isError());
auto windowData = reply.value(); auto windowData = reply.value();
QVERIFY(!windowData.isEmpty()); QVERIFY(!windowData.isEmpty());
QCOMPARE(windowData.size(), 24); QCOMPARE(windowData.size(), 25);
QCOMPARE(windowData.value(QStringLiteral("type")).toInt(), NET::Normal); QCOMPARE(windowData.value(QStringLiteral("type")).toInt(), NET::Normal);
QCOMPARE(windowData.value(QStringLiteral("x")).toInt(), client->x()); QCOMPARE(windowData.value(QStringLiteral("x")).toInt(), client->x());
QCOMPARE(windowData.value(QStringLiteral("y")).toInt(), client->y()); QCOMPARE(windowData.value(QStringLiteral("y")).toInt(), client->y());
@ -145,6 +145,7 @@ void TestDbusInterface::testGetWindowInfoXdgShellClient()
QCOMPARE(windowData.value(QStringLiteral("resourceClass")).toString(), QStringLiteral("org.kde.foo")); QCOMPARE(windowData.value(QStringLiteral("resourceClass")).toString(), QStringLiteral("org.kde.foo"));
QCOMPARE(windowData.value(QStringLiteral("desktopFile")).toString(), QStringLiteral("org.kde.foo")); QCOMPARE(windowData.value(QStringLiteral("desktopFile")).toString(), QStringLiteral("org.kde.foo"));
QCOMPARE(windowData.value(QStringLiteral("caption")).toString(), QStringLiteral("Test window")); QCOMPARE(windowData.value(QStringLiteral("caption")).toString(), QStringLiteral("Test window"));
QCOMPARE(windowData.value(QStringLiteral("activities")), QStringList());
auto verifyProperty = [client] (const QString &name) { auto verifyProperty = [client] (const QString &name) {
QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())}; QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())};
@ -262,7 +263,7 @@ void TestDbusInterface::testGetWindowInfoX11Client()
QVERIFY(!reply.isError()); QVERIFY(!reply.isError());
auto windowData = reply.value(); auto windowData = reply.value();
QVERIFY(!windowData.isEmpty()); QVERIFY(!windowData.isEmpty());
QCOMPARE(windowData.size(), 24); QCOMPARE(windowData.size(), 25);
QCOMPARE(windowData.value(QStringLiteral("type")).toInt(), NET::Normal); QCOMPARE(windowData.value(QStringLiteral("type")).toInt(), NET::Normal);
QCOMPARE(windowData.value(QStringLiteral("x")).toInt(), client->x()); QCOMPARE(windowData.value(QStringLiteral("x")).toInt(), client->x());
QCOMPARE(windowData.value(QStringLiteral("y")).toInt(), client->y()); QCOMPARE(windowData.value(QStringLiteral("y")).toInt(), client->y());
@ -285,6 +286,7 @@ void TestDbusInterface::testGetWindowInfoX11Client()
QCOMPARE(windowData.value(QStringLiteral("resourceClass")).toString(), QStringLiteral("bar")); QCOMPARE(windowData.value(QStringLiteral("resourceClass")).toString(), QStringLiteral("bar"));
QCOMPARE(windowData.value(QStringLiteral("desktopFile")).toString(), QStringLiteral("org.kde.foo")); QCOMPARE(windowData.value(QStringLiteral("desktopFile")).toString(), QStringLiteral("org.kde.foo"));
QCOMPARE(windowData.value(QStringLiteral("caption")).toString(), QStringLiteral("Some caption")); QCOMPARE(windowData.value(QStringLiteral("caption")).toString(), QStringLiteral("Some caption"));
QCOMPARE(windowData.value(QStringLiteral("activities")), QStringList());
// not testing clientmachine as that is system dependent // not testing clientmachine as that is system dependent
// due to that also not testing localhost // due to that also not testing localhost