generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added the remaining test cases for the webrtcsession unittest also some minor refactoring.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/131003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@454 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
hellner@google.com 2011-08-25 21:37:08 +00:00
parent 59af6f1434
commit b2801f3a16
1 changed files with 73 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
third_party_mods/libjingle/source/talk/app/webrtc/webrtcsession_unittest.cc
View File

@ -41,6 +41,7 @@
#include "talk/session/phone/fakesession.h" #include "talk/session/phone/fakesession.h"
#include "talk/session/phone/mediasessionclient.h" #include "talk/session/phone/mediasessionclient.h"
namespace {
cricket::VideoContentDescription* CopyVideoContentDescription( cricket::VideoContentDescription* CopyVideoContentDescription(
const cricket::VideoContentDescription* video_description) { const cricket::VideoContentDescription* video_description) {
cricket::VideoContentDescription* new_video_description = cricket::VideoContentDescription* new_video_description =
@ -108,11 +109,8 @@ cricket::SessionDescription* CopySessionDescription(
return new cricket::SessionDescription(new_content_infos); return new cricket::SessionDescription(new_content_infos);
} }
bool GenerateFakeSessionDescription(bool video, cricket::SessionDescription* GenerateFakeSessionDescription(bool video) {
cricket::SessionDescription** incoming_sdp) { cricket::SessionDescription* fake_description = new cricket::SessionDescription();
*incoming_sdp = new cricket::SessionDescription();
if (*incoming_sdp == NULL)
return false;
const std::string name = video ? std::string(cricket::CN_VIDEO) : const std::string name = video ? std::string(cricket::CN_VIDEO) :
std::string(cricket::CN_AUDIO); std::string(cricket::CN_AUDIO);
cricket::ContentDescription* description = NULL; cricket::ContentDescription* description = NULL;
@ -129,12 +127,12 @@ bool GenerateFakeSessionDescription(bool video,
} }
// Cannot fail. // Cannot fail.
(*incoming_sdp)->AddContent(name, cricket::NS_JINGLE_RTP, description); fake_description->AddContent(name, cricket::NS_JINGLE_RTP, description);
return true; return fake_description;
} }
void GenerateFakeCandidate(bool video, void GenerateFakeCandidate(std::vector<cricket::Candidate>* candidates,
std::vector<cricket::Candidate>* candidates) { bool video) {
// Next add a candidate. // Next add a candidate.
// int port_index = 0; // int port_index = 0;
std::string port_index_as_string("0"); std::string port_index_as_string("0");
@ -154,16 +152,18 @@ void GenerateFakeCandidate(bool video,
candidates->push_back(candidate); candidates->push_back(candidate);
} }
cricket::SessionDescription* GenerateFakeSession(
bool GenerateFakeSession(bool video, cricket::SessionDescription** incoming_sdp, std::vector<cricket::Candidate>* candidates,
std::vector<cricket::Candidate>* candidates) { bool video) {
if (!GenerateFakeSessionDescription(video, incoming_sdp)) { cricket::SessionDescription* fake_description =
return false; GenerateFakeSessionDescription(video);
if (fake_description == NULL) {
return NULL;
} }
GenerateFakeCandidate(candidates, video);
GenerateFakeCandidate(video, candidates); return fake_description;
return true;
} }
} // namespace
class OnSignalImpl class OnSignalImpl
: public sigslot::has_slots<> { : public sigslot::has_slots<> {
@ -388,6 +388,9 @@ class WebRtcSessionTest : public OnSignalImpl {
if (!session_->OnInitiateMessage(description, candidates)) { if (!session_->OnInitiateMessage(description, candidates)) {
return false; return false;
} }
if (!WaitForCallback(kOnAddStream, 1000)) {
return false;
}
return true; return true;
} }
@ -519,6 +522,9 @@ TEST(WebRtcSessionTest, AudioSendCallSetUp) {
// All callbacks should be caught by my_session. Assert it. // All callbacks should be caught by my_session. Assert it.
ASSERT_FALSE(CallbackReceived(my_session.get(), 1000)); ASSERT_FALSE(CallbackReceived(my_session.get(), 1000));
ASSERT_TRUE(my_session->CallHasAudioStream() &&
!my_session->CallHasVideoStream());
} }
TEST(WebRtcSessionTest, VideoSendCallSetUp) { TEST(WebRtcSessionTest, VideoSendCallSetUp) {
@ -545,6 +551,55 @@ TEST(WebRtcSessionTest, VideoSendCallSetUp) {
// All callbacks should be caught by my_session. Assert it. // All callbacks should be caught by my_session. Assert it.
ASSERT_FALSE(CallbackReceived(my_session.get(), 1000)); ASSERT_FALSE(CallbackReceived(my_session.get(), 1000));
ASSERT_TRUE(!my_session->CallHasAudioStream() &&
my_session->CallHasVideoStream());
} }
// TODO(ronghuawu): Add tests for incoming calls. TEST(WebRtcSessionTest, AudioReceiveCallSetUp) {
const bool kReceiving = true;
const bool video = false;
talk_base::scoped_ptr<WebRtcSessionTest> my_session;
my_session.reset(WebRtcSessionTest::CreateWebRtcSessionTest(kReceiving));
ASSERT_TRUE(my_session.get() != NULL);
ASSERT_TRUE(my_session->CallInitiate());
std::vector<cricket::Candidate> candidates;
cricket::SessionDescription* local_session =
GenerateFakeSession(&candidates, video);
ASSERT_FALSE(candidates.empty());
ASSERT_FALSE(local_session == NULL);
if (!my_session->CallOnInitiateMessage(local_session, candidates)) {
delete local_session;
FAIL();
}
ASSERT_TRUE(my_session->CallConnect());
ASSERT_FALSE(CallbackReceived(my_session.get(), 1000));
ASSERT_TRUE(my_session->CallHasAudioStream() &&
!my_session->CallHasVideoStream());
}
TEST(WebRtcSessionTest, VideoReceiveCallSetUp) {
const bool kReceiving = true;
const bool video = true;
talk_base::scoped_ptr<WebRtcSessionTest> my_session;
my_session.reset(WebRtcSessionTest::CreateWebRtcSessionTest(kReceiving));
ASSERT_TRUE(my_session.get() != NULL);
ASSERT_TRUE(my_session->CallInitiate());
std::vector<cricket::Candidate> candidates;
cricket::SessionDescription* local_session =
GenerateFakeSession(&candidates, video);
ASSERT_FALSE(candidates.empty());
ASSERT_FALSE(local_session == NULL);
if (!my_session->CallOnInitiateMessage(local_session, candidates)) {
delete local_session;
FAIL();
}
ASSERT_TRUE(my_session->CallConnect());
ASSERT_FALSE(CallbackReceived(my_session.get(), 1000));
ASSERT_TRUE(!my_session->CallHasAudioStream() &&
my_session->CallHasVideoStream());
}