change test names with postfix

diff --git a/tests/kds_s2000w_net_set_opt_tests.c b/tests/kds_s2000w_net_set_opt_tests.c
index 79e2a9b3d5020bede4ed7394dbf727618d35dff5..5ea3087b11d099b83e469e8bd836e19a15edb079 100644 (file)
--- a/tests/kds_s2000w_net_set_opt_tests.c
+++ b/tests/kds_s2000w_net_set_opt_tests.c
@@ -101,7 +101,7 @@ int teardown_default_option(void** state)
        return 0;
 }
 
-void kds_s2000w_net_set_no_option_is_started()
+void kds_s2000w_net_set_no_option_is_started_test()
 {
        handler_t* h = kds_s2000w_handler_init();
        h->scan_status->state = STARTED;
@@ -114,7 +114,7 @@ void kds_s2000w_net_set_no_option_is_started()
        h = NULL;
 }
 
-void kds_s2000w_net_set_option_string(void** state)
+void kds_s2000w_net_set_option_string_test(void** state)
 {
        int32_t* info = malloc(sizeof(int32_t));
        if (info == NULL)
@@ -150,7 +150,7 @@ void kds_s2000w_net_set_option_string(void** state)
        info = NULL;
 }
 
-void kds_s2000w_net_set_option_int(void** state)
+void kds_s2000w_net_set_option_int_test(void** state)
 {
        int32_t* set_value = malloc(sizeof(int32_t));
        if (set_value == NULL)
@@ -185,11 +185,17 @@ void kds_s2000w_net_set_option_int(void** state)
        set_value = NULL;
 }
 
-void kds_s2000w_net_set_option_reset(void** state)
+void kds_s2000w_net_set_option_reset_test(void** state)
 {
        int32_t* set_value = malloc(sizeof(int32_t));
        if (set_value == NULL)
                return;
+       int32_t* info = malloc(sizeof(int32_t));
+       if (info == NULL) {
+               free(set_value);
+               set_value = NULL;
+               return;
+       }
 
        const char* json = "{\"Defaults\": {\"DPI\": 200}}";
        response_t* defauls_resp = kds_s2000w_client_response_init();
@@ -215,7 +221,7 @@ void kds_s2000w_net_set_option_reset(void** state)
        expect_function_call(__wrap_kds_s2000w_client_get_capabilities);
        expect_function_call(__wrap_kds_s2000w_client_set_option);
 
-       SANE_Status status = sane_kds_s2000w_net_control_option(h, 31, SANE_ACTION_SET_VALUE, set_value, NULL);
+       SANE_Status status = sane_kds_s2000w_net_control_option(h, 31, SANE_ACTION_SET_VALUE, set_value, info);
 
        json_object* config = json_object_object_get(h->scanner_config, "Configuration");
        json_object* value_object = json_object_object_get(config, DPI);
@@ -223,7 +229,10 @@ void kds_s2000w_net_set_option_reset(void** state)
 
        assert_int_equal(status, SANE_STATUS_GOOD);
        assert_int_equal(value, 200);
+       assert_int_equal(*info, SANE_INFO_RELOAD_OPTIONS | SANE_INFO_RELOAD_PARAMS);
 
+       free(info);
+       info = NULL;
        kds_s2000w_client_response_free(defauls_resp);
        defauls_resp = NULL;
        kds_s2000w_handler_free(h);
@@ -232,7 +241,7 @@ void kds_s2000w_net_set_option_reset(void** state)
        set_value = NULL;
 }
 
-void kds_s2000w_net_set_option_int_br_x(void** state)
+void kds_s2000w_net_set_option_int_br_x_test(void** state)
 {
        int32_t* set_value = malloc(sizeof(int32_t));
        if (set_value == NULL)
@@ -267,7 +276,7 @@ void kds_s2000w_net_set_option_int_br_x(void** state)
        set_value = NULL;
 }
 
