diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-12-19 13:42:19 +0100 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2016-12-23 08:48:37 +0000 |
| commit | 568e7160184cb9312f115fb61ac06f4a90b2d982 (patch) | |
| tree | 547ce0c4417365e5c8f7875d4011f8e80e784234 | |
| parent | ecbe24a8c014197db5b4ff13bb580ba7ffba471d (diff) | |
Fix pointless asserts in compositor tests
Change-Id: Ie5528c988a15d130056f1d2a3b3e858d78897ba5
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| -rw-r--r-- | tests/auto/compositor/compositor/tst_compositor.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index 393b9f5b7..b31d51b4e 100644 --- a/tests/auto/compositor/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp @@ -451,7 +451,7 @@ void tst_WaylandCompositor::advertisesXdgShellSupport() compositor.create(); MockClient client; - QTRY_VERIFY(&client.xdgShell); + QTRY_VERIFY(client.xdgShell); } void tst_WaylandCompositor::createsXdgSurfaces() @@ -460,7 +460,7 @@ void tst_WaylandCompositor::createsXdgSurfaces() compositor.create(); MockClient client; - QTRY_VERIFY(&client.xdgShell); + QTRY_VERIFY(client.xdgShell); QSignalSpy xdgSurfaceCreatedSpy(&compositor.xdgShell, &QWaylandXdgShellV5::xdgSurfaceCreated); QWaylandXdgSurfaceV5 *xdgSurface = nullptr; @@ -648,7 +648,7 @@ void tst_WaylandCompositor::advertisesIviApplicationSupport() compositor.create(); MockClient client; - QTRY_VERIFY(&client.iviApplication); + QTRY_VERIFY(client.iviApplication); } void tst_WaylandCompositor::createsIviSurfaces() @@ -657,7 +657,7 @@ void tst_WaylandCompositor::createsIviSurfaces() compositor.create(); MockClient client; - QTRY_VERIFY(&client.iviApplication); + QTRY_VERIFY(client.iviApplication); QSignalSpy iviSurfaceCreatedSpy(&compositor.iviApplication, &QWaylandIviApplication::iviSurfaceRequested); QWaylandIviSurface *iviSurface = nullptr; @@ -740,7 +740,7 @@ void tst_WaylandCompositor::sendsIviConfigure() compositor.create(); MockClient client; - QTRY_VERIFY(&client.iviApplication); + QTRY_VERIFY(client.iviApplication); QWaylandIviSurface *iviSurface = nullptr; QObject::connect(&compositor.iviApplication, &QWaylandIviApplication::iviSurfaceCreated, [&](QWaylandIviSurface *s) { @@ -764,7 +764,7 @@ void tst_WaylandCompositor::destroysIviSurfaces() compositor.create(); MockClient client; - QTRY_VERIFY(&client.iviApplication); + QTRY_VERIFY(client.iviApplication); QWaylandIviSurface *iviSurface = nullptr; QObject::connect(&compositor.iviApplication, &QWaylandIviApplication::iviSurfaceCreated, [&](QWaylandIviSurface *s) { |