From: Bastian Dehn Date: Tue, 5 May 2026 12:40:00 +0000 (+0200) Subject: change tests one execute run X-Git-Tag: v1.1.30^2~11 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=dcd69f9c5ad1bbde690bb3deec9dc341ee46a979;p=sane-kds-s2000w-net.git change tests one execute run --- diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4676993..183c214 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -13,108 +13,32 @@ execute_process(COMMAND bash -c "${CPPCHECK} --version | sed -z 's/Cppcheck \\(. message(STATUS "CPPCHECK_VERSION: ${CPPCHECK_VERSION}") -add_executable(kds_s2000w_net_get_opt_tests - kds_s2000w_net_get_opt_tests.c - kds_s2000w_client_mock.c) -add_dependencies(kds_s2000w_net_get_opt_tests - sane-kds_s2000w_net-static) -target_link_libraries(kds_s2000w_net_get_opt_tests - ${CMOCKA_LIBRARY} - sane-kds_s2000w_net-static) +file(COPY ${CMAKE_SOURCE_DIR}/src/kds_s2000w_net.conf + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -add_executable(kds_s2000w_net_set_opt_tests +add_executable(run_tests + run_tests.c + kds_s2000w_client_mock.c + kds_s2000w_net_get_opt_tests.c kds_s2000w_net_set_opt_tests.c - kds_s2000w_client_mock.c) -add_dependencies(kds_s2000w_net_set_opt_tests sane-kds_s2000w_net-static) -target_link_libraries(kds_s2000w_net_set_opt_tests - ${CMOCKA_LIBRARY} - sane-kds_s2000w_net-static) - -add_executable(kds_s2000w_net_read_tests kds_s2000w_net_read_tests.c - kds_s2000w_client_mock.c) -add_dependencies(kds_s2000w_net_read_tests - sane-kds_s2000w_net-static) -target_link_libraries(kds_s2000w_net_read_tests - ${CMOCKA_LIBRARY} - sane-kds_s2000w_net-static) - -add_executable(kds_s2000w_net_tests kds_s2000w_net_tests.c - kds_s2000w_client_mock.c) -add_dependencies(kds_s2000w_net_tests - sane-kds_s2000w_net-static) -target_link_libraries(kds_s2000w_net_tests - ${CMOCKA_LIBRARY} - sane-kds_s2000w_net-static) - -file(COPY ${CMAKE_SOURCE_DIR}/src/kds_s2000w_net.conf - DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -add_executable(kds_s2000w_read_config_tests kds_s2000w_read_config_tests.c - kds_s2000w_client_mock.c) -add_dependencies(kds_s2000w_read_config_tests - sane-kds_s2000w_net-static) -target_link_libraries(kds_s2000w_read_config_tests - ${CMOCKA_LIBRARY} - sane-kds_s2000w_net-static) - -add_executable(kds_s2000w_image_converter_tests kds_s2000w_image_converter_tests.c - kds_s2000w_client_mock.c) -add_dependencies(kds_s2000w_image_converter_tests - sane-kds_s2000w_net-static) -target_link_libraries(kds_s2000w_image_converter_tests - ${CMOCKA_LIBRARY} - sane-kds_s2000w_net-static) - -add_executable(kds_s2000w_option_descriptor_tests kds_s2000w_option_descriptor_tests.c - kds_s2000w_client_mock.c) -add_dependencies(kds_s2000w_option_descriptor_tests - sane-kds_s2000w_net-static) -target_link_libraries(kds_s2000w_option_descriptor_tests - ${CMOCKA_LIBRARY} - sane-kds_s2000w_net-static) - -add_executable(kds_s2000w_image_type_check_tests kds_s2000w_image_type_check_tests.c - kds_s2000w_client_mock.c) -add_dependencies(kds_s2000w_image_type_check_tests - sane-kds_s2000w_net-static) -target_link_libraries(kds_s2000w_image_type_check_tests - ${CMOCKA_LIBRARY} - sane-kds_s2000w_net-static) - -add_executable(kds_s2000w_pixel_converter_tests kds_s2000w_pixel_converter_tests.c kds_s2000w_client_mock.c) -add_dependencies(kds_s2000w_pixel_converter_tests +add_dependencies(run_tests sane-kds_s2000w_net-static) -target_link_libraries(kds_s2000w_pixel_converter_tests +target_link_libraries(run_tests ${CMOCKA_LIBRARY} sane-kds_s2000w_net-static) add_custom_target(runningtests - ALL ./kds_s2000w_read_config_tests - COMMAND ./kds_s2000w_option_descriptor_tests - COMMAND ./kds_s2000w_net_get_opt_tests - COMMAND ./kds_s2000w_net_set_opt_tests - COMMAND ./kds_s2000w_net_tests - COMMAND ./kds_s2000w_net_read_tests - COMMAND ./kds_s2000w_image_type_check_tests - COMMAND ./kds_s2000w_image_converter_tests - COMMAND ./kds_s2000w_pixel_converter_tests + ALL ./run_tests WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS kds_s2000w_read_config_tests - kds_s2000w_option_descriptor_tests - kds_s2000w_net_get_opt_tests - kds_s2000w_net_set_opt_tests - kds_s2000w_net_tests - kds_s2000w_net_read_tests - kds_s2000w_image_type_check_tests - kds_s2000w_image_converter_tests - kds_s2000w_pixel_converter_tests) + DEPENDS run_tests) add_custom_command(TARGET runningtests POST_BUILD diff --git a/tests/kds_s2000w_image_converter_tests.c b/tests/kds_s2000w_image_converter_tests.c index fd44d25..95037b8 100644 --- a/tests/kds_s2000w_image_converter_tests.c +++ b/tests/kds_s2000w_image_converter_tests.c @@ -57,7 +57,7 @@ void get_metadata_from_image_test() mdata = NULL; } -int main() +int run_kds_s2000w_image_converter_tests() { const struct CMUnitTest kds_s2000w_image_converter_tests[] = { cmocka_unit_test(get_metadata_from_image_test) diff --git a/tests/kds_s2000w_image_type_check_tests.c b/tests/kds_s2000w_image_type_check_tests.c index a7ab7ac..10de67a 100644 --- a/tests/kds_s2000w_image_type_check_tests.c +++ b/tests/kds_s2000w_image_type_check_tests.c @@ -160,7 +160,7 @@ void kds_s2000w_image_type_check_is_jpeg_false_test() image = NULL; } -int main() +int run_kds_s2000w_image_type_check_tests() { const struct CMUnitTest kds_s2000w_image_type_check_tests[] = { cmocka_unit_test(kds_s2000w_image_type_check_is_tiff_true_test), diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 455c71f..0f07e3b 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -16,7 +16,7 @@ #define FULL_PROFILE_MAX_OPTION_COUNT 48 -int setup(void** state) +int _kds_s2000w_net_get_opt_setup(void** state) { mask_option_t* mask = malloc(sizeof(mask_option_t)); if (mask == NULL) @@ -91,7 +91,7 @@ int setup(void** state) return 0; } -int teardown(void** state) +int _kds_s2000w_net_get_opt_teardown(void** state) { kds_s2000w_option_descriptors_free(); response_t* resp = (response_t*) *state; @@ -1001,7 +1001,7 @@ void sane_kds_s2000w_net_could_not_load_options_by_set(void** state) resp = NULL; } -int main() +int run_kds_s2000w_net_get_opt_tests() { const struct CMUnitTest kds_s2000w_net_get_opt_tests[] = { cmocka_unit_test(sane_kds_s2000w_net_control_get_option_zero_test), @@ -1049,5 +1049,7 @@ int main() cmocka_unit_test(sane_kds_s2000w_net_could_not_load_options_by_set) }; - return cmocka_run_group_tests(kds_s2000w_net_get_opt_tests, setup, teardown); + return cmocka_run_group_tests(kds_s2000w_net_get_opt_tests, + _kds_s2000w_net_get_opt_setup, + _kds_s2000w_net_get_opt_teardown); } \ No newline at end of file diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c index 3d859a6..4557954 100644 --- a/tests/kds_s2000w_net_read_tests.c +++ b/tests/kds_s2000w_net_read_tests.c @@ -149,7 +149,7 @@ void sane_kds_s2000w_net_read_bytes_per_line_bigger_test() h = NULL; } -int main() +int run_kds_s2000w_net_read_tests() { const struct CMUnitTest kds_s2000w_net_read_tests[] = { cmocka_unit_test(sane_kds_s2000w_net_read_test), diff --git a/tests/kds_s2000w_net_set_opt_tests.c b/tests/kds_s2000w_net_set_opt_tests.c index 53dcb09..d98e3e4 100644 --- a/tests/kds_s2000w_net_set_opt_tests.c +++ b/tests/kds_s2000w_net_set_opt_tests.c @@ -11,7 +11,7 @@ #include "../src/kds_s2000w_handler.h" #include "../src/kds_s2000w_option_descriptors.h" -int setup(void** state) +int _kds_s2000w_net_set_opt_setup(void** state) { mask_option_t* mask = malloc(sizeof(mask_option_t)); if (mask == NULL) @@ -95,7 +95,7 @@ int setup(void** state) return 0; } -int teardown(void** state) +int _kds_s2000w_net_set_opt_teardown(void** state) { kds_s2000w_option_descriptors_free(); response_t** responses = (response_t**) *state; @@ -769,7 +769,7 @@ void kds_s2000w_net_set_option_color_dropout_and_deps(void** state) info = NULL; } -int main() +int run_kds_s2000w_net_set_opt_tests() { const struct CMUnitTest kds_s2000w_net_set_opt_tests[] = { cmocka_unit_test(kds_s2000w_net_set_no_option_is_started_test), @@ -792,5 +792,7 @@ int main() cmocka_unit_test(kds_s2000w_net_set_option_color_dropout_and_deps) }; - return cmocka_run_group_tests(kds_s2000w_net_set_opt_tests, setup, teardown); + return cmocka_run_group_tests(kds_s2000w_net_set_opt_tests, + _kds_s2000w_net_set_opt_setup, + _kds_s2000w_net_set_opt_teardown); } \ No newline at end of file diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c index 53db96d..a5b6d30 100644 --- a/tests/kds_s2000w_net_tests.c +++ b/tests/kds_s2000w_net_tests.c @@ -16,7 +16,7 @@ #define MINOR 1 #define PATCH 29 -int setup(void** state) +int _kds_s2000w_net_setup(void** state) { response_t** response_list = malloc(sizeof(response_t*) * 5); if (response_list == NULL) @@ -121,7 +121,7 @@ int setup(void** state) return 0; } -int teardown(void** state) +int _kds_s2000w_net_teardown(void** state) { response_t** respons_list = (response_t**) *state; for (uint32_t i = 0; respons_list[i] != NULL; i++) { @@ -987,7 +987,7 @@ void kds_s2000w_handler_filter_availables_options_profile_v1_0_36_test() mask = NULL; } -int main() +int run_kds_s2000w_net_tests() { const struct CMUnitTest kds_s2000w_net_tests[] = { cmocka_unit_test(kds_s2000w_net_init_test), @@ -1021,5 +1021,5 @@ int main() cmocka_unit_test(kds_s2000w_handler_filter_availables_options_profile_v1_0_36_test) }; - return cmocka_run_group_tests(kds_s2000w_net_tests, setup, teardown); + return cmocka_run_group_tests(kds_s2000w_net_tests, _kds_s2000w_net_setup, _kds_s2000w_net_teardown); } \ No newline at end of file diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index 1396edc..087d5cb 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -25,7 +25,7 @@ void _kds_s2000w_option_init_descriptor_no_mem(int16_t no_mem_count) assert_int_equal(status, SANE_STATUS_NO_MEM); } -int setup(void** state) +int _kds_s2000w_option_descriptor_setup(void** state) { mask_option_t* mask = malloc(sizeof(mask_option_t)); if (mask == NULL) @@ -39,7 +39,7 @@ int setup(void** state) return status; } -int teardown(void **state) +int _kds_s2000w_option_descriptor_teardown(void **state) { kds_s2000w_option_descriptors_free(); return 0; @@ -934,7 +934,7 @@ void kds_s2000w_option_get_min_profile_from_mask() kds_s2000w_option_descriptors_free(); } -int main() +int run_kds_s2000w_option_descriptor_tests() { const struct CMUnitTest kds_s2000w_option_descriptor_tests[] = { cmocka_unit_test(kds_s2000w_option_get_descriptor_zero_test), @@ -994,5 +994,7 @@ int main() cmocka_unit_test(kds_s2000w_option_get_min_profile_from_mask) }; - return cmocka_run_group_tests(kds_s2000w_option_descriptor_tests, setup, teardown); + return cmocka_run_group_tests(kds_s2000w_option_descriptor_tests, + _kds_s2000w_option_descriptor_setup, + _kds_s2000w_option_descriptor_teardown); } \ No newline at end of file diff --git a/tests/kds_s2000w_pixel_converter_tests.c b/tests/kds_s2000w_pixel_converter_tests.c index 34ce0de..9938bc7 100644 --- a/tests/kds_s2000w_pixel_converter_tests.c +++ b/tests/kds_s2000w_pixel_converter_tests.c @@ -35,7 +35,7 @@ void kds_s2000w_max_tl_x_tenth_inch_to_pixel_test() assert_int_equal(pixel, 2250); } -int main() +int run_kds_s2000w_pixel_converter_tests() { const struct CMUnitTest kds_s2000w_pixel_converter_tests[] = { cmocka_unit_test(kds_s2000w_max_tl_x_pixel_to_tenth_inch_test), diff --git a/tests/kds_s2000w_read_config_tests.c b/tests/kds_s2000w_read_config_tests.c index f2f1429..940f62d 100644 --- a/tests/kds_s2000w_read_config_tests.c +++ b/tests/kds_s2000w_read_config_tests.c @@ -170,7 +170,7 @@ void kds_s2000w_read_config_file_no_mem_test() } } -int main() +int run_kds_s2000w_read_config_tests() { const struct CMUnitTest kds_s2000w_read_config_tests[] = { cmocka_unit_test(kds_s2000w_config_null_test), diff --git a/tests/run_tests.c b/tests/run_tests.c new file mode 100644 index 0000000..4e39ed9 --- /dev/null +++ b/tests/run_tests.c @@ -0,0 +1,36 @@ +#include "kds_s2000w_client_mock.h" + +typedef int (*testgroupfn)(); + +int run_kds_s2000w_net_get_opt_tests(); +int run_kds_s2000w_net_set_opt_tests(); +int run_kds_s2000w_net_read_tests(); +int run_kds_s2000w_net_tests(); +int run_kds_s2000w_read_config_tests(); +int run_kds_s2000w_image_converter_tests(); +int run_kds_s2000w_option_descriptor_tests(); +int run_kds_s2000w_image_type_check_tests(); +int run_kds_s2000w_pixel_converter_tests(); + +int main() +{ + testgroupfn testgroups[] = { + run_kds_s2000w_net_get_opt_tests, + run_kds_s2000w_net_set_opt_tests, + run_kds_s2000w_net_read_tests, + run_kds_s2000w_net_tests, + run_kds_s2000w_read_config_tests, + run_kds_s2000w_image_converter_tests, + run_kds_s2000w_option_descriptor_tests, + run_kds_s2000w_image_type_check_tests, + run_kds_s2000w_pixel_converter_tests, + }; + + size_t count = sizeof(testgroups) / sizeof(testgroupfn); + for (size_t i = 0; i < count; i++) { + if (testgroups[i]()) + return 1; + } + + return 0; +} \ No newline at end of file