rtcp::Ij renamed to rtcp::ExtendedJitterReport and moved into own file

webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc

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 77520b633bc9de3eced7e4824137f3b320c03844..caaf489a570dcd88cb80346d84525f712785fb80 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/extended_jitter_report.h"

[åsapersson, 2015/11/13 13:30:39]

needed?

[danilchap, 2015/11/13 13:52:19]

Done.

 #include "webrtc/test/rtcp_packet_parser.h"
 
 using ::testing::ElementsAre;
@@ -23,7 +24,7 @@ using webrtc::rtcp::Bye;
 using webrtc::rtcp::Dlrr;
 using webrtc::rtcp::Empty;
 using webrtc::rtcp::Fir;
-using webrtc::rtcp::Ij;
+using webrtc::rtcp::ExtendedJitterReport;

[åsapersson, 2015/11/13 13:30:39]

needed?

[danilchap, 2015/11/13 13:52:19]

Done.

 using webrtc::rtcp::Nack;
 using webrtc::rtcp::Pli;
 using webrtc::rtcp::Sdes;
@@ -196,50 +197,6 @@ TEST(RtcpPacketTest, SrWithTooManyReportBlocks) {
   EXPECT_FALSE(sr.WithReportBlock(rb));
 }
 
-TEST(RtcpPacketTest, IjNoItem) {
-  Ij ij;
-
-  rtc::scoped_ptr<RawPacket> packet(ij.Build());
-  RtcpPacketParser parser;
-  parser.Parse(packet->Buffer(), packet->Length());
-  EXPECT_EQ(1, parser.ij()->num_packets());
-  EXPECT_EQ(0, parser.ij_item()->num_packets());
-}
-
-TEST(RtcpPacketTest, IjOneItem) {
-  Ij ij;
-  EXPECT_TRUE(ij.WithJitterItem(0x11111111));
-
-  rtc::scoped_ptr<RawPacket> packet(ij.Build());
-  RtcpPacketParser parser;
-  parser.Parse(packet->Buffer(), packet->Length());
-  EXPECT_EQ(1, parser.ij()->num_packets());
-  EXPECT_EQ(1, parser.ij_item()->num_packets());
-  EXPECT_EQ(0x11111111U, parser.ij_item()->Jitter());
-}
-
-TEST(RtcpPacketTest, IjTwoItems) {
-  Ij ij;
-  EXPECT_TRUE(ij.WithJitterItem(0x11111111));
-  EXPECT_TRUE(ij.WithJitterItem(0x22222222));
-
-  rtc::scoped_ptr<RawPacket> packet(ij.Build());
-  RtcpPacketParser parser;
-  parser.Parse(packet->Buffer(), packet->Length());
-  EXPECT_EQ(1, parser.ij()->num_packets());
-  EXPECT_EQ(2, parser.ij_item()->num_packets());
-  EXPECT_EQ(0x22222222U, parser.ij_item()->Jitter());
-}
-
-TEST(RtcpPacketTest, IjTooManyItems) {
-  Ij ij;
-  const int kMaxIjItems = (1 << 5) - 1;
-  for (int i = 0; i < kMaxIjItems; ++i) {
-    EXPECT_TRUE(ij.WithJitterItem(i));
-  }
-  EXPECT_FALSE(ij.WithJitterItem(kMaxIjItems));
-}
-
 TEST(RtcpPacketTest, AppWithNoData) {
   App app;
   app.WithSubType(30);