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

Fixed potential memory leak in unit test and removed an unnecessary copy.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@447 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
hellner@google.com 2011-08-25 15:34:19 +00:00
parent 102b2270c7
commit 3227ed567b
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,21 +369,10 @@ class WebRtcSessionTest : public OnSignalImpl {
return true;
}
bool CallOnRemoteDescription(cricket::SessionDescription* session_shallow,
std::vector<cricket::Candidate>* candidates_shallow) {
std::vector<cricket::Candidate> candidates;
candidates.insert(candidates.end(), candidates_shallow->begin(),
candidates_shallow->end());
if (candidates.empty()) {
return false;
}
cricket::SessionDescription* description = CopySessionDescription(
session_shallow);
if (description == NULL) {
return false;
}
bool CallOnRemoteDescription(
cricket::SessionDescription* description,
std::vector<cricket::Candidate> candidates) {
if (!session_->OnRemoteDescription(description, candidates)) {
delete description;
return false;
}
return true;
@ -524,7 +513,10 @@ TEST(WebRtcSessionTest, AudioSendReceiveCallSetUp) {
&candidates);
ASSERT_FALSE(candidates.empty());
ASSERT_FALSE(local_session == NULL);
ASSERT_TRUE(my_session->CallOnRemoteDescription(local_session, &candidates));
if (!my_session->CallOnRemoteDescription(local_session, candidates)) {
delete local_session;
FAIL();
}
// All callbacks should be caught by my session. Assert it.
ASSERT_FALSE(CallbackReceived(my_session.get(), 1000));
@ -546,7 +538,11 @@ TEST(WebRtcSessionTest, VideoSendCallSetUp) {
&candidates);
ASSERT_FALSE(candidates.empty());
ASSERT_FALSE(local_session == NULL);
ASSERT_TRUE(my_session->CallOnRemoteDescription(local_session, &candidates));
if (!my_session->CallOnRemoteDescription(local_session, candidates)) {
delete local_session;
FAIL();
}
// All callbacks should be caught by my session. Assert it.
ASSERT_FALSE(CallbackReceived(my_session.get(), 1000));