net/url_request/test_url_fetcher_factory.h - Issue 60923002: [sync] Allow FakeURLFetcher to return an arbitrary URLRequestStatus

Unified Diff: net/url_request/test_url_fetcher_factory.h

Issue 60923002: [sync] Allow FakeURLFetcher to return an arbitrary URLRequestStatus (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 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 | « components/precache/core/precache_fetcher_unittest.cc ('k') | net/url_request/test_url_fetcher_factory.cc » ('j') | net/url_request/test_url_fetcher_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/url_request/test_url_fetcher_factory.h

diff --git a/net/url_request/test_url_fetcher_factory.h b/net/url_request/test_url_fetcher_factory.h

index 50ab815d63ea8b4c968df0d53c66fe2e0fea36d8..d84f4fe01bcc0f3508c512d12308ed0ff17897e5 100644

--- a/net/url_request/test_url_fetcher_factory.h

+++ b/net/url_request/test_url_fetcher_factory.h

@@ -287,7 +287,8 @@ class FakeURLFetcher : public TestURLFetcher {

FakeURLFetcher(const GURL& url,

URLFetcherDelegate* d,

const std::string& response_data,

- HttpStatusCode response_code);

+ HttpStatusCode response_code,

+ URLRequestStatus::Status status);

// Start the request. This will call the given delegate asynchronously

// with the pre-baked response as parameter.

@@ -326,18 +327,21 @@ class FakeURLFetcher : public TestURLFetcher {

// // want to respond with a simple html page and an HTTP/200 code.

// factory.SetFakeResponse("http://a.com/success",

// "<html><body>hello world</body></html>",

-// HTTP_OK);

+// HTTP_OK,

+// URLRequestStatus::SUCCESS);

// // You know that class SomeService will request url http://a.com/failure and

// // you want to test the service class by returning a server error.

// factory.SetFakeResponse("http://a.com/failure",

// "",

-// HTTP_INTERNAL_SERVER_ERROR);

+// HTTP_INTERNAL_SERVER_ERROR,

+// URLRequestStatus::FAILED);

mmenke 2013/11/06 15:40:12 This really should be URLRequestStatus::SUCCESS.

Raghu Simha 2013/11/06 16:58:59 I've fixed the example section to include both the

// // You know that class SomeService will request url http://a.com/error and

// // you want to test the service class by returning a specific error code,

// // say, a HTTP/401 error.

// factory.SetFakeResponse("http://a.com/error",

// "some_response",

-// HTTP_UNAUTHORIZED);

+// HTTP_UNAUTHORIZED,

+// URLRequestStatus::SUCCESS);

// SomeService service;

// service.Run(); // Will eventually request these three URLs.

@@ -350,13 +354,16 @@ class FakeURLFetcherFactory : public URLFetcherFactory,

// |delegate| Delegate for FakeURLFetcher

// |response_data| response data for FakeURLFetcher

// |response_code| response code for FakeURLFetcher

+ // |status| URL fetch status for FakeURLFetcher

// These arguments should by default be used in instantiating FakeURLFetcher

- // as follows: new FakeURLFetcher(url, delegate, response_data, response_code)

+ // like so:

+ // new FakeURLFetcher(url, delegate, response_data, response_code, status)

typedef base::Callback<scoped_ptr<FakeURLFetcher>(

const GURL&,

URLFetcherDelegate*,

const std::string&,

- HttpStatusCode)> FakeURLFetcherCreator;

+ HttpStatusCode,

+ URLRequestStatus::Status)> FakeURLFetcherCreator;

// |default_factory|, which can be NULL, is a URLFetcherFactory that

// will be used to construct a URLFetcher in case the URL being created

@@ -390,20 +397,28 @@ class FakeURLFetcherFactory : public URLFetcherFactory,

// Sets the fake response for a given URL. The |response_data| may be empty.

// The |response_code| may be any HttpStatusCode. For instance, HTTP_OK will

// return an HTTP/200 and HTTP_INTERNAL_SERVER_ERROR will return an HTTP/500.

- // Note: The URLRequestStatus of FakeURLFetchers created by the factory will

- // be FAILED for HttpStatusCodes HTTP/5xx, and SUCCESS for all other codes.

+ // The |status| argument may be any URLRequestStatus::Status value. Typically,

+ // requests that return a valid HttpStatusCode have the SUCCESS status, while

+ // requests that indicate a failure to connect to the server have the FAILED

+ // status.

void SetFakeResponse(const GURL& url,

const std::string& response_data,

- HttpStatusCode response_code);

+ HttpStatusCode response_code,

+ URLRequestStatus::Status status);

// Clear all the fake responses that were previously set via

// SetFakeResponse().

void ClearFakeResponses();

private:

+ struct FakeURLResponse {

+ std::string response_data;

+ HttpStatusCode response_code;

+ URLRequestStatus::Status status;

+ };

+ typedef std::map<GURL, FakeURLResponse> FakeResponseMap;

const FakeURLFetcherCreator creator_;

- typedef std::map<GURL,

- std::pair<std::string, HttpStatusCode> > FakeResponseMap;

FakeResponseMap fake_responses_;

URLFetcherFactory* const default_factory_;

@@ -411,7 +426,8 @@ class FakeURLFetcherFactory : public URLFetcherFactory,

const GURL& url,

URLFetcherDelegate* delegate,

const std::string& response_data,

- HttpStatusCode response_code);

+ HttpStatusCode response_code,

+ URLRequestStatus::Status status);

DISALLOW_COPY_AND_ASSIGN(FakeURLFetcherFactory);

};