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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_framer_test.cc

Issue 265763011: Land recent SPDY changes (through 66310528) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/spdy_framer.cc ('k') | net/spdy/spdy_protocol.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_framer_test.cc
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index 8542835b67fdc00e256998568be205f6c14f5de7..27e7123eb40a5dd65346fe37e0c616aa87ae61be 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -1857,9 +1857,9 @@ TEST_P(SpdyFramerTest, CreateSynStreamUncompressed) {
0x00, 0x16, 0x01, 0x0c, // HEADERS: PRIORITY | END_HEADERS
0x00, 0x00, 0x00, 0x01, // Stream 1
0x00, 0x00, 0x00, 0x07, // Priority 7
- 0x40, 0x03, 0x62, 0x61, // @.ba
+ 0x00, 0x03, 0x62, 0x61, // @.ba
0x72, 0x03, 0x66, 0x6f, // r.fo
- 0x6f, 0x40, 0x03, 0x66, // o@.f
+ 0x6f, 0x00, 0x03, 0x66, // o@.f
0x6f, 0x6f, 0x03, 0x62, // oo.b
0x61, 0x72, // ar
};
@@ -1912,8 +1912,8 @@ TEST_P(SpdyFramerTest, CreateSynStreamUncompressed) {
0x00, 0x13, 0x01, 0x0d, // HEADERS: PRIORITY | FIN | END_HEADERS
0x7f, 0xff, 0xff, 0xff, // Stream 0x7fffffff
0x00, 0x00, 0x00, 0x00, // Priority 0
- 0x40, 0x00, 0x03, 0x66, // @..f
- 0x6f, 0x6f, 0x40, 0x03, // oo@.
+ 0x00, 0x00, 0x03, 0x66, // @..f
+ 0x6f, 0x6f, 0x00, 0x03, // oo@.
0x66, 0x6f, 0x6f, 0x03, // foo.
0x62, 0x61, 0x72, // bar
};
@@ -1969,9 +1969,9 @@ TEST_P(SpdyFramerTest, CreateSynStreamUncompressed) {
0x00, 0x13, 0x01, 0x0d, // HEADERS: PRIORITY | FIN | END_HEADERS
0x7f, 0xff, 0xff, 0xff, // Stream 0x7fffffff
0x00, 0x00, 0x00, 0x01, // Priority 1
- 0x40, 0x03, 0x62, 0x61, // @.ba
+ 0x00, 0x03, 0x62, 0x61, // @.ba
0x72, 0x03, 0x66, 0x6f, // r.fo
- 0x6f, 0x40, 0x03, 0x66, // o@.f
+ 0x6f, 0x00, 0x03, 0x66, // o@.f
0x6f, 0x6f, 0x00, // oo.
};
SpdySynStreamIR syn_stream(0x7fffffff);
@@ -2089,9 +2089,9 @@ TEST_P(SpdyFramerTest, CreateSynReplyUncompressed) {
const unsigned char kV4FrameData[] = {
0x00, 0x12, 0x01, 0x04, // HEADER: END_HEADERS
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x03, 0x62, 0x61, // @.ba
+ 0x00, 0x03, 0x62, 0x61, // @.ba
0x72, 0x03, 0x66, 0x6f, // r.fo
- 0x6f, 0x40, 0x03, 0x66, // o@.f
+ 0x6f, 0x00, 0x03, 0x66, // o@.f
0x6f, 0x6f, 0x03, 0x62, // oo.b
0x61, 0x72, // ar
};
@@ -2139,8 +2139,8 @@ TEST_P(SpdyFramerTest, CreateSynReplyUncompressed) {
const unsigned char kV4FrameData[] = {
0x00, 0x0f, 0x01, 0x05, // HEADER: FIN | END_HEADERS
0x7f, 0xff, 0xff, 0xff, // Stream 0x7fffffff
- 0x40, 0x00, 0x03, 0x66, // @..f
- 0x6f, 0x6f, 0x40, 0x03, // oo@.
+ 0x00, 0x00, 0x03, 0x66, // @..f
+ 0x6f, 0x6f, 0x00, 0x03, // oo@.
0x66, 0x6f, 0x6f, 0x03, // foo.
0x62, 0x61, 0x72, // bar
};
@@ -2189,9 +2189,9 @@ TEST_P(SpdyFramerTest, CreateSynReplyUncompressed) {
const unsigned char kV4FrameData[] = {
0x00, 0x0f, 0x01, 0x05, // HEADER: FIN | END_HEADERS
0x7f, 0xff, 0xff, 0xff, // Stream 0x7fffffff
- 0x40, 0x03, 0x62, 0x61, // @.ba
+ 0x00, 0x03, 0x62, 0x61, // @.ba
0x72, 0x03, 0x66, 0x6f, // r.fo
- 0x6f, 0x40, 0x03, 0x66, // o@.f
+ 0x6f, 0x00, 0x03, 0x66, // o@.f
0x6f, 0x6f, 0x00, // oo.
};
SpdySynReplyIR syn_reply(0x7fffffff);
@@ -2633,9 +2633,9 @@ TEST_P(SpdyFramerTest, CreateHeadersUncompressed) {
const unsigned char kV4FrameData[] = {
0x00, 0x12, 0x01, 0x04, // Headers: END_HEADERS
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x03, 0x62, 0x61, // @.ba
+ 0x00, 0x03, 0x62, 0x61, // @.ba
0x72, 0x03, 0x66, 0x6f, // r.fo
- 0x6f, 0x40, 0x03, 0x66, // o@.f
+ 0x6f, 0x00, 0x03, 0x66, // o@.f
0x6f, 0x6f, 0x03, 0x62, // oo.b
0x61, 0x72, // ar
};
@@ -2683,8 +2683,8 @@ TEST_P(SpdyFramerTest, CreateHeadersUncompressed) {
const unsigned char kV4FrameData[] = {
0x00, 0x0f, 0x01, 0x05, // HEADER: FIN | END_HEADERS
0x7f, 0xff, 0xff, 0xff, // Stream 0x7fffffff
- 0x40, 0x00, 0x03, 0x66, // @..f
- 0x6f, 0x6f, 0x40, 0x03, // oo@.
+ 0x00, 0x00, 0x03, 0x66, // @..f
+ 0x6f, 0x6f, 0x00, 0x03, // oo@.
0x66, 0x6f, 0x6f, 0x03, // foo.
0x62, 0x61, 0x72, // bar
};
@@ -2733,9 +2733,9 @@ TEST_P(SpdyFramerTest, CreateHeadersUncompressed) {
const unsigned char kV4FrameData[] = {
0x00, 0x0f, 0x01, 0x05, // HEADER: FIN | END_HEADERS
0x7f, 0xff, 0xff, 0xff, // Stream 0x7fffffff
- 0x40, 0x03, 0x62, 0x61, // @.ba
+ 0x00, 0x03, 0x62, 0x61, // @.ba
0x72, 0x03, 0x66, 0x6f, // r.fo
- 0x6f, 0x40, 0x03, 0x66, // o@.f
+ 0x6f, 0x00, 0x03, 0x66, // o@.f
0x6f, 0x6f, 0x00, // oo.
};
SpdyHeadersIR headers_ir(0x7fffffff);
@@ -2931,9 +2931,9 @@ TEST_P(SpdyFramerTest, CreatePushPromiseUncompressed) {
0x00, 0x16, 0x05, 0x04, // PUSH_PROMISE: END_HEADERS
0x00, 0x00, 0x00, 0x2a, // Stream 42
0x00, 0x00, 0x00, 0x39, // Promised stream 57
- 0x40, 0x03, 0x62, 0x61, // @.ba
+ 0x00, 0x03, 0x62, 0x61, // @.ba
0x72, 0x03, 0x66, 0x6f, // r.fo
- 0x6f, 0x40, 0x03, 0x66, // o@.f
+ 0x6f, 0x00, 0x03, 0x66, // o@.f
0x6f, 0x6f, 0x03, 0x62, // oo.b
0x61, 0x72, // ar
};
@@ -3673,9 +3673,9 @@ TEST_P(SpdyFramerTest, CreateContinuationUncompressed) {
const unsigned char kFrameData[] = {
0x00, 0x12, 0x09, 0x00, // CONTINUATION
0x00, 0x00, 0x00, 0x2a, // Stream 42
- 0x40, 0x03, 0x62, 0x61, // @.ba
+ 0x00, 0x03, 0x62, 0x61, // @.ba
0x72, 0x03, 0x66, 0x6f, // r.fo
- 0x6f, 0x40, 0x03, 0x66, // o@.f
+ 0x6f, 0x00, 0x03, 0x66, // o@.f
0x6f, 0x6f, 0x03, 0x62, // oo.b
0x61, 0x72, // ar
};
@@ -3719,23 +3719,23 @@ TEST_P(SpdyFramerTest, ReadHeadersWithContinuation) {
const unsigned char kInput[] = {
0x00, 0x10, 0x01, 0x00, // HEADERS
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x06, 0x43, 0x6f,
+ 0x00, 0x06, 0x63, 0x6f,
0x6f, 0x6b, 0x69, 0x65,
0x07, 0x66, 0x6f, 0x6f,
0x3d, 0x62, 0x61, 0x72,
0x00, 0x14, 0x09, 0x00, // CONTINUATION
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x06, 0x43, 0x6f,
+ 0x00, 0x06, 0x63, 0x6f,
0x6f, 0x6b, 0x69, 0x65,
0x08, 0x62, 0x61, 0x7a,
0x3d, 0x62, 0x69, 0x6e,
- 0x67, 0x40, 0x06, 0x43,
+ 0x67, 0x00, 0x06, 0x63,
0x00, 0x12, 0x09, 0x04, // CONTINUATION: END_HEADERS
0x00, 0x00, 0x00, 0x01, // Stream 1
0x6f, 0x6f, 0x6b, 0x69,
- 0x65, 0x00, 0x40, 0x04,
+ 0x65, 0x00, 0x00, 0x04,
0x6e, 0x61, 0x6d, 0x65,
0x05, 0x76, 0x61, 0x6c,
0x75, 0x65,
@@ -3752,7 +3752,7 @@ TEST_P(SpdyFramerTest, ReadHeadersWithContinuation) {
EXPECT_EQ(0, visitor.zero_length_data_frame_count_);
EXPECT_THAT(visitor.headers_, ElementsAre(
- Pair("Cookie", "foo=bar; baz=bing; "),
+ Pair("cookie", "foo=bar; baz=bing; "),
Pair("name", "value")));
}
@@ -3764,23 +3764,23 @@ TEST_P(SpdyFramerTest, ReadHeadersWithContinuationAndFin) {
const unsigned char kInput[] = {
0x00, 0x10, 0x01, 0x01, // HEADERS: FIN
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x06, 0x43, 0x6f,
+ 0x00, 0x06, 0x63, 0x6f,
0x6f, 0x6b, 0x69, 0x65,
0x07, 0x66, 0x6f, 0x6f,
0x3d, 0x62, 0x61, 0x72,
0x00, 0x14, 0x09, 0x00, // CONTINUATION
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x06, 0x43, 0x6f,
+ 0x00, 0x06, 0x63, 0x6f,
0x6f, 0x6b, 0x69, 0x65,
0x08, 0x62, 0x61, 0x7a,
0x3d, 0x62, 0x69, 0x6e,
- 0x67, 0x40, 0x06, 0x43,
+ 0x67, 0x00, 0x06, 0x63,
0x00, 0x12, 0x09, 0x04, // CONTINUATION: END_HEADERS
0x00, 0x00, 0x00, 0x01, // Stream 1
0x6f, 0x6f, 0x6b, 0x69,
- 0x65, 0x00, 0x40, 0x04,
+ 0x65, 0x00, 0x00, 0x04,
0x6e, 0x61, 0x6d, 0x65,
0x05, 0x76, 0x61, 0x6c,
0x75, 0x65,
@@ -3798,7 +3798,7 @@ TEST_P(SpdyFramerTest, ReadHeadersWithContinuationAndFin) {
EXPECT_EQ(1, visitor.zero_length_data_frame_count_);
EXPECT_THAT(visitor.headers_, ElementsAre(
- Pair("Cookie", "foo=bar; baz=bing; "),
+ Pair("cookie", "foo=bar; baz=bing; "),
Pair("name", "value")));
}
@@ -3811,23 +3811,23 @@ TEST_P(SpdyFramerTest, ReadPushPromiseWithContinuation) {
0x00, 0x14, 0x05, 0x00, // PUSH_PROMISE
0x00, 0x00, 0x00, 0x01, // Stream 1
0x00, 0x00, 0x00, 0x2A, // Promised stream 42
- 0x40, 0x06, 0x43, 0x6f,
+ 0x00, 0x06, 0x63, 0x6f,
0x6f, 0x6b, 0x69, 0x65,
0x07, 0x66, 0x6f, 0x6f,
0x3d, 0x62, 0x61, 0x72,
0x00, 0x14, 0x09, 0x00, // CONTINUATION
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x06, 0x43, 0x6f,
+ 0x00, 0x06, 0x63, 0x6f,
0x6f, 0x6b, 0x69, 0x65,
0x08, 0x62, 0x61, 0x7a,
0x3d, 0x62, 0x69, 0x6e,
- 0x67, 0x40, 0x06, 0x43,
+ 0x67, 0x00, 0x06, 0x63,
0x00, 0x12, 0x09, 0x04, // CONTINUATION: END_HEADERS
0x00, 0x00, 0x00, 0x01, // Stream 1
0x6f, 0x6f, 0x6b, 0x69,
- 0x65, 0x00, 0x40, 0x04,
+ 0x65, 0x00, 0x00, 0x04,
0x6e, 0x61, 0x6d, 0x65,
0x05, 0x76, 0x61, 0x6c,
0x75, 0x65,
@@ -3845,7 +3845,7 @@ TEST_P(SpdyFramerTest, ReadPushPromiseWithContinuation) {
EXPECT_EQ(0, visitor.zero_length_data_frame_count_);
EXPECT_THAT(visitor.headers_, ElementsAre(
- Pair("Cookie", "foo=bar; baz=bing; "),
+ Pair("cookie", "foo=bar; baz=bing; "),
Pair("name", "value")));
}
@@ -3857,18 +3857,18 @@ TEST_P(SpdyFramerTest, ReadContinuationWithWrongStreamId) {
const unsigned char kInput[] = {
0x00, 0x10, 0x01, 0x00, // HEADERS
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x06, 0x43, 0x6f,
+ 0x00, 0x06, 0x63, 0x6f,
0x6f, 0x6b, 0x69, 0x65,
0x07, 0x66, 0x6f, 0x6f,
0x3d, 0x62, 0x61, 0x72,
0x00, 0x14, 0x09, 0x00, // CONTINUATION
0x00, 0x00, 0x00, 0x02, // Stream 2
- 0x40, 0x06, 0x43, 0x6f,
+ 0x00, 0x06, 0x63, 0x6f,
0x6f, 0x6b, 0x69, 0x65,
0x08, 0x62, 0x61, 0x7a,
0x3d, 0x62, 0x69, 0x6e,
- 0x67, 0x40, 0x06, 0x43,
+ 0x67, 0x00, 0x06, 0x63,
};
SpdyFramer framer(spdy_version_);
@@ -3893,7 +3893,7 @@ TEST_P(SpdyFramerTest, ReadContinuationOutOfOrder) {
const unsigned char kInput[] = {
0x00, 0x10, 0x09, 0x00, // CONTINUATION
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x06, 0x43, 0x6f,
+ 0x00, 0x06, 0x63, 0x6f,
0x6f, 0x6b, 0x69, 0x65,
0x07, 0x66, 0x6f, 0x6f,
0x3d, 0x62, 0x61, 0x72,
@@ -3920,7 +3920,7 @@ TEST_P(SpdyFramerTest, ExpectContinuationReceiveData) {
const unsigned char kInput[] = {
0x00, 0x10, 0x01, 0x00, // HEADERS
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x06, 0x43, 0x6f,
+ 0x00, 0x06, 0x63, 0x6f,
0x6f, 0x6b, 0x69, 0x65,
0x07, 0x66, 0x6f, 0x6f,
0x3d, 0x62, 0x61, 0x72,
@@ -3953,18 +3953,18 @@ TEST_P(SpdyFramerTest, ExpectContinuationReceiveControlFrame) {
const unsigned char kInput[] = {
0x00, 0x10, 0x01, 0x00, // HEADERS
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x06, 0x43, 0x6f,
+ 0x00, 0x06, 0x63, 0x6f,
0x6f, 0x6b, 0x69, 0x65,
0x07, 0x66, 0x6f, 0x6f,
0x3d, 0x62, 0x61, 0x72,
0x00, 0x14, 0x08, 0x00, // HEADERS
0x00, 0x00, 0x00, 0x01, // Stream 1
- 0x40, 0x06, 0x43, 0x6f, // (Note this is a valid continued encoding).
+ 0x00, 0x06, 0x63, 0x6f, // (Note this is a valid continued encoding).
0x6f, 0x6b, 0x69, 0x65,
0x08, 0x62, 0x61, 0x7a,
0x3d, 0x62, 0x69, 0x6e,
- 0x67, 0x40, 0x06, 0x43,
+ 0x67, 0x00, 0x06, 0x63,
};
SpdyFramer framer(spdy_version_);
@@ -4753,8 +4753,8 @@ TEST_P(SpdyFramerTest, ContinuationFrameFlags) {
SpdyHeadersIR headers_ir(42);
headers_ir.SetHeader("foo", "bar");
- headers_ir.set_end_headers(false);
scoped_ptr<SpdyFrame> frame0(framer.SerializeHeaders(headers_ir));
+ SetFrameFlags(frame0.get(), 0, spdy_version_);
SpdyContinuationIR continuation(42);
continuation.SetHeader("foo", "bar");
« no previous file with comments | « net/spdy/spdy_framer.cc ('k') | net/spdy/spdy_protocol.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698