Test RtcpParser rewritten to use rtcp packet classes

webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 29 matching lines @@
   ReceiverReport rr;
   rr.From(kSenderSsrc);
   EXPECT_TRUE(rr.WithReportBlock(rb));
   compound.Append(&rr);
   compound.Append(&fir);
 
   rtc::Buffer packet = compound.Build();
   RtcpPacketParser parser;
   parser.Parse(packet.data(), packet.size());
   EXPECT_EQ(1, parser.receiver_report()->num_packets());
-  EXPECT_EQ(kSenderSsrc, parser.receiver_report()->Ssrc());
-  EXPECT_EQ(1, parser.report_block()->num_packets());
+  EXPECT_EQ(kSenderSsrc, parser.receiver_report()->sender_ssrc());
+  EXPECT_EQ(1u, parser.receiver_report()->report_blocks().size());
   EXPECT_EQ(1, parser.fir()->num_packets());
 }
 
 TEST(RtcpCompoundPacketTest, AppendPacketWithOwnAppendedPacket) {
   CompoundPacket root;
   CompoundPacket leaf;
   Fir fir;
   fir.WithRequestTo(kRemoteSsrc, kSeqNo);
   Bye bye;
   ReportBlock rb;
 
   ReceiverReport rr;
   EXPECT_TRUE(rr.WithReportBlock(rb));
   leaf.Append(&rr);
   leaf.Append(&fir);
 
   SenderReport sr;
   root.Append(&sr);
   root.Append(&bye);
   root.Append(&leaf);
 
   rtc::Buffer packet = root.Build();
   RtcpPacketParser parser;
   parser.Parse(packet.data(), packet.size());
   EXPECT_EQ(1, parser.sender_report()->num_packets());
   EXPECT_EQ(1, parser.receiver_report()->num_packets());
-  EXPECT_EQ(1, parser.report_block()->num_packets());
+  EXPECT_EQ(1u, parser.receiver_report()->report_blocks().size());
   EXPECT_EQ(1, parser.bye()->num_packets());
   EXPECT_EQ(1, parser.fir()->num_packets());
 }
 
 TEST(RtcpCompoundPacketTest, BuildWithInputBuffer) {
   CompoundPacket compound;
   Fir fir;
   fir.WithRequestTo(kRemoteSsrc, kSeqNo);
   ReportBlock rb;
   ReceiverReport rr;
   rr.From(kSenderSsrc);
   EXPECT_TRUE(rr.WithReportBlock(rb));
   compound.Append(&rr);
   compound.Append(&fir);
 
   const size_t kRrLength = 8;
   const size_t kReportBlockLength = 24;
   const size_t kFirLength = 20;
 
   class Verifier : public rtcp::RtcpPacket::PacketReadyCallback {
    public:
     void OnPacketReady(uint8_t* data, size_t length) override {
       RtcpPacketParser parser;
       parser.Parse(data, length);
       EXPECT_EQ(1, parser.receiver_report()->num_packets());
-      EXPECT_EQ(1, parser.report_block()->num_packets());
+      EXPECT_EQ(1u, parser.receiver_report()->report_blocks().size());
       EXPECT_EQ(1, parser.fir()->num_packets());
       ++packets_created_;
     }
 
     int packets_created_ = 0;
   } verifier;
   const size_t kBufferSize = kRrLength + kReportBlockLength + kFirLength;
   uint8_t buffer[kBufferSize];
   EXPECT_TRUE(compound.BuildExternalBuffer(buffer, kBufferSize, &verifier));
   EXPECT_EQ(1, verifier.packets_created_);
@@ skipping 14 matching lines @@
   const size_t kReportBlockLength = 24;
 
   class Verifier : public rtcp::RtcpPacket::PacketReadyCallback {
    public:
     void OnPacketReady(uint8_t* data, size_t length) override {
       RtcpPacketParser parser;
       parser.Parse(data, length);
       switch (packets_created_++) {
         case 0:
           EXPECT_EQ(1, parser.receiver_report()->num_packets());
-          EXPECT_EQ(1, parser.report_block()->num_packets());
+          EXPECT_EQ(1U, parser.receiver_report()->report_blocks().size());
           EXPECT_EQ(0, parser.fir()->num_packets());
           break;
         case 1:
           EXPECT_EQ(0, parser.receiver_report()->num_packets());
-          EXPECT_EQ(0, parser.report_block()->num_packets());
+          EXPECT_EQ(0U, parser.receiver_report()->report_blocks().size());
           EXPECT_EQ(1, parser.fir()->num_packets());
           break;
         default:
           ADD_FAILURE() << "OnPacketReady not expected to be called "
                         << packets_created_ << " times.";
       }
     }
 
     int packets_created_ = 0;
   } verifier;
   const size_t kBufferSize = kRrLength + kReportBlockLength;
   uint8_t buffer[kBufferSize];
   EXPECT_TRUE(compound.BuildExternalBuffer(buffer, kBufferSize, &verifier));
   EXPECT_EQ(2, verifier.packets_created_);
 }
 
 }  // namespace webrtc