QUIC: support diversified keys with version 33.

net/quic/quic_packet_generator_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_packet_generator.h"
 
 #include <cstdint>
 #include <memory>
 #include <string>
 
@@ skipping 432 matching lines @@
   CheckPacketContains(contents, 0);
 }
 
 TEST_F(QuicPacketGeneratorTest, ConsumeData_FramesPreviouslyQueued) {
   // Set the packet size be enough for two stream frames with 0 stream offset,
   // but not enough for a stream frame of 0 offset and one with non-zero offset.
   size_t length =
       NullEncrypter().GetCiphertextSize(0) +
       GetPacketHeaderSize(
           creator_->connection_id_length(), kIncludeVersion, !kIncludePathId,
+          !kIncludeDiversificationNonce,
           QuicPacketCreatorPeer::NextPacketNumberLength(creator_)) +
       // Add an extra 3 bytes for the payload and 1 byte so BytesFree is larger
       // than the GetMinStreamFrameSize.
       QuicFramer::GetMinStreamFrameSize(1, 0, false) + 3 +
       QuicFramer::GetMinStreamFrameSize(1, 0, true) + 1;
   generator_.SetMaxPacketLength(length);
   delegate_.SetCanWriteAnything();
   {
     InSequence dummy;
     EXPECT_CALL(delegate_, OnSerializedPacket(_))
@@ skipping 105 matching lines @@
   // The second should have the remainder of the stream data.
   PacketContents contents2;
   contents2.num_goaway_frames = 1;
   contents2.num_stream_frames = 1;
   CheckPacketContains(contents2, 1);
 }
 
 TEST_F(QuicPacketGeneratorTest, TestConnectionIdLength) {
   generator_.SetConnectionIdLength(0);
   EXPECT_EQ(PACKET_0BYTE_CONNECTION_ID, creator_->connection_id_length());
-  generator_.SetConnectionIdLength(1);
-  EXPECT_EQ(PACKET_1BYTE_CONNECTION_ID, creator_->connection_id_length());
-  generator_.SetConnectionIdLength(2);
-  EXPECT_EQ(PACKET_4BYTE_CONNECTION_ID, creator_->connection_id_length());
-  generator_.SetConnectionIdLength(3);
-  EXPECT_EQ(PACKET_4BYTE_CONNECTION_ID, creator_->connection_id_length());
-  generator_.SetConnectionIdLength(4);
-  EXPECT_EQ(PACKET_4BYTE_CONNECTION_ID, creator_->connection_id_length());
-  generator_.SetConnectionIdLength(5);
-  EXPECT_EQ(PACKET_8BYTE_CONNECTION_ID, creator_->connection_id_length());
-  generator_.SetConnectionIdLength(6);
-  EXPECT_EQ(PACKET_8BYTE_CONNECTION_ID, creator_->connection_id_length());
-  generator_.SetConnectionIdLength(7);
-  EXPECT_EQ(PACKET_8BYTE_CONNECTION_ID, creator_->connection_id_length());
-  generator_.SetConnectionIdLength(8);
-  EXPECT_EQ(PACKET_8BYTE_CONNECTION_ID, creator_->connection_id_length());
-  generator_.SetConnectionIdLength(9);
-  EXPECT_EQ(PACKET_8BYTE_CONNECTION_ID, creator_->connection_id_length());
+
+  for (size_t i = 1; i < 10; i++) {
+    generator_.SetConnectionIdLength(i);
+    EXPECT_EQ(PACKET_8BYTE_CONNECTION_ID, creator_->connection_id_length());
+  }
 }
 
 // Test whether SetMaxPacketLength() works in the situation when the queue is
 // empty, and we send three packets worth of data.
 TEST_F(QuicPacketGeneratorTest, SetMaxPacketLength_Initial) {
   delegate_.SetCanWriteAnything();
 
   // Send enough data for three packets.
   size_t data_len = 3 * kDefaultMaxPacketSize + 1;
   size_t packet_len = kDefaultMaxPacketSize + 100;
@@ skipping 259 matching lines @@
   EXPECT_CALL(delegate_, OnSerializedPacket(_))
       .WillOnce(Invoke(this, &QuicPacketGeneratorTest::SavePacket));
   generator_.FlushAllQueuedFrames();
   EXPECT_FALSE(generator_.HasQueuedFrames());
   generator_.SetCurrentPath(kTestPathId1, 1, 0);
   EXPECT_EQ(kTestPathId1, QuicPacketCreatorPeer::GetCurrentPath(creator_));
 }
 
 }  // namespace test
 }  // namespace net