Landing Recent QUIC changes until Fri Nov 18 23:21:04 2016 +0000

net/quic/core/frames/quic_frame_test.cc

Index: net/quic/core/frames/quic_frame_test.cc
diff --git a/net/quic/core/quic_protocol_test.cc b/net/quic/core/frames/quic_frame_test.cc
similarity index 81%
rename from net/quic/core/quic_protocol_test.cc
rename to net/quic/core/frames/quic_frame_test.cc
index d9bacf5d2ecba6a799c72a751dee08789e240112..3225d0e734b3e8f892473fb4b9496783d9167072 100644
--- a/net/quic/core/quic_protocol_test.cc
+++ b/net/quic/core/frames/quic_frame_test.cc
@@ -1,53 +1,19 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2016 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/core/quic_protocol.h"
+#include "net/quic/core/frames/quic_frame.h"
 
-#include <sstream>
-
-#include "base/stl_util.h"
-#include "net/quic/core/quic_flags.h"
-#include "net/quic/core/quic_utils.h"
-#include "net/quic/test_tools/quic_test_utils.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace test {
 namespace {
 
-TEST(QuicProtocolTest, MakeQuicTag) {
-  QuicTag tag = MakeQuicTag('A', 'B', 'C', 'D');
-  char bytes[4];
-  memcpy(bytes, &tag, 4);
-  EXPECT_EQ('A', bytes[0]);
-  EXPECT_EQ('B', bytes[1]);
-  EXPECT_EQ('C', bytes[2]);
-  EXPECT_EQ('D', bytes[3]);
-}
-
-TEST(QuicProtocolTest, IsAwaitingPacket) {
-  QuicAckFrame ack_frame1;
-  ack_frame1.largest_observed = 10u;
-  ack_frame1.packets.Add(1, 11);
-  EXPECT_TRUE(IsAwaitingPacket(ack_frame1, 11u, 0u));
-  EXPECT_FALSE(IsAwaitingPacket(ack_frame1, 1u, 0u));
-
-  ack_frame1.packets.Remove(10);
-  EXPECT_TRUE(IsAwaitingPacket(ack_frame1, 10u, 0u));
-
-  QuicAckFrame ack_frame2;
-  ack_frame2.largest_observed = 100u;
-  ack_frame2.packets.Add(21, 100);
-  EXPECT_FALSE(IsAwaitingPacket(ack_frame2, 11u, 20u));
-  EXPECT_FALSE(IsAwaitingPacket(ack_frame2, 80u, 20u));
-  EXPECT_TRUE(IsAwaitingPacket(ack_frame2, 101u, 20u));
-
-  ack_frame2.packets.Remove(50);
-  EXPECT_TRUE(IsAwaitingPacket(ack_frame2, 50u, 20u));
-}
+using testing::_;
 
-TEST(QuicProtocolTest, AckFrameToString) {
+TEST(QuicFramesTest, AckFrameToString) {
   QuicAckFrame frame;
   frame.largest_observed = 2;
   frame.ack_delay_time = QuicTime::Delta::FromMicroseconds(3);
@@ -63,7 +29,7 @@ TEST(QuicProtocolTest, AckFrameToString) {
       stream.str());
 }
 
-TEST(QuicProtocolTest, PaddingFrameToString) {
+TEST(QuicFramesTest, PaddingFrameToString) {
   QuicPaddingFrame frame;
   frame.num_padding_bytes = 1;
   std::ostringstream stream;
@@ -71,7 +37,7 @@ TEST(QuicProtocolTest, PaddingFrameToString) {
   EXPECT_EQ("{ num_padding_bytes: 1 }\n", stream.str());
 }
 
-TEST(QuicProtocolTest, RstStreamFrameToString) {
+TEST(QuicFramesTest, RstStreamFrameToString) {
   QuicRstStreamFrame frame;
   frame.stream_id = 1;
   frame.error_code = QUIC_STREAM_CANCELLED;
@@ -80,7 +46,7 @@ TEST(QuicProtocolTest, RstStreamFrameToString) {
   EXPECT_EQ("{ stream_id: 1, error_code: 6 }\n", stream.str());
 }
 
-TEST(QuicProtocolTest, ConnectionCloseFrameToString) {
+TEST(QuicFramesTest, ConnectionCloseFrameToString) {
   QuicConnectionCloseFrame frame;
   frame.error_code = QUIC_NETWORK_IDLE_TIMEOUT;
   frame.error_details = "No recent network activity.";
@@ -91,7 +57,7 @@ TEST(QuicProtocolTest, ConnectionCloseFrameToString) {
       stream.str());
 }
 
-TEST(QuicProtocolTest, GoAwayFrameToString) {
+TEST(QuicFramesTest, GoAwayFrameToString) {
   QuicGoAwayFrame frame;
   frame.error_code = QUIC_NETWORK_IDLE_TIMEOUT;
   frame.last_good_stream_id = 2;
@@ -103,7 +69,7 @@ TEST(QuicProtocolTest, GoAwayFrameToString) {
       stream.str());
 }
 
-TEST(QuicProtocolTest, WindowUpdateFrameToString) {
+TEST(QuicFramesTest, WindowUpdateFrameToString) {
   QuicWindowUpdateFrame frame;
   std::ostringstream stream;
   frame.stream_id = 1;
@@ -112,7 +78,7 @@ TEST(QuicProtocolTest, WindowUpdateFrameToString) {
   EXPECT_EQ("{ stream_id: 1, byte_offset: 2 }\n", stream.str());
 }
 
-TEST(QuicProtocolTest, BlockedFrameToString) {
+TEST(QuicFramesTest, BlockedFrameToString) {
   QuicBlockedFrame frame;
   frame.stream_id = 1;
   std::ostringstream stream;
@@ -120,7 +86,7 @@ TEST(QuicProtocolTest, BlockedFrameToString) {
   EXPECT_EQ("{ stream_id: 1 }\n", stream.str());
 }
 
-TEST(QuicProtocolTest, StreamFrameToString) {
+TEST(QuicFramesTest, StreamFrameToString) {
   QuicStreamFrame frame;
   frame.stream_id = 1;
   frame.fin = false;
@@ -131,7 +97,7 @@ TEST(QuicProtocolTest, StreamFrameToString) {
   EXPECT_EQ("{ stream_id: 1, fin: 0, offset: 2, length: 3 }\n", stream.str());
 }
 
-TEST(QuicProtocolTest, StopWaitingFrameToString) {
+TEST(QuicFramesTest, StopWaitingFrameToString) {
   QuicStopWaitingFrame frame;
   frame.least_unacked = 2;
   std::ostringstream stream;
@@ -139,7 +105,7 @@ TEST(QuicProtocolTest, StopWaitingFrameToString) {
   EXPECT_EQ("{ least_unacked: 2 }\n", stream.str());
 }
 
-TEST(QuicProtocolTest, PathCloseFrameToString) {
+TEST(QuicFramesTest, PathCloseFrameToString) {
   QuicPathCloseFrame frame;
   frame.path_id = 1;
   std::ostringstream stream;
@@ -147,17 +113,25 @@ TEST(QuicProtocolTest, PathCloseFrameToString) {
   EXPECT_EQ("{ path_id: 1 }\n", stream.str());
 }
 
-TEST(QuicProtocolTest, QuicVersionManager) {
-  QuicFlagSaver flags;
-  FLAGS_quic_enable_version_36_v3 = false;
-  QuicVersionManager manager(AllSupportedVersions());
-  EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
-            manager.GetSupportedVersions());
-  FLAGS_quic_enable_version_36_v3 = true;
-  EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
-            manager.GetSupportedVersions());
-  EXPECT_EQ(QUIC_VERSION_36, manager.GetSupportedVersions()[0]);
-  EXPECT_EQ(QUIC_VERSION_35, manager.GetSupportedVersions()[1]);
+TEST(QuicFramesTest, IsAwaitingPacket) {
+  QuicAckFrame ack_frame1;
+  ack_frame1.largest_observed = 10u;
+  ack_frame1.packets.Add(1, 11);
+  EXPECT_TRUE(IsAwaitingPacket(ack_frame1, 11u, 0u));
+  EXPECT_FALSE(IsAwaitingPacket(ack_frame1, 1u, 0u));
+
+  ack_frame1.packets.Remove(10);
+  EXPECT_TRUE(IsAwaitingPacket(ack_frame1, 10u, 0u));
+
+  QuicAckFrame ack_frame2;
+  ack_frame2.largest_observed = 100u;
+  ack_frame2.packets.Add(21, 100);
+  EXPECT_FALSE(IsAwaitingPacket(ack_frame2, 11u, 20u));
+  EXPECT_FALSE(IsAwaitingPacket(ack_frame2, 80u, 20u));
+  EXPECT_TRUE(IsAwaitingPacket(ack_frame2, 101u, 20u));
+
+  ack_frame2.packets.Remove(50);
+  EXPECT_TRUE(IsAwaitingPacket(ack_frame2, 50u, 20u));
 }
 
 // Tests that a queue contains the expected data after calls to Add().