| 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 ac84356c0f078f21e1a0b71c724fdf366e2a2f1f..cac3effed43b118321d3eec3f16a1579918415dc 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
|
| @@ -14,6 +14,7 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
|
| +#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
|
| #include "webrtc/test/rtcp_packet_parser.h"
|
|
|
| using ::testing::ElementsAre;
|
| @@ -570,43 +571,6 @@ TEST(RtcpPacketTest, AppendPacketWithOwnAppendedPacket) {
|
| EXPECT_EQ(1, parser.fir()->num_packets());
|
| }
|
|
|
| -TEST(RtcpPacketTest, Bye) {
|
| - Bye bye;
|
| - bye.From(kSenderSsrc);
|
| -
|
| - rtc::scoped_ptr<RawPacket> packet(bye.Build());
|
| - RtcpPacketParser parser;
|
| - parser.Parse(packet->Buffer(), packet->Length());
|
| - EXPECT_EQ(1, parser.bye()->num_packets());
|
| - EXPECT_EQ(kSenderSsrc, parser.bye()->Ssrc());
|
| -}
|
| -
|
| -TEST(RtcpPacketTest, ByeWithCsrcs) {
|
| - Fir fir;
|
| - Bye bye;
|
| - bye.From(kSenderSsrc);
|
| - EXPECT_TRUE(bye.WithCsrc(0x22222222));
|
| - EXPECT_TRUE(bye.WithCsrc(0x33333333));
|
| - bye.Append(&fir);
|
| -
|
| - rtc::scoped_ptr<RawPacket> packet(bye.Build());
|
| - RtcpPacketParser parser;
|
| - parser.Parse(packet->Buffer(), packet->Length());
|
| - EXPECT_EQ(1, parser.bye()->num_packets());
|
| - EXPECT_EQ(kSenderSsrc, parser.bye()->Ssrc());
|
| - EXPECT_EQ(1, parser.fir()->num_packets());
|
| -}
|
| -
|
| -TEST(RtcpPacketTest, ByeWithTooManyCsrcs) {
|
| - Bye bye;
|
| - bye.From(kSenderSsrc);
|
| - const int kMaxCsrcs = (1 << 5) - 2; // 5 bit len, first item is sender SSRC.
|
| - for (int i = 0; i < kMaxCsrcs; ++i) {
|
| - EXPECT_TRUE(bye.WithCsrc(i));
|
| - }
|
| - EXPECT_FALSE(bye.WithCsrc(kMaxCsrcs));
|
| -}
|
| -
|
| TEST(RtcpPacketTest, BuildWithInputBuffer) {
|
| Fir fir;
|
| ReportBlock rb;
|
|
|