change naming handler

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 559b4b0ff17b4d915653dee97fbc58828bfb5357..2dd3064a5c859002a1c873dd16886a5e2dc70199 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -9,7 +9,7 @@
 
 #define SPACE 0x0a
 
-int _sane_kds_s2000w_net_find_first_data_byte(imagedata* image)
+int _kds_s2000w_handler_find_first_data_byte(imagedata* image)
 {
        kds_s2000w_debug_printf(ALL, "sane_kds_s2000w_net_find_first_data_byte");
 
@@ -33,7 +33,7 @@ int _sane_kds_s2000w_net_find_first_data_byte(imagedata* image)
        return byte_count;
 }
 
-handler* init_handler()
+handler* kds_s2000w_handler_init()
 {
        kds_s2000w_debug_printf(ALL, "init handler");
 
@@ -59,7 +59,7 @@ handler* init_handler()
        return h;
 }
 
-void free_handler(handler* h)
+void kds_s2000w_handler_free(handler* h)
 {
        kds_s2000w_debug_printf(ALL, "free handler");
 
@@ -80,7 +80,7 @@ void free_handler(handler* h)
        h = NULL;
 }
 
-void reset_handler(handler* h)
+void kds_s2000w_handler_reset(handler* h)
 {
        kds_s2000w_debug_printf(ALL, "reset handler");
 
@@ -99,6 +99,142 @@ void reset_handler(handler* h)
        h->read_info->read_size = 0;
 }
 
+void kds_s2000w_handler_open(const char* devicename, void** handle)
+{
+       kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_open");
+
+       if (strcmp(devicename, "kds_s2000w_net") != 0)
+               return;
+
+       handler* h = kds_s2000w_handler_init();
+       *handle = h;
+
+       kds_s2000w_client_init();
+
+       // status code 408 waking up repeat open session
+       response* resp = NULL;
+       int result = 0;
+       for (int i = 0; i < 30; i++) {
+               kds_s2000w_client_response_free(resp);
+               resp = NULL;
+               resp = kds_s2000w_client_response_init();
+               result = kds_s2000w_client_open_session(resp);
+
+               if (result != 0) {
+                       h->state = NOTCONNECTED;
+                       break;
+               }
+
+               if (resp->code == 200) {
+                       h->state = OPENED;
+                       break;
+               }
+
+               if (resp->code == 423) {
+                       h->state = BUSY;
+                       break;
+               }
+
+               sleep(1);
+       }
+
+       if (result != 0 || resp->code != 200) {
+               kds_s2000w_client_response_free(resp);
+               resp = NULL;
+               kds_s2000w_client_free();
+               return;
+       }
+
+       h->current_scanner_config = json_tokener_parse(resp->data);
+       json_object* value_object = NULL;
+       json_object_object_get_ex(h->current_scanner_config, "SessionId", &value_object);
+       h->sessionid = json_object_get_int64(value_object);
+       kds_s2000w_debug_printf_long(INFO, "SessionId", h->sessionid);
+       value_object = NULL;
+
+       json_object_put(h->current_scanner_config);
+       h->current_scanner_config = NULL;
+       kds_s2000w_client_response_free(resp);
+       resp = NULL;
+}
+
+void kds_s2000w_handler_close(handler* h)
+{
+       kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_close");
+
+       json_object_put(h->current_scanner_config);
+       h->current_scanner_config = NULL;
+
+       if (h == NULL)
+               return;
+
+       kds_s2000w_client_close_session(h->sessionid);
+       kds_s2000w_client_free();
+       h->sessionid = 0;
+       kds_s2000w_handler_free(h);
+       h = NULL;
+}
+
+void kds_s2000w_handler_recreate_session(handler* h)
+{
+       kds_s2000w_client_close_session(h->sessionid);
+
+       response* resp = kds_s2000w_client_response_init();
+       kds_s2000w_client_open_session(resp);
+
+       if (resp->code != 200) {
+               kds_s2000w_client_response_free(resp);
+               resp = NULL;
+
+               return;
+       }
+
+       json_object* value_object = NULL;
+       json_object* sessionJson = json_tokener_parse(resp->data);
+       json_object_object_get_ex(sessionJson, "SessionId", &value_object);
+       h->sessionid = json_object_get_int64(value_object);
+       value_object = NULL;
+       json_object_put(sessionJson);
+       sessionJson = NULL;
+       kds_s2000w_debug_printf_long(INFO, "SessionId", h->sessionid);
+
+       // set old config parameters
+       kds_s2000w_client_response_free(resp);
+       resp = NULL;
+       const char* json_string = json_object_to_json_string_ext(h->current_scanner_config, JSON_C_TO_STRING_PLAIN);
+       resp = kds_s2000w_client_response_init();
+       resp->size = sizeof(char) * strlen(json_string);
+       resp->code = 0;
+       resp->data = realloc(resp->data, resp->size);
+       resp->data = memcpy(resp->data, json_string, resp->size);
+       kds_s2000w_client_set_option(h->sessionid, resp);
+
+       kds_s2000w_client_response_free(resp);
+       resp = NULL;
+}
+
+void kds_s2000w_handler_start_scan(handler* h)
+{
+       kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_start_scan");
+
+       response* resp = kds_s2000w_client_response_init();
+       kds_s2000w_client_start_scan(h->sessionid, resp);
+
+       kds_s2000w_client_response_free(resp);
+       resp = NULL;
+}
+
+void kds_s2000w_handler_stop_scan(handler* h)
+{
+       kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_stop_scan");
+
+       response* resp = kds_s2000w_client_response_init();
+       kds_s2000w_client_stop_scan(h->sessionid, resp);
+
+       kds_s2000w_client_response_free(resp);
+       resp = NULL;
+}
+
 void kds_s2000w_handler_get_current_metadata(handler* h, metadata* params)
 {
        kds_s2000w_debug_printf(ALL, "get_current_metadata");
@@ -163,7 +299,7 @@ void kds_s2000w_handler_get_current_metadata(handler* h, metadata* params)
        else
                params->bytes_per_line = channels * params->pixels_per_line * params->depth / 8;
        
-       h->read_info->read_size = _sane_kds_s2000w_net_find_first_data_byte(h->image);
+       h->read_info->read_size = _kds_s2000w_handler_find_first_data_byte(h->image);
 
        metadata = NULL;
        free(mdata);
@@ -174,38 +310,7 @@ void kds_s2000w_handler_get_current_metadata(handler* h, metadata* params)
        scanner_image = NULL;
 }
 
