Removing SPDY3 from the code base.

net/spdy/spdy_headers_block_parser_test.cc

 // Copyright 2014 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/spdy/spdy_headers_block_parser.h"
 
 #include <memory>
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 24 matching lines @@
 };
 
 class SpdyHeadersBlockParserTest :
     public ::testing::TestWithParam<SpdyMajorVersion> {
  public:
   ~SpdyHeadersBlockParserTest() override {}
 
  protected:
   void SetUp() override {
     // Create a parser using the mock handler.
-    spdy_version_ = GetParam();
-
-    parser_.reset(new SpdyHeadersBlockParser(spdy_version_, &handler_));
+    parser_.reset(new SpdyHeadersBlockParser(HTTP2, &handler_));
   }
 
   // Create a header block with a specified number of headers.
   string CreateHeaders(uint32_t num_headers, bool insert_nulls) {
     string headers;
 
     // First, write the number of headers in the header block.
     headers += EncodeLength(num_headers);
 
     // Second, write the key-value pairs.
@@ skipping 23 matching lines @@
     return headers;
   }
 
   string EncodeLength(uint32_t len) {
     char buffer[4];
     uint32_t net_order_len = base::HostToNet32(len);
     memcpy(buffer, &net_order_len, sizeof(uint32_t));
     return string(buffer, sizeof(uint32_t));
   }
 
-  SpdyMajorVersion spdy_version_;
-
   MockSpdyHeadersHandler handler_;
   std::unique_ptr<SpdyHeadersBlockParser> parser_;
 
   static const char *const kBaseKey;
   static const char *const kBaseValue;
 
   // Number of headers and header blocks used in the tests.
   static const int kNumHeadersInBlock = 10;
   static const int kNumHeaderBlocks = 10;
 };
 
 const char *const SpdyHeadersBlockParserTest::kBaseKey = "test_key";
 const char *const SpdyHeadersBlockParserTest::kBaseValue = "test_value";
 
