Move all tests under single directory hierarchy

This commit:
 - moves api tests to tests/api_tests,
 - moves integration tests under tests/integration and adds it into tests package
 - moves client example application under test/client_example
 - drops no-op sessiond tests (test template)
 - drops unused infrastructure for runnnig tests at build time

Change-Id: I6047f66c358b089710c30709454f7afa891bd10b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d03fff9..0deede7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,29 +13,4 @@ set(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 add_subdirectory(common)
 add_subdirectory(libsessiond)
 add_subdirectory(sessiond)
-add_subdirectory(clientExample)
-
-option(ENABLE_TARGET_TESTS "On target tests" ON)
-if(ENABLE_TARGET_TESTS)
-       find_package(GTest REQUIRED)
-       add_subdirectory(libsessiond/target_test)
-endif(ENABLE_TARGET_TESTS)
-
-enable_testing()
-
-#set ON if want run libsessiond test
-option(ENABLE_LIB_TESTS "Run libsessiond unit tests after build" OFF)
-if(ENABLE_LIB_TESTS)
-       find_package(GTest REQUIRED)
-       include(CTest)
-       add_subdirectory(libsessiond/test)
-endif(ENABLE_LIB_TESTS)
-
-#set ON if want run sessiond tests
-option(ENABLE_SESSIOND_TESTS "Run sessiond unit tests after build" OFF)
-
-if(ENABLE_SESSIOND_TESTS)
-       find_package(GTest REQUIRED)
-       include(CTest)
-       add_subdirectory(sessiond/test)
-endif(ENABLE_SESSIOND_TEST)
+add_subdirectory(tests)

diff --git a/libsessiond/test/CMakeLists.txt b/libsessiond/test/CMakeLists.txt
deleted file mode 100644 (file)
index c6cb9c7..0000000
--- a/libsessiond/test/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-function(add_libsd_mocked_test name wraps)
-
-       message("cmake src dir ====> ${CMAKE_SOURCE_DIR}")
-       set(CMAKE_CXX_STANDARD 20)
-       add_executable(test_${name} test_${name}.cpp)
-       add_library( libsessiond_test STATIC ${CMAKE_SOURCE_DIR}/libsessiond/src/lib.c)
-       include_directories(${CMAKE_SOURCE_DIR}/libsessiond/include ${GTEST_INCLUDE_DIR})
-       target_link_libraries(test_${name} libsessiond_test gtest_main gtest ${wraps})
-       gtest_discover_tests(test_${name})
-
-       endfunction(add_libsd_mocked_test)
-
-add_libsd_mocked_test(h_lib  "")

diff --git a/libsessiond/test/test_h_lib.cpp b/libsessiond/test/test_h_lib.cpp
deleted file mode 100644 (file)
index fea3b24..0000000
--- a/libsessiond/test/test_h_lib.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include<iostream>
-#include <gtest/gtest.h>
-
-#include "sessiond.h"
-
-// Test
-TEST(subsession_add_user_test, AddUserTest) {
-       int res = subsession_add_user(0, 0, NULL, NULL);
-       EXPECT_EQ(res,0);
-}

diff --git a/packaging/sessiond.spec b/packaging/sessiond.spec
index 54f8e63..6ba1f11 100644 (file)
--- a/packaging/sessiond.spec
+++ b/packaging/sessiond.spec
@@ -46,7 +46,6 @@ mkdir -p build
 pushd build
 %cmake .. -DVERSION=%{version} -DCMAKE_BUILD_TYPE=Release
 make %{?jobs:-j%jobs}
-make %{?jobs:-j%jobs} test
 popd
 cp %{SOURCE1} .
 
@@ -91,6 +90,7 @@ popd
 %manifest sessiond.manifest
 %license LICENSE.MIT
 %{_bindir}/test_*
+%{_bindir}/sessiond-integration-tests.sh
 
 %files -n subsession-client-example
 %manifest sessiond.manifest

diff --git a/sessiond/test/CMakeLists.txt b/sessiond/test/CMakeLists.txt
deleted file mode 100644 (file)
index 891a137..0000000
--- a/sessiond/test/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-function(add_sd_mocked_test name wraps)
-
-       message("cmake sessiond test src dir ====> ${CMAKE_SOURCE_DIR}")
-       set(CMAKE_CXX_STANDARD 20)
-       add_executable(test_${name} test_${name}.cpp)
-       #uncomment this line when add functions/files to test
-
-       #add_library( sessiond_test STATIC ${CMAKE_SOURCE_DIR}/sessiond/src/files.c)
-
-       #uncomment this line when "include" directory for local includes exists
-       #include_directories(${CMAKE_SOURCE_DIR}/sessiond/include ${GTEST_INCLUDE_DIR})
-
-       #add additional libs here
-       target_link_libraries(test_${name}  gtest_main gtest  ${wraps})
-       gtest_discover_tests(test_${name})
-
-endfunction(add_sd_mocked_test)
-
-add_sd_mocked_test(one  "")

diff --git a/sessiond/test/test_one.cpp b/sessiond/test/test_one.cpp
deleted file mode 100644 (file)
index d7a39db..0000000
--- a/sessiond/test/test_one.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include<iostream>
-#include <gtest/gtest.h>
-
-// this test will fail
-TEST(test_one, TestOne) {
-       EXPECT_EQ(0,1);
-}

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644 (file)
index 0000000..051d4f8
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_subdirectory(client_example)
+add_subdirectory(integration)
+
+option(ENABLE_TARGET_TESTS "On target API tests" ON)
+if(ENABLE_TARGET_TESTS)
+       find_package(GTest REQUIRED)
+       add_subdirectory(api_tests)
+endif(ENABLE_TARGET_TESTS)
+
+enable_testing()

diff --git a/libsessiond/target_test/CMakeLists.txt b/tests/api_tests/CMakeLists.txt
similarity index 100%
rename from libsessiond/target_test/CMakeLists.txt
rename to tests/api_tests/CMakeLists.txt

diff --git a/libsessiond/target_test/test_api_add_remove_user.cpp b/tests/api_tests/test_api_add_remove_user.cpp
similarity index 100%
rename from libsessiond/target_test/test_api_add_remove_user.cpp
rename to tests/api_tests/test_api_add_remove_user.cpp

diff --git a/libsessiond/target_test/test_api_add_remove_user_err.cpp b/tests/api_tests/test_api_add_remove_user_err.cpp
similarity index 100%
rename from libsessiond/target_test/test_api_add_remove_user_err.cpp
rename to tests/api_tests/test_api_add_remove_user_err.cpp

diff --git a/libsessiond/target_test/test_api_adduserwait.cpp b/tests/api_tests/test_api_adduserwait.cpp
similarity index 100%
rename from libsessiond/target_test/test_api_adduserwait.cpp
rename to tests/api_tests/test_api_adduserwait.cpp

diff --git a/libsessiond/target_test/test_api_event_wait_done_err.cpp b/tests/api_tests/test_api_event_wait_done_err.cpp
similarity index 100%
rename from libsessiond/target_test/test_api_event_wait_done_err.cpp
rename to tests/api_tests/test_api_event_wait_done_err.cpp

diff --git a/libsessiond/target_test/test_api_get_user_list.cpp b/tests/api_tests/test_api_get_user_list.cpp
similarity index 100%
rename from libsessiond/target_test/test_api_get_user_list.cpp
rename to tests/api_tests/test_api_get_user_list.cpp

diff --git a/libsessiond/target_test/test_api_register_event_err.cpp b/tests/api_tests/test_api_register_event_err.cpp
similarity index 100%
rename from libsessiond/target_test/test_api_register_event_err.cpp
rename to tests/api_tests/test_api_register_event_err.cpp

diff --git a/libsessiond/target_test/test_api_removeuserwait.cpp b/tests/api_tests/test_api_removeuserwait.cpp
similarity index 100%
rename from libsessiond/target_test/test_api_removeuserwait.cpp
rename to tests/api_tests/test_api_removeuserwait.cpp

diff --git a/libsessiond/target_test/test_api_switch_user_completion.cpp b/tests/api_tests/test_api_switch_user_completion.cpp
similarity index 100%
rename from libsessiond/target_test/test_api_switch_user_completion.cpp
rename to tests/api_tests/test_api_switch_user_completion.cpp

diff --git a/libsessiond/target_test/test_api_switch_user_wait.cpp b/tests/api_tests/test_api_switch_user_wait.cpp
similarity index 100%
rename from libsessiond/target_test/test_api_switch_user_wait.cpp
rename to tests/api_tests/test_api_switch_user_wait.cpp

diff --git a/libsessiond/target_test/test_api_switchuser.cpp b/tests/api_tests/test_api_switchuser.cpp
similarity index 100%
rename from libsessiond/target_test/test_api_switchuser.cpp
rename to tests/api_tests/test_api_switchuser.cpp

diff --git a/libsessiond/target_test/test_api_switchuser_err.cpp b/tests/api_tests/test_api_switchuser_err.cpp
similarity index 100%
rename from libsessiond/target_test/test_api_switchuser_err.cpp
rename to tests/api_tests/test_api_switchuser_err.cpp

diff --git a/libsessiond/target_test/test_hlp.hpp b/tests/api_tests/test_hlp.hpp
similarity index 100%
rename from libsessiond/target_test/test_hlp.hpp
rename to tests/api_tests/test_hlp.hpp

diff --git a/clientExample/CMakeLists.txt b/tests/client_example/CMakeLists.txt
similarity index 90%
rename from clientExample/CMakeLists.txt
rename to tests/client_example/CMakeLists.txt
index 2b729b3..5b486fb 100644 (file)
--- a/clientExample/CMakeLists.txt
+++ b/tests/client_example/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 find_package(PkgConfig)
 pkg_check_modules(DEPS REQUIRED IMPORTED_TARGET glib-2.0 gio-2.0 gobject-2.0)
 
-add_executable(subsession-client-example app/main.cpp)
+add_executable(subsession-client-example main.cpp)
 target_compile_features(subsession-client-example PUBLIC cxx_std_20)
 target_link_libraries(subsession-client-example PRIVATE PkgConfig::DEPS libsessiond)
 install(TARGETS subsession-client-example)

diff --git a/clientExample/app/main.cpp b/tests/client_example/main.cpp
similarity index 100%
rename from clientExample/app/main.cpp
rename to tests/client_example/main.cpp

diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2f02827
--- /dev/null
+++ b/tests/integration/CMakeLists.txt
@@ -0,0 +1,3 @@
+install(FILES sessiond-integration-tests.sh
+       DESTINATION bin
+       PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

diff --git a/sessiond-integration-tests.sh b/tests/integration/sessiond-integration-tests.sh
similarity index 100%
rename from sessiond-integration-tests.sh
rename to tests/integration/sessiond-integration-tests.sh