Expose test_wlcs_display_server in the internal headers + remove unne…

…cessary include in the test harness
canonical · Jan 17, 2025 · 1dd58e8 · 1dd58e8
1 parent c4afaf4
commit 1dd58e8
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 5 deletions.
diff --git a/...-tests/wayland/test_wlcs_display_server.h → ...ude/test/miral/test_wlcs_display_server.h b/...-tests/wayland/test_wlcs_display_server.h → ...ude/test/miral/test_wlcs_display_server.h
diff --git 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
@@ -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
@@ -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
@@ -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/...ests/wayland/test_wlcs_display_server.cpp → ...st_framework/test_wlcs_display_server.cpp b/...ests/wayland/test_wlcs_display_server.cpp → ...st_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>