From cb8679094557501bf4b0a4531fce98c53ad1aab9 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Fri, 8 Mar 2024 19:57:06 +0100 Subject: [PATCH] change test parts --- src/kds_s2000w_net.c | 2 +- tests/CMakeLists.txt | 4 ++- tests/kds_s2000w_net_get_params_tests.c | 12 +++++++- tests/kds_s2000w_net_read_tests.c | 18 ++++++++++- tests/kds_s2000w_read_config_tests.c | 16 +++++++++- tests/runtests.c | 40 ------------------------- 6 files changed, 47 insertions(+), 45 deletions(-) diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index e47fc6b..df48283 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include "config.h" #include "kds_s2000w_option_descriptors.h" #include "kds_s2000w_handler.h" #include "kds_s2000w_debug.h" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5850314..dff7f9f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -10,4 +10,6 @@ target_link_libraries("runtests" check subunit sane-kds_s2000w_net) add_custom_target("runningtests" ALL "./runtests" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS "runtests") \ No newline at end of file + DEPENDS "runtests") + +target_include_directories("runtests" PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../src") \ No newline at end of file diff --git a/tests/kds_s2000w_net_get_params_tests.c b/tests/kds_s2000w_net_get_params_tests.c index b6fcf5c..c60b745 100644 --- a/tests/kds_s2000w_net_get_params_tests.c +++ b/tests/kds_s2000w_net_get_params_tests.c @@ -29,4 +29,14 @@ START_TEST(kds_s2000w_net_get_parameters_with_image_data) free_handler(h); h = NULL; } -END_TEST \ No newline at end of file +END_TEST + +Suite* get_params() +{ + Suite* get_params = suite_create("kds_s2000w_net_get_parameters"); + + TCase* net_get_params = tcase_create("get parameters"); + tcase_add_test(net_get_params, kds_s2000w_net_get_parameters_with_image_data); + suite_add_tcase(get_params, net_get_params); + return get_params; +} \ 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 6bf84c3..124c867 100644 --- a/tests/kds_s2000w_net_read_tests.c +++ b/tests/kds_s2000w_net_read_tests.c @@ -143,4 +143,20 @@ START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test) free_handler(h); h = NULL; } -END_TEST \ No newline at end of file +END_TEST + +Suite* net_read() +{ + Suite* read = suite_create("kds_s2000w_net_read"); + + TCase* net_read = tcase_create("read"); + tcase_add_test(net_read, sane_kds_s2000w_net_find_first_data_byte_test); + tcase_add_test(net_read, sane_kds_s2000w_net_read_cancel_test); + tcase_add_test(net_read, sane_kds_s2000w_net_read_without_data); + tcase_add_test(net_read, sane_kds_s2000w_net_read_empty_image); + tcase_add_test(net_read, sane_kds_s2000w_net_read_test); + tcase_add_test(net_read, sane_kds_s2000w_net_read_bytes_per_line_bigger_test); + + suite_add_tcase(read, net_read); + return read; +} \ No newline at end of file diff --git a/tests/kds_s2000w_read_config_tests.c b/tests/kds_s2000w_read_config_tests.c index 16928cd..f4d2f32 100644 --- a/tests/kds_s2000w_read_config_tests.c +++ b/tests/kds_s2000w_read_config_tests.c @@ -64,4 +64,18 @@ START_TEST(kds_s2000w_config_read_empty_config) free(config); config = NULL; } -END_TEST \ No newline at end of file +END_TEST + +Suite* config_read() +{ + Suite* read_config = suite_create("kds_s2000w_net_read_config"); + + TCase* net_config_read = tcase_create("read config"); + tcase_add_test(net_config_read, kds_s2000w_config_read_empty_config); + tcase_add_test(net_config_read, kds_s2000w_config_read_parameter); + tcase_add_test(net_config_read, kds_s2000w_config_read_parameters_without_trim); + tcase_add_test(net_config_read, kds_s2000w_config_multiple_parameters); + suite_add_tcase(read_config, net_config_read); + + return read_config; +} \ No newline at end of file diff --git a/tests/runtests.c b/tests/runtests.c index 4e429c6..e3e59ba 100644 --- a/tests/runtests.c +++ b/tests/runtests.c @@ -19,46 +19,6 @@ void void_mock() {} #include "kds_s2000w_net_get_params_tests.c" #include "kds_s2000w_read_config_tests.c" -Suite* net_read() -{ - Suite* read = suite_create("kds_s2000w_net_read"); - - TCase* net_read = tcase_create("read"); - tcase_add_test(net_read, sane_kds_s2000w_net_find_first_data_byte_test); - tcase_add_test(net_read, sane_kds_s2000w_net_read_cancel_test); - tcase_add_test(net_read, sane_kds_s2000w_net_read_without_data); - tcase_add_test(net_read, sane_kds_s2000w_net_read_empty_image); - tcase_add_test(net_read, sane_kds_s2000w_net_read_test); - tcase_add_test(net_read, sane_kds_s2000w_net_read_bytes_per_line_bigger_test); - - suite_add_tcase(read, net_read); - return read; -} - -Suite* get_params() -{ - Suite* get_params = suite_create("kds_s2000w_net_get_parameters"); - - TCase* net_get_params = tcase_create("get parameters"); - tcase_add_test(net_get_params, kds_s2000w_net_get_parameters_with_image_data); - suite_add_tcase(get_params, net_get_params); - return get_params; -} - -Suite* config_read() -{ - Suite* read_config = suite_create("kds_s2000w_net_read_config"); - - TCase* net_config_read = tcase_create("read config"); - tcase_add_test(net_config_read, kds_s2000w_config_read_empty_config); - tcase_add_test(net_config_read, kds_s2000w_config_read_parameter); - tcase_add_test(net_config_read, kds_s2000w_config_read_parameters_without_trim); - tcase_add_test(net_config_read, kds_s2000w_config_multiple_parameters); - suite_add_tcase(read_config, net_config_read); - - return read_config; -} - int main() { int failed = 0; -- 2.39.5