From 43c43ac305276fd69767404b87c0dc44d6520d03 Mon Sep 17 00:00:00 2001 From: "Craig E. Despeaux" Date: Fri, 10 Jan 2014 11:57:37 -0500 Subject: [PATCH] Test adjustments for GETDNS_RETURN_INVALID_PARAMETER --- src/test/check_getdns_dict_get_data_type.h | 12 ++++---- src/test/check_getdns_dict_set_dict.h | 35 +++++++++++++++++----- src/test/check_getdns_general.h | 4 +-- src/test/check_getdns_list_get_data_type.h | 4 +-- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/src/test/check_getdns_dict_get_data_type.h b/src/test/check_getdns_dict_get_data_type.h index 0f42d84a..aaf55258 100644 --- a/src/test/check_getdns_dict_get_data_type.h +++ b/src/test/check_getdns_dict_get_data_type.h @@ -13,13 +13,13 @@ { /* * this_dict = NULL - * expect: GETDNS_RETURN_NO_SUCH_DICT_NAME + * expect: GETDNS_RETURN_INVALID_PARAMETER */ struct getdns_dict *this_dict = NULL; getdns_data_type answer; ASSERT_RC(getdns_dict_get_data_type(this_dict, "key", &answer), - GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_data_type()"); + GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_data_type()"); } END_TEST @@ -28,7 +28,7 @@ { /* * name = NULL - * expect: GETDNS_RETURN_NO_SUCH_DICT_NAME + * expect: GETDNS_RETURN_INVALID_PARAMETER */ struct getdns_dict *this_dict = NULL; getdns_data_type answer; @@ -38,7 +38,7 @@ GETDNS_RETURN_GOOD, "Return code from getdns_dict_set_int()"); ASSERT_RC(getdns_dict_get_data_type(this_dict, NULL, &answer), - GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_data_type()"); + GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_data_type()"); DICT_DESTROY(this_dict); @@ -78,7 +78,7 @@ { /* * answer = NULL - * expect: GETDNS_RETURN_NO_SUCH_DICT_NAME + * expect: GETDNS_RETURN_INVALID_PARAMETER */ struct getdns_dict *this_dict = NULL; @@ -87,7 +87,7 @@ GETDNS_RETURN_GOOD, "Return code from getdns_dict_set_int()"); ASSERT_RC(getdns_dict_get_data_type(this_dict, "ten", NULL), - GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_names()"); + GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_names()"); DICT_DESTROY(this_dict); } diff --git a/src/test/check_getdns_dict_set_dict.h b/src/test/check_getdns_dict_set_dict.h index 2a9f91d7..0142fe0c 100644 --- a/src/test/check_getdns_dict_set_dict.h +++ b/src/test/check_getdns_dict_set_dict.h @@ -13,37 +13,57 @@ { /* * this_dict = NULL - * expect: GETDNS_RETURN_NO_SUCH_DICT_NAME + * expect: GETDNS_RETURN_INVALID_PARAMETER */ struct getdns_dict *this_dict = NULL; struct getdns_dict *child_dict = NULL; DICT_CREATE(child_dict); ASSERT_RC(getdns_dict_set_dict(this_dict, "dict", child_dict), - GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_set_dict()"); + GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_set_dict()"); DICT_DESTROY(child_dict); } END_TEST START_TEST (getdns_dict_set_dict_2) + { + /* + * name= NULL + * expect: GETDNS_RETURN_INVALID_PARAMETER + */ + struct getdns_dict *this_dict = NULL; + struct getdns_dict *child_dict = NULL; + + DICT_CREATE(this_dict); + DICT_CREATE(child_dict); + ASSERT_RC(getdns_dict_set_dict(this_dict, NULL, child_dict), + GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_set_dict()"); + + DICT_DESTROY(this_dict); + DICT_DESTROY(child_dict); + + } + END_TEST + + START_TEST (getdns_dict_set_dict_3) { /* * child_dict = NULL - * expect: GETDNS_RETURN_NO_SUCH_DICT_NAME + * expect: GETDNS_RETURN_INVALID_PARAMETER */ struct getdns_dict *this_dict = NULL; struct getdns_dict *child_dict = NULL; DICT_CREATE(this_dict); ASSERT_RC(getdns_dict_set_dict(this_dict, "dict", child_dict), - GETDNS_RETURN_GENERIC_ERROR, "Return code from getdns_dict_set_dict()"); + GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_set_dict()"); DICT_DESTROY(this_dict); } END_TEST - START_TEST (getdns_dict_set_dict_3) + START_TEST (getdns_dict_set_dict_4) { /* * name already exists in dict @@ -92,7 +112,7 @@ } END_TEST - START_TEST (getdns_dict_set_dict_4) + START_TEST (getdns_dict_set_dict_5) { /* * name already exists in dict, changing data type @@ -152,12 +172,13 @@ TCase *tc_neg = tcase_create("Negative"); tcase_add_test(tc_neg, getdns_dict_set_dict_1); tcase_add_test(tc_neg, getdns_dict_set_dict_2); + tcase_add_test(tc_neg, getdns_dict_set_dict_3); suite_add_tcase(s, tc_neg); /* Positive test cases */ TCase *tc_pos = tcase_create("Positive"); - tcase_add_test(tc_pos, getdns_dict_set_dict_3); tcase_add_test(tc_pos, getdns_dict_set_dict_4); + tcase_add_test(tc_pos, getdns_dict_set_dict_5); suite_add_tcase(s, tc_pos); return s; diff --git a/src/test/check_getdns_general.h b/src/test/check_getdns_general.h index 5ccd7fd7..1ffc0e86 100644 --- a/src/test/check_getdns_general.h +++ b/src/test/check_getdns_general.h @@ -96,7 +96,7 @@ { /* * callbackfn = NULL - * expect: GETDNS_RETURN_GENERIC_ERROR + * expect: GETDNS_RETURN_INVALID_PARAMETER */ struct getdns_context *context = NULL; \ struct event_base *event_base = NULL; \ @@ -107,7 +107,7 @@ ASSERT_RC(getdns_general(context, "google.com", GETDNS_RRTYPE_A, NULL, NULL, &transaction_id, NULL), - GETDNS_RETURN_GENERIC_ERROR, "Return code from getdns_general()"); + GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_general()"); RUN_EVENT_LOOP; CONTEXT_DESTROY; diff --git a/src/test/check_getdns_list_get_data_type.h b/src/test/check_getdns_list_get_data_type.h index d92d7162..874e6e34 100644 --- a/src/test/check_getdns_list_get_data_type.h +++ b/src/test/check_getdns_list_get_data_type.h @@ -53,7 +53,7 @@ { /* * answer = NULL - * expect: GETDNS_RETURN_NO_SUCH_LIST_ITEM + * expect: GETDNS_RETURN_INVALID_PARAMETER */ struct getdns_list *list = NULL; size_t index = 0; @@ -64,7 +64,7 @@ "Return code from getdns_list_set_int()"); ASSERT_RC(getdns_list_get_data_type(list, index, NULL), - GETDNS_RETURN_GENERIC_ERROR, "Return code from getdns_list_get_data_type()"); + GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_list_get_data_type()"); LIST_DESTROY(list); }