From 05695d7f1b274841362ee7c0d0c5d2f3f21106b1 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Tue, 23 May 2023 14:30:04 +0300
Subject: [PATCH] autotests: Avoid binding plasmashell global in tests that
 don't use it

---
 autotests/integration/maximize_test.cpp | 3 +--
 autotests/integration/tiles_test.cpp    | 6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/autotests/integration/maximize_test.cpp b/autotests/integration/maximize_test.cpp
index 2ef213a872..08a24596bb 100644
--- a/autotests/integration/maximize_test.cpp
+++ b/autotests/integration/maximize_test.cpp
@@ -17,7 +17,6 @@
 #include "workspace.h"
 
 #include <KWayland/Client/compositor.h>
-#include <KWayland/Client/plasmashell.h>
 #include <KWayland/Client/shm_pool.h>
 #include <KWayland/Client/surface.h>
 
@@ -65,7 +64,7 @@ void TestMaximized::initTestCase()
 
 void TestMaximized::init()
 {
-    QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::XdgDecorationV1 | Test::AdditionalWaylandInterface::PlasmaShell));
+    QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::XdgDecorationV1));
 
     workspace()->setActiveOutput(QPoint(640, 512));
     KWin::input()->pointer()->warp(QPoint(640, 512));
diff --git a/autotests/integration/tiles_test.cpp b/autotests/integration/tiles_test.cpp
index 9819e74af0..bbe2bc5db2 100644
--- a/autotests/integration/tiles_test.cpp
+++ b/autotests/integration/tiles_test.cpp
@@ -9,11 +9,8 @@
 #include "kwin_wayland_test.h"
 
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "tiles/tilemanager.h"
-#include "wayland/seat_interface.h"
-#include "wayland/surface_interface.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
@@ -66,8 +63,7 @@ void TilesTest::initTestCase()
 
 void TilesTest::init()
 {
-    QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::Decoration | Test::AdditionalWaylandInterface::PlasmaShell | Test::AdditionalWaylandInterface::Seat));
-    QVERIFY(Test::waitForWaylandPointer());
+    QVERIFY(Test::setupWaylandConnection());
 
     workspace()->setActiveOutput(QPoint(640, 512));
     input()->pointer()->warp(QPoint(640, 512));