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

Side by Side Diff: net/quic/quic_unacked_packet_map_test.cc

Issue 1542123002: Add path_id to SerializedPacket. No functional change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@110310127
Patch Set: Created 4 years, 12 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 unified diff | Download patch
« no previous file with comments | « net/quic/quic_sent_packet_manager_test.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_unacked_packet_map.h" 5 #include "net/quic/quic_unacked_packet_map.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "net/quic/quic_flags.h" 8 #include "net/quic/quic_flags.h"
9 #include "net/quic/quic_utils.h" 9 #include "net/quic/quic_utils.h"
10 #include "net/quic/test_tools/quic_test_utils.h" 10 #include "net/quic/test_tools/quic_test_utils.h"
(...skipping 15 matching lines...) Expand all
26 QuicUnackedPacketMapTest() 26 QuicUnackedPacketMapTest()
27 : unacked_packets_(), 27 : unacked_packets_(),
28 now_(QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(1000))) {} 28 now_(QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(1000))) {}
29 29
30 ~QuicUnackedPacketMapTest() override { 30 ~QuicUnackedPacketMapTest() override {
31 STLDeleteElements(&packets_); 31 STLDeleteElements(&packets_);
32 } 32 }
33 33
34 SerializedPacket CreateRetransmittablePacket(QuicPacketNumber packet_number) { 34 SerializedPacket CreateRetransmittablePacket(QuicPacketNumber packet_number) {
35 packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength)); 35 packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength));
36 return SerializedPacket(packet_number, PACKET_1BYTE_PACKET_NUMBER, 36 return SerializedPacket(kDefaultPathId, packet_number,
37 packets_.back(), 0, new RetransmittableFrames(), 37 PACKET_1BYTE_PACKET_NUMBER, packets_.back(), 0,
38 false, false); 38 new RetransmittableFrames(), false, false);
39 } 39 }
40 40
41 SerializedPacket CreateRetransmittablePacketForStream( 41 SerializedPacket CreateRetransmittablePacketForStream(
42 QuicPacketNumber packet_number, 42 QuicPacketNumber packet_number,
43 QuicStreamId stream_id) { 43 QuicStreamId stream_id) {
44 packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength)); 44 packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength));
45 RetransmittableFrames* frames = new RetransmittableFrames(); 45 RetransmittableFrames* frames = new RetransmittableFrames();
46 QuicStreamFrame* frame = new QuicStreamFrame(); 46 QuicStreamFrame* frame = new QuicStreamFrame();
47 frame->stream_id = stream_id; 47 frame->stream_id = stream_id;
48 frames->AddFrame(QuicFrame(frame)); 48 frames->AddFrame(QuicFrame(frame));
49 return SerializedPacket(packet_number, PACKET_1BYTE_PACKET_NUMBER, 49 return SerializedPacket(kDefaultPathId, packet_number,
50 packets_.back(), 0, frames, false, false); 50 PACKET_1BYTE_PACKET_NUMBER, packets_.back(), 0,
51 frames, false, false);
51 } 52 }
52 53
53 SerializedPacket CreateNonRetransmittablePacket( 54 SerializedPacket CreateNonRetransmittablePacket(
54 QuicPacketNumber packet_number) { 55 QuicPacketNumber packet_number) {
55 packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength)); 56 packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength));
56 return SerializedPacket(packet_number, PACKET_1BYTE_PACKET_NUMBER, 57 return SerializedPacket(kDefaultPathId, packet_number,
57 packets_.back(), 0, nullptr, false, false); 58 PACKET_1BYTE_PACKET_NUMBER, packets_.back(), 0,
59 nullptr, false, false);
58 } 60 }
59 61
60 void VerifyInFlightPackets(QuicPacketNumber* packets, size_t num_packets) { 62 void VerifyInFlightPackets(QuicPacketNumber* packets, size_t num_packets) {
61 unacked_packets_.RemoveObsoletePackets(); 63 unacked_packets_.RemoveObsoletePackets();
62 if (num_packets == 0) { 64 if (num_packets == 0) {
63 EXPECT_FALSE(unacked_packets_.HasInFlightPackets()); 65 EXPECT_FALSE(unacked_packets_.HasInFlightPackets());
64 EXPECT_FALSE(unacked_packets_.HasMultipleInFlightPackets()); 66 EXPECT_FALSE(unacked_packets_.HasMultipleInFlightPackets());
65 return; 67 return;
66 } 68 }
67 if (num_packets == 1) { 69 if (num_packets == 1) {
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 EXPECT_FALSE(unacked_packets_.IsUnacked(2)); 417 EXPECT_FALSE(unacked_packets_.IsUnacked(2));
416 EXPECT_TRUE(unacked_packets_.IsUnacked(3)); 418 EXPECT_TRUE(unacked_packets_.IsUnacked(3));
417 EXPECT_FALSE(unacked_packets_.IsUnacked(4)); 419 EXPECT_FALSE(unacked_packets_.IsUnacked(4));
418 EXPECT_TRUE(unacked_packets_.IsUnacked(5)); 420 EXPECT_TRUE(unacked_packets_.IsUnacked(5));
419 EXPECT_EQ(5u, unacked_packets_.largest_sent_packet()); 421 EXPECT_EQ(5u, unacked_packets_.largest_sent_packet());
420 } 422 }
421 423
422 } // namespace 424 } // namespace
423 } // namespace test 425 } // namespace test
424 } // namespace net 426 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_sent_packet_manager_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698