aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-05-16 22:50:26 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-05-17 12:21:14 +0200
commit49d522e6bc2a513887277371e90838b742528b42 (patch)
tree1c9d1bc81642b96d15eeed5a6e3c7c3762dd72c2 /tests
parent9c35f2f49d11f5836b348874a655d51b7322e0f8 (diff)
downloadlibayatana-indicator-49d522e6bc2a513887277371e90838b742528b42.tar.gz
libayatana-indicator-49d522e6bc2a513887277371e90838b742528b42.tar.bz2
libayatana-indicator-49d522e6bc2a513887277371e90838b742528b42.zip
tests/CMakeLists.txt: Rewrite to fix tests and coverage
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt323
1 files changed, 267 insertions, 56 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4c24321..98684fa 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,71 +6,282 @@ else()
set (ayatana_indicator_gtkver "ayatana-indicator")
endif()
-function(add_test_helper_by_name name)
- set (TEST_HELPER_NAME ${name})
- set_source_files_properties(${TEST_HELPER_NAME}.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
- add_library("${TEST_HELPER_NAME}" SHARED ${TEST_HELPER_NAME}.c)
- target_include_directories("${TEST_HELPER_NAME}" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
- target_include_directories("${TEST_HELPER_NAME}" PUBLIC "${CMAKE_SOURCE_DIR}/src")
- target_link_libraries("${TEST_HELPER_NAME}" ${PROJECT_DEPS_LIBRARIES} -l${ayatana_indicator_gtkver})
- target_link_directories("${TEST_HELPER_NAME}" PUBLIC "${CMAKE_BINARY_DIR}/src")
- add_dependencies("${TEST_HELPER_NAME}" "${ayatana_indicator_gtkver}")
+find_program(DBUS_TEST_RUNNER dbus-test-runner)
+
+function(add_test_library_by_name name)
+ set (TEST_LIBRARY_NAME ${name})
+ set_source_files_properties(${TEST_LIBRARY_NAME}.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+ add_library("${TEST_LIBRARY_NAME}" SHARED ${TEST_LIBRARY_NAME}.c)
+ target_include_directories("${TEST_LIBRARY_NAME}" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+ target_include_directories("${TEST_LIBRARY_NAME}" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+ target_link_libraries("${TEST_LIBRARY_NAME}" ${PROJECT_DEPS_LIBRARIES} -l${ayatana_indicator_gtkver})
+ target_link_directories("${TEST_LIBRARY_NAME}" PUBLIC "${CMAKE_BINARY_DIR}/src")
+ add_dependencies("${TEST_LIBRARY_NAME}" "${ayatana_indicator_gtkver}")
+endfunction()
+
+function(add_test_executable_by_name name)
+ set (TEST_EXECUTABLE_NAME ${name})
+ set_source_files_properties(${TEST_EXECUTABLE_NAME}.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+ add_executable("${TEST_EXECUTABLE_NAME}" ${TEST_EXECUTABLE_NAME}.c)
+ target_compile_definitions("${TEST_EXECUTABLE_NAME}" PUBLIC BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}")
+ target_compile_definitions("${TEST_EXECUTABLE_NAME}" PUBLIC SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
+ target_include_directories("${TEST_EXECUTABLE_NAME}" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+ target_include_directories("${TEST_EXECUTABLE_NAME}" PUBLIC "${CMAKE_SOURCE_DIR}/src")
+ target_link_libraries("${TEST_EXECUTABLE_NAME}" ${PROJECT_DEPS_LIBRARIES} -l${ayatana_indicator_gtkver})
+ target_link_directories("${TEST_EXECUTABLE_NAME}" PUBLIC "${CMAKE_BINARY_DIR}/src")
+ add_dependencies("${TEST_EXECUTABLE_NAME}" "${ayatana_indicator_gtkver}")
endfunction()
-add_test_helper_by_name(dummy-indicator-blank)
-add_test_helper_by_name(dummy-indicator-entry-func)
-add_test_helper_by_name(dummy-indicator-null)
-add_test_helper_by_name(dummy-indicator-signaler)
-add_test_helper_by_name(dummy-indicator-simple)
-add_test_helper_by_name(dummy-indicator-visible)
-add_test_helper_by_name(service-manager-connect)
-add_test_helper_by_name(service-manager-connect-service)
-add_test_helper_by_name(service-manager-no-connect)
-add_test_helper_by_name(service-manager-nostart-connect)
-add_test_helper_by_name(service-shutdown-timeout)
-add_test_helper_by_name(service-version-bad-service)
-add_test_helper_by_name(service-version-good-service)
-add_test_helper_by_name(service-version-manager)
-add_test_helper_by_name(service-version-multiwatch-manager)
-add_test_helper_by_name(service-version-multiwatch-manager-impolite)
-add_test_helper_by_name(service-version-multiwatch-service)
+add_test_library_by_name(dummy-indicator-blank)
+add_test_library_by_name(dummy-indicator-entry-func)
+add_test_library_by_name(dummy-indicator-null)
+add_test_library_by_name(dummy-indicator-signaler)
+add_test_library_by_name(dummy-indicator-simple)
+add_test_library_by_name(dummy-indicator-visible)
+
+# session.conf
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/session.conf" @ONLY)
+
+# service-manager-connect.service
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/service-manager-connect.service.in" "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect.service" @ONLY)
+
+# service-manager-connect
+add_test_executable_by_name(service-manager-connect)
+
+# service-manager-connect-tester
+add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-tester"
+ DEPENDS "service-manager-connect"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ VERBATIM
+ COMMAND
+ echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-tester"
+ COMMAND
+ echo "${DBUS_TEST_RUNNER} --dbus-config ${CMAKE_CURRENT_BINARY_DIR}/session.conf --task ${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect" >> "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-tester"
+ COMMAND
+ chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-tester"
+)
+add_test("service-manager-connect-tester" "service-manager-connect-tester")
+
+# service-manager-connect-service
+add_test_executable_by_name(service-manager-connect-service)
+
+# service-manager-no-connect
+add_test_executable_by_name(service-manager-no-connect)
+
+# service-manager-no-connect-tester
+add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-manager-no-connect-tester"
+ DEPENDS "service-manager-no-connect"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ VERBATIM
+ COMMAND
+ echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-manager-no-connect-tester"
+ COMMAND
+ echo "${DBUS_TEST_RUNNER} --dbus-config /usr/share/dbus-test-runner/session.conf --task ${CMAKE_CURRENT_BINARY_DIR}/service-manager-no-connect" >> "${CMAKE_CURRENT_BINARY_DIR}/service-manager-no-connect-tester"
+ COMMAND
+ chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-manager-no-connect-tester"
+)
+add_test("service-manager-no-connect-tester" "service-manager-no-connect-tester")
+
+# service-manager-nostart-connect
+add_test_executable_by_name(service-manager-nostart-connect)
+
+# service-manager-connect-nostart-tester
+add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-nostart-tester"
+ DEPENDS "service-manager-connect-service"
+ DEPENDS "service-manager-nostart-connect"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ VERBATIM
+ COMMAND
+ echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-nostart-tester"
+ COMMAND
+ echo "${DBUS_TEST_RUNNER} --task ${CMAKE_CURRENT_BINARY_DIR}/service-manager-nostart-connect --task ${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-service" >> "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-nostart-tester"
+ COMMAND
+ chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-nostart-tester"
+)
+add_test("service-manager-connect-nostart-tester" "service-manager-connect-nostart-tester")
+
+# service-shutdown-timeout
+add_test_executable_by_name(service-shutdown-timeout)
+
+# service-shutdown-timeout-tester
+add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-shutdown-timeout-tester"
+ DEPENDS "service-shutdown-timeout"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ VERBATIM
+ COMMAND
+ echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-shutdown-timeout-tester"
+ COMMAND
+ echo "${DBUS_TEST_RUNNER} --dbus-config /usr/share/dbus-test-runner/session.conf --task ${CMAKE_CURRENT_BINARY_DIR}/service-shutdown-timeout" >> "${CMAKE_CURRENT_BINARY_DIR}/service-shutdown-timeout-tester"
+ COMMAND
+ chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-shutdown-timeout-tester"
+)
+add_test("service-shutdown-timeout-tester" "service-shutdown-timeout-tester")
+
+# service-version-bad.service
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/service-version-bad.service.in" "${CMAKE_CURRENT_BINARY_DIR}/service-version-bad.service" @ONLY)
+
+# service-version-bad-service
+add_test_executable_by_name(service-version-bad-service)
+
+# service-version-good.service
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/service-version-good.service.in" "${CMAKE_CURRENT_BINARY_DIR}/service-version-good.service" @ONLY)
+
+# service-version-good-service
+add_test_executable_by_name(service-version-good-service)
+
+# service-version-manager
+add_test_executable_by_name(service-version-manager)
+
+# service-version-tester
+add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-version-tester"
+ DEPENDS "service-shutdown-timeout"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ VERBATIM
+ COMMAND
+ echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-version-tester"
+ COMMAND
+ echo "${DBUS_TEST_RUNNER} --dbus-config ${CMAKE_CURRENT_BINARY_DIR}/session.conf --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-manager" >> "${CMAKE_CURRENT_BINARY_DIR}/service-version-tester"
+ COMMAND
+ chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-version-tester"
+)
+add_test("service-version-tester" "service-version-tester")
+
+# service-version-multiwatch-manager
+add_test_executable_by_name(service-version-multiwatch-manager)
+
+# service-version-multiwatch-manager-impolite
+add_test_executable_by_name(service-version-multiwatch-manager-impolite)
+
+# service-version-multiwatch-service
+add_test_executable_by_name(service-version-multiwatch-service)
+
+# service-version-multiwatch-tester
+add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-tester"
+ DEPENDS "service-version-multiwatch-manager"
+ DEPENDS "service-version-multiwatch-manager-impolite"
+ DEPENDS "service-version-multiwatch-service"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ VERBATIM
+ COMMAND
+ echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-tester"
+ COMMAND
+ echo "${DBUS_TEST_RUNNER} --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-service --task-name Service --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager --task-name Manager1 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager --task-name Manager2 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager --task-name Manager3 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager --task-name Manager4 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager --task-name Manager5 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager-impolite --task-name Impolite1 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager-impolite --task-name Impolite2 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager-impolite --task-name Impolite3" >> "${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-tester"
+ COMMAND
+ chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-tester"
+)
+add_test("service-version-multiwatch-tester" "service-version-multiwatch-tester")
# test-desktop-shortcuts
+add_test_executable_by_name(test-desktop-shortcuts)
-set_source_files_properties(test-desktop-shortcuts.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
-add_executable("test-desktop-shortcuts" test-desktop-shortcuts.c)
-target_compile_definitions("test-desktop-shortcuts" PUBLIC BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}")
-target_compile_definitions("test-desktop-shortcuts" PUBLIC SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
-target_include_directories("test-desktop-shortcuts" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
-target_include_directories("test-desktop-shortcuts" PUBLIC "${CMAKE_SOURCE_DIR}/src")
-target_link_libraries("test-desktop-shortcuts" ${PROJECT_DEPS_LIBRARIES} -l${ayatana_indicator_gtkver})
-target_link_directories("test-desktop-shortcuts" PUBLIC "${CMAKE_BINARY_DIR}/src")
-add_dependencies("test-desktop-shortcuts" "${ayatana_indicator_gtkver}")
-add_test("test-desktop-shortcuts" "test-desktop-shortcuts")
+# test-desktop-shortcuts-tester
+add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester"
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ VERBATIM
+ COMMAND
+ echo "#!/bin/bash" > "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester"
+ COMMAND
+ echo ". ${CMAKE_CURRENT_SOURCE_DIR}/run-xvfb.sh" >> "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester"
+ COMMAND
+ echo "gtester -k --verbose -o=${CMAKE_CURRENT_BINARY_DIR}/loader-check-results.xml ${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts" >> "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester"
+ COMMAND
+ chmod +x "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester"
+)
+add_test("test-desktop-shortcuts-tester" "test-desktop-shortcuts-tester")
+
+if (FLAVOUR_GTK3)
+ # test-indicator-ng
+ add_test_executable_by_name(test-indicator-ng)
+
+ # org.ayatana.indicator.test.service
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.indicator.test.service.in" "${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.indicator.test.service" @ONLY)
+
+ # test-indicator-ng-dbus-runner
+ add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner"
+ DEPENDS "test-indicator-ng"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ VERBATIM
+ COMMAND
+ echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner"
+ COMMAND
+ echo "${DBUS_TEST_RUNNER} --dbus-config /usr/share/dbus-test-runner/session.conf --task ${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng" >> "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner"
+ COMMAND
+ chmod +x "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner"
+ )
+
+ # test-indicator-ng-tester
+ add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester"
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ VERBATIM
+ COMMAND
+ echo "#!/bin/bash" > "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester"
+ COMMAND
+ echo ". ${CMAKE_CURRENT_SOURCE_DIR}/run-xvfb.sh" >> "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester"
+ COMMAND
+ echo "gtester -k --verbose -o=${CMAKE_CURRENT_BINARY_DIR}/loader-check-results.xml ${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner" >> "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester"
+ COMMAND
+ chmod +x "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester"
+ )
+ add_test("test-indicator-ng-tester" "test-indicator-ng-tester")
+endif(FLAVOUR_GTK3)
# test-loader
+add_test_executable_by_name(test-loader)
+
+# loader-tester
+add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/loader-tester"
+ DEPENDS "test-loader"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ VERBATIM
+ COMMAND
+ echo "#!/bin/bash" > "${CMAKE_CURRENT_BINARY_DIR}/loader-tester"
+ COMMAND
+ echo ". ${CMAKE_CURRENT_SOURCE_DIR}/run-xvfb.sh" >> "${CMAKE_CURRENT_BINARY_DIR}/loader-tester"
+ COMMAND
+ echo "gtester -k --verbose -o=${CMAKE_CURRENT_BINARY_DIR}/loader-check-results.xml ${CMAKE_CURRENT_BINARY_DIR}/test-loader" >> "${CMAKE_CURRENT_BINARY_DIR}/loader-tester"
+ COMMAND
+ chmod +x "${CMAKE_CURRENT_BINARY_DIR}/loader-tester"
+)
+add_test("loader-tester" "loader-tester")
-set_source_files_properties(test-loader.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
-add_executable("test-loader" test-loader.c)
-target_compile_definitions("test-loader" PUBLIC BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}")
-target_include_directories("test-loader" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
-target_include_directories("test-loader" PUBLIC "${CMAKE_SOURCE_DIR}/src")
-target_link_libraries("test-loader" ${PROJECT_DEPS_LIBRARIES} -l${ayatana_indicator_gtkver})
-target_link_directories("test-loader" PUBLIC "${CMAKE_BINARY_DIR}/src")
-add_dependencies("test-loader" "${ayatana_indicator_gtkver}")
-add_test("test-loader" "test-loader")
+# indicator-test-service
+set_source_files_properties(indicator-test-service.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
+add_executable("indicator-test-service" indicator-test-service.c)
+target_include_directories("indicator-test-service" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
+target_link_libraries("indicator-test-service" ${PROJECT_DEPS_LIBRARIES})
-# test-indicator-ng
+set (ALL_TESTERS
+ "service-manager-connect-tester"
+ "service-manager-no-connect-tester"
+ "service-manager-connect-nostart-tester"
+ "service-shutdown-timeout-tester"
+ "service-version-tester"
+ "service-version-multiwatch-tester"
+ "test-desktop-shortcuts-tester"
+ "loader-tester"
+)
if (FLAVOUR_GTK3)
- set_source_files_properties(test-indicator-ng.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
- add_executable("test-indicator-ng" test-indicator-ng.c)
- target_compile_definitions("test-indicator-ng" PUBLIC BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}")
- target_compile_definitions("test-indicator-ng" PUBLIC SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
- target_include_directories("test-indicator-ng" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS})
- target_include_directories("test-indicator-ng" PUBLIC "${CMAKE_SOURCE_DIR}/src")
- target_link_libraries("test-indicator-ng" ${PROJECT_DEPS_LIBRARIES} -l${ayatana_indicator_gtkver})
- target_link_directories("test-indicator-ng" PUBLIC "${CMAKE_BINARY_DIR}/src")
- add_dependencies("test-indicator-ng" "${ayatana_indicator_gtkver}")
- add_test("test-indicator-ng" "test-indicator-ng")
+ set (ALL_TESTERS
+ ${ALL_TESTERS}
+ "test-indicator-ng-tester"
+ )
endif()
+
+add_custom_target("tests"
+ ALL
+ DEPENDS
+ ${ALL_TESTERS}
+)