Changeset 129 for pjproject/trunk/pjmedia/src/test/test.c

Timestamp:

Feb 2, 2006 7:16:07 PM (19 years ago)

Author:

bennylp

Message:

Added SDP negotiator and changed SDP structs (tested)

File:

• pjproject/trunk/pjmedia/src/test/test.c (copied) (copied from pjproject/trunk/pjmedia/src/test/main.c) (2 diffs)

pjproject/trunk/pjmedia/src/test/test.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pj/os.h>
-#include <pj/pool.h>
-#include <pjmedia/sound.h>
+#include "test.h"
 
-pj_status_t session_test (pj_pool_factory *pf);
-pj_status_t rtp_test (pj_pool_factory *pf);
-pj_status_t sdp_test(pj_pool_factory *pf);
-int jbuf_main(pj_pool_factory *pf);
+#define THIS_FILE   "test.c"
 
-int main()
+#define DO_TEST(test)   do { \
+                            PJ_LOG(3, (THIS_FILE, "Running %s...", #test));  \
+                            rc = test; \
+                            PJ_LOG(3, (THIS_FILE,  \
+                                       "%s(%d)",  \
+                                       (rc ? "..ERROR" : "..success"), rc)); \
+                            if (rc!=0) goto on_return; \
+                        } while (0)
+
+
+pj_pool_factory *mem;
+
+
+void app_perror(pj_status_t status, const char *msg)
 {
+    char errbuf[PJMEDIA_ERR_MSG_SIZE];
+    
+    pjmedia_strerror(status, errbuf, sizeof(errbuf));
+
+    PJ_LOG(3,(THIS_FILE, "%s: %s", msg, errbuf));
+}
+
+int test_main(void)
+{
+    int rc;
     pj_caching_pool caching_pool;
 
@@ -33 +51 @@
     pj_caching_pool_init(&caching_pool, &pj_pool_factory_default_policy, 0);
 
-    sdp_test (&caching_pool.factory);
-    rtp_test(&caching_pool.factory);
-    session_test (&caching_pool.factory);
+    pj_log_set_decor(PJ_LOG_HAS_NEWLINE);
+
+    mem = &caching_pool.factory;
+
+    DO_TEST(sdp_neg_test());
+    //sdp_test (&caching_pool.factory);
+    //rtp_test(&caching_pool.factory);
+    //session_test (&caching_pool.factory);
     //jbuf_main(&caching_pool.factory);
 
+    PJ_LOG(3,(THIS_FILE," "));
+
+on_return:
+
+    if (rc != 0) {
+        PJ_LOG(3,(THIS_FILE,"Test completed with error(s)!"));
+    } else {
+        PJ_LOG(3,(THIS_FILE,"Looks like everything is okay!"));
+    }
+
     pj_caching_pool_destroy(&caching_pool);
-    return 0;
+    return rc;
 }