commit 238da9a57eb9eb45c8ee356d4f334fe797fcaa42
author Erik Språng <sprang@webrtc.org> Tue May 25 10:58:43 2021
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue May 25 12:57:35 2021
tree 128f16eaf2c4747e6e92e6e137dd377e439354fb
parent 552169c7db9930b6688ab427dd5356978865f3b4

Remove obsolete SendPacketMatches* tests from rtp_sender_egress_unittest.

These tests were likely made back when PacketRouter was iterating over
the RTP modules to find the correct to send on. Now that this is just
a DCHECK, it's already implicitly covered by other tests that actually
test the respective packet type functionality. Let's thus just remove
these old tests.

Bug: webrtc:11340
Change-Id: I244ca7e365378f4e48a601464b5df0e1d07732be
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219621
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34116}

modules/rtp_rtcp/source/rtp_sender_unittest.cc

diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index 5a8cdae..d7a7b53 100644
--- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -1102,98 +1102,6 @@
   EXPECT_EQ(rtp_sender()->ExpectedPerPacketOverhead(), 12u);
 }
 
-TEST_P(RtpSenderTest, SendPacketMatchesVideo) {
-  std::unique_ptr<RtpPacketToSend> packet =
-      BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->set_packet_type(RtpPacketMediaType::kVideo);
-
-  // Verify sent with correct SSRC.
-  packet = BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->SetSsrc(kSsrc);
-  packet->set_packet_type(RtpPacketMediaType::kVideo);
-  rtp_sender_context_->InjectPacket(std::move(packet), PacedPacketInfo());
-  EXPECT_EQ(transport_.packets_sent(), 1);
-}
-
-TEST_P(RtpSenderTest, SendPacketMatchesAudio) {
-  std::unique_ptr<RtpPacketToSend> packet =
-      BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->set_packet_type(RtpPacketMediaType::kAudio);
-
-  // Verify sent with correct SSRC.
-  packet = BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->SetSsrc(kSsrc);
-  packet->set_packet_type(RtpPacketMediaType::kAudio);
-  rtp_sender_context_->InjectPacket(std::move(packet), PacedPacketInfo());
-  EXPECT_EQ(transport_.packets_sent(), 1);
-}
-
-TEST_P(RtpSenderTest, SendPacketMatchesRetransmissions) {
-  std::unique_ptr<RtpPacketToSend> packet =
-      BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->set_packet_type(RtpPacketMediaType::kRetransmission);
-
-  // Verify sent with correct SSRC (non-RTX).
-  packet = BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->SetSsrc(kSsrc);
-  packet->set_packet_type(RtpPacketMediaType::kRetransmission);
-  rtp_sender_context_->InjectPacket(std::move(packet), PacedPacketInfo());
-  EXPECT_EQ(transport_.packets_sent(), 1);
-
-  // RTX retransmission.
-  packet = BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->SetSsrc(kRtxSsrc);
-  packet->set_packet_type(RtpPacketMediaType::kRetransmission);
-  rtp_sender_context_->InjectPacket(std::move(packet), PacedPacketInfo());
-  EXPECT_EQ(transport_.packets_sent(), 2);
-}
-
-TEST_P(RtpSenderTest, SendPacketMatchesPadding) {
-  std::unique_ptr<RtpPacketToSend> packet =
-      BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->set_packet_type(RtpPacketMediaType::kPadding);
-
-  // Verify sent with correct SSRC (non-RTX).
-  packet = BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->SetSsrc(kSsrc);
-  packet->set_packet_type(RtpPacketMediaType::kPadding);
-  rtp_sender_context_->InjectPacket(std::move(packet), PacedPacketInfo());
-  EXPECT_EQ(transport_.packets_sent(), 1);
-
-  // RTX padding.
-  packet = BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->SetSsrc(kRtxSsrc);
-  packet->set_packet_type(RtpPacketMediaType::kPadding);
-  rtp_sender_context_->InjectPacket(std::move(packet), PacedPacketInfo());
-  EXPECT_EQ(transport_.packets_sent(), 2);
-}
-
-TEST_P(RtpSenderTest, SendPacketMatchesFlexfec) {
-  std::unique_ptr<RtpPacketToSend> packet =
-      BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->set_packet_type(RtpPacketMediaType::kForwardErrorCorrection);
-
-  // Verify sent with correct SSRC.
-  packet = BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->SetSsrc(kFlexFecSsrc);
-  packet->set_packet_type(RtpPacketMediaType::kForwardErrorCorrection);
-  rtp_sender_context_->InjectPacket(std::move(packet), PacedPacketInfo());
-  EXPECT_EQ(transport_.packets_sent(), 1);
-}
-
-TEST_P(RtpSenderTest, SendPacketMatchesUlpfec) {
-  std::unique_ptr<RtpPacketToSend> packet =
-      BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->set_packet_type(RtpPacketMediaType::kForwardErrorCorrection);
-
-  // Verify sent with correct SSRC.
-  packet = BuildRtpPacket(kPayload, true, 0, clock_->TimeInMilliseconds());
-  packet->SetSsrc(kSsrc);
-  packet->set_packet_type(RtpPacketMediaType::kForwardErrorCorrection);
-  rtp_sender_context_->InjectPacket(std::move(packet), PacedPacketInfo());
-  EXPECT_EQ(transport_.packets_sent(), 1);
-}
-
 TEST_P(RtpSenderTest, SendPacketHandlesRetransmissionHistory) {
   rtp_sender_context_->packet_history_.SetStorePacketsStatus(
       RtpPacketHistory::StorageMode::kStoreAndCull, 10);