Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(770)

Unified Diff: net/spdy/spdy_headers_block_parser_test.cc

Issue 2515143002: Removing SPDY3 from the code base. (Closed)
Patch Set: Addressed a failure on windows. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ad603539033b1a5b3065013a9ad16f9cb3100271..63b15826da140b64b3342311b1adf19fe2bf1596 100644
--- a/net/spdy/spdy_headers_block_parser_test.cc
+++ b/net/spdy/spdy_headers_block_parser_test.cc
@@ -42,9 +42,7 @@ class SpdyHeadersBlockParserTest :
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.
@@ -88,8 +86,6 @@ class SpdyHeadersBlockParserTest :
return string(buffer, sizeof(uint32_t));
}
- SpdyMajorVersion spdy_version_;
-
MockSpdyHeadersHandler handler_;
std::unique_ptr<SpdyHeadersBlockParser> parser_;
@@ -104,16 +100,10 @@ class SpdyHeadersBlockParserTest :
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);
@@ -132,7 +122,7 @@ TEST_P(SpdyHeadersBlockParserTest, BasicTest) {
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);
@@ -154,7 +144,7 @@ TEST_P(SpdyHeadersBlockParserTest, NullsSupportedTest) {
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.
@@ -196,7 +186,7 @@ TEST_P(SpdyHeadersBlockParserTest, MultipleBlocksAndHeadersWithPartialData) {
}
}
-TEST_P(SpdyHeadersBlockParserTest, HandlesEmptyCallsTest) {
+TEST_F(SpdyHeadersBlockParserTest, HandlesEmptyCallsTest) {
EXPECT_CALL(handler_, OnHeaderBlockStart()).Times(1);
string expect_key = kBaseKey + IntToString(0);
@@ -225,7 +215,7 @@ TEST_P(SpdyHeadersBlockParserTest, HandlesEmptyCallsTest) {
}
}
-TEST_P(SpdyHeadersBlockParserTest, LargeBlocksDiscardedTest) {
+TEST_F(SpdyHeadersBlockParserTest, LargeBlocksDiscardedTest) {
// Header block with too many headers.
{
string headers = EncodeLength(parser_->MaxNumberOfHeaders() + 1);
@@ -234,7 +224,7 @@ TEST_P(SpdyHeadersBlockParserTest, LargeBlocksDiscardedTest) {
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(
@@ -246,7 +236,7 @@ TEST_P(SpdyHeadersBlockParserTest, LargeBlocksDiscardedTest) {
}
}
-TEST_P(SpdyHeadersBlockParserTest, ExtraDataTest) {
+TEST_F(SpdyHeadersBlockParserTest, ExtraDataTest) {
EXPECT_CALL(handler_, OnHeaderBlockStart()).Times(1);
string expect_key = kBaseKey + IntToString(0);
@@ -266,7 +256,7 @@ TEST_P(SpdyHeadersBlockParserTest, ExtraDataTest) {
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());
@@ -278,7 +268,7 @@ TEST_P(SpdyHeadersBlockParserTest, WrongStreamIdTest) {
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(

Powered by Google App Engine
This is Rietveld 408576698