Source

Target

Showing with 20 additions and 24 deletions
...@@ -124,13 +124,13 @@ static void linphone_version_test(void){ ...@@ -124,13 +124,13 @@ static void linphone_version_test(void){
} }
static void core_init_test(void) { static void core_init_test(void) {
LinphoneCoreManager* mgr = linphone_core_manager_new2("empty_rc",FALSE); LinphoneCore* lc;
lc = linphone_factory_create_core_2(linphone_factory_get(),NULL,NULL,NULL, NULL, system_context);
/* until we have good certificates on our test server... */ /* until we have good certificates on our test server... */
linphone_core_verify_server_certificates(mgr->lc, FALSE); linphone_core_verify_server_certificates(lc,FALSE);
if (BC_ASSERT_PTR_NOT_NULL(mgr->lc)) { if (BC_ASSERT_PTR_NOT_NULL(lc)) {
//linphone_core_unref(mgr->lc); linphone_core_unref(lc);
linphone_core_manager_destroy(mgr);
} }
} }
...@@ -150,11 +150,11 @@ static void linphone_address_test(void) { ...@@ -150,11 +150,11 @@ static void linphone_address_test(void) {
} }
static void core_sip_transport_test(void) { static void core_sip_transport_test(void) {
LinphoneCore* lc;
LCSipTransports tr; LCSipTransports tr;
LinphoneCoreManager* mgr = linphone_core_manager_new2(NULL, FALSE); lc = linphone_factory_create_core_2(linphone_factory_get(),NULL,NULL,NULL, NULL, system_context);
LinphoneCore* lc = mgr->lc;
if (!BC_ASSERT_PTR_NOT_NULL(lc)) return; if (!BC_ASSERT_PTR_NOT_NULL(lc)) return;
linphone_core_get_sip_transports(mgr->lc,&tr); linphone_core_get_sip_transports(lc,&tr);
BC_ASSERT_EQUAL(tr.udp_port,5060, int, "%d"); /*default config*/ BC_ASSERT_EQUAL(tr.udp_port,5060, int, "%d"); /*default config*/
BC_ASSERT_EQUAL(tr.tcp_port,5060, int, "%d"); /*default config*/ BC_ASSERT_EQUAL(tr.tcp_port,5060, int, "%d"); /*default config*/
...@@ -172,7 +172,7 @@ static void core_sip_transport_test(void) { ...@@ -172,7 +172,7 @@ static void core_sip_transport_test(void) {
BC_ASSERT_EQUAL(lp_config_get_int(linphone_core_get_config(lc),"sip","sip_tcp_port",-2),LC_SIP_TRANSPORT_RANDOM, int, "%d"); BC_ASSERT_EQUAL(lp_config_get_int(linphone_core_get_config(lc),"sip","sip_tcp_port",-2),LC_SIP_TRANSPORT_RANDOM, int, "%d");
BC_ASSERT_EQUAL(lp_config_get_int(linphone_core_get_config(lc),"sip","sip_tls_port",-2),LC_SIP_TRANSPORT_RANDOM, int, "%d"); BC_ASSERT_EQUAL(lp_config_get_int(linphone_core_get_config(lc),"sip","sip_tls_port",-2),LC_SIP_TRANSPORT_RANDOM, int, "%d");
linphone_core_manager_destroy(mgr); linphone_core_unref(lc);
} }
static void linphone_interpret_url_test(void) { static void linphone_interpret_url_test(void) {
...@@ -181,9 +181,7 @@ static void linphone_interpret_url_test(void) { ...@@ -181,9 +181,7 @@ static void linphone_interpret_url_test(void) {
LinphoneAddress* address; LinphoneAddress* address;
LinphoneProxyConfig *proxy_config; LinphoneProxyConfig *proxy_config;
char *tmp; char *tmp;
LinphoneCoreManager* mgr = linphone_core_manager_new2("empty_rc",FALSE); lc = linphone_factory_create_core_2(linphone_factory_get(),NULL,NULL,NULL, NULL, system_context);
lc = mgr->lc;
if (!BC_ASSERT_PTR_NOT_NULL( lc )) return; if (!BC_ASSERT_PTR_NOT_NULL( lc )) return;
proxy_config =linphone_core_create_proxy_config(lc); proxy_config =linphone_core_create_proxy_config(lc);
...@@ -224,7 +222,7 @@ static void linphone_interpret_url_test(void) { ...@@ -224,7 +222,7 @@ static void linphone_interpret_url_test(void) {
linphone_address_unref(address); linphone_address_unref(address);
ms_free(tmp); ms_free(tmp);
linphone_core_manager_destroy(mgr); linphone_core_unref(lc);
} }
static void linphone_lpconfig_from_buffer(void){ static void linphone_lpconfig_from_buffer(void){
...@@ -375,10 +373,11 @@ void linphone_proxy_config_is_server_config_changed_test(void) { ...@@ -375,10 +373,11 @@ void linphone_proxy_config_is_server_config_changed_test(void) {
} }
static void chat_room_test(void) { static void chat_room_test(void) {
LinphoneCoreManager* mgr = linphone_core_manager_new2("empty_rc",FALSE); LinphoneCore* lc;
if (!BC_ASSERT_PTR_NOT_NULL(mgr->lc)) return; lc = linphone_factory_create_core_2(linphone_factory_get(),NULL,NULL,NULL, NULL, system_context);
BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room_from_uri(mgr->lc,"sip:toto@titi.com")); if (!BC_ASSERT_PTR_NOT_NULL(lc)) return;
linphone_core_manager_destroy(mgr); BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room_from_uri(lc,"sip:toto@titi.com"));
linphone_core_unref(lc);
} }
static void devices_reload_test(void) { static void devices_reload_test(void) {
......
...@@ -357,9 +357,7 @@ end: ...@@ -357,9 +357,7 @@ end:
} }
static void friends_sqlite_store_lot_of_friends(void) { static void friends_sqlite_store_lot_of_friends(void) {
LinphoneCoreManager* mgr = linphone_core_manager_new2("empty_rc",FALSE); LinphoneCore* lc = linphone_factory_create_core_2(linphone_factory_get(), NULL, NULL, NULL, NULL, system_context);
LinphoneCore* lc = mgr->lc;
sqlite3 *db; sqlite3 *db;
int i; int i;
char* errmsg = NULL; char* errmsg = NULL;
...@@ -425,12 +423,11 @@ static void friends_sqlite_store_lot_of_friends(void) { ...@@ -425,12 +423,11 @@ static void friends_sqlite_store_lot_of_friends(void) {
ret = sqlite3_exec(db,"END",0,0,&errmsg); ret = sqlite3_exec(db,"END",0,0,&errmsg);
BC_ASSERT_TRUE(ret ==SQLITE_OK); BC_ASSERT_TRUE(ret ==SQLITE_OK);
sqlite3_close(db); sqlite3_close(db);
(void)lc; linphone_core_unref(lc);
linphone_core_manager_destroy(mgr);
} }
static void friends_sqlite_find_friend_in_lot_of_friends(void) { static void friends_sqlite_find_friend_in_lot_of_friends(void) {
LinphoneCoreManager* mgr = linphone_core_manager_new2("empty_rc",FALSE); LinphoneCore* lc = linphone_factory_create_core_2(linphone_factory_get(), NULL, NULL, NULL, NULL, system_context);
sqlite3 *db; sqlite3 *db;
int i; int i;
char* errmsg = NULL; char* errmsg = NULL;
...@@ -510,7 +507,7 @@ static void friends_sqlite_find_friend_in_lot_of_friends(void) { ...@@ -510,7 +507,7 @@ static void friends_sqlite_find_friend_in_lot_of_friends(void) {
ret = sqlite3_exec(db,"END",0,0,&errmsg); ret = sqlite3_exec(db,"END",0,0,&errmsg);
BC_ASSERT_TRUE(ret ==SQLITE_OK); BC_ASSERT_TRUE(ret ==SQLITE_OK);
sqlite3_close(db); sqlite3_close(db);
linphone_core_manager_destroy(mgr); linphone_core_unref(lc);
} }
typedef struct _LinphoneCardDAVStats { typedef struct _LinphoneCardDAVStats {
......