move mock definition for convert methods to mock

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86644efcd0e4acaa5d71eacf3210f041ea9d5307..aee880d4cb6ef8d93d3891e0916d1a5d3a8d5a08 100644 (file)
--- 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 22c2df49f866b36c3db9c34271088a4811486194..f89f7d5148dbb90343466fadd97ea7c91fe85e59 100644 (file)
--- 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 6ab9c46169c250994047f075cb6cbf7ebc4ba182..c08f7431eaa2ca05741c0cb9dd22ef1cfe4ef72b 100644 (file)
--- a/tests/kds_s2000w_client_mock.h
+++ b/tests/kds_s2000w_client_mock.h
@@ -6,6 +6,7 @@
 #include <setjmp.h>
 #include <cmocka.h>
 #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 f34de5a0d96ed668ece9c02c065b6bc346f85d91..0b511842075d7afc64aa680608b9d7bc69c3e8a8 100644 (file)
--- 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 61dc299d120b7ddbc2fa04cebf6d81b9b7bf6214..980685f0b14b9fb251cb022095ea314e0dc29e0b 100644 (file)
--- 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 58feec875312a498a6453b6caba4337d022b2b97..afd59535c0c1a8d5d20c3d12f6a6d8f92c92010a 100644 (file)
--- 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 f250e96d3ac280c542c873f1219d69159c510875..a120da33e09561c64effada406aae903144fa16b 100644 (file)
--- 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 c8e9872a61fc17a48e499e98de10fddcd577c1ff..df95b9e3e9d033d325c216f523785c319ecc3398 100644 (file)
--- 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 8be70a64275cede322e34521df40fa0e3ae6f51e..dfa70847c8644ccc0e5ec54b25cecec8712f30ae 100644 (file)
--- 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;