autotests: Avoid binding plasmashell global in tests that don't use it

master
Vlad Zahorodnii 1 year ago
parent 539b6bb6ac
commit 05695d7f1b

@ -17,7 +17,6 @@
#include "workspace.h" #include "workspace.h"
#include <KWayland/Client/compositor.h> #include <KWayland/Client/compositor.h>
#include <KWayland/Client/plasmashell.h>
#include <KWayland/Client/shm_pool.h> #include <KWayland/Client/shm_pool.h>
#include <KWayland/Client/surface.h> #include <KWayland/Client/surface.h>
@ -65,7 +64,7 @@ void TestMaximized::initTestCase()
void TestMaximized::init() void TestMaximized::init()
{ {
QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::XdgDecorationV1 | Test::AdditionalWaylandInterface::PlasmaShell)); QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::XdgDecorationV1));
workspace()->setActiveOutput(QPoint(640, 512)); workspace()->setActiveOutput(QPoint(640, 512));
KWin::input()->pointer()->warp(QPoint(640, 512)); KWin::input()->pointer()->warp(QPoint(640, 512));

@ -9,11 +9,8 @@
#include "kwin_wayland_test.h" #include "kwin_wayland_test.h"
#include "core/output.h" #include "core/output.h"
#include "libkwineffects/kwineffects.h"
#include "pointer_input.h" #include "pointer_input.h"
#include "tiles/tilemanager.h" #include "tiles/tilemanager.h"
#include "wayland/seat_interface.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h" #include "wayland_server.h"
#include "window.h" #include "window.h"
#include "workspace.h" #include "workspace.h"
@ -66,8 +63,7 @@ void TilesTest::initTestCase()
void TilesTest::init() void TilesTest::init()
{ {
QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::Decoration | Test::AdditionalWaylandInterface::PlasmaShell | Test::AdditionalWaylandInterface::Seat)); QVERIFY(Test::setupWaylandConnection());
QVERIFY(Test::waitForWaylandPointer());
workspace()->setActiveOutput(QPoint(640, 512)); workspace()->setActiveOutput(QPoint(640, 512));
input()->pointer()->warp(QPoint(640, 512)); input()->pointer()->warp(QPoint(640, 512));

Loading…
Cancel
Save