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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_http_utils_unittest.cc

Issue 1357953002: Replace the existing SpdyHeaderBlock typedef with a class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add some includes. Created 5 years, 3 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
« net/spdy/spdy_header_block.h ('K') | « net/spdy/spdy_http_utils.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | net/spdy/spdy_test_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_http_utils_unittest.cc
diff --git a/net/spdy/spdy_http_utils_unittest.cc b/net/spdy/spdy_http_utils_unittest.cc
index c6464aef6b401974a3ac89444104cd4a3145f226..dd0543239f2a1f5bfa443187f88841d742686faf 100644
--- a/net/spdy/spdy_http_utils_unittest.cc
+++ b/net/spdy/spdy_http_utils_unittest.cc
@@ -47,12 +47,12 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestSPDY2) {
SpdyHeaderBlock headers;
CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY2,
kDirect, &headers);
- EXPECT_EQ("GET", headers["method"]);
- EXPECT_EQ("https", headers["scheme"]);
- EXPECT_EQ("www.google.com", headers["host"]);
- EXPECT_EQ("/index.html", headers["url"]);
- EXPECT_EQ("HTTP/1.1", headers["version"]);
- EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
+ EXPECT_EQ("GET", static_cast<StringPiece>(headers["method"]));
+ EXPECT_EQ("https", static_cast<StringPiece>(headers["scheme"]));
+ EXPECT_EQ("www.google.com", static_cast<StringPiece>(headers["host"]));
+ EXPECT_EQ("/index.html", static_cast<StringPiece>(headers["url"]));
+ EXPECT_EQ("HTTP/1.1", static_cast<StringPiece>(headers["version"]));
+ EXPECT_EQ("Chrome/1.1", static_cast<StringPiece>(headers["user-agent"]));
}
TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestSPDY3) {
@@ -64,12 +64,12 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestSPDY3) {
SpdyHeaderBlock headers;
CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3,
kDirect, &headers);
- EXPECT_EQ("GET", headers[":method"]);
- EXPECT_EQ("https", headers[":scheme"]);
- EXPECT_EQ("www.google.com", headers[":host"]);
- EXPECT_EQ("/index.html", headers[":path"]);
- EXPECT_EQ("HTTP/1.1", headers[":version"]);
- EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
+ EXPECT_EQ("GET", static_cast<StringPiece>(headers[":method"]));
+ EXPECT_EQ("https", static_cast<StringPiece>(headers[":scheme"]));
+ EXPECT_EQ("www.google.com", static_cast<StringPiece>(headers[":host"]));
+ EXPECT_EQ("/index.html", static_cast<StringPiece>(headers[":path"]));
+ EXPECT_EQ("HTTP/1.1", static_cast<StringPiece>(headers[":version"]));
+ EXPECT_EQ("Chrome/1.1", static_cast<StringPiece>(headers["user-agent"]));
}
TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestHTTP2) {
@@ -81,12 +81,12 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestHTTP2) {
SpdyHeaderBlock headers;
CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, HTTP2,
kDirect, &headers);
- EXPECT_EQ("GET", headers[":method"]);
- EXPECT_EQ("https", headers[":scheme"]);
- EXPECT_EQ("www.google.com", headers[":authority"]);
- EXPECT_EQ("/index.html", headers[":path"]);
+ EXPECT_EQ("GET", static_cast<StringPiece>(headers[":method"]));
+ EXPECT_EQ("https", static_cast<StringPiece>(headers[":scheme"]));
+ EXPECT_EQ("www.google.com", static_cast<StringPiece>(headers[":authority"]));
+ EXPECT_EQ("/index.html", static_cast<StringPiece>(headers[":path"]));
EXPECT_TRUE(headers.end() == headers.find(":version"));
- EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
+ EXPECT_EQ("Chrome/1.1", static_cast<StringPiece>(headers["user-agent"]));
}
TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxySPDY2) {
@@ -98,12 +98,13 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxySPDY2) {
SpdyHeaderBlock headers;
CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY2,
!kDirect, &headers);
- EXPECT_EQ("GET", headers["method"]);
- EXPECT_EQ("https", headers["scheme"]);
- EXPECT_EQ("www.google.com", headers["host"]);
- EXPECT_EQ("https://www.google.com/index.html", headers["url"]);
- EXPECT_EQ("HTTP/1.1", headers["version"]);
- EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
+ EXPECT_EQ("GET", static_cast<StringPiece>(headers["method"]));
+ EXPECT_EQ("https", static_cast<StringPiece>(headers["scheme"]));
+ EXPECT_EQ("www.google.com", static_cast<StringPiece>(headers["host"]));
+ EXPECT_EQ("https://www.google.com/index.html",
+ static_cast<StringPiece>(headers["url"]));
+ EXPECT_EQ("HTTP/1.1", static_cast<StringPiece>(headers["version"]));
+ EXPECT_EQ("Chrome/1.1", static_cast<StringPiece>(headers["user-agent"]));
}
TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxySPDY3) {
@@ -115,12 +116,12 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxySPDY3) {
SpdyHeaderBlock headers;
CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3,
!kDirect, &headers);
- EXPECT_EQ("GET", headers[":method"]);
- EXPECT_EQ("https", headers[":scheme"]);
- EXPECT_EQ("www.google.com", headers[":host"]);
- EXPECT_EQ("/index.html", headers[":path"]);
- EXPECT_EQ("HTTP/1.1", headers[":version"]);
- EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
+ EXPECT_EQ("GET", static_cast<StringPiece>(headers[":method"]));
+ EXPECT_EQ("https", static_cast<StringPiece>(headers[":scheme"]));
+ EXPECT_EQ("www.google.com", static_cast<StringPiece>(headers[":host"]));
+ EXPECT_EQ("/index.html", static_cast<StringPiece>(headers[":path"]));
+ EXPECT_EQ("HTTP/1.1", static_cast<StringPiece>(headers[":version"]));
+ EXPECT_EQ("Chrome/1.1", static_cast<StringPiece>(headers["user-agent"]));
}
TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxyHTTP2) {
@@ -132,12 +133,12 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxyHTTP2) {
SpdyHeaderBlock headers;
CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, HTTP2,
!kDirect, &headers);
- EXPECT_EQ("GET", headers[":method"]);
- EXPECT_EQ("https", headers[":scheme"]);
- EXPECT_EQ("www.google.com", headers[":authority"]);
- EXPECT_EQ("/index.html", headers[":path"]);
+ EXPECT_EQ("GET", static_cast<StringPiece>(headers[":method"]));
+ EXPECT_EQ("https", static_cast<StringPiece>(headers[":scheme"]));
+ EXPECT_EQ("www.google.com", static_cast<StringPiece>(headers[":authority"]));
+ EXPECT_EQ("/index.html", static_cast<StringPiece>(headers[":path"]));
EXPECT_TRUE(headers.end() == headers.find(":version"));
- EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
+ EXPECT_EQ("Chrome/1.1", static_cast<StringPiece>(headers["user-agent"]));
}
TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectSPDY2) {
@@ -149,12 +150,12 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectSPDY2) {
SpdyHeaderBlock headers;
CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY2,
kDirect, &headers);
- EXPECT_EQ("CONNECT", headers["method"]);
+ EXPECT_EQ("CONNECT", static_cast<StringPiece>(headers["method"]));
EXPECT_TRUE(headers.end() == headers.find("scheme"));
- EXPECT_EQ("www.google.com", headers["host"]);
- EXPECT_EQ("www.google.com:443", headers["url"]);
- EXPECT_EQ("HTTP/1.1", headers["version"]);
- EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
+ EXPECT_EQ("www.google.com", static_cast<StringPiece>(headers["host"]));
+ EXPECT_EQ("www.google.com:443", static_cast<StringPiece>(headers["url"]));
+ EXPECT_EQ("HTTP/1.1", static_cast<StringPiece>(headers["version"]));
+ EXPECT_EQ("Chrome/1.1", static_cast<StringPiece>(headers["user-agent"]));
}
TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectSPDY3) {
@@ -166,12 +167,12 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectSPDY3) {
SpdyHeaderBlock headers;
CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3,
kDirect, &headers);
- EXPECT_EQ("CONNECT", headers[":method"]);
+ EXPECT_EQ("CONNECT", static_cast<StringPiece>(headers[":method"]));
EXPECT_TRUE(headers.end() == headers.find(":scheme"));
- EXPECT_EQ("www.google.com", headers[":host"]);
- EXPECT_EQ("www.google.com:443", headers[":path"]);
- EXPECT_EQ("HTTP/1.1", headers[":version"]);
- EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
+ EXPECT_EQ("www.google.com", static_cast<StringPiece>(headers[":host"]));
+ EXPECT_EQ("www.google.com:443", static_cast<StringPiece>(headers[":path"]));
+ EXPECT_EQ("HTTP/1.1", static_cast<StringPiece>(headers[":version"]));
+ EXPECT_EQ("Chrome/1.1", static_cast<StringPiece>(headers["user-agent"]));
}
TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectHTTP2) {
@@ -183,13 +184,14 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectHTTP2) {
SpdyHeaderBlock headers;
CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, HTTP2,
kDirect, &headers);
- EXPECT_EQ("CONNECT", headers[":method"]);
+ EXPECT_EQ("CONNECT", static_cast<StringPiece>(headers[":method"]));
EXPECT_TRUE(headers.end() == headers.find(":scheme"));
- EXPECT_EQ("www.google.com:443", headers[":authority"]);
- EXPECT_EQ(0u, headers.count(":path"));
- EXPECT_EQ(0u, headers.count(":scheme"));
+ EXPECT_EQ("www.google.com:443",
+ static_cast<StringPiece>(headers[":authority"]));
+ EXPECT_EQ(headers.end(), headers.find(":path"));
+ EXPECT_EQ(headers.end(), headers.find(":scheme"));
EXPECT_TRUE(headers.end() == headers.find(":version"));
- EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
+ EXPECT_EQ("Chrome/1.1", static_cast<StringPiece>(headers["user-agent"]));
}
} // namespace net
« net/spdy/spdy_header_block.h ('K') | « net/spdy/spdy_http_utils.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | net/spdy/spdy_test_utils.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698