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

Update talk folder to revision=49952949

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4413 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2013-07-26 19:17:59 +00:00
parent 367f640bea
commit 1e09a71126
57 changed files with 916 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
talk/session/media/mediamessages_unittest.cc
View File

@@ -152,6 +152,15 @@ class MediaMessagesTest : public testing::Test {
return desc;
}
size_t ClearXmlElements(cricket::XmlElements* elements) {
size_t size = elements->size();
for (size_t i = 0; i < size; i++) {
delete elements->at(i);
}
elements->clear();
return size;
}
talk_base::scoped_ptr<cricket::SessionDescription> remote_description_;
};
@@ -177,6 +186,7 @@ TEST_F(MediaMessagesTest, ViewNoneToFromXml) {
ASSERT_EQ(1U, actual_view_elems.size());
EXPECT_EQ(expected_view_elem->Str(), actual_view_elems[0]->Str());
ClearXmlElements(&actual_view_elems);
cricket::ParseError parse_error;
EXPECT_TRUE(cricket::IsJingleViewRequest(action_elem.get()));
@@ -211,6 +221,7 @@ TEST_F(MediaMessagesTest, ViewVgaToFromXml) {
ASSERT_EQ(2U, actual_view_elems.size());
EXPECT_EQ(expected_view_elem1->Str(), actual_view_elems[0]->Str());
EXPECT_EQ(expected_view_elem2->Str(), actual_view_elems[1]->Str());
ClearXmlElements(&actual_view_elems);
view_request.static_video_views.clear();
cricket::ParseError parse_error;