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

media_const: move MediaAttribute constants to media_const

Browse Source 
Change-Id: Ie8513b083d696604b36d6b3ecd868ce184a398d0
This commit is contained in:
agsantos
2021-06-08 13:58:08 -04:00
parent d35d214bc5
commit 6a3cdc99e5
6 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/unitTest/ice/ice_sdp_parser.cpp
View File

@ -515,7 +515,7 @@ IceSdpParsingTest::audio_video_call()
// Wait for media negotiation complete signal.
CPPUNIT_ASSERT(waitForSignal(bobData_,
DRing::CallSignal::MediaNegotiationStatus::name,
MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS));
DRing::Media::MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS));
// Wait for the StateChange signal.
CPPUNIT_ASSERT(
waitForSignal(bobData_, DRing::CallSignal::StateChange::name, StateEvent::CURRENT));
@ -525,7 +525,7 @@ IceSdpParsingTest::audio_video_call()
// Wait for media negotiation complete signal.
CPPUNIT_ASSERT(waitForSignal(aliceData_,
DRing::CallSignal::MediaNegotiationStatus::name,
MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS));
DRing::Media::MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS));
// Give some time to media to start.
std::this_thread::sleep_for(std::chrono::seconds(2));

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

@ -595,10 +595,11 @@ MediaNegotiationTest::testWithScenario(CallData& aliceData,
}
// Wait for media negotiation complete signal.
CPPUNIT_ASSERT_EQUAL(true,
waitForSignal(bobData,
DRing::CallSignal::MediaNegotiationStatus::name,
MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS));
CPPUNIT_ASSERT_EQUAL(
true,
waitForSignal(bobData,
DRing::CallSignal::MediaNegotiationStatus::name,
DRing::Media::MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS));
// Wait for the StateChange signal.
CPPUNIT_ASSERT_EQUAL(true,
waitForSignal(bobData,
@ -608,10 +609,11 @@ MediaNegotiationTest::testWithScenario(CallData& aliceData,
JAMI_INFO("BOB answered the call [%s]", bobData.callId_.c_str());
// Wait for media negotiation complete signal.
CPPUNIT_ASSERT_EQUAL(true,
waitForSignal(aliceData,
DRing::CallSignal::MediaNegotiationStatus::name,
MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS));
CPPUNIT_ASSERT_EQUAL(
true,
waitForSignal(aliceData,
DRing::CallSignal::MediaNegotiationStatus::name,
DRing::Media::MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS));
// Validate Alice's media
{
@ -658,10 +660,11 @@ MediaNegotiationTest::testWithScenario(CallData& aliceData,
if (scenario.expectMediaRenegotiation_) {
// Wait for media negotiation complete signal.
CPPUNIT_ASSERT_EQUAL(true,
waitForSignal(aliceData,
DRing::CallSignal::MediaNegotiationStatus::name,
MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS));
CPPUNIT_ASSERT_EQUAL(
true,
waitForSignal(aliceData,
DRing::CallSignal::MediaNegotiationStatus::name,
DRing::Media::MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS));
// Validate Alice's media
{