-// All tests are run with SPDY/3 and HTTP/2.
-INSTANTIATE_TEST_CASE_P(SpdyHeadersBlockParserTests,
-                        SpdyHeadersBlockParserTest,
-                        ::testing::Values(SPDY3, HTTP2));
-
-TEST_P(SpdyHeadersBlockParserTest, BasicTest) {
+TEST_F(SpdyHeadersBlockParserTest, BasicTest) {
   // Sanity test, verify that we parse out correctly a block with
   // a single key-value pair and that we notify when we start and finish
   // handling a headers block.
-  EXPECT_EQ(spdy_version_, parser_->spdy_version());
 
   EXPECT_CALL(handler_, OnHeaderBlockStart()).Times(1);
   string expect_key = kBaseKey + IntToString(0);
   string expect_value = kBaseValue + IntToString(0);
   EXPECT_CALL(handler_, OnHeader(StringPiece(expect_key),
                                  StringPiece(expect_value))).Times(1);
 
   string headers(CreateHeaders(1, false));
   if (FLAGS_chromium_http2_flag_log_compressed_size) {
     EXPECT_CALL(handler_, OnHeaderBlockEnd(headers.length(), _)).Times(1);
   } else {
     EXPECT_CALL(handler_, OnHeaderBlockEnd(headers.length())).Times(1);
   }
   EXPECT_TRUE(parser_->
       HandleControlFrameHeadersData(1, headers.c_str(), headers.length()));
   EXPECT_EQ(SpdyHeadersBlockParser::NO_PARSER_ERROR, parser_->get_error());
 }
 
-TEST_P(SpdyHeadersBlockParserTest, NullsSupportedTest) {
+TEST_F(SpdyHeadersBlockParserTest, NullsSupportedTest) {
   // Sanity test, verify that we parse out correctly a block with
   // a single key-value pair when the key and value contain null charecters.
   EXPECT_CALL(handler_, OnHeaderBlockStart()).Times(1);
 
   string expect_key = kBaseKey + string("\0", 1) + IntToString(0);
   string expect_value = kBaseValue + string("\0", 1) + IntToString(0);
   EXPECT_CALL(handler_, OnHeader(StringPiece(expect_key),
                                  StringPiece(expect_value))).Times(1);
 
   string headers(CreateHeaders(1, true));
   if (FLAGS_chromium_http2_flag_log_compressed_size) {
     EXPECT_CALL(handler_, OnHeaderBlockEnd(headers.length(), _)).Times(1);
   } else {
     EXPECT_CALL(handler_, OnHeaderBlockEnd(headers.length())).Times(1);
   }
 
   EXPECT_TRUE(parser_->
       HandleControlFrameHeadersData(1, headers.c_str(), headers.length()));
   EXPECT_EQ(SpdyHeadersBlockParser::NO_PARSER_ERROR, parser_->get_error());
 }
 
-TEST_P(SpdyHeadersBlockParserTest, MultipleBlocksAndHeadersWithPartialData) {
+TEST_F(SpdyHeadersBlockParserTest, MultipleBlocksAndHeadersWithPartialData) {
   testing::InSequence s;
 
   // CreateHeaders is deterministic; we can call it once for the whole test.
   string headers(CreateHeaders(kNumHeadersInBlock, false));
 
   // The mock doesn't retain storage of arguments, so keep them in scope.
   std::vector<string> retained_arguments;
   for (int i = 0; i < kNumHeadersInBlock; i++) {
     retained_arguments.push_back(kBaseKey + IntToString(i));
     retained_arguments.push_back(kBaseValue + IntToString(i));
@@ skipping 21 matching lines @@
         EXPECT_EQ(SpdyHeadersBlockParser::NO_PARSER_ERROR,
                   parser_->get_error());
       } else {
         EXPECT_FALSE(parser_->HandleControlFrameHeadersData(i, &(*it), 1));
         EXPECT_EQ(SpdyHeadersBlockParser::NEED_MORE_DATA, parser_->get_error());
       }
     }
   }
 }
 
-TEST_P(SpdyHeadersBlockParserTest, HandlesEmptyCallsTest) {
+TEST_F(SpdyHeadersBlockParserTest, HandlesEmptyCallsTest) {
   EXPECT_CALL(handler_, OnHeaderBlockStart()).Times(1);
 
   string expect_key = kBaseKey + IntToString(0);
   string expect_value = kBaseValue + IntToString(0);
   EXPECT_CALL(handler_, OnHeader(StringPiece(expect_key),
                                  StringPiece(expect_value))).Times(1);
 
   string headers(CreateHeaders(1, false));
   if (FLAGS_chromium_http2_flag_log_compressed_size) {
     EXPECT_CALL(handler_, OnHeaderBlockEnd(headers.length(), _)).Times(1);
   } else {
     EXPECT_CALL(handler_, OnHeaderBlockEnd(headers.length())).Times(1);
   }
 
   // Send a header in pieces with intermediate empty calls.
   for (string::iterator it = headers.begin(); it != headers.end(); ++it) {
     if ((it + 1) == headers.end()) {
       // Last byte completes the block.
       EXPECT_TRUE(parser_->HandleControlFrameHeadersData(1, &(*it), 1));
       EXPECT_EQ(SpdyHeadersBlockParser::NO_PARSER_ERROR, parser_->get_error());
     } else {
       EXPECT_FALSE(parser_->HandleControlFrameHeadersData(1, &(*it), 1));
       EXPECT_EQ(SpdyHeadersBlockParser::NEED_MORE_DATA, parser_->get_error());
       EXPECT_FALSE(parser_->HandleControlFrameHeadersData(1, NULL, 0));
     }
   }
 }
 
-TEST_P(SpdyHeadersBlockParserTest, LargeBlocksDiscardedTest) {
+TEST_F(SpdyHeadersBlockParserTest, LargeBlocksDiscardedTest) {
   // Header block with too many headers.
   {
     string headers = EncodeLength(parser_->MaxNumberOfHeaders() + 1);
     EXPECT_FALSE(parser_->
         HandleControlFrameHeadersData(1, headers.c_str(), headers.length()));
     EXPECT_EQ(SpdyHeadersBlockParser::HEADER_BLOCK_TOO_LARGE,
               parser_->get_error());
   }
-  parser_.reset(new SpdyHeadersBlockParser(spdy_version_, &handler_));
+  parser_.reset(new SpdyHeadersBlockParser(HTTP2, &handler_));
   // Header block with one header, which has a too-long key.
   {
     string headers = EncodeLength(1) + EncodeLength(
         SpdyHeadersBlockParser::kMaximumFieldLength + 1);
     EXPECT_FALSE(parser_->
         HandleControlFrameHeadersData(1, headers.c_str(), headers.length()));
     EXPECT_EQ(SpdyHeadersBlockParser::HEADER_FIELD_TOO_LARGE,
               parser_->get_error());
   }
 }
 
-TEST_P(SpdyHeadersBlockParserTest, ExtraDataTest) {
+TEST_F(SpdyHeadersBlockParserTest, ExtraDataTest) {
   EXPECT_CALL(handler_, OnHeaderBlockStart()).Times(1);
 
   string expect_key = kBaseKey + IntToString(0);
   string expect_value = kBaseValue + IntToString(0);
   EXPECT_CALL(handler_, OnHeader(StringPiece(expect_key),
                                  StringPiece(expect_value))).Times(1);
 
   string headers = CreateHeaders(1, false) + "foobar";
   if (FLAGS_chromium_http2_flag_log_compressed_size) {
     EXPECT_CALL(handler_, OnHeaderBlockEnd(headers.length(), _)).Times(1);
   } else {
     EXPECT_CALL(handler_, OnHeaderBlockEnd(headers.length())).Times(1);
   }
 
   EXPECT_FALSE(parser_->HandleControlFrameHeadersData(1, headers.c_str(),
                                                       headers.length()));
   EXPECT_EQ(SpdyHeadersBlockParser::TOO_MUCH_DATA, parser_->get_error());
 }
 
-TEST_P(SpdyHeadersBlockParserTest, WrongStreamIdTest) {
+TEST_F(SpdyHeadersBlockParserTest, WrongStreamIdTest) {
   string headers(CreateHeaders(kNumHeadersInBlock, false));
   EXPECT_FALSE(parser_->HandleControlFrameHeadersData(1, headers.data(), 1));
   EXPECT_EQ(SpdyHeadersBlockParser::NEED_MORE_DATA, parser_->get_error());
   bool result;
   EXPECT_SPDY_BUG(
       result = parser_->HandleControlFrameHeadersData(2, headers.data() + 1, 1),
       "Unexpected stream id: 2 \\(expected 1\\)");
   EXPECT_FALSE(result);
   EXPECT_EQ(SpdyHeadersBlockParser::UNEXPECTED_STREAM_ID, parser_->get_error());
 }
 
-TEST_P(SpdyHeadersBlockParserTest, InvalidStreamIdTest) {
+TEST_F(SpdyHeadersBlockParserTest, InvalidStreamIdTest) {
   string headers(CreateHeaders(kNumHeadersInBlock, false));
   bool result;
   EXPECT_SPDY_BUG(
       result = parser_->HandleControlFrameHeadersData(0, headers.data(), 1),
       "Expected nonzero stream id, saw: 0");
   EXPECT_FALSE(result);
   EXPECT_EQ(SpdyHeadersBlockParser::UNEXPECTED_STREAM_ID, parser_->get_error());
 }
 
 }  // namespace net