Index: net/spdy/spdy_headers_block_parser_test.cc |
diff --git a/net/spdy/spdy_headers_block_parser_test.cc b/net/spdy/spdy_headers_block_parser_test.cc |
index d9a54068d285e110873791fa71fad3542794badf..46d23d6727f7ad889b564c78a8168a24e4436acf 100644 |
--- a/net/spdy/spdy_headers_block_parser_test.cc |
+++ b/net/spdy/spdy_headers_block_parser_test.cc |
@@ -24,16 +24,15 @@ using testing::ElementsAreArray; |
// and call the callback methods when we should. |
class MockSpdyHeadersHandler : public SpdyHeadersHandlerInterface { |
public: |
- MOCK_METHOD2(OnHeaderBlock, void(SpdyStreamId stream_id, |
- uint32_t num_of_headers)); |
+ MOCK_METHOD2(OnHeaderBlock, |
+ void(SpdyStreamId stream_id, uint32_t num_of_headers)); |
MOCK_METHOD1(OnHeaderBlockEnd, void(SpdyStreamId stream_id)); |
- MOCK_METHOD3(OnHeader, void(SpdyStreamId stream_id, |
- StringPiece, |
- StringPiece)); |
+ MOCK_METHOD3(OnHeader, |
+ void(SpdyStreamId stream_id, StringPiece, StringPiece)); |
}; |
-class SpdyHeadersBlockParserTest : |
- public ::testing::TestWithParam<SpdyMajorVersion> { |
+class SpdyHeadersBlockParserTest |
+ : public ::testing::TestWithParam<SpdyMajorVersion> { |
public: |
virtual ~SpdyHeadersBlockParserTest() {} |
@@ -124,13 +123,14 @@ TEST_P(SpdyHeadersBlockParserTest, BasicTest) { |
std::string expect_key = base_key + IntToString(0); |
std::string expect_value = base_value + IntToString(0); |
- EXPECT_CALL(handler_, OnHeader(1, StringPiece(expect_key), |
- StringPiece(expect_value))).Times(1); |
+ EXPECT_CALL(handler_, |
+ OnHeader(1, StringPiece(expect_key), StringPiece(expect_value))) |
+ .Times(1); |
EXPECT_CALL(handler_, OnHeaderBlockEnd(1)).Times(1); |
string headers(CreateHeaders(1, false)); |
- EXPECT_TRUE(parser_-> |
- HandleControlFrameHeadersData(1, headers.c_str(), headers.length())); |
+ EXPECT_TRUE(parser_->HandleControlFrameHeadersData( |
+ 1, headers.c_str(), headers.length())); |
EXPECT_EQ(SpdyHeadersBlockParser::OK, parser_->get_error()); |
} |
@@ -141,13 +141,14 @@ TEST_P(SpdyHeadersBlockParserTest, NullsSupportedTest) { |
std::string expect_key = base_key + string("\0", 1) + IntToString(0); |
std::string expect_value = base_value + string("\0", 1) + IntToString(0); |
- EXPECT_CALL(handler_, OnHeader(1, StringPiece(expect_key), |
- StringPiece(expect_value))).Times(1); |
+ EXPECT_CALL(handler_, |
+ OnHeader(1, StringPiece(expect_key), StringPiece(expect_value))) |
+ .Times(1); |
EXPECT_CALL(handler_, OnHeaderBlockEnd(1)).Times(1); |
string headers(CreateHeaders(1, true)); |
- EXPECT_TRUE(parser_-> |
- HandleControlFrameHeadersData(1, headers.c_str(), headers.length())); |
+ EXPECT_TRUE(parser_->HandleControlFrameHeadersData( |
+ 1, headers.c_str(), headers.length())); |
EXPECT_EQ(SpdyHeadersBlockParser::OK, parser_->get_error()); |
} |
@@ -164,10 +165,11 @@ TEST_P(SpdyHeadersBlockParserTest, MultipleBlocksAndHeadersWithPartialData) { |
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); |
+ EXPECT_CALL(handler_, |
+ OnHeader(i, |
+ StringPiece(retained_arguments[2 * j]), |
+ StringPiece(retained_arguments[2 * j + 1]))) |
+ .Times(1); |
} |
EXPECT_CALL(handler_, OnHeaderBlockEnd(i)).Times(1); |
} |
@@ -192,8 +194,9 @@ TEST_P(SpdyHeadersBlockParserTest, HandlesEmptyCallsTest) { |
string expect_key = base_key + IntToString(0); |
string expect_value = base_value + IntToString(0); |
- EXPECT_CALL(handler_, OnHeader(1, StringPiece(expect_key), |
- StringPiece(expect_value))).Times(1); |
+ EXPECT_CALL(handler_, |
+ OnHeader(1, StringPiece(expect_key), StringPiece(expect_value))) |
+ .Times(1); |
EXPECT_CALL(handler_, OnHeaderBlockEnd(1)).Times(1); |
// Send a header in pieces with intermediate empty calls. |
@@ -214,10 +217,10 @@ TEST_P(SpdyHeadersBlockParserTest, HandlesEmptyCallsTest) { |
TEST_P(SpdyHeadersBlockParserTest, LargeBlocksDiscardedTest) { |
// Header block with too many headers. |
{ |
- string headers = EncodeLength( |
- parser_->MaxNumberOfHeadersForVersion(spdy_version_) + 1); |
- EXPECT_FALSE(parser_-> |
- HandleControlFrameHeadersData(1, headers.c_str(), headers.length())); |
+ string headers = |
+ EncodeLength(parser_->MaxNumberOfHeadersForVersion(spdy_version_) + 1); |
+ EXPECT_FALSE(parser_->HandleControlFrameHeadersData( |
+ 1, headers.c_str(), headers.length())); |
EXPECT_EQ(SpdyHeadersBlockParser::HEADER_BLOCK_TOO_LARGE, |
parser_->get_error()); |
} |
@@ -226,10 +229,11 @@ TEST_P(SpdyHeadersBlockParserTest, LargeBlocksDiscardedTest) { |
{ |
EXPECT_CALL(handler_, OnHeaderBlock(1, 1)).Times(1); |
- string headers = EncodeLength(1) + EncodeLength( |
- SpdyHeadersBlockParser::kMaximumFieldLength + 1); |
- EXPECT_FALSE(parser_-> |
- HandleControlFrameHeadersData(1, headers.c_str(), headers.length())); |
+ 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()); |
} |
@@ -241,12 +245,13 @@ TEST_P(SpdyHeadersBlockParserTest, ExtraDataTest) { |
string expect_key = base_key + IntToString(0); |
string expect_value = base_value + IntToString(0); |
- EXPECT_CALL(handler_, OnHeader(1, StringPiece(expect_key), |
- StringPiece(expect_value))).Times(1); |
+ EXPECT_CALL(handler_, |
+ OnHeader(1, StringPiece(expect_key), StringPiece(expect_value))) |
+ .Times(1); |
string headers = CreateHeaders(1, false) + "foobar"; |
- EXPECT_FALSE(parser_-> |
- HandleControlFrameHeadersData(1, headers.c_str(), headers.length())); |
+ EXPECT_FALSE(parser_->HandleControlFrameHeadersData( |
+ 1, headers.c_str(), headers.length())); |
EXPECT_EQ(SpdyHeadersBlockParser::TOO_MUCH_DATA, parser_->get_error()); |
} |