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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/url_request/url_request_unittest.cc

Issue 732423002: Update from chromium https://crrev.com/304586 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/url_request/url_request_simple_job.cc ('k') | sandbox/linux/bpf_dsl/policy_compiler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_unittest.cc
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 2aeecc639e7b5e06eeb9c892942da2249196d47b..1d777dc50b9068f9e455b6d93e5dde4269161b57 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1158,445 +1158,6 @@ class CancelThenRestartTestJob : public URLRequestTestJob {
~CancelThenRestartTestJob() override {}
};
-// An Interceptor for use with interceptor tests
-class TestInterceptor : URLRequest::Interceptor {
- public:
- TestInterceptor()
- : intercept_main_request_(false), restart_main_request_(false),
- cancel_main_request_(false), cancel_then_restart_main_request_(false),
- simulate_main_network_error_(false),
- intercept_redirect_(false), cancel_redirect_request_(false),
- intercept_final_response_(false), cancel_final_request_(false),
- did_intercept_main_(false), did_restart_main_(false),
- did_cancel_main_(false), did_cancel_then_restart_main_(false),
- did_simulate_error_main_(false),
- did_intercept_redirect_(false), did_cancel_redirect_(false),
- did_intercept_final_(false), did_cancel_final_(false) {
- URLRequest::Deprecated::RegisterRequestInterceptor(this);
- }
-
- ~TestInterceptor() override {
- URLRequest::Deprecated::UnregisterRequestInterceptor(this);
- }
-
- URLRequestJob* MaybeIntercept(URLRequest* request,
- NetworkDelegate* network_delegate) override {
- if (restart_main_request_) {
- restart_main_request_ = false;
- did_restart_main_ = true;
- return new RestartTestJob(request, network_delegate);
- }
- if (cancel_main_request_) {
- cancel_main_request_ = false;
- did_cancel_main_ = true;
- return new CancelTestJob(request, network_delegate);
- }
- if (cancel_then_restart_main_request_) {
- cancel_then_restart_main_request_ = false;
- did_cancel_then_restart_main_ = true;
- return new CancelThenRestartTestJob(request, network_delegate);
- }
- if (simulate_main_network_error_) {
- simulate_main_network_error_ = false;
- did_simulate_error_main_ = true;
- // will error since the requeted url is not one of its canned urls
- return new URLRequestTestJob(request, network_delegate, true);
- }
- if (!intercept_main_request_)
- return NULL;
- intercept_main_request_ = false;
- did_intercept_main_ = true;
- URLRequestTestJob* job = new URLRequestTestJob(request,
- network_delegate,
- main_headers_,
- main_data_,
- true);
- job->set_load_timing_info(main_request_load_timing_info_);
- return job;
- }
-
- URLRequestJob* MaybeInterceptRedirect(URLRequest* request,
- NetworkDelegate* network_delegate,
- const GURL& location) override {
- if (cancel_redirect_request_) {
- cancel_redirect_request_ = false;
- did_cancel_redirect_ = true;
- return new CancelTestJob(request, network_delegate);
- }
- if (!intercept_redirect_)
- return NULL;
- intercept_redirect_ = false;
- did_intercept_redirect_ = true;
- return new URLRequestTestJob(request,
- network_delegate,
- redirect_headers_,
- redirect_data_,
- true);
- }
-
- URLRequestJob* MaybeInterceptResponse(
- URLRequest* request,
- NetworkDelegate* network_delegate) override {
- if (cancel_final_request_) {
- cancel_final_request_ = false;
- did_cancel_final_ = true;
- return new CancelTestJob(request, network_delegate);
- }
- if (!intercept_final_response_)
- return NULL;
- intercept_final_response_ = false;
- did_intercept_final_ = true;
- return new URLRequestTestJob(request,
- network_delegate,
- final_headers_,
- final_data_,
- true);
- }
-
- // Whether to intercept the main request, and if so the response to return and
- // the LoadTimingInfo to use.
- bool intercept_main_request_;
- std::string main_headers_;
- std::string main_data_;
- LoadTimingInfo main_request_load_timing_info_;
-
- // Other actions we take at MaybeIntercept time
- bool restart_main_request_;
- bool cancel_main_request_;
- bool cancel_then_restart_main_request_;
- bool simulate_main_network_error_;
-
- // Whether to intercept redirects, and if so the response to return.
- bool intercept_redirect_;
- std::string redirect_headers_;
- std::string redirect_data_;
-
- // Other actions we can take at MaybeInterceptRedirect time
- bool cancel_redirect_request_;
-
- // Whether to intercept final response, and if so the response to return.
- bool intercept_final_response_;
- std::string final_headers_;
- std::string final_data_;
-
- // Other actions we can take at MaybeInterceptResponse time
- bool cancel_final_request_;
-
- // If we did something or not
- bool did_intercept_main_;
- bool did_restart_main_;
- bool did_cancel_main_;
- bool did_cancel_then_restart_main_;
- bool did_simulate_error_main_;
- bool did_intercept_redirect_;
- bool did_cancel_redirect_;
- bool did_intercept_final_;
- bool did_cancel_final_;
-
- // Static getters for canned response header and data strings
-
- static std::string ok_data() {
- return URLRequestTestJob::test_data_1();
- }
-
- static std::string ok_headers() {
- return URLRequestTestJob::test_headers();
- }
-
- static std::string redirect_data() {
- return std::string();
- }
-
- static std::string redirect_headers() {
- return URLRequestTestJob::test_redirect_headers();
- }
-
- static std::string error_data() {
- return std::string("ohhh nooooo mr. bill!");
- }
-
- static std::string error_headers() {
- return URLRequestTestJob::test_error_headers();
- }
-};
-
-TEST_F(URLRequestTest, Intercept) {
- TestInterceptor interceptor;
-
- // intercept the main request and respond with a simple response
- interceptor.intercept_main_request_ = true;
- interceptor.main_headers_ = TestInterceptor::ok_headers();
- interceptor.main_data_ = TestInterceptor::ok_data();
-
- TestDelegate d;
- scoped_ptr<URLRequest> req(default_context_.CreateRequest(
- GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL));
- base::SupportsUserData::Data* user_data0 = new base::SupportsUserData::Data();
- base::SupportsUserData::Data* user_data1 = new base::SupportsUserData::Data();
- base::SupportsUserData::Data* user_data2 = new base::SupportsUserData::Data();
- req->SetUserData(NULL, user_data0);
- req->SetUserData(&user_data1, user_data1);
- req->SetUserData(&user_data2, user_data2);
- req->set_method("GET");
- req->Start();
- base::RunLoop().Run();
-
- // Make sure we can retrieve our specific user data
- EXPECT_EQ(user_data0, req->GetUserData(NULL));
- EXPECT_EQ(user_data1, req->GetUserData(&user_data1));
- EXPECT_EQ(user_data2, req->GetUserData(&user_data2));
-
- // Check the interceptor got called as expected
- EXPECT_TRUE(interceptor.did_intercept_main_);
-
- // Check we got one good response
- EXPECT_TRUE(req->status().is_success());
- EXPECT_EQ(200, req->response_headers()->response_code());
- EXPECT_EQ(TestInterceptor::ok_data(), d.data_received());
- EXPECT_EQ(1, d.response_started_count());
- EXPECT_EQ(0, d.received_redirect_count());
-}
-
-TEST_F(URLRequestTest, InterceptRedirect) {
- TestInterceptor interceptor;
-
- // intercept the main request and respond with a redirect
- interceptor.intercept_main_request_ = true;
- interceptor.main_headers_ = TestInterceptor::redirect_headers();
- interceptor.main_data_ = TestInterceptor::redirect_data();
-
- // intercept that redirect and respond a final OK response
- interceptor.intercept_redirect_ = true;
- interceptor.redirect_headers_ = TestInterceptor::ok_headers();
- interceptor.redirect_data_ = TestInterceptor::ok_data();
-
- TestDelegate d;
- scoped_ptr<URLRequest> req(default_context_.CreateRequest(
- GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL));
- req->set_method("GET");
- req->Start();
- base::RunLoop().Run();
-
- // Check the interceptor got called as expected
- EXPECT_TRUE(interceptor.did_intercept_main_);
- EXPECT_TRUE(interceptor.did_intercept_redirect_);
-
- // Check we got one good response
- EXPECT_TRUE(req->status().is_success());
- if (req->status().is_success()) {
- EXPECT_EQ(200, req->response_headers()->response_code());
- }
- EXPECT_EQ(TestInterceptor::ok_data(), d.data_received());
- EXPECT_EQ(1, d.response_started_count());
- EXPECT_EQ(0, d.received_redirect_count());
-}
-
-TEST_F(URLRequestTest, InterceptServerError) {
- TestInterceptor interceptor;
-
- // intercept the main request to generate a server error response
- interceptor.intercept_main_request_ = true;
- interceptor.main_headers_ = TestInterceptor::error_headers();
- interceptor.main_data_ = TestInterceptor::error_data();
-
- // intercept that error and respond with an OK response
- interceptor.intercept_final_response_ = true;
- interceptor.final_headers_ = TestInterceptor::ok_headers();
- interceptor.final_data_ = TestInterceptor::ok_data();
-
- TestDelegate d;
- scoped_ptr<URLRequest> req(default_context_.CreateRequest(
- GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL));
- req->set_method("GET");
- req->Start();
- base::RunLoop().Run();
-
- // Check the interceptor got called as expected
- EXPECT_TRUE(interceptor.did_intercept_main_);
- EXPECT_TRUE(interceptor.did_intercept_final_);
-
- // Check we got one good response
- EXPECT_TRUE(req->status().is_success());
- EXPECT_EQ(200, req->response_headers()->response_code());
- EXPECT_EQ(TestInterceptor::ok_data(), d.data_received());
- EXPECT_EQ(1, d.response_started_count());
- EXPECT_EQ(0, d.received_redirect_count());
-}
-
-TEST_F(URLRequestTest, InterceptNetworkError) {
- TestInterceptor interceptor;
-
- // intercept the main request to simulate a network error
- interceptor.simulate_main_network_error_ = true;
-
- // intercept that error and respond with an OK response
- interceptor.intercept_final_response_ = true;
- interceptor.final_headers_ = TestInterceptor::ok_headers();
- interceptor.final_data_ = TestInterceptor::ok_data();
-
- TestDelegate d;
- scoped_ptr<URLRequest> req(default_context_.CreateRequest(
- GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL));
- req->set_method("GET");
- req->Start();
- base::RunLoop().Run();
-
- // Check the interceptor got called as expected
- EXPECT_TRUE(interceptor.did_simulate_error_main_);
- EXPECT_TRUE(interceptor.did_intercept_final_);
-
- // Check we received one good response
- EXPECT_TRUE(req->status().is_success());
- EXPECT_EQ(200, req->response_headers()->response_code());
- EXPECT_EQ(TestInterceptor::ok_data(), d.data_received());
- EXPECT_EQ(1, d.response_started_count());
- EXPECT_EQ(0, d.received_redirect_count());
-}
-
-TEST_F(URLRequestTest, InterceptRestartRequired) {
- TestInterceptor interceptor;
-
- // restart the main request
- interceptor.restart_main_request_ = true;
-
- // then intercept the new main request and respond with an OK response
- interceptor.intercept_main_request_ = true;
- interceptor.main_headers_ = TestInterceptor::ok_headers();
- interceptor.main_data_ = TestInterceptor::ok_data();
-
- TestDelegate d;
- scoped_ptr<URLRequest> req(default_context_.CreateRequest(
- GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL));
- req->set_method("GET");
- req->Start();
- base::RunLoop().Run();
-
- // Check the interceptor got called as expected
- EXPECT_TRUE(interceptor.did_restart_main_);
- EXPECT_TRUE(interceptor.did_intercept_main_);
-
- // Check we received one good response
- EXPECT_TRUE(req->status().is_success());
- if (req->status().is_success()) {
- EXPECT_EQ(200, req->response_headers()->response_code());
- }
- EXPECT_EQ(TestInterceptor::ok_data(), d.data_received());
- EXPECT_EQ(1, d.response_started_count());
- EXPECT_EQ(0, d.received_redirect_count());
-}
-
-TEST_F(URLRequestTest, InterceptRespectsCancelMain) {
- TestInterceptor interceptor;
-
- // intercept the main request and cancel from within the restarted job
- interceptor.cancel_main_request_ = true;
-
- // setup to intercept final response and override it with an OK response
- interceptor.intercept_final_response_ = true;
- interceptor.final_headers_ = TestInterceptor::ok_headers();
- interceptor.final_data_ = TestInterceptor::ok_data();
-
- TestDelegate d;
- scoped_ptr<URLRequest> req(default_context_.CreateRequest(
- GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL));
- req->set_method("GET");
- req->Start();
- base::RunLoop().Run();
-
- // Check the interceptor got called as expected
- EXPECT_TRUE(interceptor.did_cancel_main_);
- EXPECT_FALSE(interceptor.did_intercept_final_);
-
- // Check we see a canceled request
- EXPECT_FALSE(req->status().is_success());
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
-}
-
-TEST_F(URLRequestTest, InterceptRespectsCancelRedirect) {
- TestInterceptor interceptor;
-
- // intercept the main request and respond with a redirect
- interceptor.intercept_main_request_ = true;
- interceptor.main_headers_ = TestInterceptor::redirect_headers();
- interceptor.main_data_ = TestInterceptor::redirect_data();
-
- // intercept the redirect and cancel from within that job
- interceptor.cancel_redirect_request_ = true;
-
- // setup to intercept final response and override it with an OK response
- interceptor.intercept_final_response_ = true;
- interceptor.final_headers_ = TestInterceptor::ok_headers();
- interceptor.final_data_ = TestInterceptor::ok_data();
-
- TestDelegate d;
- scoped_ptr<URLRequest> req(default_context_.CreateRequest(
- GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL));
- req->set_method("GET");
- req->Start();
- base::RunLoop().Run();
-
- // Check the interceptor got called as expected
- EXPECT_TRUE(interceptor.did_intercept_main_);
- EXPECT_TRUE(interceptor.did_cancel_redirect_);
- EXPECT_FALSE(interceptor.did_intercept_final_);
-
- // Check we see a canceled request
- EXPECT_FALSE(req->status().is_success());
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
-}
-
-TEST_F(URLRequestTest, InterceptRespectsCancelFinal) {
- TestInterceptor interceptor;
-
- // intercept the main request to simulate a network error
- interceptor.simulate_main_network_error_ = true;
-
- // setup to intercept final response and cancel from within that job
- interceptor.cancel_final_request_ = true;
-
- TestDelegate d;
- scoped_ptr<URLRequest> req(default_context_.CreateRequest(
- GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL));
- req->set_method("GET");
- req->Start();
- base::RunLoop().Run();
-
- // Check the interceptor got called as expected
- EXPECT_TRUE(interceptor.did_simulate_error_main_);
- EXPECT_TRUE(interceptor.did_cancel_final_);
-
- // Check we see a canceled request
- EXPECT_FALSE(req->status().is_success());
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
-}
-
-TEST_F(URLRequestTest, InterceptRespectsCancelInRestart) {
- TestInterceptor interceptor;
-
- // intercept the main request and cancel then restart from within that job
- interceptor.cancel_then_restart_main_request_ = true;
-
- // setup to intercept final response and override it with an OK response
- interceptor.intercept_final_response_ = true;
- interceptor.final_headers_ = TestInterceptor::ok_headers();
- interceptor.final_data_ = TestInterceptor::ok_data();
-
- TestDelegate d;
- scoped_ptr<URLRequest> req(default_context_.CreateRequest(
- GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, NULL));
- req->set_method("GET");
- req->Start();
- base::RunLoop().Run();
-
- // Check the interceptor got called as expected
- EXPECT_TRUE(interceptor.did_cancel_then_restart_main_);
- EXPECT_FALSE(interceptor.did_intercept_final_);
-
- // Check we see a canceled request
- EXPECT_FALSE(req->status().is_success());
- EXPECT_EQ(URLRequestStatus::CANCELED, req->status().status());
-}
-
// An Interceptor for use with interceptor tests.
class MockURLRequestInterceptor : public URLRequestInterceptor {
public:
@@ -2144,8 +1705,8 @@ TEST_F(URLRequestInterceptorTest, InterceptRespectsCancelInRestart) {
// Set up to intercept the final response and override it with an OK response.
interceptor()->set_intercept_final_response(true);
- interceptor()->set_final_headers(TestInterceptor::ok_headers());
- interceptor()->set_final_data(TestInterceptor::ok_data());
+ interceptor()->set_final_headers(MockURLRequestInterceptor::ok_headers());
+ interceptor()->set_final_data(MockURLRequestInterceptor::ok_data());
TestDelegate d;
scoped_ptr<URLRequest> req(default_context().CreateRequest(
« no previous file with comments | « net/url_request/url_request_simple_job.cc ('k') | sandbox/linux/bpf_dsl/policy_compiler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698