change mock order

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a165910e95f1e2d9cc6f44228c1886545b9783ce..b0579c6e5c1d9041769679fd25c6e34339caafa9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,19 +22,19 @@ IF (RUN_TESTS)
 -Wall \
 -g \
 -fsanitize=address \
--Wl,--wrap,kds_s2000w_client_get_option,\
---wrap,kds_s2000w_client_start_scan,\
---wrap,kds_s2000w_client_stop_scan,\
+-Wl,--wrap,kds_s2000w_client_init,\
+--wrap,kds_s2000w_client_free,\
 --wrap,kds_s2000w_client_open_session,\
 --wrap,kds_s2000w_client_close_session,\
+--wrap,kds_s2000w_client_start_scan,\
+--wrap,kds_s2000w_client_stop_scan,\
 --wrap,kds_s2000w_client_status_session,\
 --wrap,kds_s2000w_client_get_image,\
 --wrap,kds_s2000w_client_delete_image,\
+--wrap,kds_s2000w_client_get_option,\
 --wrap,kds_s2000w_client_set_option,\
---wrap,kds_s2000w_client_init,\
---wrap,kds_s2000w_client_free,\
---wrap,kds_s2000w_image_converter_tiff_to_pnm,\
---wrap,kds_s2000w_image_converter_jpg_to_pnm"
+--wrap,kds_s2000w_image_converter_jpg_to_pnm,\
+--wrap,kds_s2000w_image_converter_tiff_to_pnm"
 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 cbea9a4ad179668195b491651a9f414673d949eb..63d78de92c3e84e783ab114d23720d51d2fb73be 100644 (file)
--- a/tests/kds_s2000w_client_mock.c
+++ b/tests/kds_s2000w_client_mock.c
@@ -27,14 +27,20 @@ void __wrap_kds_s2000w_client_free()
        return;
 }
 
-int __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response)
+int __wrap_kds_s2000w_client_open_session(response* response)
 {
        function_called();
        mock_response(response);
        return mock_type(int);
 }
 
-int __wrap_kds_s2000w_client_set_option(int64_t sessionid, response* response)
+void __wrap_kds_s2000w_client_close_session(int64_t sessionid)
+{
+       function_called();
+       return;
+}
+
+int __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response)
 {
        function_called();
        mock_response(response);
@@ -69,26 +75,20 @@ int __wrap_kds_s2000w_client_delete_image(int64_t sessionid, int img_number, res
        return mock_type(int);
 }
 
-int __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response)
+int __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response)
 {
        function_called();
        mock_response(response);
        return mock_type(int);
 }
 
-int __wrap_kds_s2000w_client_open_session(response* response)
+int __wrap_kds_s2000w_client_set_option(int64_t sessionid, response* response)
 {
        function_called();
        mock_response(response);
        return mock_type(int);
 }
 
-void __wrap_kds_s2000w_client_close_session(int64_t sessionid)
-{
-       function_called();
-       return;
-}
-
 void __wrap_kds_s2000w_image_converter_jpg_to_pnm(blobdata* in, blobdata* out)
 {
        if (in->data != NULL) {

diff --git a/tests/kds_s2000w_client_mock.h b/tests/kds_s2000w_client_mock.h
index 1969f8bcb966e874582a7beee0d94b940be59f4a..e328b666d18e845434cd445c82c60aea391b2d54 100644 (file)
--- a/tests/kds_s2000w_client_mock.h
+++ b/tests/kds_s2000w_client_mock.h
@@ -9,18 +9,23 @@
 #include "../src/kds_s2000w_image_converter.h"
 
 void mock_response(response* resp);
+
 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_open_session(response* response);
+void __wrap_kds_s2000w_client_close_session(int64_t sessionid);
+
+int __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response);
 int __wrap_kds_s2000w_client_stop_scan(int64_t sessionid, response* response);
+
 int __wrap_kds_s2000w_client_status_session(int64_t sessionid, response* response);
 int __wrap_kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* response);
-int __wrap_kds_s2000w_client_get_metadata(int64_t sessionid, int img_number, response* response);
 int __wrap_kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* response);
-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);
+
+int __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response);
+int __wrap_kds_s2000w_client_set_option(int64_t sessionid, response* response);
+
 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