Land recent SPDY changes (through 70021377)

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 <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 40 matching lines @@
     string headers;
 
     // First, write the number of headers in the header block.
     headers += EncodeLength(num_headers);
 
     // Second, write the key-value pairs.
     for (uint32_t i = 0; i < num_headers; i++) {
       // Build the key.
       string key;
       if (insert_nulls) {
-        key = string(base_key) + string("\0", 1) + IntToString(i);
+        key = string(kBaseKey) + string("\0", 1) + IntToString(i);
       } else {
-        key = string(base_key) + IntToString(i);
+        key = string(kBaseKey) + IntToString(i);
       }
       // Encode the key as SPDY header.
       headers += EncodeLength(key.length());
       headers += key;
 
       // Build the value.
       string value;
       if (insert_nulls) {
-        value = string(base_value) + string("\0", 1) + IntToString(i);
+        value = string(kBaseValue) + string("\0", 1) + IntToString(i);
       } else {
-        value = string(base_value) + IntToString(i);
+        value = string(kBaseValue) + IntToString(i);
       }
       // Encode the value as SPDY header.
       headers += EncodeLength(value.length());
       headers += value;
     }
     return headers;
   }
 
   string EncodeLength(uint32_t len) {
     char buffer[4];
     if (length_field_size_ == sizeof(uint32_t)) {
       uint32_t net_order_len = htonl(len);
       memcpy(buffer, &net_order_len, length_field_size_);
     } else if (length_field_size_ == sizeof(uint16_t)) {
       uint16_t net_order_len = htons(len);
       memcpy(buffer, &net_order_len, length_field_size_);
     } else {
       CHECK(false) << "Invalid length field size";
     }
     return string(buffer, length_field_size_);
   }
 
   size_t length_field_size_;
   SpdyMajorVersion spdy_version_;
 
   MockSpdyHeadersHandler handler_;
   scoped_ptr<SpdyHeadersBlockParser> parser_;
 
-  static const char* base_key;
-  static const char* base_value;
+  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* SpdyHeadersBlockParserTest::base_key = "test_key";
-const char* SpdyHeadersBlockParserTest::base_value = "test_value";
+const char *const SpdyHeadersBlockParserTest::kBaseKey = "test_key";
+const char *const SpdyHeadersBlockParserTest::kBaseValue = "test_value";
 
 // All tests are run with 3 different SPDY versions: SPDY/2, SPDY/3, SPDY/4.
 INSTANTIATE_TEST_CASE_P(SpdyHeadersBlockParserTests,
                         SpdyHeadersBlockParserTest,
                         ::testing::Values(SPDY2, SPDY3, SPDY4));
 
 TEST_P(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.
   string headers(CreateHeaders(1, false));
 
   EXPECT_CALL(handler_, OnHeaderBlock(1, 1)).Times(1);
 
-  std::string expect_key = base_key + IntToString(0);
-  std::string expect_value = base_value + IntToString(0);
+  std::string expect_key = kBaseKey + IntToString(0);
+  std::string expect_value = kBaseValue + IntToString(0);
   EXPECT_CALL(handler_, OnHeader(1, StringPiece(expect_key),
                                  StringPiece(expect_value))).Times(1);
   EXPECT_CALL(handler_, OnHeaderBlockEnd(1, headers.length())).Times(1);
 
   EXPECT_TRUE(parser_->
       HandleControlFrameHeadersData(1, headers.c_str(), headers.length()));
   EXPECT_EQ(SpdyHeadersBlockParser::OK, parser_->get_error());
 }
 
 TEST_P(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.
   string headers(CreateHeaders(1, true));
 
   EXPECT_CALL(handler_, OnHeaderBlock(1, 1)).Times(1);
 
-  std::string expect_key = base_key + string("\0", 1) + IntToString(0);
-  std::string expect_value = base_value + string("\0", 1) + IntToString(0);
+  std::string expect_key = kBaseKey + string("\0", 1) + IntToString(0);
+  std::string expect_value = kBaseValue + string("\0", 1) + IntToString(0);
   EXPECT_CALL(handler_, OnHeader(1, StringPiece(expect_key),
                                  StringPiece(expect_value))).Times(1);
   EXPECT_CALL(handler_, OnHeaderBlockEnd(1, headers.length())).Times(1);
 
   EXPECT_TRUE(parser_->
       HandleControlFrameHeadersData(1, headers.c_str(), headers.length()));
   EXPECT_EQ(SpdyHeadersBlockParser::OK, parser_->get_error());
 }
 
 TEST_P(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(base_key + IntToString(i));
-    retained_arguments.push_back(base_value + IntToString(i));
+    retained_arguments.push_back(kBaseKey + IntToString(i));
+    retained_arguments.push_back(kBaseValue + IntToString(i));
   }
   // For each block we expect to parse out the headers in order.
   for (int i = 0; i < kNumHeaderBlocks; i++) {
     EXPECT_CALL(handler_, OnHeaderBlock(i, kNumHeadersInBlock)).Times(1);
     for (int j = 0; j < kNumHeadersInBlock; j++) {
       EXPECT_CALL(handler_, OnHeader(
           i,
           StringPiece(retained_arguments[2 * j]),
           StringPiece(retained_arguments[2 * j + 1]))).Times(1);
     }
@@ skipping 12 matching lines @@
       }
     }
   }
 }
 
 TEST_P(SpdyHeadersBlockParserTest, HandlesEmptyCallsTest) {
   EXPECT_CALL(handler_, OnHeaderBlock(1, 1)).Times(1);
 
   string headers(CreateHeaders(1, false));
 
-  string expect_key = base_key + IntToString(0);
-  string expect_value = base_value + IntToString(0);
+  string expect_key = kBaseKey + IntToString(0);
+  string expect_value = kBaseValue + IntToString(0);
   EXPECT_CALL(handler_, OnHeader(1, StringPiece(expect_key),
                                  StringPiece(expect_value))).Times(1);
   EXPECT_CALL(handler_, OnHeaderBlockEnd(1, 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::OK, parser_->get_error());
@@ skipping 28 matching lines @@
               parser_->get_error());
   }
 }
 
 TEST_P(SpdyHeadersBlockParserTest, ExtraDataTest) {
   string headers = CreateHeaders(1, false) + "foobar";
 
   EXPECT_CALL(handler_, OnHeaderBlock(1, 1)).Times(1);
   EXPECT_CALL(handler_, OnHeaderBlockEnd(1, headers.length())).Times(1);
 
-  string expect_key = base_key + IntToString(0);
-  string expect_value = base_value + IntToString(0);
+  string expect_key = kBaseKey + IntToString(0);
+  string expect_value = kBaseValue + IntToString(0);
   EXPECT_CALL(handler_, OnHeader(1, StringPiece(expect_key),
                                  StringPiece(expect_value))).Times(1);
 
   EXPECT_FALSE(parser_->
       HandleControlFrameHeadersData(1, headers.c_str(), headers.length()));
   EXPECT_EQ(SpdyHeadersBlockParser::TOO_MUCH_DATA, parser_->get_error());
 }
 
 }  // namespace net