| Index: net/quic/congestion_control/paced_sender_test.cc
|
| diff --git a/net/quic/congestion_control/paced_sender_test.cc b/net/quic/congestion_control/paced_sender_test.cc
|
| index fa42c2ce5792fdf1742fc8d07781cb024801b961..df5ce7b193d2928e21bebc451624858a6a818414 100644
|
| --- a/net/quic/congestion_control/paced_sender_test.cc
|
| +++ b/net/quic/congestion_control/paced_sender_test.cc
|
| @@ -21,8 +21,7 @@ class PacedSenderTest : public ::testing::Test {
|
| : zero_time_(QuicTime::Delta::Zero()),
|
| paced_sender_(new PacedSender(
|
| QuicBandwidth::FromKBytesPerSecond(kHundredKBytesPerS),
|
| - kDefaultMaxPacketSize)) {
|
| - }
|
| + kDefaultMaxPacketSize)) {}
|
|
|
| const QuicTime::Delta zero_time_;
|
| MockClock clock_;
|
| @@ -30,46 +29,48 @@ class PacedSenderTest : public ::testing::Test {
|
| };
|
|
|
| TEST_F(PacedSenderTest, Basic) {
|
| - paced_sender_->UpdateBandwidthEstimate(clock_.Now(),
|
| + paced_sender_->UpdateBandwidthEstimate(
|
| + clock_.Now(),
|
| QuicBandwidth::FromKBytesPerSecond(kHundredKBytesPerS * 10));
|
| EXPECT_TRUE(paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).IsZero());
|
| paced_sender_->OnPacketSent(clock_.Now(), kDefaultMaxPacketSize);
|
| EXPECT_TRUE(paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).IsZero());
|
| paced_sender_->OnPacketSent(clock_.Now(), kDefaultMaxPacketSize);
|
| - EXPECT_EQ(static_cast<int64>(kDefaultMaxPacketSize * 2),
|
| - paced_sender_->TimeUntilSend(
|
| - clock_.Now(), zero_time_).ToMicroseconds());
|
| + EXPECT_EQ(
|
| + static_cast<int64>(kDefaultMaxPacketSize * 2),
|
| + paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).ToMicroseconds());
|
| clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(24));
|
| EXPECT_TRUE(paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).IsZero());
|
| }
|
|
|
| TEST_F(PacedSenderTest, LowRate) {
|
| - paced_sender_->UpdateBandwidthEstimate(clock_.Now(),
|
| - QuicBandwidth::FromKBytesPerSecond(kHundredKBytesPerS));
|
| + paced_sender_->UpdateBandwidthEstimate(
|
| + clock_.Now(), QuicBandwidth::FromKBytesPerSecond(kHundredKBytesPerS));
|
| EXPECT_TRUE(paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).IsZero());
|
| paced_sender_->OnPacketSent(clock_.Now(), kDefaultMaxPacketSize);
|
| EXPECT_TRUE(paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).IsZero());
|
| paced_sender_->OnPacketSent(clock_.Now(), kDefaultMaxPacketSize);
|
| - EXPECT_EQ(static_cast<int64>(kDefaultMaxPacketSize * 20),
|
| - paced_sender_->TimeUntilSend(
|
| - clock_.Now(), zero_time_).ToMicroseconds());
|
| + EXPECT_EQ(
|
| + static_cast<int64>(kDefaultMaxPacketSize * 20),
|
| + paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).ToMicroseconds());
|
| clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(24));
|
| EXPECT_TRUE(paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).IsZero());
|
| }
|
|
|
| TEST_F(PacedSenderTest, HighRate) {
|
| - QuicBandwidth bandwidth_estimate = QuicBandwidth::FromKBytesPerSecond(
|
| - kHundredKBytesPerS * 100);
|
| + QuicBandwidth bandwidth_estimate =
|
| + QuicBandwidth::FromKBytesPerSecond(kHundredKBytesPerS * 100);
|
| paced_sender_->UpdateBandwidthEstimate(clock_.Now(), bandwidth_estimate);
|
| EXPECT_TRUE(paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).IsZero());
|
| for (int i = 0; i < 16; ++i) {
|
| paced_sender_->OnPacketSent(clock_.Now(), kDefaultMaxPacketSize);
|
| - EXPECT_TRUE(paced_sender_->TimeUntilSend(
|
| - clock_.Now(), zero_time_).IsZero());
|
| + EXPECT_TRUE(
|
| + paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).IsZero());
|
| }
|
| paced_sender_->OnPacketSent(clock_.Now(), kDefaultMaxPacketSize);
|
| - EXPECT_EQ(2040, paced_sender_->TimeUntilSend(
|
| - clock_.Now(), zero_time_).ToMicroseconds());
|
| + EXPECT_EQ(
|
| + 2040,
|
| + paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).ToMicroseconds());
|
| clock_.AdvanceTime(QuicTime::Delta::FromMicroseconds(20400));
|
| EXPECT_TRUE(paced_sender_->TimeUntilSend(clock_.Now(), zero_time_).IsZero());
|
| }
|
|
|