Land Recent QUIC Changes.

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 <string>
 
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/null_encrypter.h"
@@ skipping 935 matching lines @@
   contents.num_stream_frames = 1;
   CheckPacketContains(contents, packet_);
 
   // The second should have the remainder of the stream data.
   PacketContents contents2;
   contents2.num_goaway_frames = 1;
   contents2.num_stream_frames = 1;
   CheckPacketContains(contents2, packet2_);
 }
 
+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());
+}
+
 }  // namespace test
 }  // namespace net