Differential D17750 Diff 48431 autotests/integration/dbus_interface_test.cpp

Changeset View

Standalone View

View Options

autotests/integration/dbus_interface_test.cpp

Show First 20 Lines • Show All 145 Lines • ▼ Show 20 Line(s)128{
146 146​
147 // let's get the window info 147​ // let's get the window info
148 QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())}; 148​ QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())};
149 reply.waitForFinished(); 149​ reply.waitForFinished();
150 QVERIFY(reply.isValid()); 150​ QVERIFY(reply.isValid());
151 QVERIFY(!reply.isError()); 151​ QVERIFY(!reply.isError());
152 auto windowData = reply.value(); 152​ auto windowData = reply.value();
153 QVERIFY(!windowData.isEmpty()); 153​ QVERIFY(!windowData.isEmpty());
154 QCOMPARE(windowData.size(), 23); 154​ QCOMPARE(windowData.size(), 24);
155 QCOMPARE(windowData.value(QStringLiteral("type")).toInt(), NET::Normal); 155​ QCOMPARE(windowData.value(QStringLiteral("type")).toInt(), NET::Normal);
156 QCOMPARE(windowData.value(QStringLiteral("x")).toInt(), client->x()); 156​ QCOMPARE(windowData.value(QStringLiteral("x")).toInt(), client->x());
157 QCOMPARE(windowData.value(QStringLiteral("y")).toInt(), client->y()); 157​ QCOMPARE(windowData.value(QStringLiteral("y")).toInt(), client->y());
158 QCOMPARE(windowData.value(QStringLiteral("width")).toInt(), client->width()); 158​ QCOMPARE(windowData.value(QStringLiteral("width")).toInt(), client->width());
159 QCOMPARE(windowData.value(QStringLiteral("height")).toInt(), client->height()); 159​ QCOMPARE(windowData.value(QStringLiteral("height")).toInt(), client->height());
160 QCOMPARE(windowData.value(QStringLiteral("x11DesktopNumber")).toInt(), 1); 160​ QCOMPARE(windowData.value(QStringLiteral("x11DesktopNumber")).toInt(), 1);
161 QCOMPARE(windowData.value(QStringLiteral("minimized")).toBool(), false); 161​ QCOMPARE(windowData.value(QStringLiteral("minimized")).toBool(), false);
162 QCOMPARE(windowData.value(QStringLiteral("shaded")).toBool(), false); 162​ QCOMPARE(windowData.value(QStringLiteral("shaded")).toBool(), false);
163 QCOMPARE(windowData.value(QStringLiteral("fullscreen")).toBool(), false); 163​ QCOMPARE(windowData.value(QStringLiteral("fullscreen")).toBool(), false);
164 QCOMPARE(windowData.value(QStringLiteral("keepAbove")).toBool(), false); 164​ QCOMPARE(windowData.value(QStringLiteral("keepAbove")).toBool(), false);
165 QCOMPARE(windowData.value(QStringLiteral("keepBelow")).toBool(), false); 165​ QCOMPARE(windowData.value(QStringLiteral("keepBelow")).toBool(), false);
166 QCOMPARE(windowData.value(QStringLiteral("skipTaskbar")).toBool(), false); 166​ QCOMPARE(windowData.value(QStringLiteral("skipTaskbar")).toBool(), false);
167 QCOMPARE(windowData.value(QStringLiteral("skipPager")).toBool(), false); 167​ QCOMPARE(windowData.value(QStringLiteral("skipPager")).toBool(), false);
168 QCOMPARE(windowData.value(QStringLiteral("skipSwitcher")).toBool(), false); 168​ QCOMPARE(windowData.value(QStringLiteral("skipSwitcher")).toBool(), false);
169 QCOMPARE(windowData.value(QStringLiteral("maximizeHorizontal")).toBool(), false); 169​ QCOMPARE(windowData.value(QStringLiteral("maximizeHorizontal")).toBool(), false);
170 QCOMPARE(windowData.value(QStringLiteral("maximizeVertical")).toBool(), false); 170​ QCOMPARE(windowData.value(QStringLiteral("maximizeVertical")).toBool(), false);
171 QCOMPARE(windowData.value(QStringLiteral("noBorder")).toBool(), true); 171​ QCOMPARE(windowData.value(QStringLiteral("noBorder")).toBool(), true);
172 QCOMPARE(windowData.value(QStringLiteral("clientMachine")).toString(), QString()); 172​ QCOMPARE(windowData.value(QStringLiteral("clientMachine")).toString(), QString());
173​ QCOMPARE(windowData.value(QStringLiteral("localhost")).toBool(), true);
173 QCOMPARE(windowData.value(QStringLiteral("role")).toString(), QString()); 174​ QCOMPARE(windowData.value(QStringLiteral("role")).toString(), QString());
174 QCOMPARE(windowData.value(QStringLiteral("resourceName")).toString(), QStringLiteral("testDbusInterface")); 175​ QCOMPARE(windowData.value(QStringLiteral("resourceName")).toString(), QStringLiteral("testDbusInterface"));
175 if (type == Test::ShellSurfaceType::WlShell) { 176​ if (type == Test::ShellSurfaceType::WlShell) {
176 QCOMPARE(windowData.value(QStringLiteral("resourceClass")).toString(), QString()); 177​ QCOMPARE(windowData.value(QStringLiteral("resourceClass")).toString(), QString());
177 QCOMPARE(windowData.value(QStringLiteral("desktopFile")).toString(), QString()); 178​ QCOMPARE(windowData.value(QStringLiteral("desktopFile")).toString(), QString());
178 QCOMPARE(windowData.value(QStringLiteral("caption")).toString(), QString()); 179​ QCOMPARE(windowData.value(QStringLiteral("caption")).toString(), QString());
179 } else { 180​ } else {
180 QCOMPARE(windowData.value(QStringLiteral("resourceClass")).toString(), QStringLiteral("org.kde.foo")); 181​ QCOMPARE(windowData.value(QStringLiteral("resourceClass")).toString(), QStringLiteral("org.kde.foo"));
▲ Show 20 Lines • Show All 112 Lines • ▼ Show 20 Line(s)263{
293 294​
294 // let's get the window info 295​ // let's get the window info
295 QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())}; 296​ QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())};
296 reply.waitForFinished(); 297​ reply.waitForFinished();
297 QVERIFY(reply.isValid()); 298​ QVERIFY(reply.isValid());
298 QVERIFY(!reply.isError()); 299​ QVERIFY(!reply.isError());
299 auto windowData = reply.value(); 300​ auto windowData = reply.value();
300 QVERIFY(!windowData.isEmpty()); 301​ QVERIFY(!windowData.isEmpty());
301 QCOMPARE(windowData.size(), 23); 302​ QCOMPARE(windowData.size(), 24);
302 QCOMPARE(windowData.value(QStringLiteral("type")).toInt(), NET::Normal); 303​ QCOMPARE(windowData.value(QStringLiteral("type")).toInt(), NET::Normal);
303 QCOMPARE(windowData.value(QStringLiteral("x")).toInt(), client->x()); 304​ QCOMPARE(windowData.value(QStringLiteral("x")).toInt(), client->x());
304 QCOMPARE(windowData.value(QStringLiteral("y")).toInt(), client->y()); 305​ QCOMPARE(windowData.value(QStringLiteral("y")).toInt(), client->y());
305 QCOMPARE(windowData.value(QStringLiteral("width")).toInt(), client->width()); 306​ QCOMPARE(windowData.value(QStringLiteral("width")).toInt(), client->width());
306 QCOMPARE(windowData.value(QStringLiteral("height")).toInt(), client->height()); 307​ QCOMPARE(windowData.value(QStringLiteral("height")).toInt(), client->height());
307 QCOMPARE(windowData.value(QStringLiteral("x11DesktopNumber")).toInt(), 1); 308​ QCOMPARE(windowData.value(QStringLiteral("x11DesktopNumber")).toInt(), 1);
308 QCOMPARE(windowData.value(QStringLiteral("minimized")).toBool(), false); 309​ QCOMPARE(windowData.value(QStringLiteral("minimized")).toBool(), false);
309 QCOMPARE(windowData.value(QStringLiteral("shaded")).toBool(), false); 310​ QCOMPARE(windowData.value(QStringLiteral("shaded")).toBool(), false);
310 QCOMPARE(windowData.value(QStringLiteral("fullscreen")).toBool(), false); 311​ QCOMPARE(windowData.value(QStringLiteral("fullscreen")).toBool(), false);
311 QCOMPARE(windowData.value(QStringLiteral("keepAbove")).toBool(), false); 312​ QCOMPARE(windowData.value(QStringLiteral("keepAbove")).toBool(), false);
312 QCOMPARE(windowData.value(QStringLiteral("keepBelow")).toBool(), false); 313​ QCOMPARE(windowData.value(QStringLiteral("keepBelow")).toBool(), false);
313 QCOMPARE(windowData.value(QStringLiteral("skipTaskbar")).toBool(), false); 314​ QCOMPARE(windowData.value(QStringLiteral("skipTaskbar")).toBool(), false);
314 QCOMPARE(windowData.value(QStringLiteral("skipPager")).toBool(), false); 315​ QCOMPARE(windowData.value(QStringLiteral("skipPager")).toBool(), false);
315 QCOMPARE(windowData.value(QStringLiteral("skipSwitcher")).toBool(), false); 316​ QCOMPARE(windowData.value(QStringLiteral("skipSwitcher")).toBool(), false);
316 QCOMPARE(windowData.value(QStringLiteral("maximizeHorizontal")).toBool(), false); 317​ QCOMPARE(windowData.value(QStringLiteral("maximizeHorizontal")).toBool(), false);
317 QCOMPARE(windowData.value(QStringLiteral("maximizeVertical")).toBool(), false); 318​ QCOMPARE(windowData.value(QStringLiteral("maximizeVertical")).toBool(), false);
318 QCOMPARE(windowData.value(QStringLiteral("noBorder")).toBool(), false); 319​ QCOMPARE(windowData.value(QStringLiteral("noBorder")).toBool(), false);
319 QCOMPARE(windowData.value(QStringLiteral("role")).toString(), QString()); 320​ QCOMPARE(windowData.value(QStringLiteral("role")).toString(), QString());
320 QCOMPARE(windowData.value(QStringLiteral("resourceName")).toString(), QStringLiteral("foo")); 321​ QCOMPARE(windowData.value(QStringLiteral("resourceName")).toString(), QStringLiteral("foo"));
321 QCOMPARE(windowData.value(QStringLiteral("resourceClass")).toString(), QStringLiteral("bar")); 322​ QCOMPARE(windowData.value(QStringLiteral("resourceClass")).toString(), QStringLiteral("bar"));
322 QCOMPARE(windowData.value(QStringLiteral("desktopFile")).toString(), QStringLiteral("org.kde.foo")); 323​ QCOMPARE(windowData.value(QStringLiteral("desktopFile")).toString(), QStringLiteral("org.kde.foo"));
323 QCOMPARE(windowData.value(QStringLiteral("caption")).toString(), QStringLiteral("Some caption")); 324​ QCOMPARE(windowData.value(QStringLiteral("caption")).toString(), QStringLiteral("Some caption"));
324 // not testing clientmachine as that is system dependent 325​ // not testing clientmachine as that is system dependent
326​ // due to that also not testing localhost
325 327​
326 auto verifyProperty = [client] (const QString &name) { 328​ auto verifyProperty = [client] (const QString &name) {
327 QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())}; 329​ QDBusPendingReply<QVariantMap> reply{getWindowInfo(client->internalId())};
328 reply.waitForFinished(); 330​ reply.waitForFinished();
329 return reply.value().value(name).toBool(); 331​ return reply.value().value(name).toBool();
330 }; 332​ };
331 333​
332 QVERIFY(!client->isMinimized()); 334​ QVERIFY(!client->isMinimized());
▲ Show 20 Lines • Show All 81 Lines • Show Last 20 Lines