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

pRevert 5371 "Revert 5367 "Update talk to 59410372.""

Browse Source 
> Revert 5367 "Update talk to 59410372."
> 
> > Update talk to 59410372.
> > 
> > R=jiayl@webrtc.org, wu@webrtc.org
> > 
> > Review URL: https://webrtc-codereview.appspot.com/6929004
> 
> TBR=mallinath@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/6999004

TBR=henrika@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/7109004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5381 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrika@webrtc.org
2014-01-14 10:00:58 +00:00
parent 4371d4650a
commit aebb1ade9d
50 changed files with 974 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
talk/media/sctp/sctpdataengine_unittest.cc
View File

@@ -31,7 +31,6 @@
#include <string>
#include <vector>
#include "talk/app/webrtc/datachannelinterface.h"
#include "talk/base/bind.h"
#include "talk/base/buffer.h"
#include "talk/base/criticalsection.h"
@@ -44,7 +43,6 @@
#include "talk/media/base/constants.h"
#include "talk/media/base/mediachannel.h"
#include "talk/media/sctp/sctpdataengine.h"
#include "talk/media/sctp/sctputils.h"
enum {
MSG_PACKET = 1,
@@ -276,8 +274,6 @@ class SctpDataMediaChannelTest : public testing::Test,
// When data is received, pass it to the SctpFakeDataReceiver.
channel->SignalDataReceived.connect(
recv, &SctpFakeDataReceiver::OnDataReceived);
channel->SignalNewStreamReceived.connect(
this, &SctpDataMediaChannelTest::OnNewStreamReceived);
return channel;
}
@@ -286,6 +282,7 @@ class SctpDataMediaChannelTest : public testing::Test,
cricket::SendDataResult* result) {
cricket::SendDataParams params;
params.ssrc = ssrc;
return chan->SendData(params, talk_base::Buffer(
msg.data(), msg.length()), result);
}
@@ -313,15 +310,6 @@ class SctpDataMediaChannelTest : public testing::Test,
SctpFakeDataReceiver* receiver1() { return recv1_.get(); }
SctpFakeDataReceiver* receiver2() { return recv2_.get(); }
void OnNewStreamReceived(const std::string& label,
const webrtc::DataChannelInit& init) {
last_label_ = label;
last_dc_init_ = init;
}
std::string last_label() { return last_label_; }
webrtc::DataChannelInit last_dc_init() { return last_dc_init_; }
private:
talk_base::scoped_ptr<cricket::SctpDataEngine> engine_;
talk_base::scoped_ptr<SctpFakeNetworkInterface> net1_;
@@ -330,8 +318,6 @@ class SctpDataMediaChannelTest : public testing::Test,
talk_base::scoped_ptr<SctpFakeDataReceiver> recv2_;
talk_base::scoped_ptr<cricket::SctpDataMediaChannel> chan1_;
talk_base::scoped_ptr<cricket::SctpDataMediaChannel> chan2_;
std::string last_label_;
webrtc::DataChannelInit last_dc_init_;
};
// Verifies that SignalReadyToSend is fired.
@@ -389,33 +375,6 @@ TEST_F(SctpDataMediaChannelTest, SendData) {
<< "recv1.last_data=" << receiver1()->last_data();
}
TEST_F(SctpDataMediaChannelTest, SendReceiveOpenMessage) {
SetupConnectedChannels();
std::string label("x");
webrtc::DataChannelInit config;
config.id = 10;
// Send the OPEN message on a unknown ssrc.
channel1()->AddSendStream(cricket::StreamParams::CreateLegacy(config.id));
cricket::SendDataParams params;
params.ssrc = config.id;
params.type = cricket::DMT_CONTROL;
cricket::SendDataResult result;
talk_base::Buffer buffer;
ASSERT_TRUE(cricket::WriteDataChannelOpenMessage(label, config, &buffer));
ASSERT_TRUE(channel1()->SendData(params, buffer, &result));
// Send data on the new ssrc immediately after sending the OPEN message.
ASSERT_TRUE(SendData(channel1(), config.id, "hi chan2", &result));
// Verifies the received OPEN message.
EXPECT_TRUE_WAIT(last_label() == label, 1000);
EXPECT_EQ(config.id, last_dc_init().id);
EXPECT_EQ(true, last_dc_init().negotiated);
// Verifies the received data.
EXPECT_TRUE_WAIT(ReceivedData(receiver2(), config.id, "hi chan2"), 1000);
}
TEST_F(SctpDataMediaChannelTest, ClosesRemoteStream) {
SetupConnectedChannels();
SignalChannelClosedObserver chan_1_sig_receiver, chan_2_sig_receiver;