rtcp::Bye packet moved to own file and got a Parse function

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

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ceab8035e906736200c1ce440b4cdefe25e873e0
--- /dev/null
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc
@@ -0,0 +1,137 @@
+/*
+ *  Copyright (c) 2015 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.
+ */
+
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
+
+#include <limits>
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
+
+using webrtc::rtcp::RawPacket;
+using webrtc::rtcp::Bye;
+using webrtc::RTCPUtility::RtcpCommonHeader;
+using webrtc::RTCPUtility::RtcpParseCommonHeader;
+
+namespace webrtc {
+namespace {
+
+const uint32_t kSenderSsrc = 0x12345678;
+const uint32_t kCsrc1 = 0x22232425;
+const uint32_t kCsrc2 = 0x33343536;
+
+class RtcpPacketByeTest : public ::testing::Test {
+ protected:
+  void BuildPacket() { packet = bye.Build().Pass(); }
+  void ParsePacket() {
+    RtcpCommonHeader header;
+    EXPECT_TRUE(
+        RtcpParseCommonHeader(packet->Buffer(), packet->Length(), &header));
+    EXPECT_TRUE(parsed_bye.Parse(
+        header, packet->Buffer() + RtcpCommonHeader::kHeaderSizeBytes));
+  }
+
+  Bye bye;
+  rtc::scoped_ptr<RawPacket> packet;
+  Bye parsed_bye;
+};
+
+TEST_F(RtcpPacketByeTest, Bye) {
+  bye.From(kSenderSsrc);
+
+  BuildPacket();
+  ParsePacket();
+
+  EXPECT_EQ(kSenderSsrc, parsed_bye.sender_ssrc());
+}
+
+TEST_F(RtcpPacketByeTest, ByeWithCsrcs) {
+  bye.From(kSenderSsrc);
+  EXPECT_TRUE(bye.WithCsrc(kCsrc1));
+  EXPECT_TRUE(bye.WithCsrc(kCsrc2));
+  EXPECT_TRUE(bye.reason().empty());
+
+  BuildPacket();
+  EXPECT_EQ(16u, packet->Length());
+
+  ParsePacket();
+
+  EXPECT_EQ(kSenderSsrc, parsed_bye.sender_ssrc());
+  ASSERT_EQ(2u, parsed_bye.csrcs_count());
+  EXPECT_EQ(kCsrc1, parsed_bye.csrc(0));
+  EXPECT_EQ(kCsrc2, parsed_bye.csrc(1));
+  EXPECT_TRUE(parsed_bye.reason().empty());
+}
+
+TEST_F(RtcpPacketByeTest, ByeWithCsecsAndReason) {
+  const std::string kReason = "Some Reason";
+
+  bye.From(kSenderSsrc);
+  EXPECT_TRUE(bye.WithCsrc(kCsrc1));
+  EXPECT_TRUE(bye.WithCsrc(kCsrc2));
+  EXPECT_TRUE(bye.WithReason(kReason));
+  EXPECT_FALSE(bye.reason().empty());
+
+  BuildPacket();
+  EXPECT_EQ(28u, packet->Length());  // Header: 4, SRCs: 12, Reason: 12.
+
+  ParsePacket();
+
+  EXPECT_EQ(kSenderSsrc, parsed_bye.sender_ssrc());
+  ASSERT_EQ(2u, parsed_bye.csrcs_count());
+  EXPECT_EQ(kCsrc1, parsed_bye.csrc(0));
+  EXPECT_EQ(kCsrc2, parsed_bye.csrc(1));
+  EXPECT_EQ(kReason, parsed_bye.reason());
+}
+
+TEST_F(RtcpPacketByeTest, ByeWithTooManyCsrcs) {
+  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_F(RtcpPacketByeTest, ByeWithALongReason) {
+  bye.From(kSenderSsrc);
+  EXPECT_FALSE(bye.WithReason(std::string(0x100, 'r')));
+  EXPECT_TRUE(bye.WithReason(std::string(0xff, 'r')));
+}
+
+TEST_F(RtcpPacketByeTest, ByeWithAReason) {
+  const std::string kReason = "Some Random Reason";
+
+  bye.From(kSenderSsrc);
+  EXPECT_TRUE(bye.WithReason(kReason));
+
+  BuildPacket();
+  ParsePacket();
+
+  EXPECT_EQ(kSenderSsrc, parsed_bye.sender_ssrc());
+  EXPECT_EQ(kReason, parsed_bye.reason());
+}
+
+TEST_F(RtcpPacketByeTest, ByeWithReasons) {
+  // Test that packet creation/parsing behave with reasons of different length
+  // both when it require padding and when it does not.
+  for (size_t reminder = 0; reminder < 4; ++reminder) {
+    const std::string kReason(4 + reminder, 'a' + reminder);
+    bye.From(kSenderSsrc);
+    EXPECT_TRUE(bye.WithReason(kReason));
+
+    BuildPacket();
+    ParsePacket();
+
+    EXPECT_EQ(kReason, parsed_bye.reason());
+  }
+}

[sprang_webrtc, 2015/11/12 16:28:31]

I'd also like a test case for parsing the doesn't work. Eg empty packet, invalid
(reason) length...

[danilchap, 2015/11/13 09:05:42]

Done.

+}  // namespace
+}  // namespace webrtc