From 062aaa9716e257a131548f72a2e019c77ea8cf05 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Mon, 30 Dec 2024 09:41:14 +0100 Subject: [PATCH] move mock definition for convert methods to mock --- CMakeLists.txt | 1 + tests/kds_s2000w_client_mock.c | 10 ++++++++++ tests/kds_s2000w_client_mock.h | 4 +++- tests/kds_s2000w_image_converter_tests.c | 5 ----- tests/kds_s2000w_net_get_opt_tests.c | 5 ----- tests/kds_s2000w_net_read_tests.c | 5 ----- tests/kds_s2000w_net_tests.c | 5 ----- tests/kds_s2000w_option_descriptor_tests.c | 5 ----- tests/kds_s2000w_read_config_tests.c | 5 ----- 9 files changed, 14 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 86644ef..aee880d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ IF (RUN_TESTS) --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,load_config,\ diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c index 22c2df4..f89f7d5 100644 --- a/tests/kds_s2000w_client_mock.c +++ b/tests/kds_s2000w_client_mock.c @@ -82,4 +82,14 @@ void __wrap_kds_s2000w_client_close_session(int64_t sessionid) { function_called(); return; +} + +void __wrap_kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata* in, blobdata* out) +{ + return; +} + +void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out) +{ + return; } \ No newline at end of file diff --git a/tests/kds_s2000w_client_mock.h b/tests/kds_s2000w_client_mock.h index 6ab9c46..c08f743 100644 --- a/tests/kds_s2000w_client_mock.h +++ b/tests/kds_s2000w_client_mock.h @@ -6,6 +6,7 @@ #include #include #include "../src/kds_s2000w_client.h" +#include "../src/kds_s2000w_image_converter.h" void mock_response(response* resp); int __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response); @@ -18,5 +19,6 @@ int __wrap_kds_s2000w_client_delete_image(int64_t sessionid, int img_number, res int __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response); int __wrap_kds_s2000w_client_open_session(response* response); void __wrap_kds_s2000w_client_close_session(int64_t sessionid); - +void __wrap_kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata* in, blobdata* out); +void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out); #endif \ No newline at end of file diff --git a/tests/kds_s2000w_image_converter_tests.c b/tests/kds_s2000w_image_converter_tests.c index f34de5a..0b51184 100644 --- a/tests/kds_s2000w_image_converter_tests.c +++ b/tests/kds_s2000w_image_converter_tests.c @@ -13,11 +13,6 @@ void __wrap_load_config(program_config* config, const char* config_stream) config->username = "Max\0"; } -void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out) -{ - return; -} - void __wrap_wait_a_second() { return; diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 61dc299..980685f 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -14,11 +14,6 @@ void __wrap_load_config(program_config* config, const char* config_stream) return; } -void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out) -{ - return; -} - void __wrap_wait_a_second() { return; diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c index 58feec8..afd5953 100644 --- a/tests/kds_s2000w_net_read_tests.c +++ b/tests/kds_s2000w_net_read_tests.c @@ -14,11 +14,6 @@ void __wrap_load_config(program_config* config, const char* config_stream) return; } -void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out) -{ - return; -} - void __wrap_wait_a_second() { return; diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c index f250e96..a120da3 100644 --- a/tests/kds_s2000w_net_tests.c +++ b/tests/kds_s2000w_net_tests.c @@ -18,11 +18,6 @@ void __wrap_load_config(program_config* config, const char* config_stream) config->username = "Max\0"; } -void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out) -{ - return; -} - void __wrap_wait_a_second() { return; diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index c8e9872..df95b9e 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -14,11 +14,6 @@ void __wrap_load_config(program_config* config, const char* config_stream) config->username = "Max\0"; } -void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out) -{ - return; -} - int setup(void** state) { kds_s2000w_option_descriptor_init_option_descriptors(); diff --git a/tests/kds_s2000w_read_config_tests.c b/tests/kds_s2000w_read_config_tests.c index 8be70a6..dfa7084 100644 --- a/tests/kds_s2000w_read_config_tests.c +++ b/tests/kds_s2000w_read_config_tests.c @@ -13,11 +13,6 @@ void __wrap_load_config(program_config* config, const char* config_stream) __real_load_config(config, config_stream); } -void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out) -{ - return; -} - void __wrap_wait_a_second() { return; -- 2.39.5