From 1dd58e874686562508055c0afd6e384bc91c5355 Mon Sep 17 00:00:00 2001
From: Matthew Kosarek <matt.kosarek@canonical.com>
Date: Fri, 17 Jan 2025 14:49:27 -0500
Subject: [PATCH] Expose test_wlcs_display_server in the internal headers +
 remove unnecessary include in the test harness

---
 .../wayland => include/test/miral}/test_wlcs_display_server.h  | 0
 tests/acceptance-tests/wayland/CMakeLists.txt                  | 1 -
 tests/acceptance-tests/wayland/miral_integration.cpp           | 2 +-
 .../mir_test_framework/window_management_test_harness.h        | 2 +-
 tests/mir_test_framework/CMakeLists.txt                        | 1 +
 .../test_wlcs_display_server.cpp                               | 3 +--
 6 files changed, 4 insertions(+), 5 deletions(-)
 rename {tests/acceptance-tests/wayland => include/test/miral}/test_wlcs_display_server.h (100%)
 rename tests/{acceptance-tests/wayland => mir_test_framework}/test_wlcs_display_server.cpp (99%)

diff --git a/tests/acceptance-tests/wayland/test_wlcs_display_server.h b/include/test/miral/test_wlcs_display_server.h
similarity index 100%
rename from tests/acceptance-tests/wayland/test_wlcs_display_server.h
rename to include/test/miral/test_wlcs_display_server.h
diff --git a/tests/acceptance-tests/wayland/CMakeLists.txt b/tests/acceptance-tests/wayland/CMakeLists.txt
index c12b7a5e291..df639079b71 100644
--- a/tests/acceptance-tests/wayland/CMakeLists.txt
+++ b/tests/acceptance-tests/wayland/CMakeLists.txt
@@ -4,7 +4,6 @@ add_library(
   miral_wlcs_integration MODULE
 
   miral_integration.cpp
-  test_wlcs_display_server.cpp test_wlcs_display_server.h
 )
 
 target_link_libraries(
diff --git a/tests/acceptance-tests/wayland/miral_integration.cpp b/tests/acceptance-tests/wayland/miral_integration.cpp
index bcfa7d26394..45a270caaf7 100644
--- a/tests/acceptance-tests/wayland/miral_integration.cpp
+++ b/tests/acceptance-tests/wayland/miral_integration.cpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test_wlcs_display_server.h"
+#include <miral/test_wlcs_display_server.h>
 #include <miral/wayland_extensions.h>
 
 namespace
diff --git a/tests/include/mir_test_framework/window_management_test_harness.h b/tests/include/mir_test_framework/window_management_test_harness.h
index 88a7825565f..4c46c166946 100644
--- a/tests/include/mir_test_framework/window_management_test_harness.h
+++ b/tests/include/mir_test_framework/window_management_test_harness.h
@@ -23,7 +23,7 @@
 #include <miral/application.h>
 #include <miral/window_manager_tools.h>
 #include <mir/shell/surface_specification.h>
-#include "mir/test/doubles/fake_display_configuration_observer_registrar.h"
+#include <mir/events/event.h>
 #include "mir_test_framework/headless_in_process_server.h"
 
 namespace mir::scene
diff --git a/tests/mir_test_framework/CMakeLists.txt b/tests/mir_test_framework/CMakeLists.txt
index 155619f2bfb..4d49d930a90 100644
--- a/tests/mir_test_framework/CMakeLists.txt
+++ b/tests/mir_test_framework/CMakeLists.txt
@@ -55,6 +55,7 @@ add_library(mir-public-test-framework OBJECT
   ${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/open_wrapper.h
   test_server.cpp  ${PROJECT_SOURCE_DIR}/include/test/miral/test_server.h
   test_display_server.cpp  ${PROJECT_SOURCE_DIR}/include/test/miral/test_display_server.h
+  test_wlcs_display_server.cpp ${PROJECT_SOURCE_DIR}/include/test/miral/test_wlcs_display_server.h
   ${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/mmap_wrapper.h
   mmap_wrapper.cpp
   window_management_test_harness.cpp ${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/window_management_test_harness.h
diff --git a/tests/acceptance-tests/wayland/test_wlcs_display_server.cpp b/tests/mir_test_framework/test_wlcs_display_server.cpp
similarity index 99%
rename from tests/acceptance-tests/wayland/test_wlcs_display_server.cpp
rename to tests/mir_test_framework/test_wlcs_display_server.cpp
index 0d0aa6770b7..6b68ed175c7 100644
--- a/tests/acceptance-tests/wayland/test_wlcs_display_server.cpp
+++ b/tests/mir_test_framework/test_wlcs_display_server.cpp
@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "test_wlcs_display_server.h"
-
+#include <miral/test_wlcs_display_server.h>
 #include <wlcs/pointer.h>
 #include <wlcs/touch.h>