diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-01-16 10:39:42 +0100 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2019-01-17 10:55:28 +0000 |
| commit | ce7fef539a3e8a155d1c821686479503164f5983 (patch) | |
| tree | 77203332b0917ce76ba8e9a601fdddeb219ac5fa /tests | |
| parent | 061934bd54757cdac423571c2096eb405bcee297 (diff) | |
Client: Implement xdg-output-unstable-v1 version 2
Adds handler for the new name event and updates tests accordingly.
This means QScreen::name() will now typically return strings like: "VGA-1",
"WL-1", "DP-2", "HDMI-A-1" instead of "Screen25", "Screen26", "Screen27" etc.
Change-Id: I3d5748a2fd0d772e2344ac53f0ed808790a84ba5
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/client/xdgoutput/tst_xdgoutput.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/client/xdgoutput/tst_xdgoutput.cpp b/tests/auto/client/xdgoutput/tst_xdgoutput.cpp index 6da2c35e8..a628810d1 100644 --- a/tests/auto/client/xdgoutput/tst_xdgoutput.cpp +++ b/tests/auto/client/xdgoutput/tst_xdgoutput.cpp @@ -100,6 +100,7 @@ public: add<XdgOutputManagerV1>(version); }); } + XdgOutputV1 *xdgOutput(int i = 0) { return get<XdgOutputManagerV1>()->getXdgOutput(output(i)); } }; class tst_xdgoutput : public QObject, private XdgOutputV1Compositor @@ -121,9 +122,14 @@ void tst_xdgoutput::primaryScreen() { // Verify that the client has bound to the global QCOMPOSITOR_TRY_COMPARE(get<XdgOutputManagerV1>()->resourceMap().size(), 1); + exec([=] { + auto *resource = xdgOutput()->resourceMap().value(client()); + QCOMPARE(resource->version(), 2); + }); auto *s = QGuiApplication::primaryScreen(); QTRY_COMPARE(s->size(), QSize(1920, 1080)); QTRY_COMPARE(s->geometry().topLeft(), QPoint(0, 0)); + QTRY_COMPARE(s->name(), QString("WL-1")); } void tst_xdgoutput::overrideGeometry() |