jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

multistream: fix compil and logic (ut_call, ut_conference, ut_media_negotiation)

Browse Source 
Change-Id: Ia7ed4438ccd466ec0bab60b5a85d9b67f721d0d8
This commit is contained in:
Sébastien Blin
2021-06-11 15:20:30 -04:00
parent 8a753f0463
commit 348ade9e2a
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/unitTest/SEND Normal file
View File

File diff suppressed because one or more lines are too long

21
test/unitTest/call/call.cpp
View File

@ -109,8 +109,11 @@ CallTest::testCall()
std::atomic_bool callReceived {false};
std::atomic<int> callStopped {0};
// Watch signals
confHandlers.insert(DRing::exportable_callback<DRing::CallSignal::IncomingCall>(
[&](const std::string&, const std::string&, const std::string&) {
confHandlers.insert(DRing::exportable_callback<DRing::CallSignal::IncomingCallWithMedia>(
[&](const std::string&,
const std::string&,
const std::string&,
const std::vector<std::map<std::string, std::string>>&) {
callReceived = true;
cv.notify_one();
}));
@ -151,8 +154,11 @@ CallTest::testCachedCall()
std::atomic_bool callReceived {false}, successfullyConnected {false};
std::atomic<int> callStopped {0};
// Watch signals
confHandlers.insert(DRing::exportable_callback<DRing::CallSignal::IncomingCall>(
[&](const std::string&, const std::string&, const std::string&) {
confHandlers.insert(DRing::exportable_callback<DRing::CallSignal::IncomingCallWithMedia>(
[&](const std::string&,
const std::string&,
const std::string&,
const std::vector<std::map<std::string, std::string>>&) {
callReceived = true;
cv.notify_one();
}));
@ -257,8 +263,11 @@ CallTest::testDeclineMultiDevice()
std::atomic<int> callStopped {0};
std::string callIdBob;
// Watch signals
confHandlers.insert(DRing::exportable_callback<DRing::CallSignal::IncomingCall>(
[&](const std::string& accountId, const std::string& callId, const std::string&) {
confHandlers.insert(DRing::exportable_callback<DRing::CallSignal::IncomingCallWithMedia>(
[&](const std::string& accountId,
const std::string& callId,
const std::string&,
const std::vector<std::map<std::string, std::string>>&) {
if (accountId == bobId)
callIdBob = callId;
callReceived += 1;

7
test/unitTest/call/conference.cpp
View File

@ -124,8 +124,11 @@ ConferenceTest::registerSignalHandlers()
std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>> confHandlers;
// Watch signals
confHandlers.insert(DRing::exportable_callback<DRing::CallSignal::IncomingCall>(
[=](const std::string& accountId, const std::string& callId, const std::string&) {
confHandlers.insert(DRing::exportable_callback<DRing::CallSignal::IncomingCallWithMedia>(
[=](const std::string& accountId,
const std::string& callId,
const std::string&,
const std::vector<std::map<std::string, std::string>>&) {
if (accountId == bobId) {
bobCall.callId = callId;
} else if (accountId == carlaId) {

3
test/unitTest/media_negotiation/media_negotiation.cpp
View File

@ -29,6 +29,7 @@
#include "jamidht/jamiaccount.h"
#include "../../test_runner.h"
#include "dring.h"
#include "dring/media_const.h"
#include "call_const.h"
#include "account_const.h"
#include "sip/sipcall.h"
@ -549,7 +550,7 @@ MediaNegotiationTest::configureScenario(CallData& aliceData, CallData& bobData)
signalHandlers.insert(DRing::exportable_callback<DRing::CallSignal::MediaNegotiationStatus>(
[&](const std::string& callId,
const std::string& event,
const std::vector<std::map<std::string, std::string>>& mediaList) {
const std::vector<std::map<std::string, std::string>>&) {
auto user = getUserAlias(callId);
if (not user.empty())
onMediaNegotiationStatus(callId,