add group advanced

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 939e880b15adce195be022e398f1ee7319ec511c..6f10f80cfc0e34e1589ac0aebc97cdae30309b63 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -6,7 +6,7 @@
 #include "kds_s2000w_debug.h"
 
 #define AUTOSTART_ON 1
-#define OPTION_COUNT 43
+#define OPTION_COUNT 44
 
 void _kds_s2000w_handler_opts_write_string_value(json_object* value_object, void* value)
 {
@@ -492,7 +492,7 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value
                        value_object = json_object_object_get(config, "ImageHeight");
                        _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
-               case 42:
+               case 43:
                        _kds_s2000w_handler_opts_set_option_to_default(h);
                        _kds_s2000w_handler_opts_set_autostart_on(h);
 

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 9add6449500231bcc0f57197d708ea0327bb72a0..4f0925c8309af874382143b04f5f853b19bf6c2c 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -4,7 +4,7 @@
 #include "kds_s2000w_option_descriptors.h"
 #include "kds_s2000w_debug.h"
 
-#define MAX_OPTION_COUNT 43
+#define MAX_OPTION_COUNT 44
 
 SANE_Option_Descriptor* descriptor_array = NULL;
 
@@ -1037,6 +1037,24 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_image_height()
        return descriptor;
 }
 
+SANE_Option_Descriptor _kds_s2000w_option_descriptor_advanced_group()
+{
+       kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_advanced_group");
+
+       SANE_Option_Descriptor descriptor = {
+               SANE_NAME_ADVANCED,
+               SANE_TITLE_ADVANCED,
+               SANE_DESC_ADVANCED,
+               SANE_TYPE_GROUP,
+               SANE_UNIT_NONE,
+               0,
+               SANE_CAP_SOFT_DETECT,
+               SANE_CONSTRAINT_NONE
+       };
+
+       return descriptor;
+}
+
 void kds_s2000w_option_descriptors_init()
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_init_option_descriptors");
@@ -1084,7 +1102,8 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[39] = _kds_s2000w_option_descriptor_image_offset_y();
        descriptor_array[40] = _kds_s2000w_option_descriptor_image_width();
        descriptor_array[41] = _kds_s2000w_option_descriptor_image_height();
-       descriptor_array[42] = _kds_s2000w_option_descriptor_config_reset();
+       descriptor_array[42] = _kds_s2000w_option_descriptor_advanced_group();
+       descriptor_array[43] = _kds_s2000w_option_descriptor_config_reset();
 }
 
 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 436c496e3211797f2918e6269700de334d9bf768..7e03bd2a0772029ba000afa6b5058f4430c73c80 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -7,7 +7,7 @@
 #include "../src/kds_s2000w_net.h"
 #include "../src/kds_s2000w_handler.h"
 
-#define MAX_OPTION_COUNT 43
+#define MAX_OPTION_COUNT 44
 
 void sane_kds_s2000w_net_control_get_option_zero_test(void** state)
 {

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 54d618125993c6d34cf213d0358e980d3d1709d7..b2363512ab20809d6b6bf2d900fc30a48e9930bc 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -4,7 +4,7 @@
 #include "kds_s2000w_client_mock.h"
 #include "../src/kds_s2000w_option_descriptors.h"
 
-#define MAX_OPTION_COUNT 43
+#define MAX_OPTION_COUNT 44
 
 int setup(void** state)
 {
@@ -755,6 +755,20 @@ void kds_s2000w_option_get_descriptor_fourtytwo_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(42);
 
+       assert_string_equal(SANE_NAME_ADVANCED, option->name);
+       assert_string_equal(SANE_TITLE_ADVANCED, option->title);
+       assert_string_equal(SANE_DESC_ADVANCED, option->desc);
+       assert_int_equal(SANE_TYPE_GROUP, option->type);
+       assert_int_equal(SANE_UNIT_NONE, option->unit);
+       assert_int_equal(0, option->size);
+       assert_int_equal(SANE_CAP_SOFT_DETECT, option->cap);
+       assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
+}
+
+void kds_s2000w_option_get_descriptor_fourtythree_test()
+{
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(43);
+
        assert_string_equal("config-reset", option->name);
        assert_string_equal("reset config", option->title);
        assert_string_equal("load default configuration from scanner", option->desc);

diff --git a/tests/kds_s2000w_option_descriptor_tests.h b/tests/kds_s2000w_option_descriptor_tests.h
index 14682d944ace02627ce02da0891d51ace98df4ba..9224b19a5b16a34a98a4a3d404ab22b93d9bce37 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.h
+++ b/tests/kds_s2000w_option_descriptor_tests.h
@@ -51,6 +51,7 @@ void kds_s2000w_option_get_descriptor_thirdynine_test();
 void kds_s2000w_option_get_descriptor_fourty_test();
 void kds_s2000w_option_get_descriptor_fourtyone_test();
 void kds_s2000w_option_get_descriptor_fourtytwo_test();
+void kds_s2000w_option_get_descriptor_fourtythree_test();
 void kds_s2000w_option_get_descriptor_get_by_name_test();
 void kds_s2000w_option_get_descriptor_over_max_options_test();
 #endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_option_descriptor_tests_run.c b/tests/kds_s2000w_option_descriptor_tests_run.c
index 05fb2f58e720209ac407acb38f8a6c599037d836..1b0a54efcbdf1544145a1993a0d866574d718933 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests_run.c
+++ b/tests/kds_s2000w_option_descriptor_tests_run.c
@@ -46,6 +46,7 @@ int main()
                cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourty_test, setup, teardown),
                cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyone_test, setup, teardown),
                cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtytwo_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtythree_test, setup, teardown),
                cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_get_by_name_test, setup, teardown),
                cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_over_max_options_test, setup, teardown),
        };