summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2014-07-25 21:51:09 +0200
committerPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2014-08-17 11:23:26 +0200
commitca83fc4620c483190aeeddd3b80645e29131c57a (patch)
tree63530f1e318f1eb36fffc0d6b9b07b78bbfceeeb /tests
parent14faa3376a9d680b97622386784d8b52a9b56ca9 (diff)
Expose surface's client to QML
Introduce QWaylandClient class that wraps wl_client credentials and has a method to destroy the client. Add QWaylandClient object as a QWaylandSurface property. This come in handy for example when the compositor wants to kill the process of an unresponsive surface or wants to know client credentails. WaylandClient typedef is now useless thus is replaced by QWaylandClient. Change-Id: I997ec459af0f19baef67e7420c90937b197b2e1d Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/compositor/tst_compositor.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/compositor/tst_compositor.cpp b/tests/auto/compositor/tst_compositor.cpp
index e97d3b16d..3a11d7be5 100644
--- a/tests/auto/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/tst_compositor.cpp
@@ -83,10 +83,11 @@ void tst_WaylandCompositor::singleClient()
wl_surface *sb = client.createSurface();
QTRY_COMPARE(compositor.surfaces.size(), 2);
- WaylandClient *ca = compositor.surfaces.at(0)->client();
- WaylandClient *cb = compositor.surfaces.at(1)->client();
+ QWaylandClient *ca = compositor.surfaces.at(0)->client();
+ QWaylandClient *cb = compositor.surfaces.at(1)->client();
QCOMPARE(ca, cb);
+ QVERIFY(ca != 0);
QList<QWaylandSurface *> surfaces = compositor.surfacesForClient(ca);
QCOMPARE(surfaces.size(), 2);
@@ -114,13 +115,14 @@ void tst_WaylandCompositor::multipleClients()
QTRY_COMPARE(compositor.surfaces.size(), 3);
- WaylandClient *ca = compositor.surfaces.at(0)->client();
- WaylandClient *cb = compositor.surfaces.at(1)->client();
- WaylandClient *cc = compositor.surfaces.at(2)->client();
+ QWaylandClient *ca = compositor.surfaces.at(0)->client();
+ QWaylandClient *cb = compositor.surfaces.at(1)->client();
+ QWaylandClient *cc = compositor.surfaces.at(2)->client();
QVERIFY(ca != cb);
QVERIFY(ca != cc);
QVERIFY(cb != cc);
+ QVERIFY(ca != 0);
QCOMPARE(compositor.surfacesForClient(ca).size(), 1);
QCOMPARE(compositor.surfacesForClient(ca).at(0), compositor.surfaces.at(0));