Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(540)

Unified Diff: net/quic/quic_sent_packet_manager_test.cc

Issue 1785853002: Remove is_fec_packet from TransmissionInfo and SerializedPacket. No functional change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@116411121
Patch Set: Merge from 116555910 Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_sent_packet_manager.cc ('k') | net/quic/quic_unacked_packet_map.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_sent_packet_manager_test.cc
diff --git a/net/quic/quic_sent_packet_manager_test.cc b/net/quic/quic_sent_packet_manager_test.cc
index 2cf3a60287cdf893d786667c5099d5cfdb06e20c..76de6eda5857346e8edf3deab76b1335b696d0ba 100644
--- a/net/quic/quic_sent_packet_manager_test.cc
+++ b/net/quic/quic_sent_packet_manager_test.cc
@@ -206,14 +206,6 @@ class QuicSentPacketManagerTest : public ::testing::TestWithParam<bool> {
return packet;
}
- SerializedPacket CreateFecPacket(QuicPacketNumber packet_number) {
- SerializedPacket serialized(kDefaultPathId, packet_number,
- PACKET_6BYTE_PACKET_NUMBER, nullptr,
- kDefaultLength, 0u, false, false);
- serialized.is_fec_packet = true;
- return serialized;
- }
-
void SendDataPacket(QuicPacketNumber packet_number) {
EXPECT_CALL(*send_algorithm_,
OnPacketSent(_, BytesInFlight(), packet_number, _, _))
@@ -238,17 +230,6 @@ class QuicSentPacketManagerTest : public ::testing::TestWithParam<bool> {
HAS_RETRANSMITTABLE_DATA);
}
- void SendFecPacket(QuicPacketNumber packet_number) {
- EXPECT_CALL(*send_algorithm_,
- OnPacketSent(_, BytesInFlight(), packet_number, kDefaultLength,
- HAS_RETRANSMITTABLE_DATA))
- .Times(1)
- .WillOnce(Return(true));
- SerializedPacket packet(CreateFecPacket(packet_number));
- manager_.OnPacketSent(&packet, 0, clock_.Now(), NOT_RETRANSMISSION,
- NO_RETRANSMITTABLE_DATA);
- }
-
void SendAckPacket(QuicPacketNumber packet_number) {
EXPECT_CALL(*send_algorithm_,
OnPacketSent(_, BytesInFlight(), packet_number, kDefaultLength,
@@ -548,53 +529,6 @@ TEST_F(QuicSentPacketManagerTest, GetLeastUnackedUnacked) {
EXPECT_EQ(1u, manager_.GetLeastUnacked());
}
-TEST_F(QuicSentPacketManagerTest, GetLeastUnackedUnackedFec) {
- SendFecPacket(1);
- EXPECT_EQ(1u, manager_.GetLeastUnacked());
-}
-
-TEST_F(QuicSentPacketManagerTest, GetLeastUnackedAndDiscard) {
- VerifyUnackedPackets(nullptr, 0);
-
- SendFecPacket(1);
- EXPECT_EQ(1u, manager_.GetLeastUnacked());
-
- SendFecPacket(2);
- EXPECT_EQ(1u, manager_.GetLeastUnacked());
-
- SendFecPacket(3);
- EXPECT_EQ(1u, manager_.GetLeastUnacked());
-
- QuicPacketNumber unacked[] = {1, 2, 3};
- VerifyUnackedPackets(unacked, arraysize(unacked));
- VerifyRetransmittablePackets(nullptr, 0);
-
- // Ack 2, so there's an rtt update.
- ExpectAck(2);
- QuicAckFrame ack_frame;
- ack_frame.largest_observed = 2;
- ack_frame.missing_packets.Add(1);
- manager_.OnIncomingAck(ack_frame, clock_.Now());
-
- EXPECT_EQ(1u, manager_.GetLeastUnacked());
-}
-
-TEST_F(QuicSentPacketManagerTest, GetSentTime) {
- VerifyUnackedPackets(nullptr, 0);
-
- QuicTime sent_time = clock_.Now();
- SendFecPacket(1);
- QuicTime sent_time2 = clock_.Now();
- SendFecPacket(2);
- QuicPacketNumber unacked[] = {1, 2};
- VerifyUnackedPackets(unacked, arraysize(unacked));
- VerifyRetransmittablePackets(nullptr, 0);
-
- EXPECT_TRUE(manager_.HasUnackedPackets());
- EXPECT_EQ(sent_time, QuicSentPacketManagerPeer::GetSentTime(&manager_, 1));
- EXPECT_EQ(sent_time2, QuicSentPacketManagerPeer::GetSentTime(&manager_, 2));
-}
-
TEST_F(QuicSentPacketManagerTest, AckAckAndUpdateRtt) {
SendDataPacket(1);
SendAckPacket(2);
« no previous file with comments | « net/quic/quic_sent_packet_manager.cc ('k') | net/quic/quic_unacked_packet_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698