From 835f9e4334902d0ad9e968a6cac66292ed3b9f9e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 7 Dec 2016 17:20:48 +0100
Subject: [PATCH] Clean temporary files created by Message suite in tester

---
 tester/message_tester.c | 14 ++++++++++++++
 tester/tester.c         |  1 +
 2 files changed, 15 insertions(+)

diff --git a/tester/message_tester.c b/tester/message_tester.c
index a6ecc6b32..e0a93d548 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -512,6 +512,8 @@ void transfer_message_base2(LinphoneCoreManager* marie, LinphoneCoreManager* pau
 		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,2, int, "%d"); //sent twice because of file transfer
 		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1, int, "%d");
 	}
+	
+	remove(receive_filepath);
 	ms_free(send_filepath);
 	bc_free(receive_filepath);
 }
@@ -715,6 +717,7 @@ static void file_transfer_2_messages_simultaneously(void) {
 			}
 		}
 		linphone_core_manager_destroy(pauline);
+		remove(receive_filepath);
 		ms_free(send_filepath);
 		bc_free(receive_filepath);
 		linphone_core_manager_destroy(marie);
@@ -860,6 +863,8 @@ static void _is_composing_notification(bool_t lime_enabled) {
 	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneIsComposingIdleReceived, 2));
 	
 end:
+	remove("tmpZIDCacheMarie.xml");
+	remove("tmpZIDCachePauline.xml");
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -916,6 +921,8 @@ static void lime_text_message(void) {
 	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity));
 	/* TODO : check the msg arrived correctly deciphered */
 end:
+	remove("tmpZIDCacheMarie.xml");
+	remove("tmpZIDCachePauline.xml");
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -953,6 +960,7 @@ static void lime_text_message_to_non_lime(void) {
 
 	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity));
 end:
+	remove("tmpZIDCachePauline.xml");
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -1052,6 +1060,9 @@ void lime_transfer_message_base(bool_t encrypt_file,bool_t download_file_from_st
 	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1, int, "%d");
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,1, int, "%d");
 end:
+	remove("tmpZIDCacheMarie.xml");
+	remove("tmpZIDCachePauline.xml");
+	remove(receive_filepath);
 	ms_free(send_filepath);
 	bc_free(receive_filepath);
 	linphone_core_manager_destroy(marie);
@@ -1266,6 +1277,9 @@ static void lime_unit(void) {
 
 		xmlFreeDoc(cacheBufferAlice);
 		xmlFreeDoc(cacheBufferBob);
+		remove("ZIDCache.xml");
+		remove("ZIDCacheAlice.xml");
+		remove("ZIDCacheBob.xml");
 	} else {
 		ms_warning("Lime not available, skiping");
 	}
diff --git a/tester/tester.c b/tester/tester.c
index 240958c47..fdfea8af9 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -176,6 +176,7 @@ LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, c
 	ms_free(nowebcampath);
 	ms_free(rootcapath);
 	ms_free(dnsuserhostspath);
+	remove(chatdb);
 	ms_free(chatdb);
 
 	if( filepath ) ms_free(filepath);