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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_packet_generator_test.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« net/base/mime_util_unittest.cc ('K') | « net/quic/quic_packet_generator.cc ('k') | net/quic/quic_packet_writer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_packet_generator_test.cc
diff --git a/net/quic/quic_packet_generator_test.cc b/net/quic/quic_packet_generator_test.cc
index 8bb1dfdff631c3617fad78bad12a19a0e8b7b82a..4cc3631158914dd3e08213888d1f5c309413a8f3 100644
--- a/net/quic/quic_packet_generator_test.cc
+++ b/net/quic/quic_packet_generator_test.cc
@@ -46,16 +46,18 @@ class MockDelegate : public QuicPacketGenerator::DelegateInterface {
void SetCanWriteAnything() {
EXPECT_CALL(*this, ShouldGeneratePacket(NOT_RETRANSMISSION, _, _))
.WillRepeatedly(Return(true));
- EXPECT_CALL(*this, ShouldGeneratePacket(NOT_RETRANSMISSION,
- NO_RETRANSMITTABLE_DATA, _))
+ EXPECT_CALL(
+ *this,
+ ShouldGeneratePacket(NOT_RETRANSMISSION, NO_RETRANSMITTABLE_DATA, _))
.WillRepeatedly(Return(true));
}
void SetCanNotWrite() {
EXPECT_CALL(*this, ShouldGeneratePacket(NOT_RETRANSMISSION, _, _))
.WillRepeatedly(Return(false));
- EXPECT_CALL(*this, ShouldGeneratePacket(NOT_RETRANSMISSION,
- NO_RETRANSMITTABLE_DATA, _))
+ EXPECT_CALL(
+ *this,
+ ShouldGeneratePacket(NOT_RETRANSMISSION, NO_RETRANSMITTABLE_DATA, _))
.WillRepeatedly(Return(false));
}
@@ -63,8 +65,9 @@ class MockDelegate : public QuicPacketGenerator::DelegateInterface {
void SetCanWriteOnlyNonRetransmittable() {
EXPECT_CALL(*this, ShouldGeneratePacket(NOT_RETRANSMISSION, _, _))
.WillRepeatedly(Return(false));
- EXPECT_CALL(*this, ShouldGeneratePacket(NOT_RETRANSMISSION,
- NO_RETRANSMITTABLE_DATA, _))
+ EXPECT_CALL(
+ *this,
+ ShouldGeneratePacket(NOT_RETRANSMISSION, NO_RETRANSMITTABLE_DATA, _))
.WillRepeatedly(Return(true));
}
@@ -84,8 +87,7 @@ struct PacketContents {
num_rst_stream_frames(0),
num_stop_waiting_frames(0),
num_stream_frames(0),
- fec_group(0) {
- }
+ fec_group(0) {}
size_t num_ack_frames;
size_t num_connection_close_frames;
@@ -110,8 +112,7 @@ class QuicPacketGeneratorTest : public ::testing::Test {
packet2_(0, PACKET_1BYTE_SEQUENCE_NUMBER, NULL, 0, NULL),
packet3_(0, PACKET_1BYTE_SEQUENCE_NUMBER, NULL, 0, NULL),
packet4_(0, PACKET_1BYTE_SEQUENCE_NUMBER, NULL, 0, NULL),
- packet5_(0, PACKET_1BYTE_SEQUENCE_NUMBER, NULL, 0, NULL) {
- }
+ packet5_(0, PACKET_1BYTE_SEQUENCE_NUMBER, NULL, 0, NULL) {}
~QuicPacketGeneratorTest() {
delete packet_.packet;
@@ -155,11 +156,12 @@ class QuicPacketGeneratorTest : public ::testing::Test {
void CheckPacketContains(const PacketContents& contents,
const SerializedPacket& packet) {
- size_t num_retransmittable_frames = contents.num_connection_close_frames +
- contents.num_goaway_frames + contents.num_rst_stream_frames +
- contents.num_stream_frames;
+ size_t num_retransmittable_frames =
+ contents.num_connection_close_frames + contents.num_goaway_frames +
+ contents.num_rst_stream_frames + contents.num_stream_frames;
size_t num_frames = contents.num_feedback_frames + contents.num_ack_frames +
- contents.num_stop_waiting_frames + num_retransmittable_frames;
+ contents.num_stop_waiting_frames +
+ num_retransmittable_frames;
if (num_retransmittable_frames == 0) {
ASSERT_TRUE(packet.retransmittable_frames == NULL);
@@ -232,8 +234,7 @@ class QuicPacketGeneratorTest : public ::testing::Test {
class MockDebugDelegate : public QuicPacketGenerator::DebugDelegateInterface {
public:
- MOCK_METHOD1(OnFrameAddedToPacket,
- void(const QuicFrame&));
+ MOCK_METHOD1(OnFrameAddedToPacket, void(const QuicFrame&));
};
TEST_F(QuicPacketGeneratorTest, ShouldSendAck_NotWritable) {
@@ -261,8 +262,8 @@ TEST_F(QuicPacketGeneratorTest, ShouldSendAck_WritableAndShouldFlush) {
delegate_.SetCanWriteOnlyNonRetransmittable();
EXPECT_CALL(delegate_, CreateAckFrame()).WillOnce(Return(CreateAckFrame()));
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet_), Return(true)));
generator_.SetShouldSendAck(false, false);
EXPECT_FALSE(generator_.HasQueuedFrames());
@@ -278,8 +279,8 @@ TEST_F(QuicPacketGeneratorTest,
generator_.StartBatchOperations();
EXPECT_CALL(delegate_, CreateAckFrame()).WillOnce(Return(CreateAckFrame()));
- EXPECT_CALL(delegate_, CreateFeedbackFrame()).WillOnce(
- Return(CreateFeedbackFrame()));
+ EXPECT_CALL(delegate_, CreateFeedbackFrame())
+ .WillOnce(Return(CreateFeedbackFrame()));
generator_.SetShouldSendAck(true, false);
EXPECT_TRUE(generator_.HasQueuedFrames());
@@ -290,13 +291,13 @@ TEST_F(QuicPacketGeneratorTest,
delegate_.SetCanWriteOnlyNonRetransmittable();
EXPECT_CALL(delegate_, CreateAckFrame()).WillOnce(Return(CreateAckFrame()));
- EXPECT_CALL(delegate_, CreateFeedbackFrame()).WillOnce(
- Return(CreateFeedbackFrame()));
- EXPECT_CALL(delegate_, CreateStopWaitingFrame()).WillOnce(
- Return(CreateStopWaitingFrame()));
+ EXPECT_CALL(delegate_, CreateFeedbackFrame())
+ .WillOnce(Return(CreateFeedbackFrame()));
+ EXPECT_CALL(delegate_, CreateStopWaitingFrame())
+ .WillOnce(Return(CreateStopWaitingFrame()));
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet_), Return(true)));
generator_.SetShouldSendAck(true, true);
EXPECT_FALSE(generator_.HasQueuedFrames());
@@ -339,8 +340,8 @@ TEST_F(QuicPacketGeneratorTest, AddControlFrame_NotWritableBatchThenFlush) {
generator_.FinishBatchOperations();
EXPECT_TRUE(generator_.HasQueuedFrames());
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet_), Return(true)));
generator_.FlushAllQueuedFrames();
EXPECT_FALSE(generator_.HasQueuedFrames());
@@ -352,8 +353,8 @@ TEST_F(QuicPacketGeneratorTest, AddControlFrame_NotWritableBatchThenFlush) {
TEST_F(QuicPacketGeneratorTest, AddControlFrame_WritableAndShouldFlush) {
delegate_.SetCanWriteAnything();
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet_), Return(true)));
generator_.AddControlFrame(QuicFrame(CreateRstStreamFrame()));
EXPECT_FALSE(generator_.HasQueuedFrames());
@@ -366,8 +367,8 @@ TEST_F(QuicPacketGeneratorTest, AddControlFrame_WritableAndShouldFlush) {
TEST_F(QuicPacketGeneratorTest, ConsumeData_NotWritable) {
delegate_.SetCanNotWrite();
- QuicConsumedData consumed = generator_.ConsumeData(1, MakeIOVector("foo"), 2,
- true, NULL);
+ QuicConsumedData consumed =
+ generator_.ConsumeData(1, MakeIOVector("foo"), 2, true, NULL);
EXPECT_EQ(0u, consumed.bytes_consumed);
EXPECT_FALSE(consumed.fin_consumed);
EXPECT_FALSE(generator_.HasQueuedFrames());
@@ -377,8 +378,8 @@ TEST_F(QuicPacketGeneratorTest, ConsumeData_WritableAndShouldNotFlush) {
delegate_.SetCanWriteAnything();
generator_.StartBatchOperations();
- QuicConsumedData consumed = generator_.ConsumeData(1, MakeIOVector("foo"), 2,
- true, NULL);
+ QuicConsumedData consumed =
+ generator_.ConsumeData(1, MakeIOVector("foo"), 2, true, NULL);
EXPECT_EQ(3u, consumed.bytes_consumed);
EXPECT_TRUE(consumed.fin_consumed);
EXPECT_TRUE(generator_.HasQueuedFrames());
@@ -387,10 +388,10 @@ TEST_F(QuicPacketGeneratorTest, ConsumeData_WritableAndShouldNotFlush) {
TEST_F(QuicPacketGeneratorTest, ConsumeData_WritableAndShouldFlush) {
delegate_.SetCanWriteAnything();
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet_), Return(true)));
- QuicConsumedData consumed = generator_.ConsumeData(1, MakeIOVector("foo"), 2,
- true, NULL);
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet_), Return(true)));
+ QuicConsumedData consumed =
+ generator_.ConsumeData(1, MakeIOVector("foo"), 2, true, NULL);
EXPECT_EQ(3u, consumed.bytes_consumed);
EXPECT_TRUE(consumed.fin_consumed);
EXPECT_FALSE(generator_.HasQueuedFrames());
@@ -406,8 +407,8 @@ TEST_F(QuicPacketGeneratorTest,
generator_.StartBatchOperations();
generator_.ConsumeData(1, MakeIOVector("foo"), 2, true, NULL);
- QuicConsumedData consumed = generator_.ConsumeData(3, MakeIOVector("quux"), 7,
- false, NULL);
+ QuicConsumedData consumed =
+ generator_.ConsumeData(3, MakeIOVector("quux"), 7, false, NULL);
EXPECT_EQ(4u, consumed.bytes_consumed);
EXPECT_FALSE(consumed.fin_consumed);
EXPECT_TRUE(generator_.HasQueuedFrames());
@@ -418,15 +419,15 @@ TEST_F(QuicPacketGeneratorTest, ConsumeData_BatchOperations) {
generator_.StartBatchOperations();
generator_.ConsumeData(1, MakeIOVector("foo"), 2, true, NULL);
- QuicConsumedData consumed = generator_.ConsumeData(3, MakeIOVector("quux"), 7,
- false, NULL);
+ QuicConsumedData consumed =
+ generator_.ConsumeData(3, MakeIOVector("quux"), 7, false, NULL);
EXPECT_EQ(4u, consumed.bytes_consumed);
EXPECT_FALSE(consumed.fin_consumed);
EXPECT_TRUE(generator_.HasQueuedFrames());
// Now both frames will be flushed out.
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet_), Return(true)));
generator_.FinishBatchOperations();
EXPECT_FALSE(generator_.HasQueuedFrames());
@@ -443,16 +444,16 @@ TEST_F(QuicPacketGeneratorTest, ConsumeDataFEC) {
{
InSequence dummy;
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet_), Return(true)));
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet2_), Return(true)));
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet3_), Return(true)));
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet4_), Return(true)));
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet5_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet2_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet3_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet4_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet5_), Return(true)));
}
// Send enough data to create 3 packets: two full and one partial.
@@ -479,12 +480,12 @@ TEST_F(QuicPacketGeneratorTest, ConsumeDataSendsFecAtEnd) {
{
InSequence dummy;
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet_), Return(true)));
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet2_), Return(true)));
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet3_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet2_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet3_), Return(true)));
}
// Send enough data to create 2 packets: one full and one partial.
@@ -511,23 +512,24 @@ TEST_F(QuicPacketGeneratorTest, ConsumeData_FramesPreviouslyQueued) {
NOT_IN_FEC_GROUP) +
// Add an extra 3 bytes for the payload and 1 byte so BytesFree is larger
// than the GetMinStreamFrameSize.
- QuicFramer::GetMinStreamFrameSize(framer_.version(), 1, 0, false,
- NOT_IN_FEC_GROUP) + 3 +
- QuicFramer::GetMinStreamFrameSize(framer_.version(), 1, 0, true,
- NOT_IN_FEC_GROUP) + 1;
+ QuicFramer::GetMinStreamFrameSize(
+ framer_.version(), 1, 0, false, NOT_IN_FEC_GROUP) +
+ 3 + QuicFramer::GetMinStreamFrameSize(
+ framer_.version(), 1, 0, true, NOT_IN_FEC_GROUP) +
+ 1;
delegate_.SetCanWriteAnything();
{
- InSequence dummy;
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet_), Return(true)));
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet2_), Return(true)));
+ InSequence dummy;
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet2_), Return(true)));
}
generator_.StartBatchOperations();
// Queue enough data to prevent a stream frame with a non-zero offset from
// fitting.
- QuicConsumedData consumed = generator_.ConsumeData(1, MakeIOVector("foo"), 0,
- false, NULL);
+ QuicConsumedData consumed =
+ generator_.ConsumeData(1, MakeIOVector("foo"), 0, false, NULL);
EXPECT_EQ(3u, consumed.bytes_consumed);
EXPECT_FALSE(consumed.fin_consumed);
EXPECT_TRUE(generator_.HasQueuedFrames());
@@ -560,16 +562,16 @@ TEST_F(QuicPacketGeneratorTest, NotWritableThenBatchOperations) {
// When the first write operation is invoked, the ack and feedback
// frames will be returned.
EXPECT_CALL(delegate_, CreateAckFrame()).WillOnce(Return(CreateAckFrame()));
- EXPECT_CALL(delegate_, CreateFeedbackFrame()).WillOnce(
- Return(CreateFeedbackFrame()));
+ EXPECT_CALL(delegate_, CreateFeedbackFrame())
+ .WillOnce(Return(CreateFeedbackFrame()));
// Send some data and a control frame
generator_.ConsumeData(3, MakeIOVector("quux"), 7, false, NULL);
generator_.AddControlFrame(QuicFrame(CreateGoAwayFrame()));
// All five frames will be flushed out in a single packet.
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet_), Return(true)));
generator_.FinishBatchOperations();
EXPECT_FALSE(generator_.HasQueuedFrames());
@@ -596,16 +598,16 @@ TEST_F(QuicPacketGeneratorTest, NotWritableThenBatchOperations2) {
// When the first write operation is invoked, the ack and feedback
// frames will be returned.
EXPECT_CALL(delegate_, CreateAckFrame()).WillOnce(Return(CreateAckFrame()));
- EXPECT_CALL(delegate_, CreateFeedbackFrame()).WillOnce(
- Return(CreateFeedbackFrame()));
+ EXPECT_CALL(delegate_, CreateFeedbackFrame())
+ .WillOnce(Return(CreateFeedbackFrame()));
{
InSequence dummy;
- // All five frames will be flushed out in a single packet
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet_), Return(true)));
- EXPECT_CALL(delegate_, OnSerializedPacket(_)).WillOnce(
- DoAll(SaveArg<0>(&packet2_), Return(true)));
+ // All five frames will be flushed out in a single packet
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet_), Return(true)));
+ EXPECT_CALL(delegate_, OnSerializedPacket(_))
+ .WillOnce(DoAll(SaveArg<0>(&packet2_), Return(true)));
}
// Send enough data to exceed one packet
« net/base/mime_util_unittest.cc ('K') | « net/quic/quic_packet_generator.cc ('k') | net/quic/quic_packet_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698