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

autotests: Fix DBusInterfaceTest with KWIN_BUILD_ACTIVITIES=OFF

Browse source 
X11-specific code path was overlooked in
79a4733dc5.
This commit is contained in:
Vlad Zahorodnii 2022-03-22 13:28:18 +02:00
parent f26c6ad5be
commit 563e372440
1 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
autotests/integration/dbus_interface_test.cpp
View file

@ -261,39 +261,44 @@ void TestDbusInterface::testGetWindowInfoX11Client()
QCOMPARE(client->window(), w); QCOMPARE(client->window(), w);
QCOMPARE(client->clientSize(), windowGeometry.size()); QCOMPARE(client->clientSize(), windowGeometry.size());
const QVariantMap expectedData {
{ QStringLiteral("type"), NET::Normal },
{ QStringLiteral("x"), client->x() },
{ QStringLiteral("y"), client->y() },
{ QStringLiteral("width"), client->width() },
{ QStringLiteral("height"), client->height() },
{ QStringLiteral("desktops"), client->desktopIds() },
{ QStringLiteral("minimized"), false },
{ QStringLiteral("shaded"), false },
{ QStringLiteral("fullscreen"), false },
{ QStringLiteral("keepAbove"), false },
{ QStringLiteral("keepBelow"), false },
{ QStringLiteral("skipTaskbar"), false },
{ QStringLiteral("skipPager"), false },
{ QStringLiteral("skipSwitcher"), false },
{ QStringLiteral("maximizeHorizontal"), false },
{ QStringLiteral("maximizeVertical"), false },
{ QStringLiteral("noBorder"), false },
{ QStringLiteral("role"), QString() },
{ QStringLiteral("resourceName"), QStringLiteral("foo") },
{ QStringLiteral("resourceClass"), QStringLiteral("bar") },
{ QStringLiteral("desktopFile"), QStringLiteral("org.kde.foo") },
{ QStringLiteral("caption"), QStringLiteral("Some caption") },
#if KWIN_BUILD_ACTIVITIES
{ QStringLiteral("activities"), QStringList() },
#endif
};
// let's get the window info // let's get the window info
QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())}; QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())};
reply.waitForFinished(); reply.waitForFinished();
QVERIFY(reply.isValid()); QVERIFY(reply.isValid());
QVERIFY(!reply.isError()); QVERIFY(!reply.isError());
auto windowData = reply.value(); auto windowData = reply.value();
QVERIFY(!windowData.isEmpty()); // not testing clientmachine as that is system dependent due to that also not testing localhost
QCOMPARE(windowData.size(), 25); windowData.remove(QStringLiteral("clientMachine"));
QCOMPARE(windowData.value(QStringLiteral("type")).toInt(), NET::Normal); windowData.remove(QStringLiteral("localhost"));
QCOMPARE(windowData.value(QStringLiteral("x")).toInt(), client->x()); QCOMPARE(windowData, expectedData);
QCOMPARE(windowData.value(QStringLiteral("y")).toInt(), client->y());
QCOMPARE(windowData.value(QStringLiteral("width")).toInt(), client->width());
QCOMPARE(windowData.value(QStringLiteral("height")).toInt(), client->height());
QCOMPARE(windowData.value(QStringLiteral("desktops")).toStringList(), client->desktopIds());
QCOMPARE(windowData.value(QStringLiteral("minimized")).toBool(), false);
QCOMPARE(windowData.value(QStringLiteral("shaded")).toBool(), false);
QCOMPARE(windowData.value(QStringLiteral("fullscreen")).toBool(), false);
QCOMPARE(windowData.value(QStringLiteral("keepAbove")).toBool(), false);
QCOMPARE(windowData.value(QStringLiteral("keepBelow")).toBool(), false);
QCOMPARE(windowData.value(QStringLiteral("skipTaskbar")).toBool(), false);
QCOMPARE(windowData.value(QStringLiteral("skipPager")).toBool(), false);
QCOMPARE(windowData.value(QStringLiteral("skipSwitcher")).toBool(), false);
QCOMPARE(windowData.value(QStringLiteral("maximizeHorizontal")).toBool(), false);
QCOMPARE(windowData.value(QStringLiteral("maximizeVertical")).toBool(), false);
QCOMPARE(windowData.value(QStringLiteral("noBorder")).toBool(), false);
QCOMPARE(windowData.value(QStringLiteral("role")).toString(), QString());
QCOMPARE(windowData.value(QStringLiteral("resourceName")).toString(), QStringLiteral("foo"));
QCOMPARE(windowData.value(QStringLiteral("resourceClass")).toString(), QStringLiteral("bar"));
QCOMPARE(windowData.value(QStringLiteral("desktopFile")).toString(), QStringLiteral("org.kde.foo"));
QCOMPARE(windowData.value(QStringLiteral("caption")).toString(), QStringLiteral("Some caption"));
QCOMPARE(windowData.value(QStringLiteral("activities")), QStringList());
// not testing clientmachine as that is system dependent
// due to that also not testing localhost
auto verifyProperty = [client] (const QString &name) { auto verifyProperty = [client] (const QString &name) {
QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())}; QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())};