Changeset 555 for pjproject/trunk/pjsip/src/test-pjsip/tsx_uas_test.c

Timestamp:

Jun 26, 2006 3:12:55 PM (18 years ago)

Author:

bennylp

Message:

Bring the dead pjsip-test up to date with latest pjsip

File:

• pjproject/trunk/pjsip/src/test-pjsip/tsx_uas_test.c (modified) (12 diffs)

pjproject/trunk/pjsip/src/test-pjsip/tsx_uas_test.c

@@ -445 +445 @@
          * TEST4_BRANCH_ID tests receiving retransmissions in TRYING state.
          */
-        if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
+        if (tsx->state == PJSIP_TSX_STATE_TRYING) {
+            /* Request is received. */
+        } else if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
 
             /* Check that status code is status_code. */
             if (tsx->status_code != TEST4_STATUS_CODE) {
-                PJ_LOG(3,(THIS_FILE, "    error: incorrect status code"));
+                PJ_LOG(3,(THIS_FILE, 
+                          "    error: incorrect status code %d "
+                          "(expecting %d)", tsx->status_code,
+                          TEST4_STATUS_CODE));
                 test_complete = -120;
             }
@@ -461 +466 @@
         } else if (tsx->state != PJSIP_TSX_STATE_DESTROYED) 
         {
-            PJ_LOG(3,(THIS_FILE, "    error: unexpected state"));
+            PJ_LOG(3,(THIS_FILE, "    error: unexpected state %s (122)",
+                      pjsip_tsx_state_str(tsx->state)));
             test_complete = -122;
 
@@ -472 +478 @@
          * TEST5_BRANCH_ID tests receiving retransmissions in PROCEEDING state
          */
-        if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
+        if (tsx->state == PJSIP_TSX_STATE_TRYING) {
+            /* Request is received. */
+
+        } else if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
 
             /* Check that status code is status_code. */
@@ -495 +504 @@
 
         } else if (tsx->state != PJSIP_TSX_STATE_DESTROYED) {
-            PJ_LOG(3,(THIS_FILE, "    error: unexpected state"));
+            PJ_LOG(3,(THIS_FILE, "    error: unexpected state %s (133)",
+                      pjsip_tsx_state_str(tsx->state)));
             test_complete = -133;
 
@@ -505 +515 @@
          * TEST6_BRANCH_ID tests receiving retransmissions in COMPLETED state
          */
-        if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
+        if (tsx->state == PJSIP_TSX_STATE_TRYING) {
+            /* Request is received. */
+
+        } else if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
 
             /* Check that status code is status_code. */
@@ -523 +536 @@
                    tsx->state != PJSIP_TSX_STATE_DESTROYED) 
         {
-            PJ_LOG(3,(THIS_FILE, "    error: unexpected state"));
+            PJ_LOG(3,(THIS_FILE, "    error: unexpected state %s (142)",
+                      pjsip_tsx_state_str(tsx->state)));
             test_complete = -142;
 
@@ -544 +558 @@
             code = TEST8_STATUS_CODE;
 
-        if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
+        if (tsx->state == PJSIP_TSX_STATE_TRYING) {
+            /* Request is received. */
+
+        } else if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
 
             if (test_complete == 0)
@@ -577 +594 @@
         } else if (tsx->state != PJSIP_TSX_STATE_DESTROYED)  {
 
-            PJ_LOG(3,(THIS_FILE, "    error: unexpected state"));
+            PJ_LOG(3,(THIS_FILE, "    error: unexpected state (154)"));
             test_complete = -154;
 
@@ -590 +607 @@
          */
 
-        if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
+        if (tsx->state == PJSIP_TSX_STATE_TRYING) {
+            /* Request is received. */
+
+        } else if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
 
             if (test_complete == 0)
@@ -638 +658 @@
         } else if (tsx->state != PJSIP_TSX_STATE_DESTROYED)  {
 
-            PJ_LOG(3,(THIS_FILE, "    error: unexpected state"));
+            PJ_LOG(3,(THIS_FILE, "    error: unexpected state (166)"));
             test_complete = -166;
 
@@ -746 +766 @@
             if (status != PJ_SUCCESS) {
                 app_perror("    error: unable to create transaction", status);
-                test_complete = -120;
+                test_complete = -116;
                 return PJ_TRUE;
             }
@@ -1272 +1292 @@
     int status;
 
-    PJ_LOG(3,(THIS_FILE,"  test1: basic sending 2xx final response"));
+    PJ_LOG(3,(THIS_FILE,"  test3: basic sending 2xx final response"));
 
     status = perform_test("sip:129.0.0.1;transport=loop-dgram",