[rtp_rtcp] rtcp::Tmmbr cleaned and got Parse function

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

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
index 6d71caa251652bf640deb65419cdc12f393d3651..9303f48e54fb9bdad47b19bc7ebc3aa9d1342124 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
@@ -10,34 +10,96 @@
 
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
 
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/test/rtcp_packet_parser.h"
-
+using testing::ElementsAreArray;
+using testing::IsEmpty;
+using testing::make_tuple;
 using webrtc::rtcp::RawPacket;
+using webrtc::rtcp::TmmbItem;
 using webrtc::rtcp::Tmmbr;
-using webrtc::test::RtcpPacketParser;
+using webrtc::RTCPUtility::RtcpCommonHeader;
+using webrtc::RTCPUtility::RtcpParseCommonHeader;
 
 namespace webrtc {
+namespace {
 const uint32_t kSenderSsrc = 0x12345678;
 const uint32_t kRemoteSsrc = 0x23456789;
+const uint32_t kBitrateBps = 312000;
+const uint16_t kOverhead = 0x1fe;
+const uint8_t kPacket[] = {0x83,  205, 0x00, 0x04,
+                           0x12, 0x34, 0x56, 0x78,
+                           0x00, 0x00, 0x00, 0x00,
+                           0x23, 0x45, 0x67, 0x89,
+                           0x0a, 0x61, 0x61, 0xfe};
+
+bool ParseTmmbr(const uint8_t* buffer, size_t length, Tmmbr* tmmbr) {
+  RtcpCommonHeader header;
+  EXPECT_TRUE(RtcpParseCommonHeader(buffer, length, &header));
+  EXPECT_EQ(length, header.BlockSize());
+  return tmmbr->Parse(header, buffer + RtcpCommonHeader::kHeaderSizeBytes);
+}
+}  // namespace
 
-TEST(RtcpPacketTest, Tmmbr) {
+TEST(RtcpPacketTmmbrTest, Create) {
   Tmmbr tmmbr;
   tmmbr.From(kSenderSsrc);
-  tmmbr.To(kRemoteSsrc);
-  tmmbr.WithBitrateKbps(312);
-  tmmbr.WithOverhead(60);
-
-  rtc::scoped_ptr<RawPacket> packet(tmmbr.Build());
-  RtcpPacketParser parser;
-  parser.Parse(packet->Buffer(), packet->Length());
-  EXPECT_EQ(1, parser.tmmbr()->num_packets());
-  EXPECT_EQ(kSenderSsrc, parser.tmmbr()->Ssrc());
-  EXPECT_EQ(1, parser.tmmbr_item()->num_packets());
-  EXPECT_EQ(312U, parser.tmmbr_item()->BitrateKbps());
-  EXPECT_EQ(60U, parser.tmmbr_item()->Overhead());
+  tmmbr.WithTmmbr(TmmbItem(kRemoteSsrc, kBitrateBps, kOverhead));
+
+  rtc::scoped_ptr<RawPacket> packet = tmmbr.Build();
+
+  EXPECT_THAT(make_tuple(packet->Buffer(), packet->Length()),
+              ElementsAreArray(kPacket));
+}
+
+TEST(RtcpPacketTmmbrTest, Parse) {
+  Tmmbr tmmbr;
+  EXPECT_TRUE(ParseTmmbr(kPacket, sizeof(kPacket), &tmmbr));
+  const Tmmbr& parsed = tmmbr;
+
+  EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
+  ASSERT_EQ(1u, parsed.requests().size());
+  EXPECT_EQ(kRemoteSsrc, parsed.requests().front().ssrc());
+  EXPECT_EQ(kBitrateBps, parsed.requests().front().bitrate_bps());
+  EXPECT_EQ(kOverhead, parsed.requests().front().packet_overhead());
 }
 
+TEST(RtcpPacketTmmbrTest, CreateAndParseWithTwoEntries) {
+  Tmmbr tmmbr;
+  tmmbr.From(kSenderSsrc);
+  tmmbr.WithTmmbr(TmmbItem(kRemoteSsrc, kBitrateBps, kOverhead));
+  tmmbr.WithTmmbr(TmmbItem(kRemoteSsrc + 1, 4 * kBitrateBps, kOverhead + 1));
+
+  rtc::scoped_ptr<RawPacket> packet = tmmbr.Build();
+
+  Tmmbr parsed;
+  EXPECT_TRUE(ParseTmmbr(packet->Buffer(), packet->Length(), &parsed));
+
+  EXPECT_EQ(kSenderSsrc, parsed.sender_ssrc());
+  EXPECT_EQ(2u, parsed.requests().size());
+  EXPECT_EQ(kRemoteSsrc, parsed.requests()[0].ssrc());
+  EXPECT_EQ(kRemoteSsrc + 1, parsed.requests()[1].ssrc());
+}
+
+TEST(RtcpPacketTmmbrTest, ParseFailsWithoutItems) {
+  const uint8_t kZeroItemsPacket[] = {0x83,  205, 0x00, 0x02,
+                                      0x12, 0x34, 0x56, 0x78,
+                                      0x00, 0x00, 0x00, 0x00};
+
+  Tmmbr tmmbr;
+  EXPECT_FALSE(ParseTmmbr(kZeroItemsPacket, sizeof(kZeroItemsPacket), &tmmbr));
+}
+
+TEST(RtcpPacketTmmbrTest, ParseFailsOnUnAlignedPacket) {
+  const uint8_t kUnalignedPacket[] = {0x83,  205, 0x00, 0x05,
+                                      0x12, 0x34, 0x56, 0x78,
+                                      0x00, 0x00, 0x00, 0x00,
+                                      0x23, 0x45, 0x67, 0x89,
+                                      0x0a, 0x61, 0x61, 0xfe,
+                                      0x34, 0x56, 0x78, 0x9a};
+
+  Tmmbr tmmbr;
+  EXPECT_FALSE(ParseTmmbr(kUnalignedPacket, sizeof(kUnalignedPacket), &tmmbr));
+}
 }  // namespace webrtc