tester: split presence tests in two: peer to peer tests and with server tests

tester/CMakeLists.txt

@@ -35,6 +35,7 @@ set(SOURCE_FILES
 	offeranswer_tester.c
 	player_tester.c
 	presence_tester.c
+	presence_server_tester.c
 	proxy_config_tester.c
 	quality_reporting_tester.c
 	register_tester.c

tester/Makefile.am

@@ -124,6 +124,7 @@ liblinphonetester_la_SOURCES = \
 				offeranswer_tester.c \
 				player_tester.c \
 				presence_tester.c \
+				presence_server_tester.c \
 				proxy_config_tester.c \
 				quality_reporting_tester.c \
 				register_tester.c \

tester/flexisip_tester.c

@@ -750,7 +750,7 @@ static void file_transfer_message_rcs_to_external_body_client(void) {
 		linphone_proxy_config_set_custom_header(marie->lc->default_proxy, "Accept", "application/sdp");
 		linphone_core_set_network_reachable(marie->lc, TRUE);
 		linphone_core_manager_start(marie, TRUE);
-		
+
 
 		linphone_proxy_config_set_custom_header(pauline->lc->default_proxy, "Accept", "application/sdp, text/plain, application/vnd.gsma.rcs-ft-http+xml");
 		linphone_core_set_network_reachable(pauline->lc, TRUE);
@@ -835,9 +835,9 @@ void send_file_transfer_message_using_external_body_url(LinphoneCoreManager *mar
 
 	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress, 1, int, "%d");
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageExtBodyReceived, 1, int, "%d");
-	
+
 	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneMessageDelivered, 1));
-	
+
 }
 
 static void file_transfer_message_external_body_to_external_body_client(void) {
@@ -1018,11 +1018,11 @@ static void test_publish_unpublish(void) {
 	linphone_proxy_config_edit(proxy);
 	linphone_proxy_config_enable_publish(proxy,TRUE);
 	linphone_proxy_config_done(proxy);
-	wait_core(marie->lc);
+	wait_for(marie->lc, NULL, NULL, 0);
 	linphone_proxy_config_edit(proxy);
 	linphone_proxy_config_enable_publish(proxy,FALSE);
 	linphone_proxy_config_done(proxy);
-	wait_core(marie->lc);
+	wait_for(marie->lc, NULL, NULL, 0);
 	linphone_core_manager_destroy(marie);
 }
 

tester/liblinphone_tester.h

@@ -44,6 +44,7 @@ extern test_suite_t register_test_suite;
 extern test_suite_t call_test_suite;
 extern test_suite_t message_test_suite;
 extern test_suite_t presence_test_suite;
+extern test_suite_t presence_server_test_suite;
 extern test_suite_t upnp_test_suite;
 extern test_suite_t event_test_suite;
 extern test_suite_t flexisip_test_suite;
@@ -367,11 +368,10 @@ LinphoneConferenceServer* linphone_conference_server_new(const char *rc_file, bo
 void linphone_conference_server_destroy(LinphoneConferenceServer *conf_srv);
 
 extern const char *liblinphone_tester_mire_id;
-	
+
 LinphoneAddress * linphone_core_manager_resolve(LinphoneCoreManager *mgr, const LinphoneAddress *source);
 FILE *sip_start(const char *senario, const char* dest_username, const char *passwd, LinphoneAddress* dest_addres);
 
-void wait_core(LinphoneCore *core) ;
 
 
 #ifdef __cplusplus

tester/tester.c

@@ -476,6 +476,7 @@ void liblinphone_tester_add_suites() {
 	bc_tester_add_suite(&multi_call_test_suite);
 	bc_tester_add_suite(&message_test_suite);
 	bc_tester_add_suite(&presence_test_suite);
+	bc_tester_add_suite(&presence_server_test_suite);
 #ifdef UPNP
 	bc_tester_add_suite(&upnp_test_suite);
 #endif