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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_connection_test.cc

Issue 1231343004: relnote: Change QuicConnectionVisitorInterface::OnStreamFrames to (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Fix_flag_quic_delay_retransmission_alarm_97271704
Patch Set: Created 5 years, 5 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_connection.cc ('k') | net/quic/quic_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_connection_test.cc
diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc
index 946cea95f82b37bbd0aefd8b4d2a99f3e66c6355..8efe6d62f0be2a74f81129b220d69b25fb7b3bb6 100644
--- a/net/quic/quic_connection_test.cc
+++ b/net/quic/quic_connection_test.cc
@@ -733,7 +733,7 @@ class QuicConnectionTest : public ::testing::TestWithParam<TestParams> {
}
void ProcessPacket(QuicPacketSequenceNumber number) {
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
ProcessDataPacket(number, 0, !kEntropyFlag);
}
@@ -783,10 +783,9 @@ class QuicConnectionTest : public ::testing::TestWithParam<TestParams> {
size_t ProcessFecProtectedPacket(QuicPacketSequenceNumber number,
bool expect_revival, bool entropy_flag) {
if (expect_revival) {
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
}
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1).
- RetiresOnSaturation();
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1).RetiresOnSaturation();
return ProcessDataPacket(number, 1, entropy_flag);
}
@@ -798,7 +797,7 @@ class QuicConnectionTest : public ::testing::TestWithParam<TestParams> {
bool entropy_flag,
QuicPacket* packet) {
if (expect_revival) {
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
}
// Construct the decrypted data packet so we can compute the correct
@@ -1073,7 +1072,7 @@ TEST_P(QuicConnectionTest, IncreaseServerMaxPacketSize) {
EXPECT_EQ(kMaxPacketSize, encrypted->length());
framer_.set_version(version());
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
connection_.ProcessUdpPacket(IPEndPoint(), IPEndPoint(), *encrypted);
EXPECT_EQ(kMaxPacketSize, connection_.max_packet_length());
@@ -1123,7 +1122,7 @@ TEST_P(QuicConnectionTest, DuplicatePacket) {
EXPECT_TRUE(IsMissing(1));
// Send packet 3 again, but do not set the expectation that
- // the visitor OnStreamFrames() will be called.
+ // the visitor OnStreamFrame() will be called.
ProcessDataPacket(3, 0, !kEntropyFlag);
EXPECT_EQ(3u, outgoing_ack()->largest_observed);
EXPECT_TRUE(IsMissing(2));
@@ -2136,7 +2135,7 @@ TEST_P(QuicConnectionTest, FramePackingFEC) {
TEST_P(QuicConnectionTest, FramePackingAckResponse) {
EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
// Process a data packet to queue up a pending ack.
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
ProcessDataPacket(1, 1, kEntropyFlag);
EXPECT_CALL(visitor_, OnCanWrite()).WillOnce(DoAll(
@@ -2958,12 +2957,12 @@ TEST_P(QuicConnectionTest, BufferNonDecryptablePackets) {
connection_.SetDecrypter(ENCRYPTION_INITIAL, new StrictTaggingDecrypter(tag));
connection_.SetDefaultEncryptionLevel(ENCRYPTION_INITIAL);
connection_.SetEncrypter(ENCRYPTION_INITIAL, new TaggingEncrypter(tag));
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(2);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(2);
ProcessDataPacketAtLevel(2, 0, kEntropyFlag, ENCRYPTION_INITIAL);
// Finally, process a third packet and note that we do not reprocess the
// buffered packet.
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
ProcessDataPacketAtLevel(3, 0, kEntropyFlag, ENCRYPTION_INITIAL);
}
@@ -2990,12 +2989,12 @@ TEST_P(QuicConnectionTest, Buffer100NonDecryptablePackets) {
connection_.SetDecrypter(ENCRYPTION_INITIAL, new StrictTaggingDecrypter(tag));
connection_.SetDefaultEncryptionLevel(ENCRYPTION_INITIAL);
connection_.SetEncrypter(ENCRYPTION_INITIAL, new TaggingEncrypter(tag));
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(101);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(101);
ProcessDataPacketAtLevel(101, 0, kEntropyFlag, ENCRYPTION_INITIAL);
// Finally, process a third packet and note that we do not reprocess the
// buffered packet.
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
ProcessDataPacketAtLevel(102, 0, kEntropyFlag, ENCRYPTION_INITIAL);
}
@@ -3625,7 +3624,7 @@ TEST_P(QuicConnectionTest, SendDelayedAck) {
// The same as ProcessPacket(1) except that ENCRYPTION_INITIAL is used
// instead of ENCRYPTION_NONE.
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
ProcessDataPacketAtLevel(1, 0, !kEntropyFlag, ENCRYPTION_INITIAL);
// Check if delayed ack timer is running for the expected interval.
@@ -3857,7 +3856,7 @@ TEST_P(QuicConnectionTest, WindowUpdate) {
QuicWindowUpdateFrame window_update;
window_update.stream_id = 3;
window_update.byte_offset = 1234;
- EXPECT_CALL(visitor_, OnWindowUpdateFrames(_));
+ EXPECT_CALL(visitor_, OnWindowUpdateFrame(_));
ProcessFramePacket(QuicFrame(&window_update));
}
@@ -3866,7 +3865,7 @@ TEST_P(QuicConnectionTest, Blocked) {
QuicBlockedFrame blocked;
blocked.stream_id = 3;
- EXPECT_CALL(visitor_, OnBlockedFrames(_));
+ EXPECT_CALL(visitor_, OnBlockedFrame(_));
ProcessFramePacket(QuicFrame(&blocked));
}
@@ -3887,7 +3886,7 @@ TEST_P(QuicConnectionTest, MissingPacketsBeforeLeastUnacked) {
}
TEST_P(QuicConnectionTest, ReceivedEntropyHashCalculation) {
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(AtLeast(1));
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(AtLeast(1));
EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
ProcessDataPacket(1, 1, kEntropyFlag);
ProcessDataPacket(4, 1, kEntropyFlag);
@@ -3898,7 +3897,7 @@ TEST_P(QuicConnectionTest, ReceivedEntropyHashCalculation) {
TEST_P(QuicConnectionTest, ReceivedEntropyHashCalculationHalfFEC) {
// FEC packets should not change the entropy hash calculation.
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(AtLeast(1));
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(AtLeast(1));
EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
ProcessDataPacket(1, 1, kEntropyFlag);
ProcessFecPacket(4, 1, false, kEntropyFlag, nullptr);
@@ -3908,7 +3907,7 @@ TEST_P(QuicConnectionTest, ReceivedEntropyHashCalculationHalfFEC) {
}
TEST_P(QuicConnectionTest, UpdateEntropyForReceivedPackets) {
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(AtLeast(1));
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(AtLeast(1));
EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
ProcessDataPacket(1, 1, kEntropyFlag);
ProcessDataPacket(5, 1, kEntropyFlag);
@@ -3929,7 +3928,7 @@ TEST_P(QuicConnectionTest, UpdateEntropyForReceivedPackets) {
}
TEST_P(QuicConnectionTest, UpdateEntropyHashUptoCurrentPacket) {
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(AtLeast(1));
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(AtLeast(1));
EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
ProcessDataPacket(1, 1, kEntropyFlag);
ProcessDataPacket(5, 1, !kEntropyFlag);
@@ -3950,7 +3949,7 @@ TEST_P(QuicConnectionTest, UpdateEntropyHashUptoCurrentPacket) {
}
TEST_P(QuicConnectionTest, EntropyCalculationForTruncatedAck) {
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(AtLeast(1));
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(AtLeast(1));
EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
QuicPacketEntropyHash entropy[51];
entropy[0] = 0;
@@ -4102,7 +4101,7 @@ TEST_P(QuicConnectionTest, ClientHandlesVersionNegotiation) {
char buffer[kMaxPacketSize];
encrypted.reset(framer_.EncryptPayload(ENCRYPTION_NONE, 12, *packet, buffer,
kMaxPacketSize));
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
connection_.ProcessUdpPacket(IPEndPoint(), IPEndPoint(), *encrypted);
@@ -4239,7 +4238,7 @@ TEST_P(QuicConnectionTest, ProcessFramesIfPacketClosedConnection) {
ENCRYPTION_NONE, 1, *packet, buffer, kMaxPacketSize));
EXPECT_CALL(visitor_, OnConnectionClosed(QUIC_PEER_GOING_AWAY, true));
- EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1);
+ EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
connection_.ProcessUdpPacket(IPEndPoint(), IPEndPoint(), *encrypted);
@@ -4602,7 +4601,7 @@ TEST_P(QuicConnectionTest, ControlFramesInstigateAcks) {
QuicWindowUpdateFrame window_update;
window_update.stream_id = 3;
window_update.byte_offset = 1234;
- EXPECT_CALL(visitor_, OnWindowUpdateFrames(_));
+ EXPECT_CALL(visitor_, OnWindowUpdateFrame(_));
ProcessFramePacket(QuicFrame(&window_update));
// Ensure that this has caused the ACK alarm to be set.
@@ -4613,7 +4612,7 @@ TEST_P(QuicConnectionTest, ControlFramesInstigateAcks) {
ack_alarm->Cancel();
QuicBlockedFrame blocked;
blocked.stream_id = 3;
- EXPECT_CALL(visitor_, OnBlockedFrames(_));
+ EXPECT_CALL(visitor_, OnBlockedFrame(_));
ProcessFramePacket(QuicFrame(&blocked));
EXPECT_TRUE(ack_alarm->IsSet());
}
« no previous file with comments | « net/quic/quic_connection.cc ('k') | net/quic/quic_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698