| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/spdy/spdy_http_utils.h" | 5 #include "net/spdy/spdy_http_utils.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <limits> | 9 #include <limits> |
| 10 | 10 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 EXPECT_EQ(LOW, ConvertSpdyPriorityToRequestPriority(2, SPDY3)); | 35 EXPECT_EQ(LOW, ConvertSpdyPriorityToRequestPriority(2, SPDY3)); |
| 36 EXPECT_EQ(LOWEST, ConvertSpdyPriorityToRequestPriority(3, SPDY3)); | 36 EXPECT_EQ(LOWEST, ConvertSpdyPriorityToRequestPriority(3, SPDY3)); |
| 37 EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(4, SPDY3)); | 37 EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(4, SPDY3)); |
| 38 // These are invalid values, but we should still handle them | 38 // These are invalid values, but we should still handle them |
| 39 // gracefully. | 39 // gracefully. |
| 40 for (int i = 5; i < std::numeric_limits<uint8_t>::max(); ++i) { | 40 for (int i = 5; i < std::numeric_limits<uint8_t>::max(); ++i) { |
| 41 EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(i, SPDY3)); | 41 EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(i, SPDY3)); |
| 42 } | 42 } |
| 43 } | 43 } |
| 44 | 44 |
| 45 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestSPDY2) { | |
| 46 GURL url("https://www.google.com/index.html"); | |
| 47 HttpRequestInfo request; | |
| 48 request.method = "GET"; | |
| 49 request.url = url; | |
| 50 request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); | |
| 51 SpdyHeaderBlock headers; | |
| 52 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY2, | |
| 53 kDirect, &headers); | |
| 54 EXPECT_EQ("GET", headers["method"]); | |
| 55 EXPECT_EQ("https", headers["scheme"]); | |
| 56 EXPECT_EQ("www.google.com", headers["host"]); | |
| 57 EXPECT_EQ("/index.html", headers["url"]); | |
| 58 EXPECT_EQ("HTTP/1.1", headers["version"]); | |
| 59 EXPECT_EQ("Chrome/1.1", headers["user-agent"]); | |
| 60 } | |
| 61 | |
| 62 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestSPDY3) { | 45 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestSPDY3) { |
| 63 GURL url("https://www.google.com/index.html"); | 46 GURL url("https://www.google.com/index.html"); |
| 64 HttpRequestInfo request; | 47 HttpRequestInfo request; |
| 65 request.method = "GET"; | 48 request.method = "GET"; |
| 66 request.url = url; | 49 request.url = url; |
| 67 request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); | 50 request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); |
| 68 SpdyHeaderBlock headers; | 51 SpdyHeaderBlock headers; |
| 69 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3, | 52 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3, |
| 70 kDirect, &headers); | 53 kDirect, &headers); |
| 71 EXPECT_EQ("GET", headers[":method"]); | 54 EXPECT_EQ("GET", headers[":method"]); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 86 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, HTTP2, | 69 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, HTTP2, |
| 87 kDirect, &headers); | 70 kDirect, &headers); |
| 88 EXPECT_EQ("GET", headers[":method"]); | 71 EXPECT_EQ("GET", headers[":method"]); |
| 89 EXPECT_EQ("https", headers[":scheme"]); | 72 EXPECT_EQ("https", headers[":scheme"]); |
| 90 EXPECT_EQ("www.google.com", headers[":authority"]); | 73 EXPECT_EQ("www.google.com", headers[":authority"]); |
| 91 EXPECT_EQ("/index.html", headers[":path"]); | 74 EXPECT_EQ("/index.html", headers[":path"]); |
| 92 EXPECT_TRUE(headers.end() == headers.find(":version")); | 75 EXPECT_TRUE(headers.end() == headers.find(":version")); |
| 93 EXPECT_EQ("Chrome/1.1", headers["user-agent"]); | 76 EXPECT_EQ("Chrome/1.1", headers["user-agent"]); |
| 94 } | 77 } |
| 95 | 78 |
| 96 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxySPDY2) { | |
| 97 GURL url("https://www.google.com/index.html"); | |
| 98 HttpRequestInfo request; | |
| 99 request.method = "GET"; | |
| 100 request.url = url; | |
| 101 request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); | |
| 102 SpdyHeaderBlock headers; | |
| 103 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY2, | |
| 104 !kDirect, &headers); | |
| 105 EXPECT_EQ("GET", headers["method"]); | |
| 106 EXPECT_EQ("https", headers["scheme"]); | |
| 107 EXPECT_EQ("www.google.com", headers["host"]); | |
| 108 EXPECT_EQ("https://www.google.com/index.html", headers["url"]); | |
| 109 EXPECT_EQ("HTTP/1.1", headers["version"]); | |
| 110 EXPECT_EQ("Chrome/1.1", headers["user-agent"]); | |
| 111 } | |
| 112 | |
| 113 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxySPDY3) { | 79 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxySPDY3) { |
| 114 GURL url("https://www.google.com/index.html"); | 80 GURL url("https://www.google.com/index.html"); |
| 115 HttpRequestInfo request; | 81 HttpRequestInfo request; |
| 116 request.method = "GET"; | 82 request.method = "GET"; |
| 117 request.url = url; | 83 request.url = url; |
| 118 request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); | 84 request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); |
| 119 SpdyHeaderBlock headers; | 85 SpdyHeaderBlock headers; |
| 120 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3, | 86 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3, |
| 121 !kDirect, &headers); | 87 !kDirect, &headers); |
| 122 EXPECT_EQ("GET", headers[":method"]); | 88 EXPECT_EQ("GET", headers[":method"]); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 137 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, HTTP2, | 103 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, HTTP2, |
| 138 !kDirect, &headers); | 104 !kDirect, &headers); |
| 139 EXPECT_EQ("GET", headers[":method"]); | 105 EXPECT_EQ("GET", headers[":method"]); |
| 140 EXPECT_EQ("https", headers[":scheme"]); | 106 EXPECT_EQ("https", headers[":scheme"]); |
| 141 EXPECT_EQ("www.google.com", headers[":authority"]); | 107 EXPECT_EQ("www.google.com", headers[":authority"]); |
| 142 EXPECT_EQ("/index.html", headers[":path"]); | 108 EXPECT_EQ("/index.html", headers[":path"]); |
| 143 EXPECT_TRUE(headers.end() == headers.find(":version")); | 109 EXPECT_TRUE(headers.end() == headers.find(":version")); |
| 144 EXPECT_EQ("Chrome/1.1", headers["user-agent"]); | 110 EXPECT_EQ("Chrome/1.1", headers["user-agent"]); |
| 145 } | 111 } |
| 146 | 112 |
| 147 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectSPDY2) { | |
| 148 GURL url("https://www.google.com/index.html"); | |
| 149 HttpRequestInfo request; | |
| 150 request.method = "CONNECT"; | |
| 151 request.url = url; | |
| 152 request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); | |
| 153 SpdyHeaderBlock headers; | |
| 154 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY2, | |
| 155 kDirect, &headers); | |
| 156 EXPECT_EQ("CONNECT", headers["method"]); | |
| 157 EXPECT_TRUE(headers.end() == headers.find("scheme")); | |
| 158 EXPECT_EQ("www.google.com", headers["host"]); | |
| 159 EXPECT_EQ("www.google.com:443", headers["url"]); | |
| 160 EXPECT_EQ("HTTP/1.1", headers["version"]); | |
| 161 EXPECT_EQ("Chrome/1.1", headers["user-agent"]); | |
| 162 } | |
| 163 | |
| 164 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectSPDY3) { | 113 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectSPDY3) { |
| 165 GURL url("https://www.google.com/index.html"); | 114 GURL url("https://www.google.com/index.html"); |
| 166 HttpRequestInfo request; | 115 HttpRequestInfo request; |
| 167 request.method = "CONNECT"; | 116 request.method = "CONNECT"; |
| 168 request.url = url; | 117 request.url = url; |
| 169 request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); | 118 request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1"); |
| 170 SpdyHeaderBlock headers; | 119 SpdyHeaderBlock headers; |
| 171 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3, | 120 CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3, |
| 172 kDirect, &headers); | 121 kDirect, &headers); |
| 173 EXPECT_EQ("CONNECT", headers[":method"]); | 122 EXPECT_EQ("CONNECT", headers[":method"]); |
| (...skipping 16 matching lines...) Expand all Loading... |
| 190 EXPECT_EQ("CONNECT", headers[":method"]); | 139 EXPECT_EQ("CONNECT", headers[":method"]); |
| 191 EXPECT_TRUE(headers.end() == headers.find(":scheme")); | 140 EXPECT_TRUE(headers.end() == headers.find(":scheme")); |
| 192 EXPECT_EQ("www.google.com:443", headers[":authority"]); | 141 EXPECT_EQ("www.google.com:443", headers[":authority"]); |
| 193 EXPECT_EQ(headers.end(), headers.find(":path")); | 142 EXPECT_EQ(headers.end(), headers.find(":path")); |
| 194 EXPECT_EQ(headers.end(), headers.find(":scheme")); | 143 EXPECT_EQ(headers.end(), headers.find(":scheme")); |
| 195 EXPECT_TRUE(headers.end() == headers.find(":version")); | 144 EXPECT_TRUE(headers.end() == headers.find(":version")); |
| 196 EXPECT_EQ("Chrome/1.1", headers["user-agent"]); | 145 EXPECT_EQ("Chrome/1.1", headers["user-agent"]); |
| 197 } | 146 } |
| 198 | 147 |
| 199 } // namespace net | 148 } // namespace net |
| OLD | NEW |