Disable QUIC versions 33 and earlier, protected by FLAGS_quic_disable_pre_34.

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 273 matching lines @@
   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};
 
   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(3u, filtered_versions.size());
-  EXPECT_EQ(QUIC_VERSION_32, filtered_versions[0]);
-  EXPECT_EQ(QUIC_VERSION_33, filtered_versions[1]);
-  EXPECT_EQ(QUIC_VERSION_34, filtered_versions[2]);
+  ASSERT_EQ(1u, filtered_versions.size());
+  EXPECT_EQ(QUIC_VERSION_34, filtered_versions[0]);
+}
+
+TEST(QuicProtocolTest, FilterSupportedVersionsAllVersions) {

[Ryan Hamilton, 2016/09/08 22:39:25]

Oh, actually, you need a QuicFlagSaver in these new tests.

+  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 = 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) {
+  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 = 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) {
+  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 = 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) {
+  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) {
+  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 = 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;
@@ skipping 149 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