change option descriptor no mem test

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index d1d47e666a963e93e5381d628b25329d02b57d95..95170f85e726bbad9e59b2c0536651e710feabf0 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -867,28 +867,27 @@ void kds_s2000w_option_full_get_descriptor_over_max_options_test()
        assert_null(option);
 }
 
-void kds_s2000w_option_get_unknown_descriptor()
+void kds_s2000w_option_get_unknown_descriptor_test()
 {
        SANE_Option_Descriptor* descriptor = kds_s2000w_option_descriptors_get_by_config_name("unknown");
 
        assert_null(descriptor);
 }
 
-void kds_s2000w_option_init_descriptor_no_mem()
+void kds_s2000w_option_init_descriptor_no_mem(int16_t no_mem_count)
 {
-       kds_s2000w_option_descriptors_free();
-
-       set_no_mem_counter(0);
-       SANE_Status status = kds_s2000w_option_descriptors_init(PROFILE_FULL);
+               set_no_mem_counter(no_mem_count);
+               SANE_Status status = kds_s2000w_option_descriptors_init(PROFILE_FULL);
 
-       assert_int_equal(status, SANE_STATUS_NO_MEM);
+               assert_int_equal(status, SANE_STATUS_NO_MEM);
+}
 
-       for (uint32_t i = 0; i < 133; i++) {
-               status = 0;
-               set_no_mem_counter(i + 1);
-               status = kds_s2000w_option_descriptors_init(PROFILE_FULL);
+void kds_s2000w_option_init_descriptor_no_mem_test()
+{
+       kds_s2000w_option_descriptors_free();
 
-               assert_int_equal(status, SANE_STATUS_NO_MEM);
+       for (uint32_t i = 0; i < 134; i++) {
+               kds_s2000w_option_init_descriptor_no_mem(i);
        }
 }
 
@@ -947,8 +946,8 @@ int main()
                cmocka_unit_test(kds_s2000w_option_get_descriptor_over_max_options_test),
                cmocka_unit_test(kds_s2000w_option_full_get_descriptor_by_number),
                cmocka_unit_test(kds_s2000w_option_full_get_descriptor_over_max_options_test),
-               cmocka_unit_test(kds_s2000w_option_get_unknown_descriptor),
-               cmocka_unit_test(kds_s2000w_option_init_descriptor_no_mem)
+               cmocka_unit_test(kds_s2000w_option_get_unknown_descriptor_test),
+               cmocka_unit_test(kds_s2000w_option_init_descriptor_no_mem_test)
 
        };