From 44040c2f3f8e31eb8b093c3ac10b48c014c748ab Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 31 Jan 2018 17:49:17 +0100 Subject: [PATCH] Some more fixes in message tester. --- tester/liblinphone_tester.h | 2 -- tester/message_tester.c | 12 ++---------- tester/tester.c | 1 - 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h index 94cf8e43a..5fecd5371 100644 --- a/tester/liblinphone_tester.h +++ b/tester/liblinphone_tester.h @@ -170,7 +170,6 @@ typedef struct _stats { int number_of_LinphoneMessageReceived; int number_of_LinphoneMessageReceivedWithFile; - int number_of_LinphoneMessageReceivedLegacy; int number_of_LinphoneMessageExtBodyReceived; int number_of_LinphoneMessageInProgress; int number_of_LinphoneMessageDelivered; @@ -343,7 +342,6 @@ void call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState void linphone_transfer_state_changed(LinphoneCore *lc, LinphoneCall *transfered, LinphoneCallState new_call_state); void notify_presence_received(LinphoneCore *lc, LinphoneFriend * lf); void notify_presence_received_for_uri_or_tel(LinphoneCore *lc, LinphoneFriend *lf, const char *uri_or_tel, const LinphonePresenceModel *presence); -void text_message_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from_address, const char *message); void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage* message); void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const LinphoneBuffer *buffer); LinphoneBuffer * tester_file_transfer_send(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t size); diff --git a/tester/message_tester.c b/tester/message_tester.c index 5e737db42..65d6df14e 100644 --- a/tester/message_tester.c +++ b/tester/message_tester.c @@ -48,11 +48,6 @@ static const char *pauline_zid_sqlcache = "BEGIN TRANSACTION; CREATE TABLE IF NO static const char *xmlCacheMigration = "\n00112233445566778899aabb99887766554433221100ffeec4274f13a2b6fa05c15ec93158f930e7264b0a893393376dbc80c6eb1cccdc5asip:bob@sip.linphone.org219d9e445d10d4ed64083c7ccbb83a23bc17a97df0af5de4261f3fe026b05b0b747e72a5cc996413cb9fa6e3d18d8b370436e274cd6ba4efc1a4580340af57cadf2bf38e719fa89e17332cf8d5e774ee70d347baa74d16dee01f306c54789869928ce78b0bfc30427a02b1b668b2b3b0496d5664d7e89b75ed292ee97e3fc850496bcc8959337abe5dda11f388384b349d210612f30824268a3753a7afa52ef6df5866dca76315c4sip:bob2@sip.linphone.orgffeeddccbbaa987654321012858b495dfad483af3c088f26d68c4beebc638bd44feae45aea726a771727235esip:bob@sip.linphone.orgb6aac945057bc4466bfe9a23771c6a1b3b8d72ec3e7d8f30ed63cbc5a9479a25bea5ac3225edd0545b816f061a8190370e3ee5160e75404846a34d1580e0c26317ce70fdf12e500294bcb5f2ffef53096761bb1c912b21e972ae03a5a9f05c477e13a20e15a517700f0be0921f74b96d4b4a0c539d5e14d5cdd8706441874ac075e18caa2cfbbf061533dee20c8116dc2c282cae9adfea689b87bc4c6a4e18a846f12e3e7fea39590987654321fedcba5a5a5a5acb6ecc87d1dd87b23f225eec53a26fc541384917623e0c46abab8c0350c6929e92bb03988e8f0ccfefa37a55fd7c5893bea3bfbb27312f49dd9b10d0e3c15fc72315705a5830b98f68458fcd49623144cb34a667512c4d44686aee125bb8b62294c56eea0dd829379263b6da3f6ac0a95388090f168a3568736ca0bd9f8d595fc319ae0d41183fec90afc412d42253c5b456580f7a463c111c7293623b8631f4sip:bob@sip.linphone.org2c46ddcc15f5779e0000000058f095bf01"; -void text_message_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from_address, const char *msg) { - stats* counters = get_stats(lc); - counters->number_of_LinphoneMessageReceivedLegacy++; -} - void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage* msg) { char* from=linphone_address_as_string(linphone_chat_message_get_from_address(msg)); stats* counters; @@ -1105,7 +1100,6 @@ static void _im_error_delivery_notification(bool_t online) { linphone_chat_room_send_message(chat_room, "Bla bla bla bla"); BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneMessageReceived, 1)); - BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneMessageReceivedLegacy, 1)); BC_ASSERT_PTR_NOT_NULL(marie->stat.last_received_chat_message); if (marie->stat.last_received_chat_message) { BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_text(marie->stat.last_received_chat_message), "Bla bla bla bla"); @@ -1175,7 +1169,6 @@ static void lime_text_message(void) { linphone_chat_room_send_message(chat_room,"Bla bla bla bla"); BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1)); - BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedLegacy,1)); BC_ASSERT_PTR_NOT_NULL(marie->stat.last_received_chat_message); if (marie->stat.last_received_chat_message) { BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_text(marie->stat.last_received_chat_message), "Bla bla bla bla"); @@ -1218,7 +1211,6 @@ static void lime_text_message_to_non_lime(bool_t sender_policy_mandatory, bool_t int chat_room_size = 0; BC_ASSERT_FALSE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1)); BC_ASSERT_FALSE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneMessageNotDelivered,1)); - BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageReceivedLegacy, 0, int, "%d"); chat_room_size = linphone_chat_room_get_history_size(chat_room); BC_ASSERT_EQUAL(chat_room_size, 1, int, "%d"); if (chat_room_size == 1) { @@ -1233,7 +1225,6 @@ static void lime_text_message_to_non_lime(bool_t sender_policy_mandatory, bool_t } } else { BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1)); - BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageReceivedLegacy, 1, int, "%d"); } BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity)); @@ -1279,7 +1270,6 @@ static void lime_multiple_messages_while_network_unreachable(void) { linphone_core_set_network_reachable(pauline->lc, TRUE); BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,2)); - BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedLegacy,2)); BC_ASSERT_PTR_NOT_NULL(marie->stat.last_received_chat_message); if (marie->stat.last_received_chat_message) { BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_text(marie->stat.last_received_chat_message), "Bla bla 2"); @@ -1594,6 +1584,7 @@ static void file_transfer_not_sent_if_invalid_url(void) { linphone_core_set_file_transfer_server(marie->lc, "INVALID URL"); linphone_chat_room_send_chat_message(chatroom, msg); BC_ASSERT_TRUE(wait_for_until(marie->lc, NULL, &marie->stat.number_of_LinphoneMessageNotDelivered, 1, 1000)); + linphone_chat_message_unref(msg); linphone_core_manager_destroy(marie); } @@ -1612,6 +1603,7 @@ void file_transfer_io_error_base(char *server_url, bool_t destroy_room) { } else { BC_ASSERT_TRUE(wait_for_until(marie->lc, NULL, &marie->stat.number_of_LinphoneMessageNotDelivered, 1, 3000)); } + linphone_chat_message_unref(msg); linphone_core_manager_destroy(marie); } diff --git a/tester/tester.c b/tester/tester.c index 59e6ff122..a552189fc 100644 --- a/tester/tester.c +++ b/tester/tester.c @@ -367,7 +367,6 @@ void linphone_core_manager_init(LinphoneCoreManager *mgr, const char* rc_file, c linphone_core_cbs_set_registration_state_changed(mgr->cbs, registration_state_changed); linphone_core_cbs_set_auth_info_requested(mgr->cbs, auth_info_requested); linphone_core_cbs_set_call_state_changed(mgr->cbs, call_state_changed); - //mgr->v_table.text_received=text_message_received; linphone_core_cbs_set_message_received(mgr->cbs, message_received); linphone_core_cbs_set_is_composing_received(mgr->cbs, is_composing_received); linphone_core_cbs_set_new_subscription_requested(mgr->cbs, new_subscription_requested);