Landing Recent QUIC changes until 9:41 AM, Oct 10, 2016 UTC-7

net/quic/core/quic_protocol_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/core/quic_protocol.h"
 
 #include <sstream>
 
 #include "base/stl_util.h"
 #include "net/quic/core/quic_flags.h"
@@ skipping 64 matching lines @@
 
 // TODO(rtenneti): Enable checking of Log(ERROR) messages.
 #if 0
   // Any logs would indicate an unsupported version which we don't expect.
   ScopedMockLog log(kDoNotCaptureLogsYet);
   EXPECT_CALL(log, Log(_, _, _)).Times(0);
   log.StartCapturingLogs();
 #endif
 
   // Explicitly test a specific version.
-  EXPECT_EQ(MakeQuicTag('Q', '0', '3', '0'),
-            QuicVersionToQuicTag(QUIC_VERSION_30));
+  EXPECT_EQ(MakeQuicTag('Q', '0', '3', '2'),
+            QuicVersionToQuicTag(QUIC_VERSION_32));
 
   // Loop over all supported versions and make sure that we never hit the
   // default case (i.e. all supported versions should be successfully converted
   // to valid QuicTags).
   for (size_t i = 0; i < arraysize(kSupportedQuicVersions); ++i) {
     QuicVersion version = kSupportedQuicVersions[i];
     EXPECT_LT(0u, QuicVersionToQuicTag(version));
   }
 }
 
@@ skipping 18 matching lines @@
 
 // TODO(rtenneti): Enable checking of Log(ERROR) messages.
 #if 0
   // Any logs would indicate an unsupported version which we don't expect.
   ScopedMockLog log(kDoNotCaptureLogsYet);
   EXPECT_CALL(log, Log(_, _, _)).Times(0);
   log.StartCapturingLogs();
 #endif
 
   // Explicitly test specific versions.
