From 1b9500b3c68fef8809484b0a6d3447fc98810abb Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 27 Sep 2017 08:13:12 +0200 Subject: [PATCH] enable gruu for gruu specific tests --- tester/call_single_tester.c | 33 +++++++++++++++++++-------------- tester/register_tester.c | 11 +++++++---- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/tester/call_single_tester.c b/tester/call_single_tester.c index aa62fa917..cf40e924f 100644 --- a/tester/call_single_tester.c +++ b/tester/call_single_tester.c @@ -6177,18 +6177,20 @@ static void recreate_zrtpdb_when_corrupted(void) { } static void simple_call_with_gruu(void) { - LinphoneCoreManager* marie; - LinphoneCoreManager* pauline; const LinphoneAddress *pauline_addr, *marie_addr; LinphoneCall *marie_call = NULL; LinphoneCall *pauline_call = NULL; LinphoneProxyConfig* pauline_cfg; LinphoneAddress *contact_addr; - marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new("pauline_tcp_rc"); - - linphone_core_add_supported_tag(pauline->lc,"gruu"); + LinphoneCoreManager *marie = ms_new0(LinphoneCoreManager, 1); + linphone_core_manager_init(marie, "marie_rc", NULL); linphone_core_add_supported_tag(marie->lc,"gruu"); + linphone_core_manager_start(marie,TRUE); + LinphoneCoreManager *pauline = ms_new0(LinphoneCoreManager, 1); + linphone_core_manager_init(pauline, "pauline_tcp_rc", NULL); + linphone_core_add_supported_tag(pauline->lc,"gruu"); + linphone_core_manager_start(pauline,TRUE); + BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneRegistrationOk, 1)); BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneRegistrationOk, 1)); @@ -6248,9 +6250,6 @@ end: } static void simple_call_with_gruu_only_one_device_ring(void) { - LinphoneCoreManager* marie; - LinphoneCoreManager* pauline; - LinphoneCoreManager* pauline2; const LinphoneAddress *pauline_addr; const LinphoneAddress *pauline_addr2; LinphoneCall *marie_call = NULL; @@ -6258,12 +6257,18 @@ static void simple_call_with_gruu_only_one_device_ring(void) { LinphoneProxyConfig* pauline_cfg; LinphoneProxyConfig* pauline_cfg2; - marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); - pauline2 = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); - linphone_core_add_supported_tag(pauline->lc,"gruu"); - linphone_core_add_supported_tag(pauline2->lc,"gruu"); + LinphoneCoreManager *marie = ms_new0(LinphoneCoreManager, 1); + linphone_core_manager_init(marie, "marie_rc", NULL); linphone_core_add_supported_tag(marie->lc,"gruu"); + linphone_core_manager_start(marie,TRUE); + LinphoneCoreManager *pauline = ms_new0(LinphoneCoreManager, 1); + linphone_core_manager_init(pauline, transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc", NULL); + linphone_core_add_supported_tag(pauline->lc,"gruu"); + linphone_core_manager_start(pauline,TRUE); + LinphoneCoreManager *pauline2 = ms_new0(LinphoneCoreManager, 1); + linphone_core_manager_init(pauline2, transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc", NULL); + linphone_core_add_supported_tag(pauline2->lc,"gruu"); + linphone_core_manager_start(pauline2,TRUE); BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneRegistrationOk, 1)); BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneRegistrationOk, 1)); diff --git a/tester/register_tester.c b/tester/register_tester.c index 7353ad7a8..1f15eb8fa 100644 --- a/tester/register_tester.c +++ b/tester/register_tester.c @@ -1187,8 +1187,10 @@ static void tls_auth_info_client_cert_cb_2(void) { } static void register_get_gruu(void) { - LinphoneCoreManager *marie=linphone_core_manager_new("marie_rc"); + LinphoneCoreManager *marie = ms_new0(LinphoneCoreManager, 1); + linphone_core_manager_init(marie, "marie_rc", NULL); linphone_core_add_supported_tag(marie->lc,"gruu"); + linphone_core_manager_start(marie,TRUE); LinphoneProxyConfig *cfg=linphone_core_get_default_proxy_config(marie->lc); if(cfg) { const LinphoneAddress *addr = linphone_proxy_config_get_contact(cfg); @@ -1199,11 +1201,12 @@ static void register_get_gruu(void) { } static void multi_devices_register_with_gruu(void) { - LinphoneCoreManager *marie=linphone_core_manager_new("marie_rc"); + LinphoneCoreManager *marie = ms_new0(LinphoneCoreManager, 1); + linphone_core_manager_init(marie, "marie_rc", NULL); + linphone_core_add_supported_tag(marie->lc,"gruu"); + linphone_core_manager_start(marie,TRUE); LinphoneProxyConfig *cfg=linphone_core_get_default_proxy_config(marie->lc); - linphone_core_add_supported_tag(marie->lc,"gruu"); - if(cfg) { const LinphoneAddress *addr = linphone_proxy_config_get_contact(cfg); BC_ASSERT_PTR_NOT_NULL(addr);