| Index: webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
|
| index 7b942871e9a5003f035e4c1f48cd4434c44a8d71..6b4ef902a167d1260c075563c4b3a7739fb604b5 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
|
| @@ -26,7 +26,6 @@ using webrtc::rtcp::Bye;
|
| using webrtc::rtcp::RawPacket;
|
| using webrtc::rtcp::ReceiverReport;
|
| using webrtc::rtcp::ReportBlock;
|
| -using webrtc::rtcp::Sdes;
|
| using webrtc::rtcp::SenderReport;
|
| using webrtc::test::RtcpPacketParser;
|
|
|
| @@ -152,63 +151,6 @@ TEST(RtcpPacketTest, App) {
|
| parser.app_item()->DataLength()));
|
| }
|
|
|
| -TEST(RtcpPacketTest, SdesWithOneChunk) {
|
| - Sdes sdes;
|
| - EXPECT_TRUE(sdes.WithCName(kSenderSsrc, "alice@host"));
|
| -
|
| - rtc::scoped_ptr<RawPacket> packet(sdes.Build());
|
| - RtcpPacketParser parser;
|
| - parser.Parse(packet->Buffer(), packet->Length());
|
| - EXPECT_EQ(1, parser.sdes()->num_packets());
|
| - EXPECT_EQ(1, parser.sdes_chunk()->num_packets());
|
| - EXPECT_EQ(kSenderSsrc, parser.sdes_chunk()->Ssrc());
|
| - EXPECT_EQ("alice@host", parser.sdes_chunk()->Cname());
|
| -}
|
| -
|
| -TEST(RtcpPacketTest, SdesWithMultipleChunks) {
|
| - Sdes sdes;
|
| - EXPECT_TRUE(sdes.WithCName(kSenderSsrc, "a"));
|
| - EXPECT_TRUE(sdes.WithCName(kSenderSsrc + 1, "ab"));
|
| - EXPECT_TRUE(sdes.WithCName(kSenderSsrc + 2, "abc"));
|
| - EXPECT_TRUE(sdes.WithCName(kSenderSsrc + 3, "abcd"));
|
| - EXPECT_TRUE(sdes.WithCName(kSenderSsrc + 4, "abcde"));
|
| - EXPECT_TRUE(sdes.WithCName(kSenderSsrc + 5, "abcdef"));
|
| -
|
| - rtc::scoped_ptr<RawPacket> packet(sdes.Build());
|
| - RtcpPacketParser parser;
|
| - parser.Parse(packet->Buffer(), packet->Length());
|
| - EXPECT_EQ(1, parser.sdes()->num_packets());
|
| - EXPECT_EQ(6, parser.sdes_chunk()->num_packets());
|
| - EXPECT_EQ(kSenderSsrc + 5, parser.sdes_chunk()->Ssrc());
|
| - EXPECT_EQ("abcdef", parser.sdes_chunk()->Cname());
|
| -}
|
| -
|
| -TEST(RtcpPacketTest, SdesWithTooManyChunks) {
|
| - Sdes sdes;
|
| - const int kMaxChunks = (1 << 5) - 1;
|
| - for (int i = 0; i < kMaxChunks; ++i) {
|
| - uint32_t ssrc = kSenderSsrc + i;
|
| - std::ostringstream oss;
|
| - oss << "cname" << i;
|
| - EXPECT_TRUE(sdes.WithCName(ssrc, oss.str()));
|
| - }
|
| - EXPECT_FALSE(sdes.WithCName(kSenderSsrc + kMaxChunks, "foo"));
|
| -}
|
| -
|
| -TEST(RtcpPacketTest, CnameItemWithEmptyString) {
|
| - Sdes sdes;
|
| - EXPECT_TRUE(sdes.WithCName(kSenderSsrc, ""));
|
| -
|
| - rtc::scoped_ptr<RawPacket> packet(sdes.Build());
|
| - RtcpPacketParser parser;
|
| - parser.Parse(packet->Buffer(), packet->Length());
|
| - EXPECT_EQ(1, parser.sdes()->num_packets());
|
| - EXPECT_EQ(1, parser.sdes_chunk()->num_packets());
|
| - EXPECT_EQ(kSenderSsrc, parser.sdes_chunk()->Ssrc());
|
| - EXPECT_EQ("", parser.sdes_chunk()->Cname());
|
| -}
|
| -
|
| -
|
| TEST(RtcpPacketTest, BuildWithTooSmallBuffer) {
|
| ReportBlock rb;
|
| ReceiverReport rr;
|
|
|