diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt index 3e58928c1..e876aeef0 100644 --- a/tester/CMakeLists.txt +++ b/tester/CMakeLists.txt @@ -197,7 +197,6 @@ set(SOURCE_FILES_C set(SOURCE_FILES_CXX clonable-object-tester.cpp conference-event-tester.cpp - conference-tester.cpp content-manager-tester.cpp cpim-tester.cpp main-db-tester.cpp diff --git a/tester/conference-tester.cpp b/tester/conference-tester.cpp deleted file mode 100644 index ca195fbfa..000000000 --- a/tester/conference-tester.cpp +++ /dev/null @@ -1,121 +0,0 @@ -/* - * conference-event-tester.cpp - * Copyright (C) 2017 Belledonne Communications SARL - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "linphone/core.h" -#include "private.h" -#include "liblinphone_tester.h" -#include "conference/local-conference.h" -#include "conference/remote-conference.h" - -using namespace LinphonePrivate; -using namespace std; - -static const string firstInvite = "" -"" -"" -" " -" Le Bricoleur" -" " -" " -" Sarah" -"" -""; - -static const string aliceAddr = "sip:alice@sip.linphone.org"; -static const string bobAddr = "sip:bob@sip.linphone.org"; -static const string johnAddr = "sip:john-doe@sip.linphone.org"; -static const string anneAddr = "sip:anne-onyme@sip.linphone.org"; -static const string sarahAddr = "sip:sarah-bache@sip.linphone.org"; - -static const string bobName = "Le Bricoleur"; -static const string sarahName = "Sarah"; - -static void check_first_invite(LinphoneCore *core, const Address &address, string invite) { - LocalConference localConf(core, address); - list
addresses = localConf.parseResourceLists(invite); - BC_ASSERT_EQUAL(addresses.size(), 5, int, "%d"); - if (addresses.size() != 5) - return; - BC_ASSERT_TRUE(addresses.front().asStringUriOnly() == aliceAddr); - BC_ASSERT_TRUE(addresses.front().getDisplayName().empty()); - addresses.pop_front(); - - BC_ASSERT_TRUE(addresses.front().asStringUriOnly() == bobAddr); - BC_ASSERT_TRUE(addresses.front().getDisplayName() == bobName); - addresses.pop_front(); - - BC_ASSERT_TRUE(addresses.front().asStringUriOnly() == johnAddr); - BC_ASSERT_TRUE(addresses.front().getDisplayName().empty()); - addresses.pop_front(); - - BC_ASSERT_TRUE(addresses.front().asStringUriOnly() == anneAddr); - BC_ASSERT_TRUE(addresses.front().getDisplayName().empty()); - addresses.pop_front(); - - BC_ASSERT_TRUE(addresses.front().asStringUriOnly() == sarahAddr); - BC_ASSERT_TRUE(addresses.front().getDisplayName() == sarahName); - addresses.pop_front(); -} - -void first_invite_parsing () { - LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); - const Address marieIdentity(linphone_address_as_string_uri_only(marie->identity)); - check_first_invite(marie->lc, marieIdentity, firstInvite); - linphone_core_manager_destroy(marie); -} - -void first_invite_serializing() { - LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); - const Address marieIdentity(linphone_address_as_string_uri_only(marie->identity)); - RemoteConference remoteConf(marie->lc, marieIdentity); - list
addresses = list
(); - string xmlBody; - - Address aliceIdentity(aliceAddr); - Address bobIdentity(bobAddr); - Address johnIdentity(johnAddr); - Address anneIdentity(anneAddr); - Address sarahIdentity(sarahAddr); - - bobIdentity.setDisplayName(bobName); - sarahIdentity.setDisplayName(sarahName); - - addresses.push_back(aliceIdentity); - addresses.push_back(bobIdentity); - addresses.push_back(johnIdentity); - addresses.push_back(anneIdentity); - addresses.push_back(sarahIdentity); - - xmlBody = remoteConf.getResourceLists(addresses); - check_first_invite(marie->lc, marieIdentity, xmlBody); - linphone_core_manager_destroy(marie); -} - -test_t conference_tests[] = { - TEST_NO_TAG("First invite parsing", first_invite_parsing), - TEST_NO_TAG("First invite serializing", first_invite_serializing) -}; - -test_suite_t conference_test_suite = { - "Conference", - nullptr, - nullptr, - liblinphone_tester_before_each, - liblinphone_tester_after_each, - sizeof(conference_tests) / sizeof(conference_tests[0]), conference_tests -}; diff --git a/tester/tester.c b/tester/tester.c index 48708461e..38394a740 100644 --- a/tester/tester.c +++ b/tester/tester.c @@ -564,7 +564,6 @@ void liblinphone_tester_add_suites() { bc_tester_add_suite(&stun_test_suite); bc_tester_add_suite(&event_test_suite); bc_tester_add_suite(&conference_event_test_suite); - bc_tester_add_suite(&conference_test_suite); bc_tester_add_suite(&content_manager_test_suite); bc_tester_add_suite(&flexisip_test_suite); bc_tester_add_suite(&remote_provisioning_test_suite);