build: move old tests to unittests/legacytests

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.

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

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()
 

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)

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()

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)

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 <array>
 #include <cstring>

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 "unittests/legacytests/mock/deskflow/MockEventQueue.h"
-#include "test/mock/deskflow/MockKeyMap.h"
+#include "unittests/legacytests/mock/deskflow/MockKeyMap.h"
-#include "test/mock/deskflow/MockKeyState.h"
+#include "unittests/legacytests/mock/deskflow/MockKeyState.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>

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 <gmock/gmock.h>

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 <gmock/gmock.h>

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"