From 3981c25c8e8ffc767b5f365c3dcbc12c1201cf1f Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Tue, 18 Feb 2025 17:54:17 +0100 Subject: [PATCH] change feeder option group position --- src/kds_s2000w_handler_opts.c | 16 +++++----- src/kds_s2000w_option_descriptors.c | 4 +-- tests/kds_s2000w_net_get_opt_tests.c | 30 +++++++++--------- tests/kds_s2000w_net_get_opt_tests.h | 2 +- tests/kds_s2000w_net_get_opt_tests_run.c | 4 +-- tests/kds_s2000w_option_descriptor_tests.c | 36 +++++++++++----------- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 7d0e3d5..ec0cfc3 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -274,10 +274,6 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "JpegQuality"); _kds_s2000w_handler_opts_write_string_value(value_object, value); break; - case 40: - value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse"); - _kds_s2000w_handler_opts_write_string_value(value_object, value); - break; case 41: value_object = json_object_object_get(config, "DocumentFeederTimeout"); _kds_s2000w_handler_opts_write_int_value(value_object, value); @@ -298,6 +294,10 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "MaxDocumentLength"); _kds_s2000w_handler_opts_write_int_value(value_object, value); break; + case 46: + value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); + break; default: break; } @@ -479,10 +479,6 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "JpegQuality"); _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; - case 40: - value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse"); - _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); - break; case 41: value_object = json_object_object_get(config, "DocumentFeederTimeout"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); @@ -503,6 +499,10 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "MaxDocumentLength"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; + case 46: + value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + break; default: break; } diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 224a138..71438d9 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -1154,13 +1154,13 @@ void kds_s2000w_option_descriptors_init() descriptor_array[37] = _kds_s2000w_option_descriptor_edge_fill(); descriptor_array[38] = _kds_s2000w_option_descriptor_image_border(); descriptor_array[39] = _kds_s2000w_option_descriptor_jpeg_quality(); - descriptor_array[40] = _kds_s2000w_option_descriptor_document_feeder_timeout_response(); + descriptor_array[40] = _kds_s2000w_option_descriptor_feeder_group(); descriptor_array[41] = _kds_s2000w_option_descriptor_document_feeder_timeout(); descriptor_array[42] = _kds_s2000w_option_descriptor_multifeed_response(); descriptor_array[43] = _kds_s2000w_option_descriptor_transport_handling(); descriptor_array[44] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); descriptor_array[45] = _kds_s2000w_option_descriptor_max_document_length(); - descriptor_array[46] = _kds_s2000w_option_descriptor_feeder_group(); + descriptor_array[46] = _kds_s2000w_option_descriptor_document_feeder_timeout_response(); } void kds_s2000w_option_descriptors_free() diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 2117917..6add228 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -525,21 +525,6 @@ void sane_kds_s2000w_net_control_get_option_thirdynine_test(void** state) h = NULL; } -void sane_kds_s2000w_net_control_get_option_fourty_test(void** state) -{ - handler* h = kds_s2000w_handler_init(); - response* resp = (response*) *state; - h->current_scanner_config = json_tokener_parse(resp->data); - char* value[50] = {0}; - - sane_kds_s2000w_net_control_option(h, 40, SANE_ACTION_GET_VALUE, &value, NULL); - - assert_string_equal(value, "Stop"); - - kds_s2000w_handler_free(h); - h = NULL; -} - void sane_kds_s2000w_net_control_get_option_fourtyone_test(void** state) { handler* h = kds_s2000w_handler_init(); @@ -611,6 +596,21 @@ void sane_kds_s2000w_net_control_get_option_fourtyfive_test(void** state) assert_int_equal(value, 140); + kds_s2000w_handler_free(h); + h = NULL; +} + +void sane_kds_s2000w_net_control_get_option_fourtysix_test(void** state) +{ + handler* h = kds_s2000w_handler_init(); + response* resp = (response*) *state; + h->current_scanner_config = json_tokener_parse(resp->data); + char* value[50] = {0}; + + sane_kds_s2000w_net_control_option(h, 46, SANE_ACTION_GET_VALUE, &value, NULL); + + assert_string_equal(value, "Stop"); + kds_s2000w_handler_free(h); h = NULL; } \ No newline at end of file diff --git a/tests/kds_s2000w_net_get_opt_tests.h b/tests/kds_s2000w_net_get_opt_tests.h index 9e5c1b0..3659963 100644 --- a/tests/kds_s2000w_net_get_opt_tests.h +++ b/tests/kds_s2000w_net_get_opt_tests.h @@ -40,11 +40,11 @@ void sane_kds_s2000w_net_control_get_option_thirdysix_test(void** state); void sane_kds_s2000w_net_control_get_option_thirdyseven_test(void** state); void sane_kds_s2000w_net_control_get_option_thirdyeight_test(void** state); void sane_kds_s2000w_net_control_get_option_thirdynine_test(void** state); -void sane_kds_s2000w_net_control_get_option_fourty_test(void** state); void sane_kds_s2000w_net_control_get_option_fourtyone_test(void** state); void sane_kds_s2000w_net_control_get_option_fourtytwo_test(void** state); void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state); void sane_kds_s2000w_net_control_get_option_fourtyfour_test(void** state); void sane_kds_s2000w_net_control_get_option_fourtyfive_test(void** state); +void sane_kds_s2000w_net_control_get_option_fourtysix_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 f4a28d5..c5de03a 100644 --- a/tests/kds_s2000w_net_get_opt_tests_run.c +++ b/tests/kds_s2000w_net_get_opt_tests_run.c @@ -114,12 +114,12 @@ int main() cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdyseven_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdyeight_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdynine_test, setup_default_get_option, teardown_default_get_option), - cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourty_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtyone_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtytwo_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtythree_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtyfour_test, setup_default_get_option, teardown_default_get_option), - cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtyfive_test, setup_default_get_option, teardown_default_get_option) + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtyfive_test, setup_default_get_option, teardown_default_get_option), + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtysix_test, setup_default_get_option, teardown_default_get_option) }; 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 0d4bd5e..5aa9c0e 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -704,18 +704,14 @@ void kds_s2000w_option_get_descriptor_fourty_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(40); - assert_string_equal("document-feeder-timeout-response", option->name); - assert_string_equal("Document feeder timeout respone", option->title); - assert_string_equal("Document feeder timeout respone", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("feeder-options", option->name); + assert_string_equal("Feeder Options", option->title); + assert_string_equal("Feeder Options", option->desc); + assert_int_equal(SANE_TYPE_GROUP, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_String_Const*) * 4, option->size); - assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap); - assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type); - assert_string_equal("Stop", option->constraint.string_list[0]); - assert_string_equal("Pause", option->constraint.string_list[1]); - assert_string_equal("PauseAndWait", option->constraint.string_list[2]); - assert_null(option->constraint.string_list[3]); + assert_int_equal(0, option->size); + assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED, option->cap); + assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type); } void kds_s2000w_option_get_descriptor_fourtyone_test() @@ -811,14 +807,18 @@ void kds_s2000w_option_get_descriptor_fourtysix_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(46); - assert_string_equal("feeder-options", option->name); - assert_string_equal("Feeder Options", option->title); - assert_string_equal("Feeder Options", option->desc); - assert_int_equal(SANE_TYPE_GROUP, option->type); + assert_string_equal("document-feeder-timeout-response", option->name); + assert_string_equal("Document feeder timeout respone", option->title); + assert_string_equal("Document feeder timeout respone", option->desc); + assert_int_equal(SANE_TYPE_STRING, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(0, option->size); - assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED, option->cap); - assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type); + assert_int_equal(sizeof(SANE_String_Const*) * 4, option->size); + assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap); + assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type); + assert_string_equal("Stop", option->constraint.string_list[0]); + assert_string_equal("Pause", option->constraint.string_list[1]); + assert_string_equal("PauseAndWait", option->constraint.string_list[2]); + assert_null(option->constraint.string_list[3]); } void kds_s2000w_option_get_descriptor_get_by_name_test() -- 2.39.5