Skip to content

GitLab

Commit e028c77f authored by Andrea Gianarda's avatar Andrea Gianarda Committed by Sylvain Berfini
Browse files

Try to add new participant device while the other one is offline

parent 2e329b74
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 23 deletions
tester/group_chat_tester.c
View file @ e028c77f
......@@ -4389,7 +4389,10 @@ static void linphone_tester_chat_room_exhumed(LinphoneCore *core, LinphoneChatRo
static void exhume_one_to_one_chat_room_3_base(bool_t core_restart) {
LinphoneCoreManager *marie = linphone_core_manager_create("marie_rc");
LinphoneCoreManager *pauline = linphone_core_manager_create("pauline_rc");
LinphoneChatRoom *marieOneToOneCr = NULL, *paulineOneToOneCr = NULL;
LinphoneCoreManager *pauline2 = NULL;
LinphoneChatRoom *marieOneToOneCr = NULL, *pauline2OneToOneCr = NULL, *paulineOneToOneCr = NULL;
int marie_messages = 0, pauline_messages = 0, pauline2_messages = 0;
LinphoneAddress *confAddr = NULL, *exhumedConfAddr = NULL;
bctbx_list_t *coresManagerList = NULL;
bctbx_list_t *participantsAddresses = NULL;
......@@ -4401,14 +4404,15 @@ static void exhume_one_to_one_chat_room_3_base(bool_t core_restart) {
bctbx_list_t *coresList = init_core_for_conference(coresManagerList);
start_core_for_conference(coresManagerList);
const char *initialSubject = "one to one";
participantsAddresses = bctbx_list_append(participantsAddresses, linphone_address_new(linphone_core_get_identity(pauline->lc)));
initialMarieStats = marie->stat;
initialPaulineStats = pauline->stat;
marieOneToOneCr = create_chat_room_client_side(coresList, marie, &initialMarieStats, participantsAddresses, "one to one", FALSE);
marieOneToOneCr = create_chat_room_client_side(coresList, marie, &initialMarieStats, participantsAddresses, initialSubject, FALSE);
if (!BC_ASSERT_PTR_NOT_NULL(marieOneToOneCr)) goto end;
confAddr = linphone_address_ref((LinphoneAddress *)linphone_chat_room_get_conference_address(marieOneToOneCr));
paulineOneToOneCr = check_creation_chat_room_client_side(coresList, pauline, &initialPaulineStats, confAddr, "one to one", 1, FALSE);
paulineOneToOneCr = check_creation_chat_room_client_side(coresList, pauline, &initialPaulineStats, confAddr, initialSubject, 1, FALSE);
LinphoneChatMessage *message = linphone_chat_room_create_message_from_utf8(paulineOneToOneCr, "Hasta la vista, baby.");
linphone_chat_message_send(message);
......@@ -4416,18 +4420,50 @@ static void exhume_one_to_one_chat_room_3_base(bool_t core_restart) {
BC_ASSERT_TRUE(wait_for_list(coresList, &marie->stat.number_of_LinphoneMessageReceived, 1, 5000));
linphone_chat_message_unref(message);
marie_messages = linphone_chat_room_get_history_size(marieOneToOneCr);
BC_ASSERT_EQUAL(marie_messages, 1, int , "%d");
pauline_messages = linphone_chat_room_get_history_size(paulineOneToOneCr);
BC_ASSERT_EQUAL(pauline_messages, 1, int , "%d");
// Pauline goes offline
int dummy = 0;
linphone_core_set_network_reachable(pauline->lc, FALSE);
wait_for_list(coresList, &dummy, 1, 2000);
if (marieOneToOneCr) {
pauline2 = linphone_core_manager_create("pauline_rc");
stats initialPauline2Stats = pauline2->stat;
coresManagerList = bctbx_list_append(coresManagerList, pauline2);
bctbx_list_t *tmpCoresManagerList = bctbx_list_append(NULL, pauline2);
bctbx_list_t *tmpCoresList = init_core_for_conference(tmpCoresManagerList);
start_core_for_conference(tmpCoresManagerList);
bctbx_list_free(tmpCoresManagerList);
coresList = bctbx_list_concat(coresList, tmpCoresList);
pauline2OneToOneCr = check_creation_chat_room_client_side(coresList, pauline2, &initialPauline2Stats, confAddr, initialSubject, 1, FALSE);
BC_ASSERT_PTR_NOT_NULL(pauline2OneToOneCr);
if (!pauline2OneToOneCr) goto end;
BC_ASSERT_FALSE(wait_for_list(coresList, &pauline2->stat.number_of_LinphoneMessageReceived, 2, 5000));
LinphoneChatMessage *offline_message = linphone_chat_room_create_message_from_utf8(marieOneToOneCr, "I'll be back.");
linphone_chat_message_send(offline_message);
BC_ASSERT_TRUE(wait_for_list(coresList, &marie->stat.number_of_LinphoneMessageSent, 1, 5000));
BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_LinphoneMessageReceived, 1, 5000));
linphone_chat_message_unref(offline_message);
// The other device using Pauline's account received the message as she was online
pauline2_messages = linphone_chat_room_get_history_size(pauline2OneToOneCr);
BC_ASSERT_EQUAL(pauline2_messages, 1, int , "%d");
marie_messages = linphone_chat_room_get_history_size(marieOneToOneCr);
BC_ASSERT_EQUAL(marie_messages, 2, int , "%d");
pauline_messages = linphone_chat_room_get_history_size(paulineOneToOneCr);
BC_ASSERT_EQUAL(pauline_messages, 1, int , "%d");
linphone_core_manager_delete_chat_room(marie, marieOneToOneCr, coresList);
BC_ASSERT_TRUE(wait_for_until(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneConferenceStateTerminated, 1, 5000));
/* The chatroom from Pauline won't be terminated as it is offline */
......@@ -4436,7 +4472,7 @@ static void exhume_one_to_one_chat_room_3_base(bool_t core_restart) {
participantsAddresses = NULL;
initialMarieStats = marie->stat;
participantsAddresses = bctbx_list_append(participantsAddresses, linphone_address_new(linphone_core_get_identity(pauline->lc)));
marieOneToOneCr = create_chat_room_client_side(coresList, marie, &initialMarieStats, participantsAddresses, "one to one", FALSE);
marieOneToOneCr = create_chat_room_client_side(coresList, marie, &initialMarieStats, participantsAddresses, initialSubject, FALSE);
wait_for_until(marie->lc, NULL, &marie->stat.number_of_LinphoneConferenceStateCreated, 2, 5000);
if (!BC_ASSERT_PTR_NOT_NULL(marieOneToOneCr)) goto end;
......@@ -4452,6 +4488,17 @@ static void exhume_one_to_one_chat_room_3_base(bool_t core_restart) {
linphone_chat_message_send(exhume_message);
BC_ASSERT_TRUE(wait_for_list(coresList, &marie->stat.number_of_LinphoneMessageSent, 2, 5000));
BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_LinphoneMessageReceived, 2, 5000));
BC_ASSERT_TRUE(wait_for_list(coresList, &pauline2->stat.number_of_LinphoneMessageReceived, 2, 5000));
marie_messages = linphone_chat_room_get_history_size(marieOneToOneCr);
BC_ASSERT_EQUAL(marie_messages, 1, int , "%d");
pauline_messages = linphone_chat_room_get_history_size(paulineOneToOneCr);
BC_ASSERT_EQUAL(pauline_messages, 1, int , "%d");
pauline2_messages = linphone_chat_room_get_history_size(pauline2OneToOneCr);
BC_ASSERT_EQUAL(pauline2_messages, 2, int , "%d");
linphone_chat_message_unref(exhume_message);
// Pauline goes back online
......@@ -4491,10 +4538,13 @@ static void exhume_one_to_one_chat_room_3_base(bool_t core_restart) {
BC_ASSERT_FALSE(wait_for_list(coresList, &pauline->stat.number_of_LinphoneConferenceStateTerminated, 1, 5000));
}
int pauline_messages = linphone_chat_room_get_history_size(paulineOneToOneCr);
pauline2_messages = linphone_chat_room_get_history_size(pauline2OneToOneCr);
BC_ASSERT_EQUAL(pauline2_messages, 2, int , "%d");
pauline_messages = linphone_chat_room_get_history_size(paulineOneToOneCr);
BC_ASSERT_EQUAL(pauline_messages, 3, int , "%d");
int marie_messages = linphone_chat_room_get_history_size(marieOneToOneCr);
marie_messages = linphone_chat_room_get_history_size(marieOneToOneCr);
BC_ASSERT_EQUAL(marie_messages, 1, int , "%d");
LinphoneChatMessage *post_exhume_message = linphone_chat_room_create_message_from_utf8(marieOneToOneCr, "Sarah Connor ?");
......@@ -4507,6 +4557,9 @@ static void exhume_one_to_one_chat_room_3_base(bool_t core_restart) {
}
linphone_chat_message_unref(post_exhume_message);
pauline2_messages = linphone_chat_room_get_history_size(pauline2OneToOneCr);
BC_ASSERT_EQUAL(pauline2_messages, 3, int , "%d");
pauline_messages = linphone_chat_room_get_history_size(paulineOneToOneCr);
BC_ASSERT_EQUAL(pauline_messages, 4, int , "%d");
......@@ -4514,6 +4567,11 @@ static void exhume_one_to_one_chat_room_3_base(bool_t core_restart) {
BC_ASSERT_EQUAL(marie_messages, 2, int , "%d");
}
linphone_config_set_int(linphone_core_get_config(pauline2->lc), "misc", "hide_empty_chat_rooms", 0);
linphone_config_set_int(linphone_core_get_config(pauline2->lc), "misc", "hide_chat_rooms_from_removed_proxies", 0);
const bctbx_list_t *pauline2_chat_rooms = linphone_core_get_chat_rooms(pauline2->lc);
BC_ASSERT_EQUAL(bctbx_list_size(pauline2_chat_rooms), 1, int , "%d");
linphone_config_set_int(linphone_core_get_config(pauline->lc), "misc", "hide_empty_chat_rooms", 0);
linphone_config_set_int(linphone_core_get_config(pauline->lc), "misc", "hide_chat_rooms_from_removed_proxies", 0);
const bctbx_list_t *pauline_chat_rooms = linphone_core_get_chat_rooms(pauline->lc);
......@@ -4534,6 +4592,7 @@ end:
bctbx_list_free(coresManagerList);
linphone_core_manager_destroy(marie);
linphone_core_manager_destroy(pauline);
linphone_core_manager_destroy(pauline2);
}
static void exhume_one_to_one_chat_room_3(void) {
......
tester/local_conference_tester.cpp
View file @ e028c77f
......@@ -201,6 +201,13 @@ public:
}
void subscribeParticipantDevice(const LinphoneAddress *conferenceAddress, const LinphoneAddress *participantDevice){
LinphoneChatRoom *cr = linphone_core_search_chat_room(getLc(), NULL, conferenceAddress, conferenceAddress, NULL);
BC_ASSERT_PTR_NOT_NULL(cr);
// CALL_CHAT_ROOM_CBS(cr, ParticipantRegistrationSubscriptionRequested, participant_registration_subscription_requested, cr, participantDevice)
_linphone_chat_room_notify_participant_registration_subscription_requested(cr, participantDevice);
}
void notifyParticipantDeviceRegistration(const LinphoneAddress *conferenceAddress, const LinphoneAddress *participantDevice){
LinphoneChatRoom *cr = linphone_core_search_chat_room(getLc(), NULL, conferenceAddress, conferenceAddress, NULL);
......@@ -342,6 +349,7 @@ static void group_chat_room_creation_server (void) {
// Laure comes back online and its chatroom is expected to be deleted
linphone_core_set_network_reachable(laure.getLc(), TRUE);
LinphoneAddress *laureDeviceAddress = linphone_address_clone(linphone_proxy_config_get_contact(linphone_core_get_default_proxy_config(laure.getLc())));
// Notify chat room that a participant has registered
focus.notifyParticipantDeviceRegistration(linphone_chat_room_get_conference_address(marieCr), laureDeviceAddress);
linphone_address_unref(laureDeviceAddress);
BC_ASSERT_TRUE(wait_for_list(coresList, &laure.getStats().number_of_LinphoneConferenceStateTerminated, initialLaureStats.number_of_LinphoneConferenceStateTerminated + 1, 5000));
......@@ -802,7 +810,7 @@ static void one_to_one_chatroom_exhumed_while_offline (void) {
int marieMsgs = linphone_chat_room_get_history_size(marieCr);
BC_ASSERT_EQUAL(marieMsgs, 1, int , "%d");
// Paulien didn't recieved the message as she was offline
// Pauline didn't received the message as she was offline
int paulineMsgs = linphone_chat_room_get_history_size(paulineCr);
BC_ASSERT_EQUAL(paulineMsgs, 0, int , "%d");
......@@ -834,11 +842,8 @@ static void one_to_one_chatroom_exhumed_while_offline (void) {
}
BC_ASSERT_EQUAL(marie.getCore().getChatRooms().size(), 1, int, "%d");
initialMarieStats = marie.getStats();
initialPaulineStats = pauline.getStats();
BC_ASSERT_EQUAL(linphone_chat_room_get_nb_participants(marieCr), 1, int, "%d");
BC_ASSERT_EQUAL(linphone_chat_room_get_nb_participants(paulineCr), 1, int, "%d");
// Wait a little bit to detect side effects
......@@ -856,12 +861,13 @@ static void one_to_one_chatroom_exhumed_while_offline (void) {
char *paulineDeviceIdentity = linphone_core_get_device_identity(pauline.getLc());
LinphoneAddress *paulineDeviceAddr = linphone_address_new(paulineDeviceIdentity);
bctbx_free(paulineDeviceIdentity);
paulineCr = linphone_core_search_chat_room(pauline.getLc(), NULL, paulineDeviceAddr, confAddr, NULL);
LinphoneChatRoom *newPaulineCr = linphone_core_search_chat_room(pauline.getLc(), NULL, paulineDeviceAddr, confAddr, NULL);
linphone_address_unref(paulineDeviceAddr);
BC_ASSERT_PTR_NOT_NULL(paulineCr);
BC_ASSERT_PTR_NOT_NULL(newPaulineCr);
BC_ASSERT_PTR_EQUAL(newPaulineCr, paulineCr);
if (paulineCr) {
LinphoneAddress *paulineNewConfAddr = linphone_address_ref((LinphoneAddress *)linphone_chat_room_get_conference_address(paulineCr));
if (newPaulineCr) {
LinphoneAddress *paulineNewConfAddr = linphone_address_ref((LinphoneAddress *)linphone_chat_room_get_conference_address(newPaulineCr));
BC_ASSERT_PTR_NOT_NULL(paulineNewConfAddr);
if (paulineNewConfAddr) {
BC_ASSERT_FALSE(linphone_address_equal(confAddr, paulineNewConfAddr));
......@@ -871,14 +877,14 @@ static void one_to_one_chatroom_exhumed_while_offline (void) {
}
linphone_address_unref(paulineNewConfAddr);
BC_ASSERT_EQUAL(linphone_chat_room_get_nb_participants(paulineCr), 1, int, "%d");
BC_ASSERT_STRING_EQUAL(linphone_chat_room_get_subject(paulineCr), initialSubject);
BC_ASSERT_EQUAL(linphone_chat_room_get_nb_participants(newPaulineCr), 1, int, "%d");
BC_ASSERT_STRING_EQUAL(linphone_chat_room_get_subject(newPaulineCr), initialSubject);
BC_ASSERT_TRUE(wait_for_list(coresList, &pauline.getStats().number_of_LinphoneMessageReceived, initialPaulineStats.number_of_LinphoneMessageReceived + 1, 5000));
paulineMsgs = linphone_chat_room_get_history_size(paulineCr);
paulineMsgs = linphone_chat_room_get_history_size(newPaulineCr);
BC_ASSERT_EQUAL(paulineMsgs, 1, int , "%d");
LinphoneChatMessage *paulineMsg = linphone_chat_room_create_message_from_utf8(paulineCr, "Sorry I was offline :(");
LinphoneChatMessage *paulineMsg = linphone_chat_room_create_message_from_utf8(newPaulineCr, "Sorry I was offline :(");
linphone_chat_message_send(paulineMsg);
BC_ASSERT_TRUE(CoreManagerAssert({focus,marie,pauline}).wait([paulineMsg] {
return (linphone_chat_message_get_state(paulineMsg) == LinphoneChatMessageStateDelivered);
......@@ -890,7 +896,7 @@ static void one_to_one_chatroom_exhumed_while_offline (void) {
// Since Marie has deleted the chat room, she lost all messages she sent before deleting it
marieMsgs = linphone_chat_room_get_history_size(marieCr);
BC_ASSERT_EQUAL(marieMsgs, 1, int , "%d");
paulineMsgs = linphone_chat_room_get_history_size(paulineCr);
paulineMsgs = linphone_chat_room_get_history_size(newPaulineCr);
BC_ASSERT_EQUAL(paulineMsgs, 2, int , "%d");
LinphoneChatMessage *marieMsg = linphone_chat_room_create_message_from_utf8(marieCr, "exhumed!!");
......@@ -898,14 +904,14 @@ static void one_to_one_chatroom_exhumed_while_offline (void) {
BC_ASSERT_TRUE(CoreManagerAssert({focus,marie,pauline}).wait([marieMsg] {
return (linphone_chat_message_get_state(marieMsg) == LinphoneChatMessageStateDelivered);
}));
BC_ASSERT_TRUE(CoreManagerAssert({focus,marie,pauline}).wait([paulineCr] {
return linphone_chat_room_get_unread_messages_count(paulineCr) == 2;
BC_ASSERT_TRUE(CoreManagerAssert({focus,marie,pauline}).wait([newPaulineCr] {
return linphone_chat_room_get_unread_messages_count(newPaulineCr) == 2;
}));
linphone_chat_message_unref(marieMsg);
marieMsgs = linphone_chat_room_get_history_size(marieCr);
BC_ASSERT_EQUAL(marieMsgs, 2, int , "%d");
paulineMsgs = linphone_chat_room_get_history_size(paulineCr);
paulineMsgs = linphone_chat_room_get_history_size(newPaulineCr);
BC_ASSERT_EQUAL(paulineMsgs, 3, int , "%d");
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment