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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/buffered_spdy_framer_unittest.cc

Issue 2140673002: Remove SPDY/3.1 tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months 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
« no previous file with comments | « net/spdy/bidirectional_stream_spdy_impl_unittest.cc ('k') | net/spdy/spdy_http_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/buffered_spdy_framer_unittest.cc
diff --git a/net/spdy/buffered_spdy_framer_unittest.cc b/net/spdy/buffered_spdy_framer_unittest.cc
index 3e96481df2338836ca6a64d4606bb6bae5d54dee..de4deb6feb23b31b63247305ceccf706873ddd87 100644
--- a/net/spdy/buffered_spdy_framer_unittest.cc
+++ b/net/spdy/buffered_spdy_framer_unittest.cc
@@ -16,8 +16,8 @@ namespace {
class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface {
public:
- explicit TestBufferedSpdyVisitor(SpdyMajorVersion spdy_version)
- : buffered_spdy_framer_(spdy_version),
+ explicit TestBufferedSpdyVisitor()
+ : buffered_spdy_framer_(HTTP2),
error_count_(0),
setting_count_(0),
syn_frame_count_(0),
@@ -202,27 +202,15 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface {
} // namespace
-class BufferedSpdyFramerTest
- : public PlatformTest,
- public ::testing::WithParamInterface<NextProto> {
- protected:
- SpdyMajorVersion spdy_version() {
- return NextProtoToSpdyMajorVersion(GetParam());
- }
-};
-
-INSTANTIATE_TEST_CASE_P(NextProto,
- BufferedSpdyFramerTest,
- testing::Values(kProtoSPDY31,
- kProtoHTTP2));
+class BufferedSpdyFramerTest : public PlatformTest {};
-TEST_P(BufferedSpdyFramerTest, OnSetting) {
- SpdyFramer framer(spdy_version());
+TEST_F(BufferedSpdyFramerTest, OnSetting) {
+ SpdyFramer framer(HTTP2);
SpdySettingsIR settings_ir;
settings_ir.AddSetting(SETTINGS_INITIAL_WINDOW_SIZE, false, false, 2);
settings_ir.AddSetting(SETTINGS_MAX_CONCURRENT_STREAMS, false, false, 3);
SpdySerializedFrame control_frame(framer.SerializeSettings(settings_ir));
- TestBufferedSpdyVisitor visitor(spdy_version());
+ TestBufferedSpdyVisitor visitor;
visitor.SimulateInFramer(
reinterpret_cast<unsigned char*>(control_frame.data()),
@@ -231,39 +219,11 @@ TEST_P(BufferedSpdyFramerTest, OnSetting) {
EXPECT_EQ(2, visitor.setting_count_);
}
-TEST_P(BufferedSpdyFramerTest, ReadSynStreamHeaderBlock) {
- if (spdy_version() > SPDY3) {
- // SYN_STREAM not supported in SPDY>3.
- return;
- }
- SpdyHeaderBlock headers;
- headers["aa"] = "vv";
- headers["bb"] = "ww";
- BufferedSpdyFramer framer(spdy_version());
- std::unique_ptr<SpdySerializedFrame> control_frame(
- framer.CreateSynStream(1, // stream_id
- 0, // associated_stream_id
- 1, // priority
- CONTROL_FLAG_NONE, headers.Clone()));
- EXPECT_TRUE(control_frame.get() != NULL);
-
- TestBufferedSpdyVisitor visitor(spdy_version());
- visitor.SimulateInFramer(
- reinterpret_cast<unsigned char*>(control_frame.get()->data()),
- control_frame.get()->size());
- EXPECT_EQ(0, visitor.error_count_);
- EXPECT_EQ(1, visitor.syn_frame_count_);
- EXPECT_EQ(0, visitor.syn_reply_frame_count_);
- EXPECT_EQ(0, visitor.headers_frame_count_);
- EXPECT_EQ(0, visitor.push_promise_frame_count_);
- EXPECT_EQ(headers, visitor.headers_);
-}
-
-TEST_P(BufferedSpdyFramerTest, HeaderListTooLarge) {
+TEST_F(BufferedSpdyFramerTest, HeaderListTooLarge) {
SpdyHeaderBlock headers;
std::string long_header_value(256 * 1024, 'x');
headers["foo"] = long_header_value;
- BufferedSpdyFramer framer(spdy_version());
+ BufferedSpdyFramer framer(HTTP2);
std::unique_ptr<SpdySerializedFrame> control_frame(
framer.CreateHeaders(1, // stream_id
CONTROL_FLAG_NONE,
@@ -271,7 +231,7 @@ TEST_P(BufferedSpdyFramerTest, HeaderListTooLarge) {
std::move(headers)));
EXPECT_TRUE(control_frame);
- TestBufferedSpdyVisitor visitor(spdy_version());
+ TestBufferedSpdyVisitor visitor;
visitor.SimulateInFramer(
reinterpret_cast<unsigned char*>(control_frame.get()->data()),
control_frame.get()->size());
@@ -284,42 +244,11 @@ TEST_P(BufferedSpdyFramerTest, HeaderListTooLarge) {
EXPECT_EQ(SpdyHeaderBlock(), visitor.headers_);
}
-TEST_P(BufferedSpdyFramerTest, ReadSynReplyHeaderBlock) {
- if (spdy_version() > SPDY3) {
- // SYN_REPLY not supported in SPDY>3.
- return;
- }
- SpdyHeaderBlock headers;
- headers["alpha"] = "beta";
- headers["gamma"] = "delta";
- BufferedSpdyFramer framer(spdy_version());
- std::unique_ptr<SpdySerializedFrame> control_frame(
- framer.CreateSynReply(1, // stream_id
- CONTROL_FLAG_NONE, headers.Clone()));
- EXPECT_TRUE(control_frame.get() != NULL);
-
- TestBufferedSpdyVisitor visitor(spdy_version());
- visitor.SimulateInFramer(
- reinterpret_cast<unsigned char*>(control_frame.get()->data()),
- control_frame.get()->size());
- EXPECT_EQ(0, visitor.error_count_);
- EXPECT_EQ(0, visitor.syn_frame_count_);
- EXPECT_EQ(0, visitor.push_promise_frame_count_);
- if (spdy_version() < HTTP2) {
- EXPECT_EQ(1, visitor.syn_reply_frame_count_);
- EXPECT_EQ(0, visitor.headers_frame_count_);
- } else {
- EXPECT_EQ(0, visitor.syn_reply_frame_count_);
- EXPECT_EQ(1, visitor.headers_frame_count_);
- }
- EXPECT_EQ(headers, visitor.headers_);
-}
-
-TEST_P(BufferedSpdyFramerTest, ReadHeadersHeaderBlock) {
+TEST_F(BufferedSpdyFramerTest, ReadHeadersHeaderBlock) {
SpdyHeaderBlock headers;
headers["alpha"] = "beta";
headers["gamma"] = "delta";
- BufferedSpdyFramer framer(spdy_version());
+ BufferedSpdyFramer framer(HTTP2);
std::unique_ptr<SpdySerializedFrame> control_frame(
framer.CreateHeaders(1, // stream_id
CONTROL_FLAG_NONE,
@@ -327,7 +256,7 @@ TEST_P(BufferedSpdyFramerTest, ReadHeadersHeaderBlock) {
headers.Clone()));
EXPECT_TRUE(control_frame.get() != NULL);
- TestBufferedSpdyVisitor visitor(spdy_version());
+ TestBufferedSpdyVisitor visitor;
visitor.SimulateInFramer(
reinterpret_cast<unsigned char*>(control_frame.get()->data()),
control_frame.get()->size());
@@ -339,18 +268,16 @@ TEST_P(BufferedSpdyFramerTest, ReadHeadersHeaderBlock) {
EXPECT_EQ(headers, visitor.headers_);
}
-TEST_P(BufferedSpdyFramerTest, ReadPushPromiseHeaderBlock) {
- if (spdy_version() < HTTP2)
- return;
+TEST_F(BufferedSpdyFramerTest, ReadPushPromiseHeaderBlock) {
SpdyHeaderBlock headers;
headers["alpha"] = "beta";
headers["gamma"] = "delta";
- BufferedSpdyFramer framer(spdy_version());
+ BufferedSpdyFramer framer(HTTP2);
std::unique_ptr<SpdySerializedFrame> control_frame(
framer.CreatePushPromise(1, 2, headers.Clone()));
EXPECT_TRUE(control_frame.get() != NULL);
- TestBufferedSpdyVisitor visitor(spdy_version());
+ TestBufferedSpdyVisitor visitor;
visitor.SimulateInFramer(
reinterpret_cast<unsigned char*>(control_frame.get()->data()),
control_frame.get()->size());
@@ -364,14 +291,12 @@ TEST_P(BufferedSpdyFramerTest, ReadPushPromiseHeaderBlock) {
EXPECT_EQ(2u, visitor.promised_stream_id_);
}
-TEST_P(BufferedSpdyFramerTest, GoAwayDebugData) {
- if (spdy_version() < HTTP2)
- return;
- BufferedSpdyFramer framer(spdy_version());
+TEST_F(BufferedSpdyFramerTest, GoAwayDebugData) {
+ BufferedSpdyFramer framer(HTTP2);
std::unique_ptr<SpdySerializedFrame> goaway_frame(
framer.CreateGoAway(2u, GOAWAY_FRAME_SIZE_ERROR, "foo"));
- TestBufferedSpdyVisitor visitor(spdy_version());
+ TestBufferedSpdyVisitor visitor;
visitor.SimulateInFramer(
reinterpret_cast<unsigned char*>(goaway_frame.get()->data()),
goaway_frame.get()->size());
@@ -382,10 +307,7 @@ TEST_P(BufferedSpdyFramerTest, GoAwayDebugData) {
EXPECT_EQ("foo", visitor.goaway_debug_data_);
}
-TEST_P(BufferedSpdyFramerTest, OnAltSvc) {
- if (spdy_version() < HTTP2)
- return;
-
+TEST_F(BufferedSpdyFramerTest, OnAltSvc) {
const SpdyStreamId altsvc_stream_id(1);
const char altsvc_origin[] = "https://www.example.org";
SpdyAltSvcIR altsvc_ir(altsvc_stream_id);
@@ -394,10 +316,10 @@ TEST_P(BufferedSpdyFramerTest, OnAltSvc) {
SpdyAltSvcWireFormat::VersionVector());
altsvc_ir.add_altsvc(alternative_service);
altsvc_ir.set_origin(altsvc_origin);
- BufferedSpdyFramer framer(spdy_version());
+ BufferedSpdyFramer framer(HTTP2);
SpdySerializedFrame altsvc_frame(framer.SerializeFrame(altsvc_ir));
- TestBufferedSpdyVisitor visitor(spdy_version());
+ TestBufferedSpdyVisitor visitor;
visitor.SimulateInFramer(
reinterpret_cast<unsigned char*>(altsvc_frame.data()),
altsvc_frame.size());
« no previous file with comments | « net/spdy/bidirectional_stream_spdy_impl_unittest.cc ('k') | net/spdy/spdy_http_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698