summaryrefslogtreecommitdiffstats
path: root/tests/auto/client/xdgshell
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-05-07 03:01:52 +0200
committerJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-05-07 12:39:12 +0200
commit17b1705ce4c8bc9ca19a6b424a00a045134b3aac (patch)
tree03e7b7d461064dd007179cd29da9c024e6c8f190 /tests/auto/client/xdgshell
parent4ab3cbcc5c4da6384e9081993c5ba24303a382bd (diff)
parenta658a10f6a42e67bd762f87851c23cc1c1e3b141 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts: src/client/qwaylanddisplay_p.h src/client/qwaylandwindow.cpp Change-Id: I50eb5c83a8b81e4bdb032b68d41f429b17d0a74d
Diffstat (limited to 'tests/auto/client/xdgshell')
-rw-r--r--tests/auto/client/xdgshell/tst_xdgshell.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/auto/client/xdgshell/tst_xdgshell.cpp b/tests/auto/client/xdgshell/tst_xdgshell.cpp
index 809e564e..038ff662 100644
--- a/tests/auto/client/xdgshell/tst_xdgshell.cpp
+++ b/tests/auto/client/xdgshell/tst_xdgshell.cpp
@@ -65,7 +65,7 @@ void tst_xdgshell::showMinimized()
// Make sure the window on the compositor side is/was created here, and not after the test
// finishes, as that may mess up for later tests.
- QCOMPOSITOR_TRY_VERIFY(surface());
+ QCOMPOSITOR_TRY_VERIFY(xdgSurface());
QVERIFY(!window.isExposed());
}
@@ -426,9 +426,16 @@ void tst_xdgshell::switchPopups()
void tst_xdgshell::pongs()
{
- QSignalSpy pongSpy(exec([=] { return get<XdgWmBase>(); }), &XdgWmBase::pong);
+ // Create and show a window to trigger shell integration initialzation,
+ // otherwise we don't have anything to send ping events to.
+ QRasterWindow window;
+ window.resize(200, 200);
+ window.show();
+
// Verify that the client has bound to the global
QCOMPOSITOR_TRY_COMPARE(get<XdgWmBase>()->resourceMap().size(), 1);
+
+ QSignalSpy pongSpy(exec([=] { return get<XdgWmBase>(); }), &XdgWmBase::pong);
const uint serial = exec([=] { return nextSerial(); });
exec([=] {
auto *base = get<XdgWmBase>();