Remove PacketRouterTest fixture

webrtc/modules/pacing/packet_router_unittest.cc

 /*
  *  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.
  */
 
@@ skipping 12 matching lines @@
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::Field;
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnPointee;
 using ::testing::SaveArg;
 
 namespace webrtc {
 
+namespace {
+constexpr int kProbeMinProbes = 5;
+constexpr int kProbeMinBytes = 1000;
+}  // namespace

[danilchap, 2017/07/31 14:18:15]

since you've added an unnamed namespace, may be hide own MockWithRemb inside it
too.

[eladalon, 2017/07/31 14:33:16]

Done.

+
 // TODO(eladalon): Restructure and/or replace the existing monolithic tests
 // (only some of the test are monolithic) according to the new
 // guidelines - small tests for one thing at a time.
 // (I'm not removing any tests during CL, so as to demonstrate no regressions.)
 
 class MockRtpRtcpWithRembTracking : public MockRtpRtcp {
  public:
   MockRtpRtcpWithRembTracking() {
     ON_CALL(*this, SetREMBStatus(_)).WillByDefault(SaveArg<0>(&remb_));
     ON_CALL(*this, REMB()).WillByDefault(ReturnPointee(&remb_));
   }
 
  private:
   bool remb_ = false;
 };
 
-class PacketRouterTest : public ::testing::Test {
- public:
-  PacketRouterTest() : packet_router_(new PacketRouter()) {}
- protected:
-  static constexpr int kProbeMinProbes = 5;
-  static constexpr int kProbeMinBytes = 1000;
-  const std::unique_ptr<PacketRouter> packet_router_;
-};
-
-TEST_F(PacketRouterTest, TimeToSendPacket) {
+TEST(PacketRouterTest, TimeToSendPacket) {
+  PacketRouter packet_router;
   NiceMock<MockRtpRtcp> rtp_1;
   NiceMock<MockRtpRtcp> rtp_2;
-  packet_router_->AddSendRtpModule(&rtp_1, false);
-  packet_router_->AddSendRtpModule(&rtp_2, false);
+
+  packet_router.AddSendRtpModule(&rtp_1, false);
+  packet_router.AddSendRtpModule(&rtp_2, false);
 
   const uint16_t kSsrc1 = 1234;
   uint16_t sequence_number = 17;
   uint64_t timestamp = 7890;
   bool retransmission = false;
 
   // Send on the first module by letting rtp_1 be sending with correct ssrc.
   EXPECT_CALL(rtp_1, SendingMedia()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_1, SSRC()).Times(1).WillOnce(Return(kSsrc1));
   EXPECT_CALL(rtp_1, TimeToSendPacket(
                          kSsrc1, sequence_number, timestamp, retransmission,
                          Field(&PacedPacketInfo::probe_cluster_id, 1)))
       .Times(1)
       .WillOnce(Return(true));
   EXPECT_CALL(rtp_2, TimeToSendPacket(_, _, _, _, _)).Times(0);
-  EXPECT_TRUE(packet_router_->TimeToSendPacket(
+  EXPECT_TRUE(packet_router.TimeToSendPacket(
       kSsrc1, sequence_number, timestamp, retransmission,
       PacedPacketInfo(1, kProbeMinProbes, kProbeMinBytes)));
 
   // Send on the second module by letting rtp_2 be sending, but not rtp_1.
   ++sequence_number;
   timestamp += 30;
   retransmission = true;
   const uint16_t kSsrc2 = 4567;
   EXPECT_CALL(rtp_1, SendingMedia()).Times(1).WillOnce(Return(false));
   EXPECT_CALL(rtp_2, SendingMedia()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_2, SSRC()).Times(1).WillOnce(Return(kSsrc2));
   EXPECT_CALL(rtp_1, TimeToSendPacket(_, _, _, _, _)).Times(0);
   EXPECT_CALL(rtp_2, TimeToSendPacket(
                          kSsrc2, sequence_number, timestamp, retransmission,
                          Field(&PacedPacketInfo::probe_cluster_id, 2)))
       .Times(1)
       .WillOnce(Return(true));
-  EXPECT_TRUE(packet_router_->TimeToSendPacket(
+  EXPECT_TRUE(packet_router.TimeToSendPacket(
       kSsrc2, sequence_number, timestamp, retransmission,
       PacedPacketInfo(2, kProbeMinProbes, kProbeMinBytes)));
 
   // No module is sending, hence no packet should be sent.
   EXPECT_CALL(rtp_1, SendingMedia()).Times(1).WillOnce(Return(false));
   EXPECT_CALL(rtp_1, TimeToSendPacket(_, _, _, _, _)).Times(0);
   EXPECT_CALL(rtp_2, SendingMedia()).Times(1).WillOnce(Return(false));
   EXPECT_CALL(rtp_2, TimeToSendPacket(_, _, _, _, _)).Times(0);
-  EXPECT_TRUE(packet_router_->TimeToSendPacket(
+  EXPECT_TRUE(packet_router.TimeToSendPacket(
       kSsrc1, sequence_number, timestamp, retransmission,
       PacedPacketInfo(1, kProbeMinProbes, kProbeMinBytes)));
 
   // Add a packet with incorrect ssrc and test it's dropped in the router.
   EXPECT_CALL(rtp_1, SendingMedia()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_1, SSRC()).Times(1).WillOnce(Return(kSsrc1));
   EXPECT_CALL(rtp_2, SendingMedia()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_2, SSRC()).Times(1).WillOnce(Return(kSsrc2));
   EXPECT_CALL(rtp_1, TimeToSendPacket(_, _, _, _, _)).Times(0);
   EXPECT_CALL(rtp_2, TimeToSendPacket(_, _, _, _, _)).Times(0);
-  EXPECT_TRUE(packet_router_->TimeToSendPacket(
+  EXPECT_TRUE(packet_router.TimeToSendPacket(
       kSsrc1 + kSsrc2, sequence_number, timestamp, retransmission,
       PacedPacketInfo(1, kProbeMinProbes, kProbeMinBytes)));
 
-  packet_router_->RemoveSendRtpModule(&rtp_1);
+  packet_router.RemoveSendRtpModule(&rtp_1);
 
   // rtp_1 has been removed, try sending a packet on that ssrc and make sure
   // it is dropped as expected by not expecting any calls to rtp_1.
   EXPECT_CALL(rtp_2, SendingMedia()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_2, SSRC()).Times(1).WillOnce(Return(kSsrc2));
   EXPECT_CALL(rtp_2, TimeToSendPacket(_, _, _, _, _)).Times(0);
-  EXPECT_TRUE(packet_router_->TimeToSendPacket(
+  EXPECT_TRUE(packet_router.TimeToSendPacket(
       kSsrc1, sequence_number, timestamp, retransmission,
       PacedPacketInfo(PacedPacketInfo::kNotAProbe, kProbeMinBytes,
                       kProbeMinBytes)));
 
-  packet_router_->RemoveSendRtpModule(&rtp_2);
+  packet_router.RemoveSendRtpModule(&rtp_2);
 }
 
-TEST_F(PacketRouterTest, TimeToSendPadding) {
+TEST(PacketRouterTest, TimeToSendPadding) {
+  PacketRouter packet_router;
+
   const uint16_t kSsrc1 = 1234;
   const uint16_t kSsrc2 = 4567;
 
   NiceMock<MockRtpRtcp> rtp_1;
   EXPECT_CALL(rtp_1, RtxSendStatus()).WillOnce(Return(kRtxOff));
   EXPECT_CALL(rtp_1, SSRC()).WillRepeatedly(Return(kSsrc1));
   NiceMock<MockRtpRtcp> rtp_2;
   // rtp_2 will be prioritized for padding.
   EXPECT_CALL(rtp_2, RtxSendStatus()).WillOnce(Return(kRtxRedundantPayloads));
   EXPECT_CALL(rtp_2, SSRC()).WillRepeatedly(Return(kSsrc2));
-  packet_router_->AddSendRtpModule(&rtp_1, false);
-  packet_router_->AddSendRtpModule(&rtp_2, false);
+  packet_router.AddSendRtpModule(&rtp_1, false);
+  packet_router.AddSendRtpModule(&rtp_2, false);
 
   // Default configuration, sending padding on all modules sending media,
   // ordered by priority (based on rtx mode).
   const size_t requested_padding_bytes = 1000;
   const size_t sent_padding_bytes = 890;
   EXPECT_CALL(rtp_2, SendingMedia()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_2, HasBweExtensions()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_2,
               TimeToSendPadding(requested_padding_bytes,
                                 Field(&PacedPacketInfo::probe_cluster_id, 111)))
       .Times(1)
       .WillOnce(Return(sent_padding_bytes));
   EXPECT_CALL(rtp_1, SendingMedia()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_1, HasBweExtensions()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_1,
               TimeToSendPadding(requested_padding_bytes - sent_padding_bytes,
                                 Field(&PacedPacketInfo::probe_cluster_id, 111)))
       .Times(1)
       .WillOnce(Return(requested_padding_bytes - sent_padding_bytes));
   EXPECT_EQ(requested_padding_bytes,
-            packet_router_->TimeToSendPadding(
+            packet_router.TimeToSendPadding(
                 requested_padding_bytes,
                 PacedPacketInfo(111, kProbeMinBytes, kProbeMinBytes)));
 
   // Let only the lower priority module be sending and verify the padding
   // request is routed there.
   EXPECT_CALL(rtp_2, SendingMedia()).Times(1).WillOnce(Return(false));
   EXPECT_CALL(rtp_2, TimeToSendPadding(requested_padding_bytes, _)).Times(0);
   EXPECT_CALL(rtp_1, SendingMedia()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_1, HasBweExtensions()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_1, TimeToSendPadding(_, _))
       .Times(1)
       .WillOnce(Return(sent_padding_bytes));
   EXPECT_EQ(sent_padding_bytes,
-            packet_router_->TimeToSendPadding(
+            packet_router.TimeToSendPadding(
                 requested_padding_bytes,
                 PacedPacketInfo(PacedPacketInfo::kNotAProbe, kProbeMinBytes,
                                 kProbeMinBytes)));
 
   // No sending module at all.
   EXPECT_CALL(rtp_1, SendingMedia()).Times(1).WillOnce(Return(false));
   EXPECT_CALL(rtp_1, TimeToSendPadding(requested_padding_bytes, _)).Times(0);
   EXPECT_CALL(rtp_2, SendingMedia()).Times(1).WillOnce(Return(false));
   EXPECT_CALL(rtp_2, TimeToSendPadding(_, _)).Times(0);
   EXPECT_EQ(0u,
-            packet_router_->TimeToSendPadding(
+            packet_router.TimeToSendPadding(
                 requested_padding_bytes,
                 PacedPacketInfo(PacedPacketInfo::kNotAProbe, kProbeMinBytes,
                                 kProbeMinBytes)));
 
   // Only one module has BWE extensions.
   EXPECT_CALL(rtp_1, SendingMedia()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_1, HasBweExtensions()).Times(1).WillOnce(Return(false));
   EXPECT_CALL(rtp_1, TimeToSendPadding(requested_padding_bytes, _)).Times(0);
   EXPECT_CALL(rtp_2, SendingMedia()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_2, HasBweExtensions()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_2, TimeToSendPadding(requested_padding_bytes, _))
       .Times(1)
       .WillOnce(Return(sent_padding_bytes));
   EXPECT_EQ(sent_padding_bytes,
-            packet_router_->TimeToSendPadding(
+            packet_router.TimeToSendPadding(
                 requested_padding_bytes,
                 PacedPacketInfo(PacedPacketInfo::kNotAProbe, kProbeMinBytes,
                                 kProbeMinBytes)));
 
-  packet_router_->RemoveSendRtpModule(&rtp_1);
+  packet_router.RemoveSendRtpModule(&rtp_1);
 
   // rtp_1 has been removed, try sending padding and make sure rtp_1 isn't asked
   // to send by not expecting any calls. Instead verify rtp_2 is called.
   EXPECT_CALL(rtp_2, SendingMedia()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_2, HasBweExtensions()).Times(1).WillOnce(Return(true));
   EXPECT_CALL(rtp_2, TimeToSendPadding(requested_padding_bytes, _)).Times(1);
   EXPECT_EQ(0u,
-            packet_router_->TimeToSendPadding(
+            packet_router.TimeToSendPadding(
                 requested_padding_bytes,
                 PacedPacketInfo(PacedPacketInfo::kNotAProbe, kProbeMinBytes,
                                 kProbeMinBytes)));
 
-  packet_router_->RemoveSendRtpModule(&rtp_2);
+  packet_router.RemoveSendRtpModule(&rtp_2);
 }
 
-TEST_F(PacketRouterTest, SenderOnlyFunctionsRespectSendingMedia) {
+TEST(PacketRouterTest, SenderOnlyFunctionsRespectSendingMedia) {
+  PacketRouter packet_router;
   NiceMock<MockRtpRtcp> rtp;
-  packet_router_->AddSendRtpModule(&rtp, false);
+  packet_router.AddSendRtpModule(&rtp, false);
   static const uint16_t kSsrc = 1234;
   EXPECT_CALL(rtp, SSRC()).WillRepeatedly(Return(kSsrc));
   EXPECT_CALL(rtp, SendingMedia()).WillRepeatedly(Return(false));
 
   // Verify that TimeToSendPacket does not end up in a receiver.
   EXPECT_CALL(rtp, TimeToSendPacket(_, _, _, _, _)).Times(0);
-  EXPECT_TRUE(packet_router_->TimeToSendPacket(
+  EXPECT_TRUE(packet_router.TimeToSendPacket(
       kSsrc, 1, 1, false, PacedPacketInfo(PacedPacketInfo::kNotAProbe,
                                           kProbeMinBytes, kProbeMinBytes)));
   // Verify that TimeToSendPadding does not end up in a receiver.
   EXPECT_CALL(rtp, TimeToSendPadding(_, _)).Times(0);
   EXPECT_EQ(0u,
-            packet_router_->TimeToSendPadding(
+            packet_router.TimeToSendPadding(
                 200, PacedPacketInfo(PacedPacketInfo::kNotAProbe,
                                      kProbeMinBytes, kProbeMinBytes)));
 
-  packet_router_->RemoveSendRtpModule(&rtp);
+  packet_router.RemoveSendRtpModule(&rtp);
 }
 
-TEST_F(PacketRouterTest, AllocateSequenceNumbers) {
+TEST(PacketRouterTest, AllocateSequenceNumbers) {
+  PacketRouter packet_router;
+
   const uint16_t kStartSeq = 0xFFF0;
   const size_t kNumPackets = 32;
 
-  packet_router_->SetTransportWideSequenceNumber(kStartSeq - 1);
+  packet_router.SetTransportWideSequenceNumber(kStartSeq - 1);
 
   for (size_t i = 0; i < kNumPackets; ++i) {
-    uint16_t seq = packet_router_->AllocateSequenceNumber();
+    uint16_t seq = packet_router.AllocateSequenceNumber();
     uint32_t expected_unwrapped_seq = static_cast<uint32_t>(kStartSeq) + i;
     EXPECT_EQ(static_cast<uint16_t>(expected_unwrapped_seq & 0xFFFF), seq);
   }
 }
 
-TEST_F(PacketRouterTest, SendTransportFeedback) {
+TEST(PacketRouterTest, SendTransportFeedback) {
+  PacketRouter packet_router;
   NiceMock<MockRtpRtcp> rtp_1;
   NiceMock<MockRtpRtcp> rtp_2;
-  packet_router_->AddSendRtpModule(&rtp_1, false);
-  packet_router_->AddReceiveRtpModule(&rtp_2, false);
+
+  packet_router.AddSendRtpModule(&rtp_1, false);
+  packet_router.AddReceiveRtpModule(&rtp_2, false);
 
   rtcp::TransportFeedback feedback;
   EXPECT_CALL(rtp_1, SendFeedbackPacket(_)).Times(1).WillOnce(Return(true));
-  packet_router_->SendTransportFeedback(&feedback);
-  packet_router_->RemoveSendRtpModule(&rtp_1);
+  packet_router.SendTransportFeedback(&feedback);
+  packet_router.RemoveSendRtpModule(&rtp_1);
   EXPECT_CALL(rtp_2, SendFeedbackPacket(_)).Times(1).WillOnce(Return(true));
-  packet_router_->SendTransportFeedback(&feedback);
-  packet_router_->RemoveReceiveRtpModule(&rtp_2);
+  packet_router.SendTransportFeedback(&feedback);
+  packet_router.RemoveReceiveRtpModule(&rtp_2);
 }
 
 #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
-TEST_F(PacketRouterTest, DoubleRegistrationOfSendModuleDisallowed) {
+TEST(PacketRouterTest, DoubleRegistrationOfSendModuleDisallowed) {
+  PacketRouter packet_router;
   NiceMock<MockRtpRtcp> module;
 
   constexpr bool remb_candidate = false;  // Value irrelevant.
-  packet_router_->AddSendRtpModule(&module, remb_candidate);
-  EXPECT_DEATH(packet_router_->AddSendRtpModule(&module, remb_candidate), "");
+  packet_router.AddSendRtpModule(&module, remb_candidate);
+  EXPECT_DEATH(packet_router.AddSendRtpModule(&module, remb_candidate), "");
 
   // Test tear-down
-  packet_router_->RemoveSendRtpModule(&module);
+  packet_router.RemoveSendRtpModule(&module);
 }
 
-TEST_F(PacketRouterTest, DoubleRegistrationOfReceiveModuleDisallowed) {
+TEST(PacketRouterTest, DoubleRegistrationOfReceiveModuleDisallowed) {
+  PacketRouter packet_router;
   NiceMock<MockRtpRtcp> module;
 
   constexpr bool remb_candidate = false;  // Value irrelevant.
-  packet_router_->AddReceiveRtpModule(&module, remb_candidate);
-  EXPECT_DEATH(packet_router_->AddReceiveRtpModule(&module, remb_candidate),
-               "");
+  packet_router.AddReceiveRtpModule(&module, remb_candidate);
+  EXPECT_DEATH(packet_router.AddReceiveRtpModule(&module, remb_candidate), "");
 
   // Test tear-down
-  packet_router_->RemoveReceiveRtpModule(&module);
+  packet_router.RemoveReceiveRtpModule(&module);
 }
 
-TEST_F(PacketRouterTest, RemovalOfNeverAddedSendModuleDisallowed) {
+TEST(PacketRouterTest, RemovalOfNeverAddedSendModuleDisallowed) {
+  PacketRouter packet_router;
   NiceMock<MockRtpRtcp> module;
 
-  EXPECT_DEATH(packet_router_->RemoveSendRtpModule(&module), "");
+  EXPECT_DEATH(packet_router.RemoveSendRtpModule(&module), "");
 }
 
-TEST_F(PacketRouterTest, RemovalOfNeverAddedReceiveModuleDisallowed) {
+TEST(PacketRouterTest, RemovalOfNeverAddedReceiveModuleDisallowed) {
+  PacketRouter packet_router;
   NiceMock<MockRtpRtcp> module;
 
-  EXPECT_DEATH(packet_router_->RemoveReceiveRtpModule(&module), "");
+  EXPECT_DEATH(packet_router.RemoveReceiveRtpModule(&module), "");
 }
 #endif  // RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 
 // TODO(eladalon): Remove this test; it should be covered by:
 // 1. SendCandidatePreferredOverReceiveCandidate_SendModuleAddedFirst
 // 2. SendCandidatePreferredOverReceiveCandidate_ReceiveModuleAddedFirst
 // 3. LowerEstimateToSendRemb
 // (Not removing in this CL to prove it doesn't break this test.)
 TEST(PacketRouterRembTest, PreferSendModuleOverReceiveModule) {
   rtc::ScopedFakeClock clock;
@@ skipping 375 matching lines @@
   EXPECT_CALL(receive_module, SetREMBData(bitrate_estimate, ssrcs)).Times(1);
 
   clock.AdvanceTime(rtc::TimeDelta::FromMilliseconds(1000));
   packet_router.OnReceiveBitrateChanged(ssrcs, bitrate_estimate);
 
   // Test tear-down
   packet_router.RemoveReceiveRtpModule(&receive_module);
 }
 
 }  // namespace webrtc