From: Bastian Dehn Date: Sat, 21 Dec 2024 18:45:13 +0000 (+0100) Subject: remove option feeder automatic X-Git-Tag: v1.0.10^2~1 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=75f1f7fd983309d72910b333f58c088ea792aa60;p=sane-kds-s2000w-net.git remove option feeder automatic --- diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index db9aa18..8b96f39 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -327,7 +327,6 @@ void kds_s2000w_handler_open(const char* devicename, void** handle) return; } - h->image->size = 0; h->image->data = NULL; diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 726252d..76e48e2 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -144,9 +144,6 @@ void kds_s2000w_handler_get_option(handler* h, int option, void* value, int* inf if (strcmp(value, "DocumentFeeder") == 0) h->current_scan_status->feeder = 1; - if (strcmp(value, "Automatic") == 0) - h->current_scan_status->feeder = 2; - break; case 3: value_object = json_object_object_get(config, "ColorMode"); @@ -249,9 +246,6 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf if (strcmp(value, "DocumentFeeder") == 0) h->current_scan_status->feeder = 1; - if (strcmp(value, "Automatic") == 0) - h->current_scan_status->feeder = 2; - break; case 3: value_object = json_object_object_get(config, "ColorMode"); diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index 4ed0968..5a786b7 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -231,8 +231,7 @@ SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle) return SANE_STATUS_GOOD; } - if (h->current_scan_status->feeder != 1 - && h->current_scan_status->available_images <= 0) { + if (h->current_scan_status->available_images <= 0) { kds_s2000w_handler_recreate_session(h); return SANE_STATUS_GOOD; } diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 6cf2f2f..d0a34f6 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -498,9 +498,8 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_scan_source() constraint_scan_source = malloc(sizeof(SANE_String_Const*) * 4); constraint_scan_source[0] = "DocumentFeeder"; - constraint_scan_source[1] = "Automatic"; - constraint_scan_source[2] = "Flatbed"; - constraint_scan_source[3] = NULL; + constraint_scan_source[1] = "Flatbed"; + constraint_scan_source[2] = NULL; SANE_Option_Descriptor descriptor = { SANE_NAME_SCAN_SOURCE, @@ -508,7 +507,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_scan_source() SANE_DESC_SCAN_SOURCE, SANE_TYPE_STRING, SANE_UNIT_NONE, - sizeof(SANE_String_Const*) * 4, + sizeof(SANE_String_Const*) * 3, SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, SANE_CONSTRAINT_STRING_LIST, {.string_list = constraint_scan_source} diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c index a816958..2374d0d 100644 --- a/tests/kds_s2000w_net_tests.c +++ b/tests/kds_s2000w_net_tests.c @@ -379,99 +379,6 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state) h = NULL; } -void sane_kds_s2000w_net_start_slow_two_pages_per_feeder(void** state) -{ - response** response_list = (response**) *state; - will_return(mock_response, response_list[0]); - will_return(__wrap_kds_s2000w_client_start_scan, 0); - response* resp_status = kds_s2000w_client_response_init(); - resp_status->data = realloc(resp_status->data, 205); - const char* status = "{ \ - \"Status\": { \ - \"NumImagesScanned\": 1, \ - \"NumImagesStored\": 1, \ - \"State\": \"Scanning\", \ - \"ErrorNum\": 0, \ - \"LastError\": \"Status: 200 Success\", \ - \"PaperDetected\": \"0\", \ - \"PercentAvailable\": 99 \ - }}\0"; - memcpy(resp_status->data, status, 205); - resp_status->code = 200; - resp_status->size = 205; - will_return(mock_response, resp_status); - will_return(__wrap_kds_s2000w_client_status_session, 0); - will_return(mock_response, response_list[2]); - will_return(__wrap_kds_s2000w_client_get_image, 0); - will_return(mock_response, response_list[0]); - will_return(__wrap_kds_s2000w_client_delete_image, 0); - expect_function_call(__wrap_kds_s2000w_client_start_scan); - 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(); - h->current_scan_status->feeder = 1; - const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }"; - h->current_scanner_config = json_tokener_parse(test_config); - - int result = _sane_kds_s2000w_net_start(h); - - resp_status->data = realloc(resp_status->data, 210); - const char* status2 = "{ \ - \"Status\": { \ - \"NumImagesScanned\": 2, \ - \"NumImagesStored\": 1, \ - \"State\": \"Done Scanning\", \ - \"ErrorNum\": 0, \ - \"LastError\": \"Status: 200 Success\", \ - \"PaperDetected\": \"0\", \ - \"PercentAvailable\": 99 \ - }}\0"; - memcpy(resp_status->data, status2, 210); - resp_status->code = 200; - resp_status->size = 210; - will_return(mock_response, resp_status); - will_return(__wrap_kds_s2000w_client_status_session, 0); - will_return(mock_response, response_list[2]); - will_return(__wrap_kds_s2000w_client_get_image, 0); - will_return(mock_response, response_list[0]); - will_return(__wrap_kds_s2000w_client_delete_image, 0); - response* resp_open_session = kds_s2000w_client_response_init(); - resp_open_session->data = realloc(resp_open_session->data, 25); - const char* session_data = "{\"SessionId\":\"8154711\"}\0"; - memcpy(resp_open_session->data, session_data, 25); - resp_open_session->code = 200; - resp_open_session->size = 25; - will_return(mock_response, resp_open_session); - will_return(__wrap_kds_s2000w_client_open_session, 0); - response* resp_set_option = kds_s2000w_client_response_init(); - resp_set_option->code = 200; - will_return(mock_response, resp_set_option); - will_return(__wrap_kds_s2000w_client_set_option, 0); - 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); - 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); - result = _sane_kds_s2000w_net_start(h); - - assert_int_equal(result, SANE_STATUS_GOOD); - assert_int_equal(h->current_scan_status->complete_scanned, 1); - - json_object_put(h->current_scanner_config); - h->current_scanner_config = NULL; - kds_s2000w_client_response_free(resp_status); - resp_status = NULL; - kds_s2000w_client_response_free(resp_open_session); - resp_open_session = NULL; - kds_s2000w_client_response_free(resp_set_option); - resp_set_option = NULL; - free_handler(h); - h = NULL; -} - void sane_kds_s2000w_net_get_parameter_cancel() { handler* h = init_handler(); diff --git a/tests/kds_s2000w_net_tests.h b/tests/kds_s2000w_net_tests.h index 34c1bf8..a8a7026 100644 --- a/tests/kds_s2000w_net_tests.h +++ b/tests/kds_s2000w_net_tests.h @@ -16,7 +16,6 @@ void sane_kds_s2000w_net_start(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_start_slow_two_pages_per_feeder(void** state); void sane_kds_s2000w_net_get_parameter_cancel(); void sane_kds_s2000w_net_cancel(); void sane_kds_s2000w_net_open(); diff --git a/tests/kds_s2000w_net_tests_run.c b/tests/kds_s2000w_net_tests_run.c index 7f52daa..775a4ff 100644 --- a/tests/kds_s2000w_net_tests_run.c +++ b/tests/kds_s2000w_net_tests_run.c @@ -79,7 +79,6 @@ int main() 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_slow_two_pages_per_feeder, setup_net_start, teardown_net_start) }; return cmocka_run_group_tests(net_tests, NULL, NULL); diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index c8e9872..55f6574 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -69,13 +69,12 @@ void kds_s2000w_option_get_descriptor_two() assert_string_equal(SANE_DESC_SCAN_SOURCE, option->desc); assert_int_equal(SANE_TYPE_STRING, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_String_Const*) * 4, option->size); + assert_int_equal(sizeof(SANE_String_Const*) * 3, option->size); assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap); assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type); assert_string_equal("DocumentFeeder", option->constraint.string_list[0]); - assert_string_equal("Automatic", option->constraint.string_list[1]); - assert_string_equal("Flatbed", option->constraint.string_list[2]); - assert_null(option->constraint.string_list[3]); + assert_string_equal("Flatbed", option->constraint.string_list[1]); + assert_null(option->constraint.string_list[2]); } void kds_s2000w_option_get_descriptor_three()