From b476465b7049c0121ec0a70a6dece99b1a2201cc Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Tue, 7 Oct 2025 12:11:40 +0200 Subject: [PATCH] change option descriptor tests single file --- tests/CMakeLists.txt | 11 ++-- tests/kds_s2000w_option_descriptor_tests.c | 66 ++++++++++++++++++- tests/kds_s2000w_option_descriptor_tests.h | 63 ------------------ .../kds_s2000w_option_descriptor_tests_run.c | 61 ----------------- 4 files changed, 70 insertions(+), 131 deletions(-) delete mode 100644 tests/kds_s2000w_option_descriptor_tests.h delete mode 100644 tests/kds_s2000w_option_descriptor_tests_run.c diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0a7b99f..5976b67 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -45,12 +45,11 @@ TARGET_LINK_LIBRARIES("kds_s2000w_image_converter_tests" ${CMOCKA_LIBRARY} sane-kds_s2000w_net-static) -ADD_EXECUTABLE("kds_s2000w_option_descriptor_tests_run" - "kds_s2000w_option_descriptor_tests_run.c" +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_run" sane-kds_s2000w_net-static) -TARGET_LINK_LIBRARIES("kds_s2000w_option_descriptor_tests_run" +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) @@ -63,7 +62,7 @@ TARGET_LINK_LIBRARIES("kds_s2000w_image_type_check_tests" ADD_CUSTOM_TARGET("runningtests" ALL ./kds_s2000w_read_config_tests_run - COMMAND ./kds_s2000w_option_descriptor_tests_run + COMMAND ./kds_s2000w_option_descriptor_tests COMMAND ./kds_s2000w_net_get_opt_tests COMMAND ./kds_s2000w_net_tests COMMAND ./kds_s2000w_net_read_tests @@ -71,7 +70,7 @@ ADD_CUSTOM_TARGET("runningtests" COMMAND ./kds_s2000w_image_converter_tests WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS "kds_s2000w_read_config_tests_run" - "kds_s2000w_option_descriptor_tests_run" + "kds_s2000w_option_descriptor_tests" "kds_s2000w_net_get_opt_tests" "kds_s2000w_net_tests" "kds_s2000w_net_read_tests" diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index 315aaa9..c87159b 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -1,6 +1,10 @@ +#include +#include +#include +#include +#include #include #include -#include "kds_s2000w_option_descriptor_tests.h" #include "kds_s2000w_client_mock.h" #include "../src/kds_s2000w_option_descriptors.h" @@ -863,4 +867,64 @@ void kds_s2000w_option_full_get_descriptor_over_max_options_test() option_descriptor* option = kds_s2000w_option_descriptors_full_get_by_number(max_option_count); assert_null(option); +} + +int main() +{ + const struct CMUnitTest option_descriptor_tests[] = { + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_zero_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_one_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_two_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_three_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_four_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_five_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_six_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_seven_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eight_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_nine_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_ten_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eleven_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twelve_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdteen_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourteen_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fifteen_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_sixteen_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_seventeen_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eightteen_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_nineteen_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twenty_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyone_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentytwo_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentythree_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyfour_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyfive_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentysix_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyseven_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyeight_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentynine_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdy_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyone_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdytwo_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdythree_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyfour_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyfive_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdysix_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyseven_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyeight_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdynine_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourty_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyone_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtytwo_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtythree_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyfour_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyfive_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtysix_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyseven_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_get_by_config_name_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_over_max_options_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_full_get_descriptor_by_number, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_full_get_descriptor_over_max_options_test, setup, teardown), + }; + + return cmocka_run_group_tests(option_descriptor_tests, NULL, NULL); } \ No newline at end of file diff --git a/tests/kds_s2000w_option_descriptor_tests.h b/tests/kds_s2000w_option_descriptor_tests.h deleted file mode 100644 index 7ce502e..0000000 --- a/tests/kds_s2000w_option_descriptor_tests.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef KDS_S2000W_OPTION_DESCRIPTOR_TESTS_H -#define KDS_S2000W_OPTION_DESCRIPTOR_TESTS_H -#include -#include -#include -#include -#include - -int setup(void** state); -int teardown(void** state); -void kds_s2000w_option_get_descriptor_zero_test(); -void kds_s2000w_option_get_descriptor_one_test(); -void kds_s2000w_option_get_descriptor_two_test(); -void kds_s2000w_option_get_descriptor_three_test(); -void kds_s2000w_option_get_descriptor_four_test(); -void kds_s2000w_option_get_descriptor_five_test(); -void kds_s2000w_option_get_descriptor_six_test(); -void kds_s2000w_option_get_descriptor_seven_test(); -void kds_s2000w_option_get_descriptor_eight_test(); -void kds_s2000w_option_get_descriptor_nine_test(); -void kds_s2000w_option_get_descriptor_ten_test(); -void kds_s2000w_option_get_descriptor_eleven_test(); -void kds_s2000w_option_get_descriptor_twelve_test(); -void kds_s2000w_option_get_descriptor_thirdteen_test(); -void kds_s2000w_option_get_descriptor_fourteen_test(); -void kds_s2000w_option_get_descriptor_fifteen_test(); -void kds_s2000w_option_get_descriptor_sixteen_test(); -void kds_s2000w_option_get_descriptor_seventeen_test(); -void kds_s2000w_option_get_descriptor_eightteen_test(); -void kds_s2000w_option_get_descriptor_nineteen_test(); -void kds_s2000w_option_get_descriptor_twenty_test(); -void kds_s2000w_option_get_descriptor_twentyone_test(); -void kds_s2000w_option_get_descriptor_twentytwo_test(); -void kds_s2000w_option_get_descriptor_twentythree_test(); -void kds_s2000w_option_get_descriptor_twentyfour_test(); -void kds_s2000w_option_get_descriptor_twentyfive_test(); -void kds_s2000w_option_get_descriptor_twentysix_test(); -void kds_s2000w_option_get_descriptor_twentyseven_test(); -void kds_s2000w_option_get_descriptor_twentyeight_test(); -void kds_s2000w_option_get_descriptor_twentynine_test(); -void kds_s2000w_option_get_descriptor_thirdy_test(); -void kds_s2000w_option_get_descriptor_thirdyone_test(); -void kds_s2000w_option_get_descriptor_thirdytwo_test(); -void kds_s2000w_option_get_descriptor_thirdythree_test(); -void kds_s2000w_option_get_descriptor_thirdyfour_test(); -void kds_s2000w_option_get_descriptor_thirdyfive_test(); -void kds_s2000w_option_get_descriptor_thirdysix_test(); -void kds_s2000w_option_get_descriptor_thirdyseven_test(); -void kds_s2000w_option_get_descriptor_thirdyeight_test(); -void kds_s2000w_option_get_descriptor_thirdynine_test(); -void kds_s2000w_option_get_descriptor_fourty_test(); -void kds_s2000w_option_get_descriptor_fourtyone_test(); -void kds_s2000w_option_get_descriptor_fourtytwo_test(); -void kds_s2000w_option_get_descriptor_fourtythree_test(); -void kds_s2000w_option_get_descriptor_fourtyfour_test(); -void kds_s2000w_option_get_descriptor_fourtyfive_test(); -void kds_s2000w_option_get_descriptor_fourtysix_test(); -void kds_s2000w_option_get_descriptor_fourtyseven_test(); -void kds_s2000w_option_get_descriptor_get_by_config_name_test(); -void kds_s2000w_option_get_descriptor_over_max_options_test(); -void kds_s2000w_option_full_get_descriptor_by_number(); -void kds_s2000w_option_full_get_descriptor_over_max_options_test(); -#endif \ No newline at end of file diff --git a/tests/kds_s2000w_option_descriptor_tests_run.c b/tests/kds_s2000w_option_descriptor_tests_run.c deleted file mode 100644 index e6d72e3..0000000 --- a/tests/kds_s2000w_option_descriptor_tests_run.c +++ /dev/null @@ -1,61 +0,0 @@ -#include "kds_s2000w_option_descriptor_tests.h" - -int main() -{ - const struct CMUnitTest option_descriptor_tests[] = { - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_zero_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_one_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_two_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_three_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_four_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_five_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_six_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_seven_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eight_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_nine_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_ten_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eleven_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twelve_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdteen_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourteen_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fifteen_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_sixteen_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_seventeen_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eightteen_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_nineteen_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twenty_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyone_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentytwo_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentythree_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyfour_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyfive_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentysix_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyseven_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyeight_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentynine_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdy_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyone_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdytwo_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdythree_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyfour_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyfive_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdysix_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyseven_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyeight_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdynine_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourty_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyone_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtytwo_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtythree_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyfour_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyfive_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtysix_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyseven_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_get_by_config_name_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_over_max_options_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_full_get_descriptor_by_number, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_full_get_descriptor_over_max_options_test, setup, teardown), - }; - - return cmocka_run_group_tests(option_descriptor_tests, NULL, NULL); -} \ No newline at end of file -- 2.47.3