提交 676d7c5b authored 作者: Michael Jerris's avatar Michael Jerris

Thu Mar 5 13:04:56 CST 2009 Pekka Pessi <first.last@nokia.com>

  * check_nua: use S2_CASE()
  Ignore-this: 85691a39065d7ad3da57f45fe87c1da



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12735 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 113da462
Tue Mar 24 10:32:33 CDT 2009 Tue Mar 24 10:33:24 CDT 2009
...@@ -201,7 +201,7 @@ START_TEST(SIP_CC_OE_CE_V_019) ...@@ -201,7 +201,7 @@ START_TEST(SIP_CC_OE_CE_V_019)
struct message *invite; struct message *invite;
struct message *bye; struct message *bye;
s2_case("6.1.1", "SIP_CC_OE_CE_V_019", S2_CASE("6.1.1", "SIP_CC_OE_CE_V_019",
"Ensure that the IUT when an INVITE client transaction " "Ensure that the IUT when an INVITE client transaction "
"is in the Calling state, on receipt of Success (200 OK) " "is in the Calling state, on receipt of Success (200 OK) "
"responses differing only on the tag in the To header, " "responses differing only on the tag in the To header, "
...@@ -241,7 +241,7 @@ START_TEST(SIP_CC_OE_CE_TI_008) ...@@ -241,7 +241,7 @@ START_TEST(SIP_CC_OE_CE_TI_008)
nua_handle_t *nh; nua_handle_t *nh;
struct message *invite; struct message *invite;
s2_case("6.1.2", "SIP_CC_OE_CE_TI_008", S2_CASE("6.1.2", "SIP_CC_OE_CE_TI_008",
"If an unreliable transport is used, ensure that " "If an unreliable transport is used, ensure that "
"the IUT, when an INVITE client transaction is in " "the IUT, when an INVITE client transaction is in "
"the Completed state, on receipt of final responses " "the Completed state, on receipt of final responses "
...@@ -291,7 +291,7 @@ START_TEST(SIP_CC_OE_CE_TI_011_012) ...@@ -291,7 +291,7 @@ START_TEST(SIP_CC_OE_CE_TI_011_012)
nua_handle_t *nh; nua_handle_t *nh;
struct message *invite; struct message *invite;
s2_case("6.1.2", "SIP_CC_OE_CE_TI_011_012", S2_CASE("6.1.2", "SIP_CC_OE_CE_TI_011_012",
"Ensure that the IUT, when an INVITE client transaction " "Ensure that the IUT, when an INVITE client transaction "
"has been in the Terminated state, on receipt of a " "has been in the Terminated state, on receipt of a "
"retransmitted Success (200 OK) responses sends an ACK " "retransmitted Success (200 OK) responses sends an ACK "
......
...@@ -117,7 +117,7 @@ START_TEST(register_1_0_1) ...@@ -117,7 +117,7 @@ START_TEST(register_1_0_1)
nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); nua_handle_t *nh = nua_handle(nua, NULL, TAG_END());
struct message *m; struct message *m;
s2_case("1.0.1", "Failed Register", "REGISTER returned 403 response"); S2_CASE("1.0.1", "Failed Register", "REGISTER returned 403 response");
nua_register(nh, TAG_END()); nua_register(nh, TAG_END());
...@@ -135,7 +135,7 @@ START_TEST(register_1_0_1) ...@@ -135,7 +135,7 @@ START_TEST(register_1_0_1)
START_TEST(register_1_1_1) START_TEST(register_1_1_1)
{ {
s2_case("1.1.1", "Basic Register", "REGISTER returning 200 OK"); S2_CASE("1.1.1", "Basic Register", "REGISTER returning 200 OK");
s2_register_setup(); s2_register_setup();
...@@ -149,7 +149,7 @@ START_TEST(register_1_1_2) ...@@ -149,7 +149,7 @@ START_TEST(register_1_1_2)
nua_handle_t *nh; nua_handle_t *nh;
struct message *m; struct message *m;
s2_case("1.1.2", "Register with dual authentication", S2_CASE("1.1.2", "Register with dual authentication",
"Register, authenticate"); "Register, authenticate");
nh = nua_handle(nua, NULL, TAG_END()); nh = nua_handle(nua, NULL, TAG_END());
...@@ -230,7 +230,7 @@ START_TEST(register_1_2_1) { ...@@ -230,7 +230,7 @@ START_TEST(register_1_2_1) {
nua_handle_t *nh; nua_handle_t *nh;
struct message *m; struct message *m;
s2_case("1.2.1", "Register behind NAT", S2_CASE("1.2.1", "Register behind NAT",
"Register through NAT, detect NAT, re-REGISTER"); "Register through NAT, detect NAT, re-REGISTER");
nh = nua_handle(nua, NULL, TAG_END()); nh = nua_handle(nua, NULL, TAG_END());
...@@ -324,7 +324,7 @@ START_TEST(register_1_2_2_1) ...@@ -324,7 +324,7 @@ START_TEST(register_1_2_2_1)
{ {
nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); nua_handle_t *nh = nua_handle(nua, NULL, TAG_END());
s2_case("1.2.2.1", "Register behind NAT", S2_CASE("1.2.2.1", "Register behind NAT",
"Authenticate, outbound activated"); "Authenticate, outbound activated");
mark_point(); mark_point();
...@@ -339,7 +339,7 @@ START_TEST(register_1_2_2_2) ...@@ -339,7 +339,7 @@ START_TEST(register_1_2_2_2)
nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); nua_handle_t *nh = nua_handle(nua, NULL, TAG_END());
struct message *m; struct message *m;
s2_case("1.2.2.2", "Register behind NAT", S2_CASE("1.2.2.2", "Register behind NAT",
"Authenticate, outbound activated, " "Authenticate, outbound activated, "
"authenticate OPTIONS probe, " "authenticate OPTIONS probe, "
"NAT binding change"); "NAT binding change");
...@@ -421,7 +421,7 @@ START_TEST(register_1_2_2_3) ...@@ -421,7 +421,7 @@ START_TEST(register_1_2_2_3)
nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); nua_handle_t *nh = nua_handle(nua, NULL, TAG_END());
struct message *m; struct message *m;
s2_case("1.2.2.3", "Register behind NAT", S2_CASE("1.2.2.3", "Register behind NAT",
"Authenticate, outbound activated, " "Authenticate, outbound activated, "
"detect NAT binding change when re-REGISTERing"); "detect NAT binding change when re-REGISTERing");
...@@ -476,7 +476,7 @@ START_TEST(register_1_2_3) { ...@@ -476,7 +476,7 @@ START_TEST(register_1_2_3) {
nua_handle_t *nh; nua_handle_t *nh;
struct message *m; struct message *m;
s2_case("1.2.3", "Register behind NAT", S2_CASE("1.2.3", "Register behind NAT",
"Outbound activated by error response"); "Outbound activated by error response");
nh = nua_handle(nua, NULL, TAG_END()); nh = nua_handle(nua, NULL, TAG_END());
...@@ -525,7 +525,7 @@ START_TEST(register_1_3_1) ...@@ -525,7 +525,7 @@ START_TEST(register_1_3_1)
nua_handle_t *nh; nua_handle_t *nh;
struct message *m; struct message *m;
s2_case("1.3.1", "Register over TCP via NAT", S2_CASE("1.3.1", "Register over TCP via NAT",
"REGISTER via TCP, detect NTA, re-REGISTER"); "REGISTER via TCP, detect NTA, re-REGISTER");
nh = nua_handle(nua, NULL, TAG_END()); nh = nua_handle(nua, NULL, TAG_END());
...@@ -576,7 +576,7 @@ START_TEST(register_1_3_2_1) ...@@ -576,7 +576,7 @@ START_TEST(register_1_3_2_1)
{ {
nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); nua_handle_t *nh = nua_handle(nua, NULL, TAG_END());
s2_case("1.3.2.1", "Register behind NAT", S2_CASE("1.3.2.1", "Register behind NAT",
"Authenticate, outbound activated"); "Authenticate, outbound activated");
mark_point(); mark_point();
...@@ -593,7 +593,7 @@ START_TEST(register_1_3_2_2) ...@@ -593,7 +593,7 @@ START_TEST(register_1_3_2_2)
nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); nua_handle_t *nh = nua_handle(nua, NULL, TAG_END());
struct message *m; struct message *m;
s2_case("1.3.2.2", "Register behind NAT with TCP", S2_CASE("1.3.2.2", "Register behind NAT with TCP",
"Detect NAT over TCP using rport. " "Detect NAT over TCP using rport. "
"Authenticate, detect NAT, " "Authenticate, detect NAT, "
"close TCP at server, wait for re-REGISTERs."); "close TCP at server, wait for re-REGISTERs.");
...@@ -652,7 +652,7 @@ START_TEST(register_1_3_3_1) ...@@ -652,7 +652,7 @@ START_TEST(register_1_3_3_1)
struct message *m; struct message *m;
tport_t *tcp; tport_t *tcp;
s2_case("1.3.3.1", "Register behind NAT with UDP and TCP", S2_CASE("1.3.3.1", "Register behind NAT with UDP and TCP",
"Register with UDP, UDP time-outing, then w/ TCP using rport. "); "Register with UDP, UDP time-outing, then w/ TCP using rport. ");
nua_set_params(nua, NTATAG_TCP_RPORT(1), TAG_END()); nua_set_params(nua, NTATAG_TCP_RPORT(1), TAG_END());
......
...@@ -265,7 +265,7 @@ START_TEST(subscribe_6_1_1) ...@@ -265,7 +265,7 @@ START_TEST(subscribe_6_1_1)
{ {
nua_handle_t *nh; nua_handle_t *nh;
struct event *notify; struct event *notify;
s2_case("6.1.1", "Basic subscription", S2_CASE("6.1.1", "Basic subscription",
"NUA sends SUBSCRIBE, waits for NOTIFY, sends un-SUBSCRIBE"); "NUA sends SUBSCRIBE, waits for NOTIFY, sends un-SUBSCRIBE");
nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
...@@ -283,7 +283,7 @@ START_TEST(subscribe_6_1_2) ...@@ -283,7 +283,7 @@ START_TEST(subscribe_6_1_2)
struct message *subscribe, *response; struct message *subscribe, *response;
struct event *notify, *event; struct event *notify, *event;
s2_case("6.1.2", "Basic subscription with refresh", S2_CASE("6.1.2", "Basic subscription with refresh",
"NUA sends SUBSCRIBE, waits for NOTIFY, " "NUA sends SUBSCRIBE, waits for NOTIFY, "
"sends re-SUBSCRIBE, waits for NOTIFY, " "sends re-SUBSCRIBE, waits for NOTIFY, "
"sends un-SUBSCRIBE"); "sends un-SUBSCRIBE");
...@@ -331,7 +331,7 @@ START_TEST(subscribe_6_1_3) ...@@ -331,7 +331,7 @@ START_TEST(subscribe_6_1_3)
struct message *response; struct message *response;
struct event *notify, *event; struct event *notify, *event;
s2_case("6.1.3", "Subscription terminated by notifier", S2_CASE("6.1.3", "Subscription terminated by notifier",
"NUA sends SUBSCRIBE, waits for NOTIFY, " "NUA sends SUBSCRIBE, waits for NOTIFY, "
"gets NOTIFY terminating the subscription,"); "gets NOTIFY terminating the subscription,");
...@@ -361,7 +361,7 @@ START_TEST(subscribe_6_1_4) ...@@ -361,7 +361,7 @@ START_TEST(subscribe_6_1_4)
struct message *response; struct message *response;
struct event *notify, *event; struct event *notify, *event;
s2_case("6.1.4", "Subscription terminated by notifier, re-established", S2_CASE("6.1.4", "Subscription terminated by notifier, re-established",
"NUA sends SUBSCRIBE, waits for NOTIFY, " "NUA sends SUBSCRIBE, waits for NOTIFY, "
"gets NOTIFY terminating the subscription,"); "gets NOTIFY terminating the subscription,");
...@@ -419,7 +419,7 @@ START_TEST(fetch_6_2_1) ...@@ -419,7 +419,7 @@ START_TEST(fetch_6_2_1)
nua_handle_t *nh; nua_handle_t *nh;
struct event *notify; struct event *notify;
s2_case("6.2.1", "Event fetch - NOTIFY after 202", S2_CASE("6.2.1", "Event fetch - NOTIFY after 202",
"NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY"); "NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY");
nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
...@@ -436,7 +436,7 @@ START_TEST(fetch_6_2_2) ...@@ -436,7 +436,7 @@ START_TEST(fetch_6_2_2)
nua_handle_t *nh; nua_handle_t *nh;
struct event *notify; struct event *notify;
s2_case("6.2.2", "Event fetch - NOTIFY before 200", S2_CASE("6.2.2", "Event fetch - NOTIFY before 200",
"NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY"); "NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY");
send_notify_before_response = 1; send_notify_before_response = 1;
...@@ -456,7 +456,7 @@ START_TEST(fetch_6_2_3) ...@@ -456,7 +456,7 @@ START_TEST(fetch_6_2_3)
struct message *subscribe; struct message *subscribe;
struct event *event; struct event *event;
s2_case("6.2.3", "Event fetch - no NOTIFY", S2_CASE("6.2.3", "Event fetch - no NOTIFY",
"NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY, times out"); "NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY, times out");
nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
...@@ -539,7 +539,7 @@ START_TEST(notify_6_3_1) ...@@ -539,7 +539,7 @@ START_TEST(notify_6_3_1)
struct message *notify, *response; struct message *notify, *response;
sip_t *sip; sip_t *sip;
s2_case("6.3.1", "Basic NOTIFY server", S2_CASE("6.3.1", "Basic NOTIFY server",
"NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "NUA receives SUBSCRIBE, sends 202 and NOTIFY. "
"First NOTIFY terminates subscription. "); "First NOTIFY terminates subscription. ");
...@@ -612,7 +612,7 @@ START_TEST(notify_6_3_2) ...@@ -612,7 +612,7 @@ START_TEST(notify_6_3_2)
struct message *notify; struct message *notify;
sip_t *sip; sip_t *sip;
s2_case("6.3.2", "NOTIFY server - automatic subscription termination", S2_CASE("6.3.2", "NOTIFY server - automatic subscription termination",
"NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "NUA receives SUBSCRIBE, sends 202 and NOTIFY. "
"The subscription terminates with timeout. "); "The subscription terminates with timeout. ");
...@@ -664,7 +664,7 @@ START_TEST(notify_6_3_3) ...@@ -664,7 +664,7 @@ START_TEST(notify_6_3_3)
struct event *response; struct event *response;
sip_t *sip; sip_t *sip;
s2_case("6.3.3", "NOTIFY server - terminate with error response to NOTIFY", S2_CASE("6.3.3", "NOTIFY server - terminate with error response to NOTIFY",
"NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "NUA receives SUBSCRIBE, sends 202 and NOTIFY. "
"The subscription terminates when watcher " "The subscription terminates when watcher "
"returns 481 to second NOTIFY."); "returns 481 to second NOTIFY.");
...@@ -709,7 +709,7 @@ START_TEST(notify_6_3_4) ...@@ -709,7 +709,7 @@ START_TEST(notify_6_3_4)
struct event *response; struct event *response;
sip_t *sip; sip_t *sip;
s2_case("6.3.4", "NOTIFY server - terminate with error response to NOTIFY", S2_CASE("6.3.4", "NOTIFY server - terminate with error response to NOTIFY",
"NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "NUA receives SUBSCRIBE, sends 202 and NOTIFY. "
"The subscription terminates when watcher " "The subscription terminates when watcher "
"returns 481 to second NOTIFY. The queued 3rd NOTIFY gets " "returns 481 to second NOTIFY. The queued 3rd NOTIFY gets "
...@@ -778,7 +778,7 @@ TCase *notifier_tcase(int threading) ...@@ -778,7 +778,7 @@ TCase *notifier_tcase(int threading)
START_TEST(empty) START_TEST(empty)
{ {
s2_case("0.0.0", "Empty test case", S2_CASE("0.0.0", "Empty test case",
"Detailed explanation for empty test case."); "Detailed explanation for empty test case.");
tport_set_params(s2sip->master, TPTAG_LOG(1), TAG_END()); tport_set_params(s2sip->master, TPTAG_LOG(1), TAG_END());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论