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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/core/quic_packet_creator_test.cc

Issue 2325803002: Deprecate FLAGS_quic_never_write_unencrypted_data now that the unit tests all pass. (Closed)
Patch Set: Created 4 years, 3 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/core/quic_packet_creator.cc ('k') | net/quic/core/quic_packet_generator_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_packet_creator_test.cc
diff --git a/net/quic/core/quic_packet_creator_test.cc b/net/quic/core/quic_packet_creator_test.cc
index bf099f61d86a30d2bd93d53238486bce9b75779c..01bd50e5f96edf426134259813c5c9f8b1f55ec8 100644
--- a/net/quic/core/quic_packet_creator_test.cc
+++ b/net/quic/core/quic_packet_creator_test.cc
@@ -138,8 +138,6 @@ class QuicPacketCreatorTest : public ::testing::TestWithParam<TestParams> {
client_framer_.set_visitor(&framer_visitor_);
client_framer_.set_received_entropy_calculator(&entropy_calculator_);
server_framer_.set_visitor(&framer_visitor_);
- // TODO(ianswett): Fix this test so it uses a non-null encrypter.
- FLAGS_quic_never_write_unencrypted_data = false;
}
~QuicPacketCreatorTest() override {
@@ -252,10 +250,10 @@ TEST_P(QuicPacketCreatorTest, SerializeFrames) {
EncryptionLevel level = static_cast<EncryptionLevel>(i);
creator_.set_encryption_level(level);
frames_.push_back(QuicFrame(new QuicAckFrame(MakeAckFrame(0u))));
- frames_.push_back(
- QuicFrame(new QuicStreamFrame(0u, false, 0u, StringPiece())));
- frames_.push_back(
- QuicFrame(new QuicStreamFrame(0u, true, 0u, StringPiece())));
+ frames_.push_back(QuicFrame(
+ new QuicStreamFrame(kCryptoStreamId, false, 0u, StringPiece())));
+ frames_.push_back(QuicFrame(
+ new QuicStreamFrame(kCryptoStreamId, true, 0u, StringPiece())));
SerializedPacket serialized = SerializeAllFrames(frames_);
EXPECT_EQ(level, serialized.encryption_level);
delete frames_[0].ack_frame;
@@ -641,8 +639,8 @@ TEST_P(QuicPacketCreatorTest, SerializeConnectionClose) {
TEST_P(QuicPacketCreatorTest, ConsumeData) {
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("test"));
- ASSERT_TRUE(
- creator_.ConsumeData(1u, io_vector, 0u, 0u, false, false, &frame));
+ ASSERT_TRUE(creator_.ConsumeData(kCryptoStreamId, io_vector, 0u, 0u, false,
+ false, &frame));
ASSERT_TRUE(frame.stream_frame);
size_t consumed = frame.stream_frame->data_length;
EXPECT_EQ(4u, consumed);
@@ -653,8 +651,8 @@ TEST_P(QuicPacketCreatorTest, ConsumeData) {
TEST_P(QuicPacketCreatorTest, ConsumeDataFin) {
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("test"));
- ASSERT_TRUE(
- creator_.ConsumeData(1u, io_vector, 0u, 10u, true, false, &frame));
+ ASSERT_TRUE(creator_.ConsumeData(kCryptoStreamId, io_vector, 0u, 10u, true,
+ false, &frame));
ASSERT_TRUE(frame.stream_frame);
size_t consumed = frame.stream_frame->data_length;
EXPECT_EQ(4u, consumed);
@@ -665,7 +663,8 @@ TEST_P(QuicPacketCreatorTest, ConsumeDataFin) {
TEST_P(QuicPacketCreatorTest, ConsumeDataFinOnly) {
QuicFrame frame;
QuicIOVector io_vector(nullptr, 0, 0);
- ASSERT_TRUE(creator_.ConsumeData(1u, io_vector, 0u, 0u, true, false, &frame));
+ ASSERT_TRUE(creator_.ConsumeData(kCryptoStreamId, io_vector, 0u, 0u, true,
+ false, &frame));
ASSERT_TRUE(frame.stream_frame);
size_t consumed = frame.stream_frame->data_length;
EXPECT_EQ(0u, consumed);
@@ -674,6 +673,7 @@ TEST_P(QuicPacketCreatorTest, ConsumeDataFinOnly) {
}
TEST_P(QuicPacketCreatorTest, CreateAllFreeBytesForStreamFrames) {
+ creator_.set_encryption_level(ENCRYPTION_FORWARD_SECURE);
const size_t overhead = GetPacketHeaderOverhead(client_framer_.version()) +
GetEncryptionOverhead();
for (size_t i = overhead; i < overhead + 100; ++i) {
@@ -698,6 +698,7 @@ TEST_P(QuicPacketCreatorTest, CreateAllFreeBytesForStreamFrames) {
}
TEST_P(QuicPacketCreatorTest, StreamFrameConsumption) {
+ creator_.set_encryption_level(ENCRYPTION_FORWARD_SECURE);
// Compute the total overhead for a single frame in packet.
const size_t overhead = GetPacketHeaderOverhead(client_framer_.version()) +
GetEncryptionOverhead() + GetStreamFrameOverhead();
@@ -762,6 +763,7 @@ TEST_P(QuicPacketCreatorTest, CryptoStreamFramePacketPadding) {
}
TEST_P(QuicPacketCreatorTest, NonCryptoStreamFramePacketNonPadding) {
+ creator_.set_encryption_level(ENCRYPTION_FORWARD_SECURE);
// Compute the total overhead for a single frame in packet.
const size_t overhead = GetPacketHeaderOverhead(client_framer_.version()) +
GetEncryptionOverhead() + GetStreamFrameOverhead();
@@ -916,8 +918,8 @@ TEST_P(QuicPacketCreatorTest, SerializeFrame) {
if (!GetParam().version_serialization) {
creator_.StopSendingVersion();
}
- frames_.push_back(
- QuicFrame(new QuicStreamFrame(0u, false, 0u, StringPiece())));
+ frames_.push_back(QuicFrame(
+ new QuicStreamFrame(kCryptoStreamId, false, 0u, StringPiece())));
SerializedPacket serialized = SerializeAllFrames(frames_);
delete frames_[0].stream_frame;
@@ -955,7 +957,8 @@ TEST_P(QuicPacketCreatorTest, ConsumeDataLargerThanOneStreamFrame) {
QuicIOVector io_vector(MakeIOVector(too_long_payload));
EXPECT_CALL(delegate_, OnSerializedPacket(_))
.WillOnce(Invoke(this, &QuicPacketCreatorTest::SaveSerializedPacket));
- ASSERT_TRUE(creator_.ConsumeData(1u, io_vector, 0u, 0u, true, false, &frame));
+ ASSERT_TRUE(creator_.ConsumeData(kCryptoStreamId, io_vector, 0u, 0u, true,
+ false, &frame));
ASSERT_TRUE(frame.stream_frame);
size_t consumed = frame.stream_frame->data_length;
EXPECT_EQ(payload_length, consumed);
@@ -987,8 +990,8 @@ TEST_P(QuicPacketCreatorTest, AddFrameAndFlush) {
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("test"));
- ASSERT_TRUE(
- creator_.ConsumeData(1u, io_vector, 0u, 0u, false, false, &frame));
+ ASSERT_TRUE(creator_.ConsumeData(kCryptoStreamId, io_vector, 0u, 0u, false,
+ false, &frame));
ASSERT_TRUE(frame.stream_frame);
size_t consumed = frame.stream_frame->data_length;
EXPECT_EQ(4u, consumed);
@@ -1050,6 +1053,7 @@ TEST_P(QuicPacketCreatorTest, SerializeAndSendStreamFrame) {
}
TEST_P(QuicPacketCreatorTest, SerializeTruncatedAckFrameWithLargePacketSize) {
+ creator_.set_encryption_level(ENCRYPTION_FORWARD_SECURE);
if (!GetParam().version_serialization) {
creator_.StopSendingVersion();
}
@@ -1137,8 +1141,8 @@ TEST_P(QuicPacketCreatorTest, SerializeTruncatedAckFrameWithSmallPacketSize) {
}
TEST_P(QuicPacketCreatorTest, EntropyFlag) {
- frames_.push_back(
- QuicFrame(new QuicStreamFrame(0u, false, 0u, StringPiece())));
+ frames_.push_back(QuicFrame(
+ new QuicStreamFrame(kCryptoStreamId, false, 0u, StringPiece())));
for (int i = 0; i < 2; ++i) {
for (int j = 0; j < 64; ++j) {
@@ -1168,8 +1172,8 @@ TEST_P(QuicPacketCreatorTest, SetCurrentPath) {
// Add a stream frame to the creator.
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("test"));
- ASSERT_TRUE(
- creator_.ConsumeData(1u, io_vector, 0u, 0u, false, false, &frame));
+ ASSERT_TRUE(creator_.ConsumeData(kCryptoStreamId, io_vector, 0u, 0u, false,
+ false, &frame));
ASSERT_TRUE(frame.stream_frame);
size_t consumed = frame.stream_frame->data_length;
EXPECT_EQ(4u, consumed);
@@ -1200,8 +1204,8 @@ TEST_P(QuicPacketCreatorTest, SetCurrentPath) {
EXPECT_EQ(PACKET_1BYTE_PACKET_NUMBER,
QuicPacketCreatorPeer::GetPacketNumberLength(&creator_));
// Add a stream frame to the creator.
- ASSERT_TRUE(
- creator_.ConsumeData(1u, io_vector, 0u, 0u, false, false, &frame));
+ ASSERT_TRUE(creator_.ConsumeData(kCryptoStreamId, io_vector, 0u, 0u, false,
+ false, &frame));
ASSERT_TRUE(frame.stream_frame);
consumed = frame.stream_frame->data_length;
EXPECT_EQ(4u, consumed);
@@ -1229,8 +1233,8 @@ TEST_P(QuicPacketCreatorTest,
// Add a stream frame to the creator and send the packet.
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("test"));
- ASSERT_TRUE(
- creator_.ConsumeData(1u, io_vector, 0u, 0u, false, false, &frame));
+ ASSERT_TRUE(creator_.ConsumeData(kCryptoStreamId, io_vector, 0u, 0u, false,
+ false, &frame));
EXPECT_CALL(delegate_, OnSerializedPacket(_))
.Times(1)
.WillRepeatedly(
@@ -1262,8 +1266,8 @@ TEST_P(QuicPacketCreatorTest, SerializePacketOnDifferentPath) {
// Add a stream frame to the creator and flush the packet.
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("test"));
- ASSERT_TRUE(
- creator_.ConsumeData(1u, io_vector, 0u, 0u, false, false, &frame));
+ ASSERT_TRUE(creator_.ConsumeData(kCryptoStreamId, io_vector, 0u, 0u, false,
+ false, &frame));
ASSERT_TRUE(frame.stream_frame);
size_t consumed = frame.stream_frame->data_length;
EXPECT_EQ(4u, consumed);
@@ -1289,8 +1293,8 @@ TEST_P(QuicPacketCreatorTest, SerializePacketOnDifferentPath) {
QuicPacketCreatorPeer::GetPacketNumberLength(&creator_));
// Add a stream frame to the creator and flush the packet.
- ASSERT_TRUE(
- creator_.ConsumeData(1u, io_vector, 0u, 0u, false, false, &frame));
+ ASSERT_TRUE(creator_.ConsumeData(kCryptoStreamId, io_vector, 0u, 0u, false,
+ false, &frame));
ASSERT_TRUE(frame.stream_frame);
consumed = frame.stream_frame->data_length;
EXPECT_EQ(4u, consumed);
@@ -1302,7 +1306,7 @@ TEST_P(QuicPacketCreatorTest, SerializePacketOnDifferentPath) {
}
TEST_P(QuicPacketCreatorTest, AddUnencryptedStreamDataClosesConnection) {
- FLAGS_quic_never_write_unencrypted_data = true;
+ creator_.set_encryption_level(ENCRYPTION_NONE);
EXPECT_CALL(delegate_, OnUnrecoverableError(_, _, _));
QuicStreamFrame stream_frame(kHeadersStreamId, /*fin=*/false, 0u,
StringPiece());
@@ -1324,9 +1328,9 @@ TEST_P(QuicPacketCreatorTest, ChloTooLarge) {
QuicFrame frame;
EXPECT_CALL(delegate_,
OnUnrecoverableError(QUIC_CRYPTO_CHLO_TOO_LARGE, _, _));
- EXPECT_QUIC_BUG(
- creator_.ConsumeData(1u, data_iovec, 0u, 0u, false, false, &frame),
- "Client hello won't fit in a single packet.");
+ EXPECT_QUIC_BUG(creator_.ConsumeData(kCryptoStreamId, data_iovec, 0u, 0u,
+ false, false, &frame),
+ "Client hello won't fit in a single packet.");
}
} // namespace
« no previous file with comments | « net/quic/core/quic_packet_creator.cc ('k') | net/quic/core/quic_packet_generator_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698