From 63f2e5a2fafe9ab9a03d0c20ede70c31ceabf6fa Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Thu, 9 Jan 2025 19:11:55 +0100 Subject: [PATCH] optimize header includes for test files --- CMakeLists.txt | 4 ++-- tests/kds_s2000w_client_mock.c | 15 ++++++++++----- tests/kds_s2000w_client_mock.h | 4 ++++ tests/kds_s2000w_image_converter_tests.c | 15 --------------- tests/kds_s2000w_net_get_opt_tests.c | 10 ---------- tests/kds_s2000w_net_read_tests.c | 10 ---------- tests/kds_s2000w_net_tests.c | 13 ------------- tests/kds_s2000w_option_descriptor_tests.c | 11 ----------- tests/kds_s2000w_read_config_tests.c | 8 -------- 9 files changed, 16 insertions(+), 74 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91541f1..750d770 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,12 +29,12 @@ IF (RUN_TESTS) --wrap,kds_s2000w_client_close_session,\ --wrap,kds_s2000w_client_status_session,\ --wrap,kds_s2000w_client_get_image,\ ---wrap,kds_s2000w_convert_tiff_to_pnm,\ ---wrap,kds_s2000w_convert_jpg_to_pnm_with_depth,\ --wrap,kds_s2000w_client_delete_image,\ --wrap,kds_s2000w_client_set_option,\ --wrap,kds_s2000w_client_init,\ --wrap,kds_s2000w_client_free,\ +--wrap,kds_s2000w_convert_tiff_to_pnm,\ +--wrap,kds_s2000w_convert_jpg_to_pnm_with_depth,\ --wrap,wait_a_second,\ --wrap,usleep" CACHE STRING "test coverage compiler flags" FORCE) ENDIF() diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c index e52a5b4..c4266b0 100644 --- a/tests/kds_s2000w_client_mock.c +++ b/tests/kds_s2000w_client_mock.c @@ -3,11 +3,6 @@ #include #include "kds_s2000w_client_mock.h" -int __wrap_usleep(__useconds_t usec) -{ - return 0; -} - void mock_response(response* resp) { response* mock_resp = mock_type(response*); @@ -22,6 +17,16 @@ void mock_response(response* resp) resp->size = mock_resp->size; } +void __wrap_wait_a_second() +{ + return; +} + +int __wrap_usleep(__useconds_t usec) +{ + return 0; +} + void __wrap_kds_s2000w_client_init() { return; diff --git a/tests/kds_s2000w_client_mock.h b/tests/kds_s2000w_client_mock.h index c08f743..3c519d2 100644 --- a/tests/kds_s2000w_client_mock.h +++ b/tests/kds_s2000w_client_mock.h @@ -9,6 +9,10 @@ #include "../src/kds_s2000w_image_converter.h" void mock_response(response* resp); +void __wrap_wait_a_second(); +int __wrap_usleep(__useconds_t usec); +void __wrap_kds_s2000w_client_init(); +void __wrap_kds_s2000w_client_free(); int __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response); int __wrap_kds_s2000w_client_set_option(int64_t sessionid, response* response); int __wrap_kds_s2000w_client_stop_scan(int64_t sessionid, response* response); diff --git a/tests/kds_s2000w_image_converter_tests.c b/tests/kds_s2000w_image_converter_tests.c index 0b51184..c770ed8 100644 --- a/tests/kds_s2000w_image_converter_tests.c +++ b/tests/kds_s2000w_image_converter_tests.c @@ -4,21 +4,6 @@ #include "kds_s2000w_client_mock.h" #include "kds_s2000w_image_converter_tests.h" -void __wrap_load_config(program_config* config, const char* config_stream) -{ - config->scanner_url = malloc(sizeof(char) * 28); - config->username = malloc(sizeof(char) * 4); - - config->scanner_url = "https://scanner.example.com\0"; - config->username = "Max\0"; -} - -void __wrap_wait_a_second() -{ - return; -} - - void get_metadata_from_image_test() { blobdata* image = malloc(sizeof(blobdata)); diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 980685f..48a5e83 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -9,16 +9,6 @@ #include "../src/kds_s2000w_handler.h" #include "../src/kds_s2000w_image_converter.h" -void __wrap_load_config(program_config* config, const char* config_stream) -{ - return; -} - -void __wrap_wait_a_second() -{ - return; -} - void sane_kds_s2000w_net_control_get_option_zero(void** state) { response* resp = (response*) *state; diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c index dfc184a..a08876a 100644 --- a/tests/kds_s2000w_net_read_tests.c +++ b/tests/kds_s2000w_net_read_tests.c @@ -9,16 +9,6 @@ #include "../src/kds_s2000w_net.h" #include "../src/kds_s2000w_image_converter.h" -void __wrap_load_config(program_config* config, const char* config_stream) -{ - return; -} - -void __wrap_wait_a_second() -{ - return; -} - void sane_kds_s2000w_net_read_without_data() { int length = 0; diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c index 660fdf6..3174a36 100644 --- a/tests/kds_s2000w_net_tests.c +++ b/tests/kds_s2000w_net_tests.c @@ -3,21 +3,8 @@ #include #include "kds_s2000w_net_tests.h" #include "kds_s2000w_client_mock.h" -#include "../src/kds_s2000w_config.h" #include "../src/kds_s2000w_net.h" -#include "../src/kds_s2000w_option_descriptors.h" #include "../src/kds_s2000w_handler.h" -#include "../src/kds_s2000w_image_converter.h" - -void __wrap_load_config(program_config* config, const char* config_stream) -{ - return; -} - -void __wrap_wait_a_second() -{ - return; -} void kds_s2000w_net_get_devices() { diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index b97d660..83cb9a9 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -2,17 +2,6 @@ #include #include "kds_s2000w_option_descriptor_tests.h" #include "../src/kds_s2000w_option_descriptors.h" -#include "../src/kds_s2000w_image_converter.h" -#include "../src/kds_s2000w_config.h" - -void __wrap_load_config(program_config* config, const char* config_stream) -{ - config->scanner_url = malloc(sizeof(char) * 28); - config->username = malloc(sizeof(char) * 4); - - config->scanner_url = "https://scanner.example.com\0"; - config->username = "Max\0"; -} int setup(void** state) { diff --git a/tests/kds_s2000w_read_config_tests.c b/tests/kds_s2000w_read_config_tests.c index 72719ff..0212b7c 100644 --- a/tests/kds_s2000w_read_config_tests.c +++ b/tests/kds_s2000w_read_config_tests.c @@ -1,15 +1,7 @@ #include #include #include "kds_s2000w_read_config_tests.h" -#include "kds_s2000w_client_mock.h" -#include "../src/kds_s2000w_client.h" #include "../src/kds_s2000w_config.h" -#include "../src/kds_s2000w_image_converter.h" - -void __wrap_wait_a_second() -{ - return; -} void kds_s2000w_config_null() { -- 2.39.5