-void kds_s2000w_handler_delete_current_image(handler* h)
-{
-       kds_s2000w_debug_printf(ALL, "delete_current_image");
-
-       response* resp = kds_s2000w_client_response_init();
-       kds_s2000w_client_delete_image(h->sessionid, h->current_scan_status->current_image_number, resp);
-       h->current_scan_status->available_images--;
-
-       kds_s2000w_client_response_free(resp);
-       resp = NULL;
-}
-
-void kds_s2000w_handler_download_current_image(handler* h)
-{
-       kds_s2000w_debug_printf(ALL, "download_current_image");
-
-       free(h->image->data);
-       h->image->data = NULL;
-       h->image->size = 0;
-
-       response* resp = kds_s2000w_client_response_init();
-       kds_s2000w_client_get_image(h->sessionid, h->current_scan_status->current_image_number, resp);
-       h->image->size = resp->size;
-       h->image->data = malloc(sizeof(char) * resp->size);
-       memcpy(h->image->data, resp->data, resp->size);
-
-       kds_s2000w_client_response_free(resp);
-       resp = NULL;
-       h->current_scan_status->downloaded_images++;
-}
-
-void kds_s2000w_net_handler_get_current_scan_status(handler* h)
+void kds_s2000w_handler_get_current_scan_status(handler* h)
 {
        kds_s2000w_debug_printf(ALL, "get_current_scan_status");
 
@@ -233,137 +338,32 @@ void kds_s2000w_net_handler_get_current_scan_status(handler* h)
        resp = NULL;
 }
 
-void kds_s2000w_handler_recreate_session(handler* h)
-{
-       kds_s2000w_client_close_session(h->sessionid);
-
-       response* resp = kds_s2000w_client_response_init();
-       kds_s2000w_client_open_session(resp);
-
-       if (resp->code != 200) {
-               kds_s2000w_client_response_free(resp);
-               resp = NULL;
-
-               return;
-       }
-
-       json_object* value_object = NULL;
-       json_object* sessionJson = json_tokener_parse(resp->data);
-       json_object_object_get_ex(sessionJson, "SessionId", &value_object);
-       h->sessionid = json_object_get_int64(value_object);
-       value_object = NULL;
-       json_object_put(sessionJson);
-       sessionJson = NULL;
-       kds_s2000w_debug_printf_long(INFO, "SessionId", h->sessionid);
-
-       // set old config parameters
-       kds_s2000w_client_response_free(resp);
-       resp = NULL;
-       const char* json_string = json_object_to_json_string_ext(h->current_scanner_config, JSON_C_TO_STRING_PLAIN);
-       resp = kds_s2000w_client_response_init();
-       resp->size = sizeof(char) * strlen(json_string);
-       resp->code = 0;
-       resp->data = realloc(resp->data, resp->size);
-       resp->data = memcpy(resp->data, json_string, resp->size);
-       kds_s2000w_client_set_option(h->sessionid, resp);
-
-       kds_s2000w_client_response_free(resp);
-       resp = NULL;
-}
-
-void kds_s2000w_handler_open(const char* devicename, void** handle)
-{
-       kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_open");
-
-       if (strcmp(devicename, "kds_s2000w_net") != 0)
-               return;
-
-       handler* h = init_handler();
-       *handle = h;
-
-       kds_s2000w_client_init();
-
-       // status code 408 waking up repeat open session
-       response* resp = NULL;
-       int result = 0;
-       for (int i = 0; i < 30; i++) {
-               kds_s2000w_client_response_free(resp);
-               resp = NULL;
-               resp = kds_s2000w_client_response_init();
-               result = kds_s2000w_client_open_session(resp);
-
-               if (result != 0) {
-                       h->state = NOTCONNECTED;
-                       break;
-               }
-
-               if (resp->code == 200) {
-                       h->state = OPENED;
-                       break;
-               }
-
-               if (resp->code == 423) {
-                       h->state = BUSY;
-                       break;
-               }
-
-               sleep(1);
-       }
-
-       if (result != 0 || resp->code != 200) {
-               kds_s2000w_client_response_free(resp);
-               resp = NULL;
-               kds_s2000w_client_free();
-               return;
-       }
-
-       h->current_scanner_config = json_tokener_parse(resp->data);
-       json_object* value_object = NULL;
-       json_object_object_get_ex(h->current_scanner_config, "SessionId", &value_object);
-       h->sessionid = json_object_get_int64(value_object);
-       kds_s2000w_debug_printf_long(INFO, "SessionId", h->sessionid);
-       value_object = NULL;
-
-       json_object_put(h->current_scanner_config);
-       h->current_scanner_config = NULL;
-       kds_s2000w_client_response_free(resp);
-       resp = NULL;
-}
-
-void kds_s2000w_handler_close(handler* h)
+void kds_s2000w_handler_download_current_image(handler* h)
 {
-       kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_close");
-
-       json_object_put(h->current_scanner_config);
-       h->current_scanner_config = NULL;
-
-       if (h == NULL)
-               return;
-
-       kds_s2000w_client_close_session(h->sessionid);
-       kds_s2000w_client_free();
-       h->sessionid = 0;
-       free_handler(h);
-       h = NULL;
-}
+       kds_s2000w_debug_printf(ALL, "download_current_image");
 
