Chromium Code Reviews| Index: net/url_request/url_request_http_job_unittest.cc |
| diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc |
| index aa1599aa6cce1b56b906753b84491447423c7fff..3d27b4888c82a3ee4ec6b90ba6bfa2f4131589f3 100644 |
| --- a/net/url_request/url_request_http_job_unittest.cc |
| +++ b/net/url_request/url_request_http_job_unittest.cc |
| @@ -267,6 +267,113 @@ TEST_F(URLRequestHttpJobWithMockSocketsTest, |
| } |
| TEST_F(URLRequestHttpJobWithMockSocketsTest, |
| + TestRawHeaderSizeSuccessfullRequest) { |
| + MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)}; |
| + MockRead reads[] = {MockRead("HTTP/1.1 200 OK\r\n" |
| + "Content-Length: 12\r\n\r\n"), |
| + MockRead("Test Content"), |
| + MockRead(net::SYNCHRONOUS, net::OK)}; |
| + |
| + StaticSocketDataProvider socket_data(reads, arraysize(reads), writes, |
| + arraysize(writes)); |
| + socket_factory_.AddSocketDataProvider(&socket_data); |
| + |
| + TestDelegate delegate; |
| + std::unique_ptr<URLRequest> request = context_->CreateRequest( |
| + GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate); |
| + |
| + request->Start(); |
| + ASSERT_TRUE(request->is_pending()); |
| + base::RunLoop().Run(); |
| + |
| + EXPECT_TRUE(request->status().is_success()); |
| + EXPECT_EQ(12, request->received_response_content_length()); |
| + EXPECT_EQ(39, request->raw_header_size()); |
| + EXPECT_EQ(CountReadBytes(reads, arraysize(reads)), |
| + request->GetTotalReceivedBytes()); |
| +} |
| + |
| +TEST_F(URLRequestHttpJobWithMockSocketsTest, |
| + TestRawHeaderSizeSuccessfull100ContinueRequest) { |
| + MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)}; |
| + MockRead reads[] = {MockRead("HTTP/1.1 100 Continue\r\n\r\n"), |
| + MockRead("HTTP/1.1 200 OK\r\n" |
| + "Content-Length: 12\r\n\r\n"), |
| + MockRead("Test Content"), |
| + MockRead(net::SYNCHRONOUS, net::OK)}; |
| + |
| + StaticSocketDataProvider socket_data(reads, arraysize(reads), writes, |
| + arraysize(writes)); |
| + socket_factory_.AddSocketDataProvider(&socket_data); |
| + |
| + TestDelegate delegate; |
| + std::unique_ptr<URLRequest> request = context_->CreateRequest( |
| + GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate); |
| + |
| + request->Start(); |
| + ASSERT_TRUE(request->is_pending()); |
| + base::RunLoop().Run(); |
| + |
| + EXPECT_TRUE(request->status().is_success()); |
| + EXPECT_EQ(12, request->received_response_content_length()); |
| + EXPECT_EQ(64, request->raw_header_size()); |
| + EXPECT_EQ(CountReadBytes(reads, arraysize(reads)), |
| + request->GetTotalReceivedBytes()); |
| +} |
| + |
| +TEST_F(URLRequestHttpJobWithMockSocketsTest, |
| + TestRawHeaderSizeFailureTruncatedHeaders) { |
| + MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)}; |
| + MockRead reads[] = {MockRead("HTTP/1.0 200 OK\r\n" |
| + "Content-Len"), |
| + MockRead(net::SYNCHRONOUS, net::OK)}; |
| + |
| + StaticSocketDataProvider socket_data(reads, arraysize(reads), writes, |
| + arraysize(writes)); |
| + socket_factory_.AddSocketDataProvider(&socket_data); |
| + |
| + TestDelegate delegate; |
| + std::unique_ptr<URLRequest> request = context_->CreateRequest( |
| + GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate); |
| + |
| + delegate.set_cancel_in_response_started(true); |
| + request->Start(); |
| + base::RunLoop().RunUntilIdle(); |
| + |
| + EXPECT_FALSE(request->status().is_success()); |
|
mmenke
2016/09/06 18:55:00
Should expect on the error here, too (We're workin
allada
2016/09/07 06:01:12
Done.
|
| + EXPECT_EQ(0, request->received_response_content_length()); |
| + EXPECT_EQ(28, request->raw_header_size()); |
| + EXPECT_EQ(CountReadBytes(reads, arraysize(reads)), |
| + request->GetTotalReceivedBytes()); |
| +} |
| + |
| +TEST_F(URLRequestHttpJobWithMockSocketsTest, |
| + TestRawHeaderSizeSuccessfullContinuiousRead) { |
| + MockWrite writes[] = {MockWrite(kSimpleGetMockWrite)}; |
| + MockRead reads[] = { |
| + MockRead("HTTP/1.1 200 OK\r\n" |
| + "Content-Length: 12\r\n\r\n" |
| + "Test Content")}; |
| + |
| + StaticSocketDataProvider socket_data(reads, arraysize(reads), writes, |
| + arraysize(writes)); |
| + socket_factory_.AddSocketDataProvider(&socket_data); |
| + |
| + TestDelegate delegate; |
| + std::unique_ptr<URLRequest> request = context_->CreateRequest( |
| + GURL("http://www.example.com"), DEFAULT_PRIORITY, &delegate); |
| + |
| + request->Start(); |
| + base::RunLoop().Run(); |
| + |
| + EXPECT_TRUE(request->status().is_success()); |
| + EXPECT_EQ(12, request->received_response_content_length()); |
| + EXPECT_EQ(39, request->raw_header_size()); |
| + EXPECT_EQ(CountReadBytes(reads, arraysize(reads)), |
| + request->GetTotalReceivedBytes()); |
| +} |
| + |
|
mmenke
2016/09/06 18:55:00
Also, should we make sure the header size is reada
mmenke
2016/09/06 18:55:00
Should we have a test for the cached path? That w
mmenke
2016/09/06 18:55:00
Suggest an HTTP/0.9 test. (i.e., just a response
allada
2016/09/07 06:01:12
We have this kind of test in our tests: third_part
allada
2016/09/07 06:01:12
I can do a cached path, however, in our case it's
allada
2016/09/07 06:01:12
I was opting out of doing this kind of test since
mmenke
2016/09/07 15:18:21
My concern is just that we don't return nonsense.
mmenke
2016/09/07 15:18:21
Unfortunately, I don't think we'll be able to comp
allada
2016/09/07 18:14:56
What if we refuse to set the header size if the ve
|
| +TEST_F(URLRequestHttpJobWithMockSocketsTest, |
| TestNetworkBytesRedirectedRequest) { |
| MockWrite redirect_writes[] = { |
| MockWrite("GET / HTTP/1.1\r\n" |