-void kds_s2000w_net_set_option_int_scanimage_default_br_x(void** state)
+void kds_s2000w_net_set_option_int_scanimage_default_br_x_test(void** state)
 {
        int32_t* set_value = malloc(sizeof(int32_t));
        if (set_value == NULL)
@@ -302,7 +311,7 @@ void kds_s2000w_net_set_option_int_scanimage_default_br_x(void** state)
        set_value = NULL;
 }
 
-void kds_s2000w_net_set_option_int_scanimage_default_br_y(void** state)
+void kds_s2000w_net_set_option_int_scanimage_default_br_y_test(void** state)
 {
        int32_t* set_value = malloc(sizeof(int32_t));
        if (set_value == NULL)
@@ -337,7 +346,7 @@ void kds_s2000w_net_set_option_int_scanimage_default_br_y(void** state)
        set_value = NULL;
 }
 
-void kds_s2000w_net_set_option_int_word_list(void** state)
+void kds_s2000w_net_set_option_int_word_list_test(void** state)
 {
        int32_t* set_value = malloc(sizeof(int32_t));
        if (set_value == NULL)
@@ -372,7 +381,7 @@ void kds_s2000w_net_set_option_int_word_list(void** state)
        set_value = NULL;
 }
 
-void kds_s2000w_net_set_invalid_option_string(void** state)
+void kds_s2000w_net_set_invalid_option_string_test(void** state)
 {
        int32_t* info = malloc(sizeof(int32_t));
        if (info == NULL)
@@ -399,7 +408,7 @@ void kds_s2000w_net_set_invalid_option_string(void** state)
        info = NULL;
 }
 
-void kds_s2000w_net_set_invalid_option_int(void** state)
+void kds_s2000w_net_set_invalid_option_int_test(void** state)
 {
        int32_t* set_value = malloc(sizeof(int32_t));
        if (set_value == NULL)
@@ -426,7 +435,7 @@ void kds_s2000w_net_set_invalid_option_int(void** state)
        set_value = NULL;
 }
 
-void kds_s2000w_net_set_invalid_option_int_word_list(void** state)
+void kds_s2000w_net_set_invalid_option_int_word_list_test(void** state)
 {
        int32_t* set_value = malloc(sizeof(int32_t));
        if (set_value == NULL)
@@ -456,17 +465,17 @@ void kds_s2000w_net_set_invalid_option_int_word_list(void** state)
 int main()
 {
        const struct CMUnitTest net_tests[] = {
-               cmocka_unit_test(kds_s2000w_net_set_no_option_is_started),
-               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_string, setup_default_option, teardown_default_option),
-               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_int, setup_default_option, teardown_default_option),
-               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_reset, setup_default_option, teardown_default_option),
-               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_int_br_x, setup_default_option, teardown_default_option),
-               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_int_scanimage_default_br_x, setup_default_option, teardown_default_option),
-               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_int_scanimage_default_br_y, setup_default_option, teardown_default_option),
-               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_int_word_list, setup_default_option, teardown_default_option),
-               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_invalid_option_string, setup_default_option, teardown_default_option),
-               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_invalid_option_int, setup_default_option, teardown_default_option),
-               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_invalid_option_int_word_list, setup_default_option, teardown_default_option)
+               cmocka_unit_test(kds_s2000w_net_set_no_option_is_started_test),
+               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_string_test, setup_default_option, teardown_default_option),
+               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_int_test, setup_default_option, teardown_default_option),
+               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_reset_test, setup_default_option, teardown_default_option),
+               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_int_br_x_test, setup_default_option, teardown_default_option),
+               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_int_scanimage_default_br_x_test, setup_default_option, teardown_default_option),
+               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_int_scanimage_default_br_y_test, setup_default_option, teardown_default_option),
+               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_option_int_word_list_test, setup_default_option, teardown_default_option),
+               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_invalid_option_string_test, setup_default_option, teardown_default_option),
+               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_invalid_option_int_test, setup_default_option, teardown_default_option),
+               cmocka_unit_test_setup_teardown(kds_s2000w_net_set_invalid_option_int_word_list_test, setup_default_option, teardown_default_option)
        };
 
        return cmocka_run_group_tests(net_tests, NULL, NULL);