-void kds_s2000w_handler_start_scan(handler* h)
-{
-       kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_start_scan");
+       free(h->image->data);
+       h->image->data = NULL;
+       h->image->size = 0;
 
        response* resp = kds_s2000w_client_response_init();
-       kds_s2000w_client_start_scan(h->sessionid, resp);
+       kds_s2000w_client_get_image(h->sessionid, h->current_scan_status->current_image_number, resp);
+       h->image->size = resp->size;
+       h->image->data = malloc(sizeof(char) * resp->size);
+       memcpy(h->image->data, resp->data, resp->size);
 
        kds_s2000w_client_response_free(resp);
        resp = NULL;
+       h->current_scan_status->downloaded_images++;
 }
 
-void kds_s2000w_handler_stop_scan(handler* h)
+void kds_s2000w_handler_delete_current_image(handler* h)
 {
-       kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_stop_scan");
+       kds_s2000w_debug_printf(ALL, "delete_current_image");
 
        response* resp = kds_s2000w_client_response_init();
-       kds_s2000w_client_stop_scan(h->sessionid, resp);
+       kds_s2000w_client_delete_image(h->sessionid, h->current_scan_status->current_image_number, resp);
+       h->current_scan_status->available_images--;
 
        kds_s2000w_client_response_free(resp);
        resp = NULL;

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index 7c920e87ad2f39f88cc0eb59f9e7a9482e1b379e..b15d996b84b6d98f236b2341143658e54c0ab1a6 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -50,20 +50,23 @@ typedef struct {
        imagedata* image;
 } handler;
 
-handler* init_handler();
-void free_handler(handler* h);
-void reset_handler(handler* h);
-void kds_s2000w_handler_get_current_metadata(handler* h, metadata* params);
-void kds_s2000w_handler_delete_current_image(handler* h);
-void kds_s2000w_handler_download_current_image(handler* h);
-void kds_s2000w_net_handler_get_current_scan_status(handler* h);
-void kds_s2000w_handler_recreate_session(handler* h);
+handler* kds_s2000w_handler_init();
+void kds_s2000w_handler_free(handler* h);
+void kds_s2000w_handler_reset(handler* h);
+
 void kds_s2000w_handler_open(const char* devicename, void** handle);
 void kds_s2000w_handler_close(handler* h);
+void kds_s2000w_handler_recreate_session(handler* h);
+
 void kds_s2000w_handler_opts_get_option(handler* handle, int option, void* value, int* info);
 void kds_s2000w_handler_opts_set_option(handler* handle, int option, void* value, int* info);
-void kds_s2000w_handler_set_option_auto(int option);
+
 void kds_s2000w_handler_start_scan(handler* h);
 void kds_s2000w_handler_stop_scan(handler* h);
 
+void kds_s2000w_handler_get_current_metadata(handler* h, metadata* params);
+void kds_s2000w_handler_get_current_scan_status(handler* h);
+void kds_s2000w_handler_download_current_image(handler* h);
+void kds_s2000w_handler_delete_current_image(handler* h);
+
 #endif
\ No newline at end of file

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 19969b622bb654a25c8c0245883c898a74baa7c0..1dd0c95e30f933d66cfa8be7fcaa18eaf05eee85 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -57,14 +57,14 @@ SANE_Status sane_kds_s2000w_net_open(SANE_String_Const devicename,
        handler* h = (handler*) *handle;
 
        if (h->state == NOTCONNECTED) {
-               free_handler(h);
+               kds_s2000w_handler_free(h);
                h = NULL;
                *handle = NULL;
                return SANE_STATUS_IO_ERROR;
        }
 
        if (h->state == BUSY) {
-               free_handler(h);
+               kds_s2000w_handler_free(h);
                h = NULL;
                *handle = NULL;
                return SANE_STATUS_DEVICE_BUSY;
@@ -117,22 +117,22 @@ void sane_kds_s2000w_net_cancel(SANE_Handle handle)
 
        if (h->read_info->cancel > 0) {
                kds_s2000w_debug_printf(DEBUG, "scan completed canceled");
-               reset_handler(h);
+               kds_s2000w_handler_reset(h);
                kds_s2000w_handler_recreate_session(h);
                return;
        }
 
-       kds_s2000w_net_handler_get_current_scan_status(h);
+       kds_s2000w_handler_get_current_scan_status(h);
 
        if (h->current_scan_status->complete_scanned > 0) {
                kds_s2000w_debug_printf(DEBUG, "scan completed");
-               reset_handler(h);
+               kds_s2000w_handler_reset(h);
                return;
        }
 
        if (h->current_scan_status->available_images <= 0) {
                kds_s2000w_debug_printf(DEBUG, "scan completed no availible images");
-               reset_handler(h);
+               kds_s2000w_handler_reset(h);
                kds_s2000w_handler_recreate_session(h);
                return;
        }
@@ -171,7 +171,7 @@ SANE_Status sane_kds_s2000w_net_start(SANE_Handle handle)
        }
 
        for (int i = 0; i < 30; i++) {
-               kds_s2000w_net_handler_get_current_scan_status(h);
+               kds_s2000w_handler_get_current_scan_status(h);
 
                if (h->current_scan_status->available_images > 0
                        || h->current_scan_status->downloaded_images > 0)

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 752012bfbc0889c259425edaccf8f72c167ff20d..b4a3e5620cae3942f671f7ae483f40d56cad4cfd 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -8,7 +8,7 @@
 #include "../src/kds_s2000w_net.h"
 #include "../src/kds_s2000w_handler.h"
 
-void sane_kds_s2000w_net_control_get_option_zero(void** state)
+void sane_kds_s2000w_net_control_get_option_zero_test(void** state)
 {
        response* resp = (response*) *state;
        will_return(mock_response, resp);
@@ -17,20 +17,20 @@ void sane_kds_s2000w_net_control_get_option_zero(void** state)
        will_return(__wrap_kds_s2000w_client_set_option, 0);
        expect_function_call(__wrap_kds_s2000w_client_get_option);
        expect_function_call(__wrap_kds_s2000w_client_set_option);
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        int value = 0;
 
        sane_kds_s2000w_net_control_option(h, 0, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 22);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_two(void** state)
+void sane_kds_s2000w_net_control_get_option_two_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
@@ -40,13 +40,13 @@ void sane_kds_s2000w_net_control_get_option_two(void** state)
        assert_string_equal(value, "DocumentFeeder");
        assert_int_equal(h->current_scan_status->feeder, 1);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_three(void** state)
+void sane_kds_s2000w_net_control_get_option_three_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
@@ -55,13 +55,13 @@ void sane_kds_s2000w_net_control_get_option_three(void** state)
 
        assert_string_equal(value, "Color");
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_four(void** state)
+void sane_kds_s2000w_net_control_get_option_four_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = 0;
@@ -70,13 +70,13 @@ void sane_kds_s2000w_net_control_get_option_four(void** state)
 
        assert_int_equal(value, 200);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_five(void** state)
+void sane_kds_s2000w_net_control_get_option_five_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
@@ -85,13 +85,13 @@ void sane_kds_s2000w_net_control_get_option_five(void** state)
 
        assert_string_equal(value, "Duplex");
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_seven(void** state)
+void sane_kds_s2000w_net_control_get_option_seven_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
@@ -100,13 +100,13 @@ void sane_kds_s2000w_net_control_get_option_seven(void** state)
 
        assert_int_equal(value, 0);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_eight(void** state)
+void sane_kds_s2000w_net_control_get_option_eight_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
@@ -115,13 +115,13 @@ void sane_kds_s2000w_net_control_get_option_eight(void** state)
 
        assert_string_equal(value, "None");
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_nine(void** state)
+void sane_kds_s2000w_net_control_get_option_nine_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
@@ -130,13 +130,13 @@ void sane_kds_s2000w_net_control_get_option_nine(void** state)
 
        assert_int_equal(value, 0);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_ten(void** state)
+void sane_kds_s2000w_net_control_get_option_ten_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
@@ -145,13 +145,13 @@ void sane_kds_s2000w_net_control_get_option_ten(void** state)
 
        assert_string_equal(value, "Automatic");
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_eleven(void** state)
+void sane_kds_s2000w_net_control_get_option_eleven_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
@@ -160,13 +160,13 @@ void sane_kds_s2000w_net_control_get_option_eleven(void** state)
 
        assert_string_equal(value, "Automatic");
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_twelve(void** state)
+void sane_kds_s2000w_net_control_get_option_twelve_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
@@ -175,13 +175,13 @@ void sane_kds_s2000w_net_control_get_option_twelve(void** state)
 
        assert_int_equal(value, 0);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_thirdteen(void** state)
+void sane_kds_s2000w_net_control_get_option_thirdteen_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
@@ -190,13 +190,13 @@ void sane_kds_s2000w_net_control_get_option_thirdteen(void** state)
 
        assert_int_equal(value, 0);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_fourteen(void** state)
+void sane_kds_s2000w_net_control_get_option_fourteen_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
@@ -205,13 +205,13 @@ void sane_kds_s2000w_net_control_get_option_fourteen(void** state)
 
        assert_int_equal(value, 0);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_fifteen(void** state)
+void sane_kds_s2000w_net_control_get_option_fifteen_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
@@ -220,13 +220,13 @@ void sane_kds_s2000w_net_control_get_option_fifteen(void** state)
 
        assert_int_equal(value, 0);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_sixteen(void** state)
+void sane_kds_s2000w_net_control_get_option_sixteen_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
@@ -235,13 +235,13 @@ void sane_kds_s2000w_net_control_get_option_sixteen(void** state)
 
        assert_string_equal(value, "None");
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_seventeen(void** state)
+void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
@@ -250,13 +250,13 @@ void sane_kds_s2000w_net_control_get_option_seventeen(void** state)
 
        assert_int_equal(value, 0);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_eightteen(void** state)
+void sane_kds_s2000w_net_control_get_option_eightteen_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
@@ -265,13 +265,13 @@ void sane_kds_s2000w_net_control_get_option_eightteen(void** state)
 
        assert_string_equal(value, "None");
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_nineteen(void** state)
+void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
@@ -280,13 +280,13 @@ void sane_kds_s2000w_net_control_get_option_nineteen(void** state)
 
        assert_int_equal(value, 0);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_control_get_option_twenty(void** state)
+void sane_kds_s2000w_net_control_get_option_twenty_test(void** state)
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
@@ -295,6 +295,6 @@ void sane_kds_s2000w_net_control_get_option_twenty(void** state)
 
        assert_int_equal(value, 0);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }

diff --git a/tests/kds_s2000w_net_get_opt_tests.h b/tests/kds_s2000w_net_get_opt_tests.h
index 394767911726562e8dd1acaf95a1e8d526019968..3782fa661e7aae7d7df9dd7169a715f2a9207257 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.h
+++ b/tests/kds_s2000w_net_get_opt_tests.h
@@ -6,24 +6,24 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
-void sane_kds_s2000w_net_control_get_option_zero(void** state);
-void sane_kds_s2000w_net_control_get_option_two(void** state);
-void sane_kds_s2000w_net_control_get_option_three(void** state);
-void sane_kds_s2000w_net_control_get_option_four(void** state);
-void sane_kds_s2000w_net_control_get_option_five(void** state);
-void sane_kds_s2000w_net_control_get_option_seven(void** state);
-void sane_kds_s2000w_net_control_get_option_eight(void** state);
-void sane_kds_s2000w_net_control_get_option_nine(void** state);
-void sane_kds_s2000w_net_control_get_option_ten(void** state);
-void sane_kds_s2000w_net_control_get_option_eleven(void** state);
-void sane_kds_s2000w_net_control_get_option_twelve(void** state);
-void sane_kds_s2000w_net_control_get_option_thirdteen(void** state);
-void sane_kds_s2000w_net_control_get_option_fourteen(void** state);
-void sane_kds_s2000w_net_control_get_option_fifteen(void** state);
-void sane_kds_s2000w_net_control_get_option_sixteen(void** state);
-void sane_kds_s2000w_net_control_get_option_seventeen(void** state);
-void sane_kds_s2000w_net_control_get_option_eightteen(void** state);
-void sane_kds_s2000w_net_control_get_option_nineteen(void** state);
-void sane_kds_s2000w_net_control_get_option_twenty(void** state);
+void sane_kds_s2000w_net_control_get_option_zero_test(void** state);
+void sane_kds_s2000w_net_control_get_option_two_test(void** state);
+void sane_kds_s2000w_net_control_get_option_three_test(void** state);
+void sane_kds_s2000w_net_control_get_option_four_test(void** state);
+void sane_kds_s2000w_net_control_get_option_five_test(void** state);
+void sane_kds_s2000w_net_control_get_option_seven_test(void** state);
+void sane_kds_s2000w_net_control_get_option_eight_test(void** state);
+void sane_kds_s2000w_net_control_get_option_nine_test(void** state);
+void sane_kds_s2000w_net_control_get_option_ten_test(void** state);
+void sane_kds_s2000w_net_control_get_option_eleven_test(void** state);
+void sane_kds_s2000w_net_control_get_option_twelve_test(void** state);
+void sane_kds_s2000w_net_control_get_option_thirdteen_test(void** state);
+void sane_kds_s2000w_net_control_get_option_fourteen_test(void** state);
+void sane_kds_s2000w_net_control_get_option_fifteen_test(void** state);
+void sane_kds_s2000w_net_control_get_option_sixteen_test(void** state);
+void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state);
+void sane_kds_s2000w_net_control_get_option_eightteen_test(void** state);
+void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state);
+void sane_kds_s2000w_net_control_get_option_twenty_test(void** state);
 
 #endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_get_opt_tests_run.c b/tests/kds_s2000w_net_get_opt_tests_run.c
index 31eafca562da64f2f11df888c46a0f2ce6421a9e..5ddc78204082eb38f22a2e0744f06f5c800335fb 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests_run.c
+++ b/tests/kds_s2000w_net_get_opt_tests_run.c
@@ -60,25 +60,25 @@ int teardown_default_get_option(void** state)
 int main()
 {
        const struct CMUnitTest net_tests[] = {
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_zero, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_two, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_three, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_four, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_five, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_seven, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_eight, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_nine, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_ten, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_eleven, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twelve, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdteen, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourteen, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fifteen, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_sixteen, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_seventeen, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_eightteen, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_nineteen, setup_default_get_option, teardown_default_get_option),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twenty, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_zero_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_two_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_three_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_four_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_five_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_seven_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_eight_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_nine_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_ten_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_eleven_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twelve_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdteen_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourteen_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fifteen_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_sixteen_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_seventeen_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_eightteen_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_nineteen_test, setup_default_get_option, teardown_default_get_option),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twenty_test, setup_default_get_option, teardown_default_get_option),
        };
 
        return cmocka_run_group_tests(net_tests, NULL, NULL);

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index 66d425f2da75e494f9b78f7cdee3558e89e39641..863059022ad17ad64ad5a9d92930265bb782c4be 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -6,10 +6,10 @@
 #include "../src/kds_s2000w_handler.h"
 #include "../src/kds_s2000w_net.h"
 
