From 238da9a57eb9eb45c8ee356d4f334fe797fcaa42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Tue, 25 May 2021 12:58:43 +0200 Subject: [PATCH] Remove obsolete SendPacketMatches* tests from rtp_sender_egress_unittest. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#34116} --- .../rtp_rtcp/source/rtp_sender_unittest.cc | 92 ------------------- 1 file changed, 92 deletions(-) diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc index 5a8cdae05f..d7a7b53367 100644 --- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc @@ -1102,98 +1102,6 @@ TEST_P(RtpSenderTest, DontCountVolatileExtensionsIntoOverhead) { EXPECT_EQ(rtp_sender()->ExpectedPerPacketOverhead(), 12u); } -TEST_P(RtpSenderTest, SendPacketMatchesVideo) { - std::unique_ptr 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 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 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 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 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 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);