Changeset 555

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

Location:

pjproject/trunk/pjsip/src/test-pjsip

Files:

• test.c (modified) (1 diff)
• test.h (modified) (1 diff)
• tsx_uac_test.c (modified) (1 diff)
• tsx_uas_test.c (modified) (12 diffs)

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

@@ -126 +126 @@
     }
 
+#if INCLUDE_URI_TEST
     DO_TEST(uri_test());
+#endif
+
+#if INCLUDE_MSG_TEST
     DO_TEST(msg_test());
     DO_TEST(msg_err_test());
+#endif
+
+#if INCLUDE_TXDATA_TEST
     DO_TEST(txdata_test());
+#endif
+
+#if INCLUDE_UDP_TEST
     DO_TEST(transport_udp_test());
+#endif
+
+#if INCLUDE_LOOP_TEST
     DO_TEST(transport_loop_test());
+#endif
+
+#if INCLUDE_TSX_TEST
     DO_TEST(tsx_basic_test());
     DO_TEST(tsx_uac_test());
     DO_TEST(tsx_uas_test());
+#endif
+
 
 on_return:

pjproject/trunk/pjsip/src/test-pjsip/test.h

@@ -26 +26 @@
 #define TEST_UDP_PORT       15060
 #define TEST_UDP_PORT_STR   "15060"
+
+
+#define INCLUDE_MESSAGING_GROUP     1
+#define INCLUDE_TRANSPORT_GROUP     1
+#define INCLUDE_TSX_GROUP           1
+
+
+
+#define INCLUDE_URI_TEST        INCLUDE_MESSAGING_GROUP
+#define INCLUDE_MSG_TEST        INCLUDE_MESSAGING_GROUP
+#define INCLUDE_TXDATA_TEST     INCLUDE_MESSAGING_GROUP
+#define INCLUDE_UDP_TEST        INCLUDE_TRANSPORT_GROUP
+#define INCLUDE_LOOP_TEST       INCLUDE_TRANSPORT_GROUP
+#define INCLUDE_TSX_TEST        INCLUDE_TSX_GROUP
+
+
 
 /* The tests */

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

@@ -947 +947 @@
     // Ignore send result. Some tests do deliberately triggers error
     // when sending message.
-    //if (status != PJ_SUCCESS) {
-    //  app_perror("   Error: unable to send request", status);
-    //  pjsip_tx_data_dec_ref(tdata);
-    //  return -120;
-    //}
+    if (status != PJ_SUCCESS) {
+        // app_perror("   Error: unable to send request", status);
+        pjsip_tx_data_dec_ref(tdata);
+        // return -120;
+    }
 
 

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",