-void sane_kds_s2000w_net_read_without_data()
+void sane_kds_s2000w_net_read_without_data_test()
 {
        int length = 0;
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        char* dataptr = malloc(sizeof(char));
 
        SANE_Status status = sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length);
@@ -18,14 +18,14 @@ void sane_kds_s2000w_net_read_without_data()
 
        free(dataptr);
        dataptr = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_read_empty_image()
+void sane_kds_s2000w_net_read_empty_image_test()
 {
        int length = 0;
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        h->image->data = malloc(sizeof(char));
        h->image->size = 0;
        char* dataptr = malloc(sizeof(char));
@@ -38,13 +38,13 @@ void sane_kds_s2000w_net_read_empty_image()
        h->image->data = NULL;
        free(dataptr);
        dataptr = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
 void sane_kds_s2000w_net_read_test()
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        h->image->size = 65536;
        h->image->data = malloc(sizeof(char) * 65536);
        char* imagedata = (char*) h->image->data;
@@ -68,13 +68,13 @@ void sane_kds_s2000w_net_read_test()
        length = NULL;
        free(h->image->data);
        h->image->data = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
 void sane_kds_s2000w_net_read_bytes_per_line_bigger_test()
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        h->read_info->cancel = 0;
        h->read_info->read_size = 0;
        h->image->size = 95003;
@@ -100,6 +100,6 @@ void sane_kds_s2000w_net_read_bytes_per_line_bigger_test()
        length = NULL;
        free(h->image->data);
        h->image->data = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_read_tests.h b/tests/kds_s2000w_net_read_tests.h
index 62a339603bc1aa06a300fb95263c2b9a61f59eba..92b88d05f738e16acc21c93cd182d283cf5f3fe7 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.h
+++ b/tests/kds_s2000w_net_read_tests.h
@@ -6,8 +6,8 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
-void sane_kds_s2000w_net_read_without_data();
-void sane_kds_s2000w_net_read_empty_image();
+void sane_kds_s2000w_net_read_without_data_test();
+void sane_kds_s2000w_net_read_empty_image_test();
 void sane_kds_s2000w_net_read_test();
 void sane_kds_s2000w_net_read_bytes_per_line_bigger_test();
 

diff --git a/tests/kds_s2000w_net_read_tests_run.c b/tests/kds_s2000w_net_read_tests_run.c
index 7468c5e8aa80255fffba9a9277319ca7bc2dc0b4..2cf98c1d89456f3ae87522c3ede7e8bfbb63a004 100644 (file)
--- a/tests/kds_s2000w_net_read_tests_run.c
+++ b/tests/kds_s2000w_net_read_tests_run.c
@@ -3,8 +3,8 @@
 int main()
 {
        const struct CMUnitTest net_read_tests[] = {
-               cmocka_unit_test(sane_kds_s2000w_net_read_without_data),
-               cmocka_unit_test(sane_kds_s2000w_net_read_empty_image),
+               cmocka_unit_test(sane_kds_s2000w_net_read_without_data_test),
+               cmocka_unit_test(sane_kds_s2000w_net_read_empty_image_test),
                cmocka_unit_test(sane_kds_s2000w_net_read_test),
                cmocka_unit_test(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
        };

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 57a2f29825f959e6061387896d408947987f7c9f..e7134c3ad0231f7282dbcbac162005bcc3ab5960 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -7,7 +7,7 @@
 #include "../src/kds_s2000w_net.h"
 #include "../src/kds_s2000w_handler.h"
 
-void kds_s2000w_net_get_devices()
+void kds_s2000w_net_get_devices_test()
 {
        SANE_Device*** device_list = malloc(sizeof(SANE_Device**));
 
@@ -22,7 +22,7 @@ void kds_s2000w_net_get_devices()
        device_list = NULL;
 }
 
-void kds_s2000w_net_init()
+void kds_s2000w_net_init_test()
 {
        SANE_Int* version = malloc(sizeof(SANE_Int));
 
@@ -35,7 +35,7 @@ void kds_s2000w_net_init()
        version = NULL;
 }
 
-void kds_s2000w_net_get_devices_only_remote()
+void kds_s2000w_net_get_devices_only_remote_test()
 {
        SANE_Device*** device_list = malloc(sizeof(SANE_Device**));
 
@@ -47,30 +47,30 @@ void kds_s2000w_net_get_devices_only_remote()
        device_list = NULL;
 }
 
-void kds_s2000w_net_set_io_mode()
+void kds_s2000w_net_set_io_mode_test()
 {
        SANE_Status result = sane_kds_s2000w_net_set_io_mode(NULL, SANE_FALSE);
 
        assert_int_equal(result, SANE_STATUS_UNSUPPORTED);
 }
 
-void kds_s2000w_net_get_select_fd()
+void kds_s2000w_net_get_select_fd_test()
 {
        SANE_Status result = sane_kds_s2000w_net_get_select_fd(NULL, NULL);
 
        assert_int_equal(result, SANE_STATUS_UNSUPPORTED);
 }
 
-void sane_kds_s2000w_net_start_cancel()
+void sane_kds_s2000w_net_start_cancel_test()
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        h->read_info->cancel = 1;
 
        SANE_Status status = sane_kds_s2000w_net_start(h);
 
        assert_int_equal(status, SANE_STATUS_CANCELLED);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
@@ -104,7 +104,7 @@ void sane_kds_s2000w_net_start_test(void** state)
        expect_function_call(__wrap_kds_s2000w_client_status_session);
        expect_function_call(__wrap_kds_s2000w_client_get_image);
        expect_function_call(__wrap_kds_s2000w_client_delete_image);
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
        h->current_scanner_config = json_tokener_parse(test_config);
 
@@ -117,11 +117,11 @@ void sane_kds_s2000w_net_start_test(void** state)
        h->current_scanner_config = NULL;
        kds_s2000w_client_response_free(resp_status);
        resp_status = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_start_one_page_per_flatscan(void** state)
+void sane_kds_s2000w_net_start_one_page_per_flatscan_test(void** state)
 {
        response** response_list = (response**) *state;
        will_return(mock_response, response_list[0]);
@@ -151,7 +151,7 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan(void** state)
        expect_function_call(__wrap_kds_s2000w_client_status_session);
        expect_function_call(__wrap_kds_s2000w_client_get_image);
        expect_function_call(__wrap_kds_s2000w_client_delete_image);
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        h->current_scan_status->feeder = 0;
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
        h->current_scanner_config = json_tokener_parse(test_config);
@@ -165,11 +165,11 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan(void** state)
        h->current_scanner_config = NULL;
        kds_s2000w_client_response_free(resp_status);
        resp_status = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_start_one_page_per_feeder(void** state)
+void sane_kds_s2000w_net_start_one_page_per_feeder_test(void** state)
 {
        response** response_list = (response**) *state;
        will_return(mock_response, response_list[0]);
@@ -202,7 +202,7 @@ void sane_kds_s2000w_net_start_one_page_per_feeder(void** state)
        expect_function_call(__wrap_kds_s2000w_client_get_image);
        expect_function_call(__wrap_kds_s2000w_client_delete_image);
        expect_function_call(__wrap_kds_s2000w_client_stop_scan);
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
        h->current_scanner_config = json_tokener_parse(test_config);
 
@@ -215,11 +215,11 @@ void sane_kds_s2000w_net_start_one_page_per_feeder(void** state)
        h->current_scanner_config = NULL;
        kds_s2000w_client_response_free(resp_status);
        resp_status = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state)
+void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state)
 {
        response** response_list = (response**) *state;
        will_return(mock_response, response_list[0]);
@@ -253,7 +253,7 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state)
        expect_function_call(__wrap_kds_s2000w_client_delete_image);
        expect_function_call(__wrap_kds_s2000w_client_stop_scan);
 
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
        h->current_scanner_config = json_tokener_parse(test_config);
 
@@ -293,13 +293,13 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state)
        h->current_scanner_config = NULL;
        kds_s2000w_client_response_free(resp_status);
        resp_status = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_get_parameter_color()
+void sane_kds_s2000w_net_get_parameter_color_test()
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        const char* config = "{\"Configuration\":{\"ColorMode\":\"Color\"}}";
        h->current_scanner_config = json_tokener_parse(config);
        h->image->size = 17;
@@ -333,15 +333,15 @@ void sane_kds_s2000w_net_get_parameter_color()
        assert_int_equal(params->depth, 8);
        assert_int_equal(h->read_info->read_size, 11);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
        free(params);
        params = NULL;
 }
 
-void sane_kds_s2000w_net_get_parameter_bw()
+void sane_kds_s2000w_net_get_parameter_bw_test()
 {
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        const char* config = "{\"Configuration\":{\"ColorMode\":\"Color\"}}";
        h->current_scanner_config = json_tokener_parse(config);
        h->image->size = 17;
@@ -371,14 +371,13 @@ void sane_kds_s2000w_net_get_parameter_bw()
        assert_int_equal(params->depth, 1);
        assert_int_equal(h->read_info->read_size, 7);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
        free(params);
        params = NULL;
 }
 
-
-void sane_kds_s2000w_net_cance_testl()
+void sane_kds_s2000w_net_cancel_test()
 {
        response* resp_status = kds_s2000w_client_response_init();
        resp_status->data = realloc(resp_status->data, 205);
@@ -404,7 +403,7 @@ void sane_kds_s2000w_net_cance_testl()
        will_return(__wrap_kds_s2000w_client_stop_scan, 0);
        expect_function_call(__wrap_kds_s2000w_client_status_session);
        expect_function_call(__wrap_kds_s2000w_client_stop_scan);
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        h->current_scan_status->available_images = 1;
 
        sane_kds_s2000w_net_cancel(h);
@@ -415,11 +414,11 @@ void sane_kds_s2000w_net_cance_testl()
        resp = NULL;
        kds_s2000w_client_response_free(resp_status);
        resp_status = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_cancel_canceled()
+void sane_kds_s2000w_net_cancel_canceled_test()
 {
        response* resp_status = kds_s2000w_client_response_init();
        resp_status->data = realloc(resp_status->data, 27);
@@ -437,7 +436,7 @@ void sane_kds_s2000w_net_cancel_canceled()
        expect_function_call(__wrap_kds_s2000w_client_close_session);
        expect_function_call(__wrap_kds_s2000w_client_open_session);
        expect_function_call(__wrap_kds_s2000w_client_set_option);
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
        h->read_info->cancel = 1;
 
        sane_kds_s2000w_net_cancel(h);
@@ -448,11 +447,11 @@ void sane_kds_s2000w_net_cancel_canceled()
        resp_status = NULL;
        kds_s2000w_client_response_free(set_option);
        set_option = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_cancel_completed_scan_feeder()
+void sane_kds_s2000w_net_cancel_completed_scan_feeder_test()
 {
        response* resp_status = kds_s2000w_client_response_init();
        resp_status->data = realloc(resp_status->data, 210);
@@ -473,7 +472,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_feeder()
        will_return(__wrap_kds_s2000w_client_status_session, 0);
        expect_function_call(__wrap_kds_s2000w_client_status_session);
 
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
 
        sane_kds_s2000w_net_cancel(h);
 
@@ -482,11 +481,11 @@ void sane_kds_s2000w_net_cancel_completed_scan_feeder()
 
        kds_s2000w_client_response_free(resp_status);
        resp_status = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_cancel_completed_scan_flatbed()
+void sane_kds_s2000w_net_cancel_completed_scan_flatbed_test()
 {
        response* resp_status = kds_s2000w_client_response_init();
        resp_status->data = realloc(resp_status->data, 205);
@@ -523,7 +522,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_flatbed()
        expect_function_call(__wrap_kds_s2000w_client_open_session);
        expect_function_call(__wrap_kds_s2000w_client_set_option);
 
-       handler* h = init_handler();
+       handler* h = kds_s2000w_handler_init();
 
        sane_kds_s2000w_net_cancel(h);
 
@@ -536,7 +535,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_flatbed()
        resp_session = NULL;
        kds_s2000w_client_response_free(resp_options);
        resp_options = NULL;
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
 }
 
@@ -559,7 +558,7 @@ void sane_kds_s2000w_net_open_test()
        assert_int_equal(h->sessionid, 1251877821);
        assert_int_equal(status, SANE_STATUS_GOOD);
 
-       free_handler(h);
+       kds_s2000w_handler_free(h);
        h = NULL;
        kds_s2000w_client_response_free(resp);
        resp = NULL;
@@ -567,7 +566,7 @@ void sane_kds_s2000w_net_open_test()
        hlist = NULL;
 }
 
-void sane_kds_s2000w_net_open_busy_device()
+void sane_kds_s2000w_net_open_busy_device_test()
 {
        response* resp = kds_s2000w_client_response_init();
        resp->code = 423;
@@ -586,7 +585,7 @@ void sane_kds_s2000w_net_open_busy_device()
        hlist = NULL;
 }
 
-void sane_kds_s2000w_net_open_invalid()
+void sane_kds_s2000w_net_open_invalid_test()
 {
        void** hlist = malloc(sizeof(void*));
 
@@ -598,7 +597,7 @@ void sane_kds_s2000w_net_open_invalid()
        hlist = NULL;
 }
 
-void sane_kds_s2000w_net_open_not_connected()
+void sane_kds_s2000w_net_open_not_connected_test()
 {
        response* resp = kds_s2000w_client_response_init();
        resp->code = 0;

diff --git a/tests/kds_s2000w_net_tests.h b/tests/kds_s2000w_net_tests.h
index 9ce60e773ad6a40468e424e576ed8606685300b3..be16ce9881eb12eeb72e091da4aace0f0fb81742 100644 (file)
--- a/tests/kds_s2000w_net_tests.h
+++ b/tests/kds_s2000w_net_tests.h
@@ -6,25 +6,25 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
-void kds_s2000w_net_get_devices();
-void kds_s2000w_net_init();
-void kds_s2000w_net_get_devices_only_remote();
-void kds_s2000w_net_set_io_mode();
-void kds_s2000w_net_get_select_fd();
-void sane_kds_s2000w_net_start_cancel();
-void sane_kds_s2000w_net_cancel_canceled();
-void sane_kds_s2000w_net_cancel_completed_scan_flatbed();
+void kds_s2000w_net_get_devices_test();
+void kds_s2000w_net_init_test();
+void kds_s2000w_net_get_devices_only_remote_test();
+void kds_s2000w_net_set_io_mode_test();
+void kds_s2000w_net_get_select_fd_test();
+void sane_kds_s2000w_net_start_cancel_test();
+void sane_kds_s2000w_net_cancel_canceled_test();
+void sane_kds_s2000w_net_cancel_completed_scan_flatbed_test();
 void sane_kds_s2000w_net_start_test(void** state);
-void sane_kds_s2000w_net_start_one_page_per_flatscan(void** state);
-void sane_kds_s2000w_net_start_one_page_per_feeder(void** state);
-void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state);
-void sane_kds_s2000w_net_get_parameter_color();
-void sane_kds_s2000w_net_get_parameter_bw();
-void sane_kds_s2000w_net_cance_testl();
-void sane_kds_s2000w_net_cancel_completed_scan_feeder();
+void sane_kds_s2000w_net_start_one_page_per_flatscan_test(void** state);
+void sane_kds_s2000w_net_start_one_page_per_feeder_test(void** state);
+void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state);
+void sane_kds_s2000w_net_get_parameter_color_test();
+void sane_kds_s2000w_net_get_parameter_bw_test();
+void sane_kds_s2000w_net_cancel_test();
+void sane_kds_s2000w_net_cancel_completed_scan_feeder_test();
 void sane_kds_s2000w_net_open_test();
-void sane_kds_s2000w_net_open_busy_device();
-void sane_kds_s2000w_net_open_invalid();
-void sane_kds_s2000w_net_open_not_connected();
+void sane_kds_s2000w_net_open_busy_device_test();
+void sane_kds_s2000w_net_open_invalid_test();
+void sane_kds_s2000w_net_open_not_connected_test();
 
 #endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_tests_run.c b/tests/kds_s2000w_net_tests_run.c
index 99db9bb8f836376c083fc03e76c2e8fa7158408c..34d9a0775e7651cd506ef6fa692ecb9662ec141f 100644 (file)
--- a/tests/kds_s2000w_net_tests_run.c
+++ b/tests/kds_s2000w_net_tests_run.c
@@ -63,26 +63,26 @@ int teardown_net_start(void** state)
 int main()
 {
        const struct CMUnitTest net_tests[] = {
-               cmocka_unit_test(kds_s2000w_net_get_devices),
-               cmocka_unit_test(kds_s2000w_net_init),
-               cmocka_unit_test(kds_s2000w_net_get_devices_only_remote),
-               cmocka_unit_test(kds_s2000w_net_set_io_mode),
-               cmocka_unit_test(kds_s2000w_net_get_select_fd),
-               cmocka_unit_test(sane_kds_s2000w_net_start_cancel),
-               cmocka_unit_test(sane_kds_s2000w_net_cancel_canceled),
-               cmocka_unit_test(sane_kds_s2000w_net_cance_testl),
-               cmocka_unit_test(sane_kds_s2000w_net_cancel_completed_scan_feeder),
-               cmocka_unit_test(sane_kds_s2000w_net_cancel_completed_scan_flatbed),
+               cmocka_unit_test(kds_s2000w_net_get_devices_test),
+               cmocka_unit_test(kds_s2000w_net_init_test),
+               cmocka_unit_test(kds_s2000w_net_get_devices_only_remote_test),
+               cmocka_unit_test(kds_s2000w_net_set_io_mode_test),
+               cmocka_unit_test(kds_s2000w_net_get_select_fd_test),
+               cmocka_unit_test(sane_kds_s2000w_net_start_cancel_test),
+               cmocka_unit_test(sane_kds_s2000w_net_cancel_canceled_test),
+               cmocka_unit_test(sane_kds_s2000w_net_cancel_test),
+               cmocka_unit_test(sane_kds_s2000w_net_cancel_completed_scan_feeder_test),
+               cmocka_unit_test(sane_kds_s2000w_net_cancel_completed_scan_flatbed_test),
                cmocka_unit_test(sane_kds_s2000w_net_open_test),
-               cmocka_unit_test(sane_kds_s2000w_net_open_busy_device),
-               cmocka_unit_test(sane_kds_s2000w_net_open_invalid),
-               cmocka_unit_test(sane_kds_s2000w_net_open_not_connected),
-               cmocka_unit_test(sane_kds_s2000w_net_get_parameter_color),
-               cmocka_unit_test(sane_kds_s2000w_net_get_parameter_bw),
+               cmocka_unit_test(sane_kds_s2000w_net_open_busy_device_test),
+               cmocka_unit_test(sane_kds_s2000w_net_open_invalid_test),
+               cmocka_unit_test(sane_kds_s2000w_net_open_not_connected_test),
+               cmocka_unit_test(sane_kds_s2000w_net_get_parameter_color_test),
+               cmocka_unit_test(sane_kds_s2000w_net_get_parameter_bw_test),
                cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start_test, setup_net_start, teardown_net_start),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start_one_page_per_flatscan, setup_net_start, teardown_net_start),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start_one_page_per_feeder, setup_net_start, teardown_net_start),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start_two_pages_per_feeder, setup_net_start, teardown_net_start),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start_one_page_per_flatscan_test, setup_net_start, teardown_net_start),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start_one_page_per_feeder_test, setup_net_start, teardown_net_start),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start_two_pages_per_feeder_test, setup_net_start, teardown_net_start),
        };
 
        return cmocka_run_group_tests(net_tests, NULL, NULL);