From 0ed21ada8db7e9ac61436f28c5c67572ea9f7d4f Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Tue, 7 Oct 2025 12:13:58 +0200 Subject: [PATCH] change read config tests single file --- tests/CMakeLists.txt | 11 +++++------ tests/kds_s2000w_read_config_tests.c | 23 ++++++++++++++++++++++- tests/kds_s2000w_read_config_tests.h | 19 ------------------- tests/kds_s2000w_read_config_tests_run.c | 18 ------------------ 4 files changed, 27 insertions(+), 44 deletions(-) delete mode 100644 tests/kds_s2000w_read_config_tests.h delete mode 100644 tests/kds_s2000w_read_config_tests_run.c diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5976b67..a68dbd3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -28,12 +28,11 @@ TARGET_LINK_LIBRARIES("kds_s2000w_net_tests" ${CMOCKA_LIBRARY} sane-kds_s2000w_net-static) -ADD_EXECUTABLE("kds_s2000w_read_config_tests_run" - "kds_s2000w_read_config_tests_run.c" +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_run" sane-kds_s2000w_net-static) -TARGET_LINK_LIBRARIES("kds_s2000w_read_config_tests_run" +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) @@ -61,7 +60,7 @@ TARGET_LINK_LIBRARIES("kds_s2000w_image_type_check_tests" sane-kds_s2000w_net-static) ADD_CUSTOM_TARGET("runningtests" - ALL ./kds_s2000w_read_config_tests_run + ALL ./kds_s2000w_read_config_tests COMMAND ./kds_s2000w_option_descriptor_tests COMMAND ./kds_s2000w_net_get_opt_tests COMMAND ./kds_s2000w_net_tests @@ -69,7 +68,7 @@ ADD_CUSTOM_TARGET("runningtests" COMMAND ./kds_s2000w_image_type_check_tests COMMAND ./kds_s2000w_image_converter_tests WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS "kds_s2000w_read_config_tests_run" + DEPENDS "kds_s2000w_read_config_tests" "kds_s2000w_option_descriptor_tests" "kds_s2000w_net_get_opt_tests" "kds_s2000w_net_tests" diff --git a/tests/kds_s2000w_read_config_tests.c b/tests/kds_s2000w_read_config_tests.c index b81843b..9dc9f15 100644 --- a/tests/kds_s2000w_read_config_tests.c +++ b/tests/kds_s2000w_read_config_tests.c @@ -1,6 +1,10 @@ +#include +#include +#include +#include +#include #include #include -#include "kds_s2000w_read_config_tests.h" #include "../src/kds_s2000w_config.h" void kds_s2000w_config_null_test() @@ -114,4 +118,21 @@ void kds_s2000w_config_profile_test() kds_s2000w_config_free(config); config = NULL; +} + +int main() +{ + const struct CMUnitTest read_config[] = { + cmocka_unit_test(kds_s2000w_config_null_test), + cmocka_unit_test(kds_s2000w_config_read_empty_config_test), + cmocka_unit_test(kds_s2000w_config_read_parameter_test), + cmocka_unit_test(kds_s2000w_config_read_parameters_without_trim_test), + cmocka_unit_test(kds_s2000w_config_multiple_parameters_test), + cmocka_unit_test(kds_s2000w_config_heartbeat_five_seconds_test), + cmocka_unit_test(kds_s2000w_config_default_heartbeat_zero_set_default_test), + cmocka_unit_test(kds_s2000w_config_ssl_verify_on_test), + cmocka_unit_test(kds_s2000w_config_profile_test) + }; + + return cmocka_run_group_tests(read_config, NULL, NULL); } \ No newline at end of file diff --git a/tests/kds_s2000w_read_config_tests.h b/tests/kds_s2000w_read_config_tests.h deleted file mode 100644 index 1ab6946..0000000 --- a/tests/kds_s2000w_read_config_tests.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef KDS_S2000W_READ_CONFIG_TESTS_H -#define KDS_S2000W_READ_CONFIG_TESTS_H -#include -#include -#include -#include -#include - -void kds_s2000w_config_null_test(); -void kds_s2000w_config_read_empty_config_test(); -void kds_s2000w_config_read_parameter_test(); -void kds_s2000w_config_read_parameters_without_trim_test(); -void kds_s2000w_config_multiple_parameters_test(); -void kds_s2000w_config_heartbeat_five_seconds_test(); -void kds_s2000w_config_default_heartbeat_zero_set_default_test(); -void kds_s2000w_config_ssl_verify_on_test(); -void kds_s2000w_config_profile_test(); - -#endif \ No newline at end of file diff --git a/tests/kds_s2000w_read_config_tests_run.c b/tests/kds_s2000w_read_config_tests_run.c deleted file mode 100644 index 5a31e32..0000000 --- a/tests/kds_s2000w_read_config_tests_run.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "kds_s2000w_read_config_tests.h" - -int main() -{ - const struct CMUnitTest read_config[] = { - cmocka_unit_test(kds_s2000w_config_null_test), - cmocka_unit_test(kds_s2000w_config_read_empty_config_test), - cmocka_unit_test(kds_s2000w_config_read_parameter_test), - cmocka_unit_test(kds_s2000w_config_read_parameters_without_trim_test), - cmocka_unit_test(kds_s2000w_config_multiple_parameters_test), - cmocka_unit_test(kds_s2000w_config_heartbeat_five_seconds_test), - cmocka_unit_test(kds_s2000w_config_default_heartbeat_zero_set_default_test), - cmocka_unit_test(kds_s2000w_config_ssl_verify_on_test), - cmocka_unit_test(kds_s2000w_config_profile_test) - }; - - return cmocka_run_group_tests(read_config, NULL, NULL); -} \ No newline at end of file -- 2.47.3