From 81392fe758b4b554d65ea847b8cbdb7bb28f0b91 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 9 May 2025 10:59:45 -0400 Subject: [PATCH] build: move old tests to unittests/legacytests --- cmake/Libraries.cmake | 2 +- sonar-project.properties | 4 ++-- src/CMakeLists.txt | 1 - src/unittests/CMakeLists.txt | 1 + src/{test => unittests/legacytests}/CMakeLists.txt | 2 +- .../legacytests}/legacytests/CMakeLists.txt | 1 + .../legacytests/arch/unix/ArchNetworkBSDTests.cpp | 0 .../legacytests}/legacytests/base/LogTests.cpp | 0 .../legacytests}/legacytests/client/HelloBackTests.cpp | 2 +- .../legacytests}/legacytests/deskflow/KeyStateTests.cpp | 6 +++--- .../legacytests}/legacytests/deskflow/ServerAppTests.cpp | 0 .../legacytests/gui/core/ClientConnectionTests.cpp | 0 .../legacytests}/legacytests/gui/core/CoreProcessTests.cpp | 2 +- .../legacytests/gui/core/ServerConnectionTests.cpp | 2 +- .../legacytests/gui/core/WaylandWarningsTests.cpp | 0 src/{test => unittests/legacytests}/legacytests/main.cpp | 2 +- .../legacytests}/mock/deskflow/MockEventQueue.h | 0 .../legacytests}/mock/deskflow/MockKeyMap.h | 0 .../legacytests}/mock/deskflow/MockKeyState.h | 0 src/{test => unittests/legacytests}/mock/io/MockStream.h | 0 src/{test => unittests/legacytests}/shared/ExitTimeout.cpp | 0 src/{test => unittests/legacytests}/shared/ExitTimeout.h | 0 .../legacytests}/shared/gui/mocks/ServerConfigMock.h | 0 23 files changed, 13 insertions(+), 12 deletions(-) rename src/{test => unittests/legacytests}/CMakeLists.txt (98%) rename src/{test => unittests/legacytests}/legacytests/CMakeLists.txt (81%) rename src/{test => unittests/legacytests}/legacytests/arch/unix/ArchNetworkBSDTests.cpp (100%) rename src/{test => unittests/legacytests}/legacytests/base/LogTests.cpp (100%) rename src/{test => unittests/legacytests}/legacytests/client/HelloBackTests.cpp (99%) rename src/{test => unittests/legacytests}/legacytests/deskflow/KeyStateTests.cpp (98%) rename src/{test => unittests/legacytests}/legacytests/deskflow/ServerAppTests.cpp (100%) rename src/{test => unittests/legacytests}/legacytests/gui/core/ClientConnectionTests.cpp (100%) rename src/{test => unittests/legacytests}/legacytests/gui/core/CoreProcessTests.cpp (98%) rename src/{test => unittests/legacytests}/legacytests/gui/core/ServerConnectionTests.cpp (97%) rename src/{test => unittests/legacytests}/legacytests/gui/core/WaylandWarningsTests.cpp (100%) rename src/{test => unittests/legacytests}/legacytests/main.cpp (95%) rename src/{test => unittests/legacytests}/mock/deskflow/MockEventQueue.h (100%) rename src/{test => unittests/legacytests}/mock/deskflow/MockKeyMap.h (100%) rename src/{test => unittests/legacytests}/mock/deskflow/MockKeyState.h (100%) rename src/{test => unittests/legacytests}/mock/io/MockStream.h (100%) rename src/{test => unittests/legacytests}/shared/ExitTimeout.cpp (100%) rename src/{test => unittests/legacytests}/shared/ExitTimeout.h (100%) rename src/{test => unittests/legacytests}/shared/gui/mocks/ServerConfigMock.h (100%) diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake index 787c38871..b229e340b 100644 --- a/cmake/Libraries.cmake +++ b/cmake/Libraries.cmake @@ -46,7 +46,7 @@ macro(configure_libs) message(STATUS "Enabling code coverage") include(cmake/CodeCoverage.cmake) append_coverage_compiler_flags() - set(test_exclude subprojects/* build/* src/tests/*) + set(test_exclude subprojects/* build/* src/unittests/*) set(test_src ${PROJECT_SOURCE_DIR}/src) # Apparently solves the bug in gcov where it returns negative counts and confuses gcovr. diff --git a/sonar-project.properties b/sonar-project.properties index cb53670c7..4b593651b 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,9 +1,9 @@ sonar.organization=deskflow sonar.projectKey=deskflow_deskflow sonar.sources=src/apps,src/lib -sonar.tests=src/test +sonar.tests=src/unittests sonar.exclusions=subprojects/**,build/** -sonar.coverage.exclusions=subprojects/**,src/test/**,src/apps/deskflow-gui/**,src/apps/res/** +sonar.coverage.exclusions=subprojects/**,src/unittests/**,src/apps/deskflow-gui/**,src/apps/res/** sonar.cpd.exclusions=**/*Test*.cpp sonar.host.url=https://sonarcloud.io sonar.cfamily.compile-commands=build/compile_commands.json diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3c1d54ee2..72a86f926 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,6 @@ add_subdirectory(apps) option(BUILD_TESTS "Build tests" ON) if(BUILD_TESTS) - add_subdirectory(test) add_subdirectory(unittests) endif() diff --git a/src/unittests/CMakeLists.txt b/src/unittests/CMakeLists.txt index 48ea5d777..1501f67d6 100644 --- a/src/unittests/CMakeLists.txt +++ b/src/unittests/CMakeLists.txt @@ -49,6 +49,7 @@ add_subdirectory(base) add_subdirectory(common) add_subdirectory(deskflow) add_subdirectory(gui) +add_subdirectory(legacytests) add_subdirectory(net) add_subdirectory(platform) add_subdirectory(server) diff --git a/src/test/CMakeLists.txt b/src/unittests/legacytests/CMakeLists.txt similarity index 98% rename from src/test/CMakeLists.txt rename to src/unittests/legacytests/CMakeLists.txt index 9ca2a5511..ce3f26c5c 100644 --- a/src/test/CMakeLists.txt +++ b/src/unittests/legacytests/CMakeLists.txt @@ -17,7 +17,7 @@ macro(config_all_tests) set(base_dir ${PROJECT_SOURCE_DIR}) set(src_dir ${base_dir}/src) - set(test_base_dir ${src_dir}/test) + set(test_base_dir ${src_dir}/unittests/legacytests) set(gui_dir ${src_dir}/gui/src) config_test_deps() diff --git a/src/test/legacytests/CMakeLists.txt b/src/unittests/legacytests/legacytests/CMakeLists.txt similarity index 81% rename from src/test/legacytests/CMakeLists.txt rename to src/unittests/legacytests/legacytests/CMakeLists.txt index 459a73b8f..27ea7b6d1 100644 --- a/src/test/legacytests/CMakeLists.txt +++ b/src/unittests/legacytests/legacytests/CMakeLists.txt @@ -3,6 +3,7 @@ # SPDX-License-Identifier: MIT config_test() +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(target legacytests) add_executable(${target} ${sources} ${headers}) target_link_libraries(${target} ${test_libs} common) diff --git a/src/test/legacytests/arch/unix/ArchNetworkBSDTests.cpp b/src/unittests/legacytests/legacytests/arch/unix/ArchNetworkBSDTests.cpp similarity index 100% rename from src/test/legacytests/arch/unix/ArchNetworkBSDTests.cpp rename to src/unittests/legacytests/legacytests/arch/unix/ArchNetworkBSDTests.cpp diff --git a/src/test/legacytests/base/LogTests.cpp b/src/unittests/legacytests/legacytests/base/LogTests.cpp similarity index 100% rename from src/test/legacytests/base/LogTests.cpp rename to src/unittests/legacytests/legacytests/base/LogTests.cpp diff --git a/src/test/legacytests/client/HelloBackTests.cpp b/src/unittests/legacytests/legacytests/client/HelloBackTests.cpp similarity index 99% rename from src/test/legacytests/client/HelloBackTests.cpp rename to src/unittests/legacytests/legacytests/client/HelloBackTests.cpp index 121a7162e..65ef06f1d 100644 --- a/src/test/legacytests/client/HelloBackTests.cpp +++ b/src/unittests/legacytests/legacytests/client/HelloBackTests.cpp @@ -7,7 +7,7 @@ #include "client/HelloBack.h" #include "common/Common.h" -#include "mock/io/MockStream.h" +#include "unittests/legacytests/mock/io/MockStream.h" #include #include diff --git a/src/test/legacytests/deskflow/KeyStateTests.cpp b/src/unittests/legacytests/legacytests/deskflow/KeyStateTests.cpp similarity index 98% rename from src/test/legacytests/deskflow/KeyStateTests.cpp rename to src/unittests/legacytests/legacytests/deskflow/KeyStateTests.cpp index 183a1ebbe..ea8b17439 100644 --- a/src/test/legacytests/deskflow/KeyStateTests.cpp +++ b/src/unittests/legacytests/legacytests/deskflow/KeyStateTests.cpp @@ -5,9 +5,9 @@ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception */ -#include "test/mock/deskflow/MockEventQueue.h" -#include "test/mock/deskflow/MockKeyMap.h" -#include "test/mock/deskflow/MockKeyState.h" +#include "unittests/legacytests/mock/deskflow/MockEventQueue.h" +#include "unittests/legacytests/mock/deskflow/MockKeyMap.h" +#include "unittests/legacytests/mock/deskflow/MockKeyState.h" #include #include diff --git a/src/test/legacytests/deskflow/ServerAppTests.cpp b/src/unittests/legacytests/legacytests/deskflow/ServerAppTests.cpp similarity index 100% rename from src/test/legacytests/deskflow/ServerAppTests.cpp rename to src/unittests/legacytests/legacytests/deskflow/ServerAppTests.cpp diff --git a/src/test/legacytests/gui/core/ClientConnectionTests.cpp b/src/unittests/legacytests/legacytests/gui/core/ClientConnectionTests.cpp similarity index 100% rename from src/test/legacytests/gui/core/ClientConnectionTests.cpp rename to src/unittests/legacytests/legacytests/gui/core/ClientConnectionTests.cpp diff --git a/src/test/legacytests/gui/core/CoreProcessTests.cpp b/src/unittests/legacytests/legacytests/gui/core/CoreProcessTests.cpp similarity index 98% rename from src/test/legacytests/gui/core/CoreProcessTests.cpp rename to src/unittests/legacytests/legacytests/gui/core/CoreProcessTests.cpp index ebcf27602..3ac2fca03 100644 --- a/src/test/legacytests/gui/core/CoreProcessTests.cpp +++ b/src/unittests/legacytests/legacytests/gui/core/CoreProcessTests.cpp @@ -7,7 +7,7 @@ #include "common/Settings.h" #include "gui/core/CoreProcess.h" #include "gui/proxy/QProcessProxy.h" -#include "shared/gui/mocks/ServerConfigMock.h" +#include "unittests/legacytests/shared/gui/mocks/ServerConfigMock.h" #include "gmock/gmock.h" #include diff --git a/src/test/legacytests/gui/core/ServerConnectionTests.cpp b/src/unittests/legacytests/legacytests/gui/core/ServerConnectionTests.cpp similarity index 97% rename from src/test/legacytests/gui/core/ServerConnectionTests.cpp rename to src/unittests/legacytests/legacytests/gui/core/ServerConnectionTests.cpp index 9d30279de..4222fb634 100644 --- a/src/test/legacytests/gui/core/ServerConnectionTests.cpp +++ b/src/unittests/legacytests/legacytests/gui/core/ServerConnectionTests.cpp @@ -6,7 +6,7 @@ #include "gui/core/ServerConnection.h" -#include "shared/gui/mocks/ServerConfigMock.h" +#include "unittests/legacytests/shared/gui/mocks/ServerConfigMock.h" #include "gmock/gmock.h" #include diff --git a/src/test/legacytests/gui/core/WaylandWarningsTests.cpp b/src/unittests/legacytests/legacytests/gui/core/WaylandWarningsTests.cpp similarity index 100% rename from src/test/legacytests/gui/core/WaylandWarningsTests.cpp rename to src/unittests/legacytests/legacytests/gui/core/WaylandWarningsTests.cpp diff --git a/src/test/legacytests/main.cpp b/src/unittests/legacytests/legacytests/main.cpp similarity index 95% rename from src/test/legacytests/main.cpp rename to src/unittests/legacytests/legacytests/main.cpp index fdf9bf21a..3b6f278a6 100644 --- a/src/test/legacytests/main.cpp +++ b/src/unittests/legacytests/legacytests/main.cpp @@ -8,7 +8,7 @@ #include "arch/Arch.h" #include "base/Log.h" #include "common/Settings.h" -#include "shared/ExitTimeout.h" +#include "unittests/legacytests/shared/ExitTimeout.h" #if SYSAPI_WIN32 #include "arch/win32/ArchMiscWindows.h" diff --git a/src/test/mock/deskflow/MockEventQueue.h b/src/unittests/legacytests/mock/deskflow/MockEventQueue.h similarity index 100% rename from src/test/mock/deskflow/MockEventQueue.h rename to src/unittests/legacytests/mock/deskflow/MockEventQueue.h diff --git a/src/test/mock/deskflow/MockKeyMap.h b/src/unittests/legacytests/mock/deskflow/MockKeyMap.h similarity index 100% rename from src/test/mock/deskflow/MockKeyMap.h rename to src/unittests/legacytests/mock/deskflow/MockKeyMap.h diff --git a/src/test/mock/deskflow/MockKeyState.h b/src/unittests/legacytests/mock/deskflow/MockKeyState.h similarity index 100% rename from src/test/mock/deskflow/MockKeyState.h rename to src/unittests/legacytests/mock/deskflow/MockKeyState.h diff --git a/src/test/mock/io/MockStream.h b/src/unittests/legacytests/mock/io/MockStream.h similarity index 100% rename from src/test/mock/io/MockStream.h rename to src/unittests/legacytests/mock/io/MockStream.h diff --git a/src/test/shared/ExitTimeout.cpp b/src/unittests/legacytests/shared/ExitTimeout.cpp similarity index 100% rename from src/test/shared/ExitTimeout.cpp rename to src/unittests/legacytests/shared/ExitTimeout.cpp diff --git a/src/test/shared/ExitTimeout.h b/src/unittests/legacytests/shared/ExitTimeout.h similarity index 100% rename from src/test/shared/ExitTimeout.h rename to src/unittests/legacytests/shared/ExitTimeout.h diff --git a/src/test/shared/gui/mocks/ServerConfigMock.h b/src/unittests/legacytests/shared/gui/mocks/ServerConfigMock.h similarity index 100% rename from src/test/shared/gui/mocks/ServerConfigMock.h rename to src/unittests/legacytests/shared/gui/mocks/ServerConfigMock.h