link another test to mock file

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 019f2860099cfc4535b8a03c94dab44d52d31201..8c36c5bd83b394821f3e9a80d2df6b62a007af73 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,7 +6,8 @@ MESSAGE(STATUS "find ${CMOCKA_LIBRARY}")
 
 ADD_EXECUTABLE("kds_s2000w_net_read_tests_run"
        "kds_s2000w_net_read_tests_run.c"
-       "kds_s2000w_net_read_tests.c")
+       "kds_s2000w_net_read_tests.c"
+       "kds_s2000w_client_mock.c")
 ADD_DEPENDENCIES("kds_s2000w_net_read_tests_run" sane-kds_s2000w_net)
 TARGET_LINK_LIBRARIES("kds_s2000w_net_read_tests_run"
        ${CMOCKA_LIBRARY}
@@ -23,7 +24,8 @@ TARGET_LINK_LIBRARIES("kds_s2000w_net_tests_run"
 
        ADD_EXECUTABLE("kds_s2000w_read_config_tests_run"
        "kds_s2000w_read_config_tests_run.c"
-       "kds_s2000w_read_config_tests.c")
+       "kds_s2000w_read_config_tests.c"
+       "kds_s2000w_client_mock.c")
 ADD_DEPENDENCIES("kds_s2000w_read_config_tests_run" sane-kds_s2000w_net)
 TARGET_LINK_LIBRARIES("kds_s2000w_read_config_tests_run"
        ${CMOCKA_LIBRARY}

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index 56ff920c7e18544d0c0fbb0d8ef55a6097ca61de..8b6f712a7edb2aefcf212b852f050b8ba02738fd 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -2,62 +2,23 @@
 #include <sane/sane.h>
 #include <string.h>
 #include "kds_s2000w_net_read_tests.h"
+#include "kds_s2000w_client_mock.h"
 #include "../src/kds_s2000w_config.h"
 #include "../src/kds_s2000w_client.h"
 #include "../src/kds_s2000w_handler.h"
 #include "../src/kds_s2000w_net.h"
 #include "../src/kds_s2000w_image_converter.h"
 
-int __wrap_kds_s2000w_client_open_session(response* response)
-{
-       return mock_type(int);
-}
-
 void __wrap_load_config(program_config* config, const char* config_stream)
 {
        return;
 }
 
-int __wrap_kds_s2000w_client_stop_scan(int64_t sessionid, response* response)
-{
-       return mock_type(int);
-}
-
-int __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response)
-{
-       return mock_type(int);
-}
-
-int __wrap_kds_s2000w_client_status_session(int64_t sessionid, response* response)
-{
-       return mock_type(int);
-}
-
-int __wrap_kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* response)
-{
-       return mock_type(int);
-}
-
-int __wrap_kds_s2000w_client_get_metadata(int64_t sessionid, int img_number, response* response)
-{
-       return mock_type(int);
-}
-
 void __wrap_kds_s2000w_convert_jpg_to_pnm(blobdata* in, blobdata* out)
 {
        return;
 }
 
-int __wrap_kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* response)
-{
-       return mock_type(int);
-}
-
-int __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response)
-{
-       return mock_type(int);
-}
-
 void sane_kds_s2000w_net_read_cancel_test()
 {
        handler* h = init_handler();

diff --git a/tests/kds_s2000w_read_config_tests.c b/tests/kds_s2000w_read_config_tests.c
index 925a6f01d9a36c4824f47afda2cd0d20d931ac8a..9d058db47ef2b04acb420eb7333982b2b4bf51f8 100644 (file)
--- a/tests/kds_s2000w_read_config_tests.c
+++ b/tests/kds_s2000w_read_config_tests.c
@@ -1,62 +1,23 @@
 #include <stdlib.h>
 #include <string.h>
 #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"
 
 extern typeof (load_config) __real_load_config;
 
-int __wrap_kds_s2000w_client_open_session(response* response)
-{
-       return mock_type(int);
-}
-
 void __wrap_load_config(program_config* config, const char* config_stream)
 {
        __real_load_config(config, config_stream);
 }
 
-int __wrap_kds_s2000w_client_stop_scan(int64_t sessionid, response* response)
-{
-       return mock_type(int);
-}
-
-int __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response)
-{
-       return mock_type(int);
-}
-
-int __wrap_kds_s2000w_client_status_session(int64_t sessionid, response* response)
-{
-       return mock_type(int);
-}
-
-int __wrap_kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* response)
-{
-       return mock_type(int);
-}
-
-int __wrap_kds_s2000w_client_get_metadata(int64_t sessionid, int img_number, response* response)
-{
-       return mock_type(int);
-}
-
 void __wrap_kds_s2000w_convert_jpg_to_pnm(blobdata* in, blobdata* out)
 {
        return;
 }
 
-int __wrap_kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* response)
-{
-       return mock_type(int);
-}
-
-int __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response)
-{
-       return mock_type(int);
-}
-
 void kds_s2000w_config_read_parameter()
 {
        const char* input_stream = "   scanner_url   =   http://scanner.example.com    \n";