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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_packet_creator_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_creator.cc ('k') | net/quic/quic_packet_generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_packet_creator_test.cc
diff --git a/net/quic/quic_packet_creator_test.cc b/net/quic/quic_packet_creator_test.cc
index 6d0ea5c8a0f7676880f07af59c12d7ea78cd3917..bc2d819af7f488a2daba8ac1de6e54f08841e487 100644
--- a/net/quic/quic_packet_creator_test.cc
+++ b/net/quic/quic_packet_creator_test.cc
@@ -31,11 +31,8 @@ namespace {
// Run tests with combinations of {QuicVersion, ToggleVersionSerialization}.
struct TestParams {
- TestParams(QuicVersion version,
- bool version_serialization)
- : version(version),
- version_serialization(version_serialization) {
- }
+ TestParams(QuicVersion version, bool version_serialization)
+ : version(version), version_serialization(version_serialization) {}
friend ostream& operator<<(ostream& os, const TestParams& p) {
os << "{ client_version: " << QuicVersionToString(p.version)
@@ -61,9 +58,11 @@ vector<TestParams> GetTestParams() {
class QuicPacketCreatorTest : public ::testing::TestWithParam<TestParams> {
protected:
QuicPacketCreatorTest()
- : server_framer_(SupportedVersions(GetParam().version), QuicTime::Zero(),
+ : server_framer_(SupportedVersions(GetParam().version),
+ QuicTime::Zero(),
true),
- client_framer_(SupportedVersions(GetParam().version), QuicTime::Zero(),
+ client_framer_(SupportedVersions(GetParam().version),
+ QuicTime::Zero(),
false),
sequence_number_(0),
connection_id_(2),
@@ -72,13 +71,11 @@ class QuicPacketCreatorTest : public ::testing::TestWithParam<TestParams> {
client_framer_.set_visitor(&framer_visitor_);
server_framer_.set_visitor(&framer_visitor_);
}
- ~QuicPacketCreatorTest() {
- }
+ ~QuicPacketCreatorTest() {}
void ProcessPacket(QuicPacket* packet) {
- scoped_ptr<QuicEncryptedPacket> encrypted(
- server_framer_.EncryptPacket(ENCRYPTION_NONE, sequence_number_,
- *packet));
+ scoped_ptr<QuicEncryptedPacket> encrypted(server_framer_.EncryptPacket(
+ ENCRYPTION_NONE, sequence_number_, *packet));
server_framer_.ProcessPacket(*encrypted);
}
@@ -109,8 +106,8 @@ class QuicPacketCreatorTest : public ::testing::TestWithParam<TestParams> {
// of maximum length.
size_t GetEncryptionOverhead() {
return creator_.options()->max_packet_length -
- client_framer_.GetMaxPlaintextSize(
- creator_.options()->max_packet_length);
+ client_framer_.GetMaxPlaintextSize(
+ creator_.options()->max_packet_length);
}
// Returns the number of bytes consumed by the non-data fields of a stream
@@ -140,7 +137,6 @@ INSTANTIATE_TEST_CASE_P(QuicPacketCreatorTests,
QuicPacketCreatorTest,
::testing::ValuesIn(GetTestParams()));
-
TEST_P(QuicPacketCreatorTest, SerializeFrames) {
frames_.push_back(QuicFrame(new QuicAckFrame(MakeAckFrame(0u, 0u))));
frames_.push_back(QuicFrame(new QuicStreamFrame(0u, false, 0u, IOVector())));
@@ -393,8 +389,8 @@ TEST_P(QuicPacketCreatorTest, SerializeConnectionClose) {
TEST_P(QuicPacketCreatorTest, CreateStreamFrame) {
QuicFrame frame;
- size_t consumed = creator_.CreateStreamFrame(1u, MakeIOVector("test"), 0u,
- false, &frame);
+ size_t consumed =
+ creator_.CreateStreamFrame(1u, MakeIOVector("test"), 0u, false, &frame);
EXPECT_EQ(4u, consumed);
CheckStreamFrame(frame, 1u, "test", 0u, false);
delete frame.stream_frame;
@@ -402,8 +398,8 @@ TEST_P(QuicPacketCreatorTest, CreateStreamFrame) {
TEST_P(QuicPacketCreatorTest, CreateStreamFrameFin) {
QuicFrame frame;
- size_t consumed = creator_.CreateStreamFrame(1u, MakeIOVector("test"), 10u,
- true, &frame);
+ size_t consumed =
+ creator_.CreateStreamFrame(1u, MakeIOVector("test"), 10u, true, &frame);
EXPECT_EQ(4u, consumed);
CheckStreamFrame(frame, 1u, "test", 10u, true);
delete frame.stream_frame;
@@ -411,20 +407,20 @@ TEST_P(QuicPacketCreatorTest, CreateStreamFrameFin) {
TEST_P(QuicPacketCreatorTest, CreateStreamFrameFinOnly) {
QuicFrame frame;
- size_t consumed = creator_.CreateStreamFrame(1u, IOVector(), 0u, true,
- &frame);
+ size_t consumed =
+ creator_.CreateStreamFrame(1u, IOVector(), 0u, true, &frame);
EXPECT_EQ(0u, consumed);
CheckStreamFrame(frame, 1u, string(), 0u, true);
delete frame.stream_frame;
}
TEST_P(QuicPacketCreatorTest, CreateAllFreeBytesForStreamFrames) {
- const size_t overhead = GetPacketHeaderOverhead(NOT_IN_FEC_GROUP)
- + GetEncryptionOverhead();
+ const size_t overhead =
+ GetPacketHeaderOverhead(NOT_IN_FEC_GROUP) + GetEncryptionOverhead();
for (size_t i = overhead; i < overhead + 100; ++i) {
creator_.options()->max_packet_length = i;
- const bool should_have_room = i > overhead + GetStreamFrameOverhead(
- NOT_IN_FEC_GROUP);
+ const bool should_have_room =
+ i > overhead + GetStreamFrameOverhead(NOT_IN_FEC_GROUP);
ASSERT_EQ(should_have_room,
creator_.HasRoomForStreamFrame(kStreamId, kOffset));
if (should_have_room) {
@@ -443,8 +439,9 @@ TEST_P(QuicPacketCreatorTest, CreateAllFreeBytesForStreamFrames) {
TEST_P(QuicPacketCreatorTest, StreamFrameConsumption) {
// Compute the total overhead for a single frame in packet.
- const size_t overhead = GetPacketHeaderOverhead(NOT_IN_FEC_GROUP)
- + GetEncryptionOverhead() + GetStreamFrameOverhead(NOT_IN_FEC_GROUP);
+ const size_t overhead = GetPacketHeaderOverhead(NOT_IN_FEC_GROUP) +
+ GetEncryptionOverhead() +
+ GetStreamFrameOverhead(NOT_IN_FEC_GROUP);
size_t capacity = kDefaultMaxPacketSize - overhead;
// Now, test various sizes around this size.
for (int delta = -5; delta <= 5; ++delta) {
@@ -472,8 +469,9 @@ TEST_P(QuicPacketCreatorTest, StreamFrameConsumptionWithFec) {
// Turn on FEC protection.
creator_.options()->max_packets_per_fec_group = 6;
// Compute the total overhead for a single frame in packet.
- const size_t overhead = GetPacketHeaderOverhead(IN_FEC_GROUP)
- + GetEncryptionOverhead() + GetStreamFrameOverhead(IN_FEC_GROUP);
+ const size_t overhead = GetPacketHeaderOverhead(IN_FEC_GROUP) +
+ GetEncryptionOverhead() +
+ GetStreamFrameOverhead(IN_FEC_GROUP);
size_t capacity = kDefaultMaxPacketSize - overhead;
// Now, test various sizes around this size.
for (int delta = -5; delta <= 5; ++delta) {
@@ -500,8 +498,9 @@ TEST_P(QuicPacketCreatorTest, StreamFrameConsumptionWithFec) {
TEST_P(QuicPacketCreatorTest, CryptoStreamFramePacketPadding) {
// Compute the total overhead for a single frame in packet.
- const size_t overhead = GetPacketHeaderOverhead(NOT_IN_FEC_GROUP)
- + GetEncryptionOverhead() + GetStreamFrameOverhead(NOT_IN_FEC_GROUP);
+ const size_t overhead = GetPacketHeaderOverhead(NOT_IN_FEC_GROUP) +
+ GetEncryptionOverhead() +
+ GetStreamFrameOverhead(NOT_IN_FEC_GROUP);
ASSERT_GT(kMaxPacketSize, overhead);
size_t capacity = kDefaultMaxPacketSize - overhead;
// Now, test various sizes around this size.
@@ -520,8 +519,9 @@ TEST_P(QuicPacketCreatorTest, CryptoStreamFramePacketPadding) {
// (1 byte) and to expand the stream frame (another 2 bytes) the packet
// will not be padded.
if (bytes_free < 3) {
- EXPECT_EQ(client_framer_.GetMaxPlaintextSize(kDefaultMaxPacketSize)
- - bytes_free, serialized_packet.packet->length());
+ EXPECT_EQ(client_framer_.GetMaxPlaintextSize(kDefaultMaxPacketSize) -
+ bytes_free,
+ serialized_packet.packet->length());
} else {
EXPECT_EQ(client_framer_.GetMaxPlaintextSize(kDefaultMaxPacketSize),
serialized_packet.packet->length());
@@ -533,8 +533,9 @@ TEST_P(QuicPacketCreatorTest, CryptoStreamFramePacketPadding) {
TEST_P(QuicPacketCreatorTest, NonCryptoStreamFramePacketNonPadding) {
// Compute the total overhead for a single frame in packet.
- const size_t overhead = GetPacketHeaderOverhead(NOT_IN_FEC_GROUP)
- + GetEncryptionOverhead() + GetStreamFrameOverhead(NOT_IN_FEC_GROUP);
+ const size_t overhead = GetPacketHeaderOverhead(NOT_IN_FEC_GROUP) +
+ GetEncryptionOverhead() +
+ GetStreamFrameOverhead(NOT_IN_FEC_GROUP);
ASSERT_GT(kDefaultMaxPacketSize, overhead);
size_t capacity = kDefaultMaxPacketSize - overhead;
// Now, test various sizes around this size.
@@ -550,8 +551,9 @@ TEST_P(QuicPacketCreatorTest, NonCryptoStreamFramePacketNonPadding) {
SerializedPacket serialized_packet = creator_.SerializePacket();
ASSERT_TRUE(serialized_packet.packet);
if (bytes_free > 0) {
- EXPECT_EQ(client_framer_.GetMaxPlaintextSize(kDefaultMaxPacketSize)
- - bytes_free, serialized_packet.packet->length());
+ EXPECT_EQ(client_framer_.GetMaxPlaintextSize(kDefaultMaxPacketSize) -
+ bytes_free,
+ serialized_packet.packet->length());
} else {
EXPECT_EQ(client_framer_.GetMaxPlaintextSize(kDefaultMaxPacketSize),
serialized_packet.packet->length());
@@ -655,8 +657,8 @@ TEST_P(QuicPacketCreatorTest, SerializeFrame) {
EXPECT_CALL(framer_visitor_, OnUnauthenticatedPublicHeader(_));
EXPECT_CALL(framer_visitor_, OnUnauthenticatedHeader(_));
EXPECT_CALL(framer_visitor_, OnDecryptedPacket(_));
- EXPECT_CALL(framer_visitor_, OnPacketHeader(_)).WillOnce(
- DoAll(SaveArg<0>(&header), Return(true)));
+ EXPECT_CALL(framer_visitor_, OnPacketHeader(_))
+ .WillOnce(DoAll(SaveArg<0>(&header), Return(true)));
EXPECT_CALL(framer_visitor_, OnStreamFrame(_));
EXPECT_CALL(framer_visitor_, OnPacketComplete());
}
@@ -675,7 +677,9 @@ TEST_P(QuicPacketCreatorTest, CreateStreamFrameTooLarge) {
creator_.options()->max_packet_length = GetPacketLengthForOneStream(
client_framer_.version(),
QuicPacketCreatorPeer::SendVersionInPacket(&creator_),
- PACKET_1BYTE_SEQUENCE_NUMBER, NOT_IN_FEC_GROUP, &payload_length);
+ PACKET_1BYTE_SEQUENCE_NUMBER,
+ NOT_IN_FEC_GROUP,
+ &payload_length);
QuicFrame frame;
const string too_long_payload(payload_length * 2, 'a');
size_t consumed = creator_.CreateStreamFrame(
@@ -694,10 +698,11 @@ TEST_P(QuicPacketCreatorTest, AddFrameAndSerialize) {
client_framer_.GetMaxPlaintextSize(creator_.options()->max_packet_length);
EXPECT_FALSE(creator_.HasPendingFrames());
EXPECT_EQ(max_plaintext_size -
- GetPacketHeaderSize(
- creator_.options()->send_connection_id_length,
- QuicPacketCreatorPeer::SendVersionInPacket(&creator_),
- PACKET_1BYTE_SEQUENCE_NUMBER, NOT_IN_FEC_GROUP),
+ GetPacketHeaderSize(
+ creator_.options()->send_connection_id_length,
+ QuicPacketCreatorPeer::SendVersionInPacket(&creator_),
+ PACKET_1BYTE_SEQUENCE_NUMBER,
+ NOT_IN_FEC_GROUP),
creator_.BytesFree());
// Add a variety of frame types and then a padding frame.
@@ -711,8 +716,8 @@ TEST_P(QuicPacketCreatorTest, AddFrameAndSerialize) {
EXPECT_TRUE(creator_.HasPendingFrames());
QuicFrame frame;
- size_t consumed = creator_.CreateStreamFrame(
- 1u, MakeIOVector("test"), 0u, false, &frame);
+ size_t consumed =
+ creator_.CreateStreamFrame(1u, MakeIOVector("test"), 0u, false, &frame);
EXPECT_EQ(4u, consumed);
ASSERT_TRUE(frame.stream_frame);
EXPECT_TRUE(creator_.AddSavedFrame(frame));
@@ -738,11 +743,11 @@ TEST_P(QuicPacketCreatorTest, AddFrameAndSerialize) {
EXPECT_FALSE(creator_.HasPendingFrames());
EXPECT_EQ(max_plaintext_size -
- GetPacketHeaderSize(
- creator_.options()->send_connection_id_length,
- QuicPacketCreatorPeer::SendVersionInPacket(&creator_),
- PACKET_1BYTE_SEQUENCE_NUMBER,
- NOT_IN_FEC_GROUP),
+ GetPacketHeaderSize(
+ creator_.options()->send_connection_id_length,
+ QuicPacketCreatorPeer::SendVersionInPacket(&creator_),
+ PACKET_1BYTE_SEQUENCE_NUMBER,
+ NOT_IN_FEC_GROUP),
creator_.BytesFree());
}
@@ -756,8 +761,8 @@ TEST_P(QuicPacketCreatorTest, EntropyFlag) {
bool expected_rand_bool =
(mock_random_.RandUint64() & (GG_UINT64_C(1) << j)) != 0;
bool observed_rand_bool =
- (serialized.entropy_hash & (1 << ((j+1) % 8))) != 0;
- uint8 rest_of_hash = serialized.entropy_hash & ~(1 << ((j+1) % 8));
+ (serialized.entropy_hash & (1 << ((j + 1) % 8))) != 0;
+ uint8 rest_of_hash = serialized.entropy_hash & ~(1 << ((j + 1) % 8));
EXPECT_EQ(expected_rand_bool, observed_rand_bool);
EXPECT_EQ(0, rest_of_hash);
delete serialized.packet;
« net/base/mime_util_unittest.cc ('K') | « net/quic/quic_packet_creator.cc ('k') | net/quic/quic_packet_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698