-  EXPECT_EQ(QUIC_VERSION_30,
-            QuicTagToQuicVersion(MakeQuicTag('Q', '0', '3', '0')));
+  EXPECT_EQ(QUIC_VERSION_32,
+            QuicTagToQuicVersion(MakeQuicTag('Q', '0', '3', '2')));
 
   for (size_t i = 0; i < arraysize(kSupportedQuicVersions); ++i) {
     QuicVersion version = kSupportedQuicVersions[i];
 
     // Get the tag from the version (we can loop over QuicVersions easily).
     QuicTag tag = QuicVersionToQuicTag(version);
     EXPECT_LT(0u, tag);
 
     // Now try converting back.
     QuicVersion tag_to_quic_version = QuicTagToQuicVersion(tag);
@@ skipping 12 matching lines @@
       .Times(1);
 #endif
   log.StartCapturingLogs();
 #endif
 
   EXPECT_EQ(QUIC_VERSION_UNSUPPORTED,
             QuicTagToQuicVersion(MakeQuicTag('F', 'A', 'K', 'E')));
 }
 
 TEST(QuicProtocolTest, QuicVersionToString) {
-  EXPECT_EQ("QUIC_VERSION_30", QuicVersionToString(QUIC_VERSION_30));
+  EXPECT_EQ("QUIC_VERSION_32", QuicVersionToString(QUIC_VERSION_32));
   EXPECT_EQ("QUIC_VERSION_UNSUPPORTED",
             QuicVersionToString(QUIC_VERSION_UNSUPPORTED));
 
-  QuicVersion single_version[] = {QUIC_VERSION_30};
+  QuicVersion single_version[] = {QUIC_VERSION_32};
   QuicVersionVector versions_vector;
   for (size_t i = 0; i < arraysize(single_version); ++i) {
     versions_vector.push_back(single_version[i]);
   }
-  EXPECT_EQ("QUIC_VERSION_30", QuicVersionVectorToString(versions_vector));
+  EXPECT_EQ("QUIC_VERSION_32", QuicVersionVectorToString(versions_vector));
 
-  QuicVersion multiple_versions[] = {QUIC_VERSION_UNSUPPORTED, QUIC_VERSION_30};
+  QuicVersion multiple_versions[] = {QUIC_VERSION_UNSUPPORTED, QUIC_VERSION_32};
   versions_vector.clear();
   for (size_t i = 0; i < arraysize(multiple_versions); ++i) {
     versions_vector.push_back(multiple_versions[i]);
   }
-  EXPECT_EQ("QUIC_VERSION_UNSUPPORTED,QUIC_VERSION_30",
+  EXPECT_EQ("QUIC_VERSION_UNSUPPORTED,QUIC_VERSION_32",
             QuicVersionVectorToString(versions_vector));
 
   // Make sure that all supported versions are present in QuicVersionToString.
   for (size_t i = 0; i < arraysize(kSupportedQuicVersions); ++i) {
     QuicVersion version = kSupportedQuicVersions[i];
     EXPECT_NE("QUIC_VERSION_UNSUPPORTED", QuicVersionToString(version));
   }
 }
 
 TEST(QuicProtocolTest, AckFrameToString) {
@@ skipping 93 matching lines @@
 TEST(QuicProtocolTest, PathCloseFrameToString) {
   QuicPathCloseFrame frame;
   frame.path_id = 1;
   std::ostringstream stream;
   stream << frame;
   EXPECT_EQ("{ path_id: 1 }\n", stream.str());
 }
 
 TEST(QuicProtocolTest, FilterSupportedVersions) {
   QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
 
-  FLAGS_quic_disable_pre_32 = true;
   FLAGS_quic_disable_pre_34 = true;
   FLAGS_quic_enable_version_35 = false;
   FLAGS_quic_enable_version_36_v2 = false;
 
   QuicVersionVector filtered_versions = FilterSupportedVersions(all_versions);
   ASSERT_EQ(1u, filtered_versions.size());
   EXPECT_EQ(QUIC_VERSION_34, filtered_versions[0]);
 }
 
 TEST(QuicProtocolTest, FilterSupportedVersionsAllVersions) {
   QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
 
-  FLAGS_quic_disable_pre_32 = false;
   FLAGS_quic_disable_pre_34 = false;
   FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = true;
 
   QuicVersionVector filtered_versions = FilterSupportedVersions(all_versions);
   ASSERT_EQ(all_versions, filtered_versions);
 }
 
 TEST(QuicProtocolTest, FilterSupportedVersionsNo36) {
   QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
 
-  FLAGS_quic_disable_pre_32 = false;
   FLAGS_quic_disable_pre_34 = false;
   FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = false;
 
   all_versions.pop_back();  // Remove 36
 
   ASSERT_EQ(all_versions, FilterSupportedVersions(all_versions));
 }
 
 TEST(QuicProtocolTest, FilterSupportedVersionsNo35) {
   QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
 
-  FLAGS_quic_disable_pre_32 = false;
   FLAGS_quic_disable_pre_34 = false;
   FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = true;
 
   all_versions.pop_back();  // Remove 36
   all_versions.pop_back();  // Remove 35
 
   ASSERT_EQ(all_versions, FilterSupportedVersions(all_versions));
 }
 
-TEST(QuicProtocolTest, FilterSupportedVersionsNoPre32) {
-  QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
-
-  FLAGS_quic_disable_pre_32 = true;
-  FLAGS_quic_disable_pre_34 = false;
-  FLAGS_quic_enable_version_35 = true;
-  FLAGS_quic_enable_version_36_v2 = true;
-
-  all_versions.erase(all_versions.begin());  // Remove 30
-  all_versions.erase(all_versions.begin());  // Remove 31
-
-  ASSERT_EQ(all_versions, FilterSupportedVersions(all_versions));
-}
-
 TEST(QuicProtocolTest, FilterSupportedVersionsNoPre34) {
   QuicFlagSaver flags;
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
 
-  FLAGS_quic_disable_pre_32 = false;
   FLAGS_quic_disable_pre_34 = true;
   FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = true;
 
-  all_versions.erase(all_versions.begin());  // Remove 30
-  all_versions.erase(all_versions.begin());  // Remove 31
   all_versions.erase(all_versions.begin());  // Remove 32
   all_versions.erase(all_versions.begin());  // Remove 33
 
   ASSERT_EQ(all_versions, FilterSupportedVersions(all_versions));
 }
 
 TEST(QuicProtocolTest, QuicVersionManager) {
   QuicFlagSaver flags;
   FLAGS_quic_enable_version_35 = false;
   FLAGS_quic_enable_version_36_v2 = false;
   QuicVersionManager manager(AllSupportedVersions());
   EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
             manager.GetSupportedVersions());
   FLAGS_quic_enable_version_35 = true;
   FLAGS_quic_enable_version_36_v2 = true;
   EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()),
             manager.GetSupportedVersions());
   EXPECT_EQ(QUIC_VERSION_36, manager.GetSupportedVersions()[0]);
   EXPECT_EQ(QUIC_VERSION_35, manager.GetSupportedVersions()[1]);
 }
 
 TEST(QuicProtocolTest, LookUpVersionByIndex) {
-  QuicVersionVector all_versions = {
-      QUIC_VERSION_30, QUIC_VERSION_31, QUIC_VERSION_32, QUIC_VERSION_33,
-      QUIC_VERSION_34, QUIC_VERSION_35, QUIC_VERSION_36};
+  QuicVersionVector all_versions = {QUIC_VERSION_32, QUIC_VERSION_33,
+                                    QUIC_VERSION_34, QUIC_VERSION_35,
+                                    QUIC_VERSION_36};
   int version_count = all_versions.size();
   for (int i = -5; i <= version_count + 1; ++i) {
     if (i >= 0 && i < version_count) {
       EXPECT_EQ(all_versions[i], VersionOfIndex(all_versions, i)[0]);
     } else {
       EXPECT_EQ(QUIC_VERSION_UNSUPPORTED, VersionOfIndex(all_versions, i)[0]);
     }
   }
 }
 
@@ skipping 128 matching lines @@
   EXPECT_EQ(2u, queue.NumIntervals());
   EXPECT_TRUE(queue.Contains(10));
   EXPECT_TRUE(queue.Contains(11));
   EXPECT_TRUE(queue.Contains(20));
   EXPECT_TRUE(queue.Contains(21));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net