Land Recent QUIC Changes.

net/quic/congestion_control/time_loss_algorithm_test.cc

Index: net/quic/congestion_control/time_loss_algorithm_test.cc
diff --git a/net/quic/congestion_control/tcp_loss_algorithm_test.cc b/net/quic/congestion_control/time_loss_algorithm_test.cc
similarity index 40%
copy from net/quic/congestion_control/tcp_loss_algorithm_test.cc
copy to net/quic/congestion_control/time_loss_algorithm_test.cc
index d2737df0a1c169932491e981f2ca50b0c2e37110..264a7efb6a0df236837867d74a3f7d1a7392f614 100644
--- a/net/quic/congestion_control/tcp_loss_algorithm_test.cc
+++ b/net/quic/congestion_control/time_loss_algorithm_test.cc
@@ -1,31 +1,31 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/quic/congestion_control/tcp_loss_algorithm.h"
-
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
+#include "net/quic/congestion_control/time_loss_algorithm.h"
 #include "net/quic/quic_unacked_packet_map.h"
+#include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace test {
 namespace {
 
-class TcpLossAlgorithmTest : public ::testing::Test {
+class TimeLossAlgorithmTest : public ::testing::Test {
  protected:
-  TcpLossAlgorithmTest()
+  TimeLossAlgorithmTest()
       : unacked_packets_(true),
-        srtt_(QuicTime::Delta::FromMilliseconds(10)) { }
+        srtt_(QuicTime::Delta::FromMilliseconds(100)) { }
 
   void SendDataPacket(QuicPacketSequenceNumber sequence_number) {
     SerializedPacket packet(sequence_number, PACKET_1BYTE_SEQUENCE_NUMBER,
                             NULL, 0, new RetransmittableFrames());
     unacked_packets_.AddPacket(packet);
-    unacked_packets_.SetPending(sequence_number, QuicTime::Zero(), 1000);
+    unacked_packets_.SetPending(sequence_number, clock_.Now(), 1000);
   }
 
   void VerifyLosses(QuicPacketSequenceNumber largest_observed,
@@ -33,7 +33,7 @@ class TcpLossAlgorithmTest : public ::testing::Test {
                     size_t num_losses) {
     SequenceNumberSet lost_packets =
         loss_algorithm_.DetectLostPackets(
-            unacked_packets_, QuicTime::Zero(), largest_observed, srtt_);
+            unacked_packets_, clock_.Now(), largest_observed, srtt_, srtt_);
     EXPECT_EQ(num_losses, lost_packets.size());
     for (size_t i = 0; i < num_losses; ++i) {
       EXPECT_TRUE(ContainsKey(lost_packets, losses_expected[i]));
@@ -41,105 +41,94 @@ class TcpLossAlgorithmTest : public ::testing::Test {
   }
 
   QuicUnackedPacketMap unacked_packets_;
-  TCPLossAlgorithm loss_algorithm_;
+  TimeLossAlgorithm loss_algorithm_;
   QuicTime::Delta srtt_;
+  MockClock clock_;
 };
 
-TEST_F(TcpLossAlgorithmTest, NackRetransmit1Packet) {
+TEST_F(TimeLossAlgorithmTest, NoLossFor500Nacks) {
   const size_t kNumSentPackets = 5;
   // Transmit 5 packets.
   for (size_t i = 1; i <= kNumSentPackets; ++i) {
     SendDataPacket(i);
   }
-  // No loss on one ack.
   unacked_packets_.SetNotPending(2);
-  unacked_packets_.NackPacket(1, 1);
-  VerifyLosses(2, NULL, 0);
-  // No loss on two acks.
-  unacked_packets_.SetNotPending(3);
-  unacked_packets_.NackPacket(1, 2);
-  VerifyLosses(3, NULL, 0);
-  // Loss on three acks.
-  unacked_packets_.SetNotPending(4);
-  unacked_packets_.NackPacket(1, 3);
-  QuicPacketSequenceNumber lost[] = { 1 };
-  VerifyLosses(4, lost, arraysize(lost));
+  for (size_t i = 0; i < 500; ++i) {
+    unacked_packets_.NackPacket(1, i);
+    VerifyLosses(2, NULL, 0);
+  }
+  EXPECT_EQ(srtt_.Multiply(1.25),
+            loss_algorithm_.GetLossTimeout().Subtract(clock_.Now()));
 }
 
-// A stretch ack is an ack that covers more than 1 packet of previously
-// unacknowledged data.
-TEST_F(TcpLossAlgorithmTest, NackRetransmit1PacketWith1StretchAck) {
+TEST_F(TimeLossAlgorithmTest, NoLossUntilTimeout) {
   const size_t kNumSentPackets = 10;
-  // Transmit 10 packets.
+  // Transmit 10 packets at 1/10th an RTT interval.
   for (size_t i = 1; i <= kNumSentPackets; ++i) {
     SendDataPacket(i);
+    clock_.AdvanceTime(srtt_.Multiply(0.1));
   }
-
-  // Nack the first packet 3 times in a single StretchAck.
-  unacked_packets_.NackPacket(1, 3);
+  // Expect the timer to not be set.
+  EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
+  // The packet should not be lost until 1.25 RTTs pass.
+  unacked_packets_.NackPacket(1, 1);
   unacked_packets_.SetNotPending(2);
-  unacked_packets_.SetNotPending(3);
-  unacked_packets_.SetNotPending(4);
+  VerifyLosses(2, NULL, 0);
+  // Expect the timer to be set to 0.25 RTT's in the future.
+  EXPECT_EQ(srtt_.Multiply(0.25),
+            loss_algorithm_.GetLossTimeout().Subtract(clock_.Now()));
+  unacked_packets_.NackPacket(1, 5);
+  VerifyLosses(2, NULL, 0);
+  clock_.AdvanceTime(srtt_.Multiply(0.25));
   QuicPacketSequenceNumber lost[] = { 1 };
-  VerifyLosses(4, lost, arraysize(lost));
+  VerifyLosses(2, lost, arraysize(lost));
+  EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
 }
 
-// Ack a packet 3 packets ahead, causing a retransmit.
-TEST_F(TcpLossAlgorithmTest, NackRetransmit1PacketSingleAck) {
+TEST_F(TimeLossAlgorithmTest, NoLossWithoutNack) {
   const size_t kNumSentPackets = 10;
-  // Transmit 10 packets.
+  // Transmit 10 packets at 1/10th an RTT interval.
   for (size_t i = 1; i <= kNumSentPackets; ++i) {
     SendDataPacket(i);
+    clock_.AdvanceTime(srtt_.Multiply(0.1));
   }
-
-  // Nack the first packet 3 times in an AckFrame with three missing packets.
-  unacked_packets_.NackPacket(1, 3);
-  unacked_packets_.NackPacket(2, 2);
-  unacked_packets_.NackPacket(3, 1);
-  unacked_packets_.SetNotPending(4);
-  QuicPacketSequenceNumber lost[] = { 1 };
-  VerifyLosses(4, lost, arraysize(lost));
+  // Expect the timer to not be set.
+  EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
+  // The packet should not be lost without a nack.
+  unacked_packets_.SetNotPending(1);
+  VerifyLosses(1, NULL, 0);
+  // The timer should still not be set.
+  EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
+  clock_.AdvanceTime(srtt_.Multiply(0.25));
+  VerifyLosses(1, NULL, 0);
+  clock_.AdvanceTime(srtt_);
+  VerifyLosses(1, NULL, 0);
+
+  EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
 }
 
-TEST_F(TcpLossAlgorithmTest, EarlyRetransmit1Packet) {
-  const size_t kNumSentPackets = 2;
-  // Transmit 2 packets.
-  for (size_t i = 1; i <= kNumSentPackets; ++i) {
-    SendDataPacket(i);
-  }
-  // Early retransmit when the final packet gets acked and the first is nacked.
-  unacked_packets_.SetNotPending(2);
-  unacked_packets_.NackPacket(1, 1);
-  QuicPacketSequenceNumber lost[] = { 1 };
-  VerifyLosses(2, lost, arraysize(lost));
-}
-
-TEST_F(TcpLossAlgorithmTest, EarlyRetransmitAllPackets) {
-  const size_t kNumSentPackets = 5;
+TEST_F(TimeLossAlgorithmTest, MultipleLossesAtOnce) {
+  const size_t kNumSentPackets = 10;
+  // Transmit 10 packets at once and then go forward an RTT.
   for (size_t i = 1; i <= kNumSentPackets; ++i) {
     SendDataPacket(i);
   }
-  // Early retransmit when the final packet gets acked and the first 4 are
-  // nacked multiple times via FACK.
-  unacked_packets_.SetNotPending(kNumSentPackets);
+  clock_.AdvanceTime(srtt_);
+  // Expect the timer to not be set.
+  EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
+  // The packet should not be lost until 1.25 RTTs pass.
   for (size_t i = 1; i < kNumSentPackets; ++i) {
-    unacked_packets_.NackPacket(i, kNumSentPackets - i);
+    unacked_packets_.NackPacket(i, 1);
   }
-  QuicPacketSequenceNumber lost[] = { 1, 2, 3, 4 };
-  VerifyLosses(kNumSentPackets, lost, arraysize(lost));
-}
-
-TEST_F(TcpLossAlgorithmTest, DontEarlyRetransmitNeuteredPacket) {
-  const size_t kNumSentPackets = 2;
-  // Transmit 2 packets.
-  for (size_t i = 1; i <= kNumSentPackets; ++i) {
-    SendDataPacket(i);
-  }
-  // Early retransmit when the final packet gets acked and the first is nacked.
-  unacked_packets_.SetNotPending(2);
-  unacked_packets_.NackPacket(1, 1);
-  unacked_packets_.NeuterPacket(1);
-  VerifyLosses(2, NULL, 0);
+  unacked_packets_.SetNotPending(10);
+  VerifyLosses(10, NULL, 0);
+  // Expect the timer to be set to 0.25 RTT's in the future.
+  EXPECT_EQ(srtt_.Multiply(0.25),
+            loss_algorithm_.GetLossTimeout().Subtract(clock_.Now()));
+  clock_.AdvanceTime(srtt_.Multiply(0.25));
+  QuicPacketSequenceNumber lost[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+  VerifyLosses(10, lost, arraysize(lost));
+  EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
 }
 
 }  // namespace