tests: port tst_client to use shared folder

instead of shared_old

Task-number: QTBUG-96440
Change-Id: I1f9e04841b432937e47ed337b05fe96b2e0662fc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

1 files changed, 31 insertions, 2 deletions

diff --git a/tests/auto/client/shared/mockcompositor.cpp b/tests/auto/client/shared/mockcompositor.cpp
index 62fa44f0e..63134db55 100644
--- a/tests/auto/client/shared/mockcompositor.cpp
+++ b/tests/auto/client/shared/mockcompositor.cpp
@@ -31,7 +31,8 @@
 
 namespace MockCompositor {
 
-DefaultCompositor::DefaultCompositor()
+DefaultCompositor::DefaultCompositor(CompositorType t)
+    : CoreCompositor(t)
 {
     {
         Lock l(this);
@@ -43,8 +44,16 @@ DefaultCompositor::DefaultCompositor()
         auto *output = add<Output>();
         output->m_data.physicalSize = output->m_data.mode.physicalSizeForDpi(96);
         add<Seat>(Seat::capability_pointer | Seat::capability_keyboard | Seat::capability_touch);
+        add<WlShell>();
         add<XdgWmBase>();
-        add<Shm>();
+        switch (m_type) {
+        case CompositorType::Default:
+            add<Shm>();
+            break;
+        case CompositorType::Legacy:
+            wl_display_init_shm(m_display);
+            break;
+        }
         add<FullScreenShellV1>();
         add<IviApplication>();
 
@@ -89,4 +98,24 @@ void DefaultCompositor::xdgPingAndWaitForPong()
     QTRY_COMPARE(pongSpy.first().at(0).toUInt(), serial);
 }
 
+WlShellCompositor::WlShellCompositor(CompositorType t)
+    : DefaultCompositor(t)
+{
+}
+
+Surface *DefaultCompositor::wlSurface(int i)
+{
+    QList<Surface *> surfaces, msurfaces;
+    msurfaces = get<WlCompositor>()->m_surfaces;
+    for (Surface *surface : msurfaces) {
+        if (surface->isMapped())
+            surfaces << surface;
+    }
+
+    if (i >=0 && i < surfaces.size())
+        return surfaces[i];
+
+    return nullptr;
+}
+
 } // namespace MockCompositor