From 4e9cf0d77fd177a5809b0dda8ecde1fc7c9b55e2 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 29 Sep 2021 11:57:11 +0200 Subject: [PATCH] Moved unit tests close to the sources --- src/CMakeLists.txt | 3 --- src/libs/database/CMakeLists.txt | 4 +++- src/{test/database => libs/database/test}/Artist.cpp | 0 src/{test/database => libs/database/test}/CMakeLists.txt | 0 src/{test/database => libs/database/test}/Cluster.cpp | 0 src/{test/database => libs/database/test}/Common.hpp | 0 src/{test/database => libs/database/test}/DatabaseTest.cpp | 0 src/{test/database => libs/database/test}/Release.cpp | 0 src/{test/database => libs/database/test}/Track.cpp | 0 src/libs/som/CMakeLists.txt | 5 ++++- src/{test/som => libs/som/test}/CMakeLists.txt | 0 src/{test/som => libs/som/test}/SomTest.cpp | 0 src/libs/utils/CMakeLists.txt | 4 +++- src/{test/utils => libs/utils/test}/CMakeLists.txt | 0 src/{test/utils => libs/utils/test}/RecursiveSharedMutex.cpp | 0 src/{test/utils => libs/utils/test}/String.cpp | 0 src/{test/utils => libs/utils/test}/Utils.cpp | 0 src/test/CMakeLists.txt | 5 ----- 18 files changed, 10 insertions(+), 11 deletions(-) rename src/{test/database => libs/database/test}/Artist.cpp (100%) rename src/{test/database => libs/database/test}/CMakeLists.txt (100%) rename src/{test/database => libs/database/test}/Cluster.cpp (100%) rename src/{test/database => libs/database/test}/Common.hpp (100%) rename src/{test/database => libs/database/test}/DatabaseTest.cpp (100%) rename src/{test/database => libs/database/test}/Release.cpp (100%) rename src/{test/database => libs/database/test}/Track.cpp (100%) rename src/{test/som => libs/som/test}/CMakeLists.txt (100%) rename src/{test/som => libs/som/test}/SomTest.cpp (100%) rename src/{test/utils => libs/utils/test}/CMakeLists.txt (100%) rename src/{test/utils => libs/utils/test}/RecursiveSharedMutex.cpp (100%) rename src/{test/utils => libs/utils/test}/String.cpp (100%) rename src/{test/utils => libs/utils/test}/Utils.cpp (100%) delete mode 100644 src/test/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c796f0e9..79236cc5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,8 +4,5 @@ add_subdirectory(libs) add_subdirectory(lms) add_subdirectory(tools) -if(BUILD_TESTING) - add_subdirectory(test) -endif() diff --git a/src/libs/database/CMakeLists.txt b/src/libs/database/CMakeLists.txt index cdf1288f..38b13e75 100644 --- a/src/libs/database/CMakeLists.txt +++ b/src/libs/database/CMakeLists.txt @@ -1,4 +1,3 @@ - add_library(lmsdatabase SHARED impl/Artist.cpp impl/Cluster.cpp @@ -36,3 +35,6 @@ target_link_libraries(lmsdatabase PUBLIC install(TARGETS lmsdatabase DESTINATION lib) +if(BUILD_TESTING) + add_subdirectory(test) +endif() diff --git a/src/test/database/Artist.cpp b/src/libs/database/test/Artist.cpp similarity index 100% rename from src/test/database/Artist.cpp rename to src/libs/database/test/Artist.cpp diff --git a/src/test/database/CMakeLists.txt b/src/libs/database/test/CMakeLists.txt similarity index 100% rename from src/test/database/CMakeLists.txt rename to src/libs/database/test/CMakeLists.txt diff --git a/src/test/database/Cluster.cpp b/src/libs/database/test/Cluster.cpp similarity index 100% rename from src/test/database/Cluster.cpp rename to src/libs/database/test/Cluster.cpp diff --git a/src/test/database/Common.hpp b/src/libs/database/test/Common.hpp similarity index 100% rename from src/test/database/Common.hpp rename to src/libs/database/test/Common.hpp diff --git a/src/test/database/DatabaseTest.cpp b/src/libs/database/test/DatabaseTest.cpp similarity index 100% rename from src/test/database/DatabaseTest.cpp rename to src/libs/database/test/DatabaseTest.cpp diff --git a/src/test/database/Release.cpp b/src/libs/database/test/Release.cpp similarity index 100% rename from src/test/database/Release.cpp rename to src/libs/database/test/Release.cpp diff --git a/src/test/database/Track.cpp b/src/libs/database/test/Track.cpp similarity index 100% rename from src/test/database/Track.cpp rename to src/libs/database/test/Track.cpp diff --git a/src/libs/som/CMakeLists.txt b/src/libs/som/CMakeLists.txt index 4c967429..938e835a 100644 --- a/src/libs/som/CMakeLists.txt +++ b/src/libs/som/CMakeLists.txt @@ -1,4 +1,3 @@ - add_library(lmssom SHARED impl/DataNormalizer.cpp impl/Network.cpp @@ -19,3 +18,7 @@ target_link_libraries(lmssom PUBLIC set_property(TARGET lmssom PROPERTY POSITION_INDEPENDENT_CODE ON) install(TARGETS lmssom DESTINATION lib) + +if(BUILD_TESTING) + add_subdirectory(test) +endif() diff --git a/src/test/som/CMakeLists.txt b/src/libs/som/test/CMakeLists.txt similarity index 100% rename from src/test/som/CMakeLists.txt rename to src/libs/som/test/CMakeLists.txt diff --git a/src/test/som/SomTest.cpp b/src/libs/som/test/SomTest.cpp similarity index 100% rename from src/test/som/SomTest.cpp rename to src/libs/som/test/SomTest.cpp diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt index f6ef50b7..34744ea7 100644 --- a/src/libs/utils/CMakeLists.txt +++ b/src/libs/utils/CMakeLists.txt @@ -1,4 +1,3 @@ - add_library(lmsutils SHARED impl/ChildProcess.cpp impl/ChildProcessManager.cpp @@ -37,3 +36,6 @@ target_link_libraries(lmsutils PUBLIC install(TARGETS lmsutils DESTINATION lib) +if(BUILD_TESTING) + add_subdirectory(test) +endif() diff --git a/src/test/utils/CMakeLists.txt b/src/libs/utils/test/CMakeLists.txt similarity index 100% rename from src/test/utils/CMakeLists.txt rename to src/libs/utils/test/CMakeLists.txt diff --git a/src/test/utils/RecursiveSharedMutex.cpp b/src/libs/utils/test/RecursiveSharedMutex.cpp similarity index 100% rename from src/test/utils/RecursiveSharedMutex.cpp rename to src/libs/utils/test/RecursiveSharedMutex.cpp diff --git a/src/test/utils/String.cpp b/src/libs/utils/test/String.cpp similarity index 100% rename from src/test/utils/String.cpp rename to src/libs/utils/test/String.cpp diff --git a/src/test/utils/Utils.cpp b/src/libs/utils/test/Utils.cpp similarity index 100% rename from src/test/utils/Utils.cpp rename to src/libs/utils/test/Utils.cpp diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt deleted file mode 100644 index ea5a1fe2..00000000 --- a/src/test/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ - -add_subdirectory(database) -add_subdirectory(som) -add_subdirectory(utils) -