Merge pull request #90 from verisign/feature/adjust_general_and_sync

Adjust getdns_general() and getdns_general_sync() tests such that name =...
This commit is contained in:
cedespeaux 2014-02-03 18:31:38 -08:00
commit 7730b88bad
2 changed files with 18 additions and 58 deletions

View File

@ -355,15 +355,10 @@
START_TEST (getdns_general_13) START_TEST (getdns_general_13)
{ {
/* /*
* name = "75.101.146.66" need to change this to local unbound data * name = "75.101.146.66"
* request_type = GETDNS_RRTYPE_PTR * request_type = GETDNS_RRTYPE_PTR
* expect: NOERROR response with PTR record * expect: GETDNS_RETURN_BAD_DOMAIN_NAME
* status = GETDNS_RESPSTATUS_GOOD
* rcode = 0
* ancount == 1 (number of records in ANSWER section)
* and PTR record found ("type": 12) in "answer" list
*/ */
void verify_getdns_general_13(struct extracted_response *ex_response);
struct getdns_context *context = NULL; \ struct getdns_context *context = NULL; \
struct event_base *event_base = NULL; \ struct event_base *event_base = NULL; \
getdns_transaction_t transaction_id = 0; getdns_transaction_t transaction_id = 0;
@ -372,32 +367,21 @@
EVENT_BASE_CREATE; EVENT_BASE_CREATE;
ASSERT_RC(getdns_general(context, "75.101.146.66", GETDNS_RRTYPE_PTR, NULL, ASSERT_RC(getdns_general(context, "75.101.146.66", GETDNS_RRTYPE_PTR, NULL,
verify_getdns_general_13, &transaction_id, callbackfn), NULL, &transaction_id, callbackfn),
GETDNS_RETURN_GOOD, "Return code from getdns_general()"); GETDNS_RETURN_BAD_DOMAIN_NAME, "Return code from getdns_general()");
RUN_EVENT_LOOP; RUN_EVENT_LOOP;
CONTEXT_DESTROY; CONTEXT_DESTROY;
} }
END_TEST END_TEST
void verify_getdns_general_13(struct extracted_response *ex_response)
{
assert_noerror(ex_response);
assert_ptr_in_answer(ex_response);
}
START_TEST (getdns_general_14) START_TEST (getdns_general_14)
{ {
/* /*
* name = "2607:f8b0:4006:802::1007" need to change this to local unbound data * name = "2607:f8b0:4006:802::1007"
* request_type = GETDNS_RRTYPE_PTR * request_type = GETDNS_RRTYPE_PTR
* expect: NOERROR response with PTR record * expect: GETDNS_RETURN_BAD_DOMAIN_NAME
* status = GETDNS_RESPSTATUS_GOOD
* rcode = 0
* ancount == 1 (number of records in ANSWER section)
* and PTR record found ("type": 12) in "answer" list
*/ */
void verify_getdns_general_14(struct extracted_response *ex_response);
struct getdns_context *context = NULL; \ struct getdns_context *context = NULL; \
struct event_base *event_base = NULL; \ struct event_base *event_base = NULL; \
getdns_transaction_t transaction_id = 0; getdns_transaction_t transaction_id = 0;
@ -406,20 +390,14 @@
EVENT_BASE_CREATE; EVENT_BASE_CREATE;
ASSERT_RC(getdns_general(context, "2607:f8b0:4006:802::1007", GETDNS_RRTYPE_PTR, NULL, ASSERT_RC(getdns_general(context, "2607:f8b0:4006:802::1007", GETDNS_RRTYPE_PTR, NULL,
verify_getdns_general_14, &transaction_id, callbackfn), NULL, &transaction_id, callbackfn),
GETDNS_RETURN_GOOD, "Return code from getdns_general()"); GETDNS_RETURN_BAD_DOMAIN_NAME, "Return code from getdns_general()");
RUN_EVENT_LOOP; RUN_EVENT_LOOP;
CONTEXT_DESTROY; CONTEXT_DESTROY;
} }
END_TEST END_TEST
void verify_getdns_general_14(struct extracted_response *ex_response)
{
assert_noerror(ex_response);
assert_ptr_in_answer(ex_response);
}
Suite * Suite *
getdns_general_suite (void) getdns_general_suite (void)
{ {
@ -432,6 +410,8 @@
tcase_add_test(tc_neg, getdns_general_3); tcase_add_test(tc_neg, getdns_general_3);
tcase_add_test(tc_neg, getdns_general_4); tcase_add_test(tc_neg, getdns_general_4);
tcase_add_test(tc_neg, getdns_general_5); tcase_add_test(tc_neg, getdns_general_5);
tcase_add_test(tc_neg, getdns_general_13);
tcase_add_test(tc_neg, getdns_general_14);
suite_add_tcase(s, tc_neg); suite_add_tcase(s, tc_neg);
/* Positive test cases */ /* Positive test cases */
@ -443,8 +423,6 @@
tcase_add_test(tc_pos, getdns_general_10); tcase_add_test(tc_pos, getdns_general_10);
tcase_add_test(tc_pos, getdns_general_11); tcase_add_test(tc_pos, getdns_general_11);
tcase_add_test(tc_pos, getdns_general_12); tcase_add_test(tc_pos, getdns_general_12);
tcase_add_test(tc_pos, getdns_general_13);
tcase_add_test(tc_pos, getdns_general_14);
suite_add_tcase(s, tc_pos); suite_add_tcase(s, tc_pos);
return s; return s;

View File

@ -295,13 +295,9 @@
START_TEST (getdns_general_sync_13) START_TEST (getdns_general_sync_13)
{ {
/* /*
* name = "75.101.146.66" need to change this to local unbound data * name = "75.101.146.66"
* request_type = GETDNS_RRTYPE_PTR * request_type = GETDNS_RRTYPE_PTR
* expect: NOERROR response with PTR record * expect: GETDNS_RETURN_BAD_DOMAIN_NAME
* status = GETDNS_RESPSTATUS_GOOD
* rcode = 0
* ancount == 1 (number of records in ANSWER section)
* and PTR record found ("type": 12) in "answer" list
*/ */
struct getdns_context *context = NULL; struct getdns_context *context = NULL;
struct getdns_dict *response = NULL; struct getdns_dict *response = NULL;
@ -309,12 +305,7 @@
CONTEXT_CREATE(TRUE); CONTEXT_CREATE(TRUE);
ASSERT_RC(getdns_general_sync(context, "75.101.146.66", GETDNS_RRTYPE_PTR, NULL, &response), ASSERT_RC(getdns_general_sync(context, "75.101.146.66", GETDNS_RRTYPE_PTR, NULL, &response),
GETDNS_RETURN_GOOD, "Return code from getdns_general_sync()"); GETDNS_RETURN_BAD_DOMAIN_NAME, "Return code from getdns_general_sync()");
EXTRACT_RESPONSE;
assert_noerror(&ex_response);
assert_ptr_in_answer(&ex_response);
CONTEXT_DESTROY; CONTEXT_DESTROY;
} }
@ -323,13 +314,9 @@
START_TEST (getdns_general_sync_14) START_TEST (getdns_general_sync_14)
{ {
/* /*
* name = "2607:f8b0:4006:802::1007" need to change this to local unbound data * name = "2607:f8b0:4006:802::1007"
* request_type = GETDNS_RRTYPE_PTR * request_type = GETDNS_RRTYPE_PTR
* expect: NOERROR response with PTR record * expect: GETDNS_RETURN_BAD_DOMAIN_NAME
* status = GETDNS_RESPSTATUS_GOOD
* rcode = 0
* ancount == 1 (number of records in ANSWER section)
* and PTR record found ("type": 12) in "answer" list
*/ */
struct getdns_context *context = NULL; struct getdns_context *context = NULL;
struct getdns_dict *response = NULL; struct getdns_dict *response = NULL;
@ -337,12 +324,7 @@
CONTEXT_CREATE(TRUE); CONTEXT_CREATE(TRUE);
ASSERT_RC(getdns_general_sync(context, "2607:f8b0:4006:802::1007", GETDNS_RRTYPE_PTR, NULL, &response), ASSERT_RC(getdns_general_sync(context, "2607:f8b0:4006:802::1007", GETDNS_RRTYPE_PTR, NULL, &response),
GETDNS_RETURN_GOOD, "Return code from getdns_general_sync()"); GETDNS_RETURN_BAD_DOMAIN_NAME, "Return code from getdns_general_sync()");
EXTRACT_RESPONSE;
assert_noerror(&ex_response);
assert_ptr_in_answer(&ex_response);
CONTEXT_DESTROY; CONTEXT_DESTROY;
} }
@ -360,6 +342,8 @@
tcase_add_test(tc_neg, getdns_general_sync_3); tcase_add_test(tc_neg, getdns_general_sync_3);
tcase_add_test(tc_neg, getdns_general_sync_4); tcase_add_test(tc_neg, getdns_general_sync_4);
tcase_add_test(tc_neg, getdns_general_sync_5); tcase_add_test(tc_neg, getdns_general_sync_5);
tcase_add_test(tc_neg, getdns_general_sync_13);
tcase_add_test(tc_neg, getdns_general_sync_14);
suite_add_tcase(s, tc_neg); suite_add_tcase(s, tc_neg);
/* Positive test cases */ /* Positive test cases */
@ -371,8 +355,6 @@
tcase_add_test(tc_pos, getdns_general_sync_10); tcase_add_test(tc_pos, getdns_general_sync_10);
tcase_add_test(tc_pos, getdns_general_sync_11); tcase_add_test(tc_pos, getdns_general_sync_11);
tcase_add_test(tc_pos, getdns_general_sync_12); tcase_add_test(tc_pos, getdns_general_sync_12);
tcase_add_test(tc_pos, getdns_general_sync_13);
tcase_add_test(tc_pos, getdns_general_sync_14);
suite_add_tcase(s, tc_pos); suite_add_tcase(s, tc_pos);
return s; return s;