components/precache/core/precache_fetcher_unittest.cc - Issue 60923002: [sync] Allow FakeURLFetcher to return an arbitrary URLRequestStatus

Unified Diff: components/precache/core/precache_fetcher_unittest.cc

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

Patch Set: Address feedback 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/dom_distiller/core/distiller_url_fetcher_unittest.cc ('k') | net/url_request/test_url_fetcher_factory.h » ('j') | net/url_request/test_url_fetcher_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/precache/core/precache_fetcher_unittest.cc

diff --git a/components/precache/core/precache_fetcher_unittest.cc b/components/precache/core/precache_fetcher_unittest.cc

index e2fe2adce04afc755d1fe34da85b6cc5020e2af6..98008558217387b097aefb3fb1663baf9d83f366 100644

--- a/components/precache/core/precache_fetcher_unittest.cc

+++ b/components/precache/core/precache_fetcher_unittest.cc

@@ -19,6 +19,7 @@

#include "net/http/http_response_headers.h"

#include "net/http/http_status_code.h"

#include "net/url_request/test_url_fetcher_factory.h"

+#include "net/url_request/url_request_status.h"

#include "net/url_request/url_request_test_util.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -30,11 +31,12 @@ class TestURLFetcherCallback {

public:

scoped_ptr<net::FakeURLFetcher> CreateURLFetcher(

const GURL& url, net::URLFetcherDelegate* delegate,

- const std::string& response_data, net::HttpStatusCode response_code) {

- scoped_ptr<net::FakeURLFetcher> fetcher(

- new net::FakeURLFetcher(url, delegate, response_data, response_code));

+ const std::string& response_data, net::HttpStatusCode response_code,

+ net::URLRequestStatus::Status status) {

+ scoped_ptr<net::FakeURLFetcher> fetcher(new net::FakeURLFetcher(

+ url, delegate, response_data, response_code, status));

- if (response_code == net::HTTP_OK) {

+ if (net::HttpStatusCode(request_status.error()) == net::HTTP_OK) {

akalin 2013/11/06 00:11:02 is this still correct? revert?

Raghu Simha 2013/11/06 15:28:00 Not needed any more. Reverted.

scoped_refptr<net::HttpResponseHeaders> download_headers =

new net::HttpResponseHeaders("");

download_headers->AddHeader("Content-Type: text/html");

@@ -124,19 +126,21 @@ TEST_F(PrecacheFetcherTest, FullPrecache) {

good_manifest.add_resource(); // Resource with no URL, should not be fetched.

good_manifest.add_resource()->set_url(kGoodResourceURL);

- factory_.SetFakeResponse(GURL(kConfigURL),

- config.SerializeAsString(),

- net::HTTP_OK);

- factory_.SetFakeResponse(GURL(kManifestFetchFailureURL),

- "",

- net::HTTP_INTERNAL_SERVER_ERROR);

- factory_.SetFakeResponse(GURL(kBadManifestURL), "bad protobuf", net::HTTP_OK);

+ factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(),

+ net::HTTP_OK, net::URLRequestStatus::SUCCESS);

+ factory_.SetFakeResponse(GURL(kManifestFetchFailureURL), "",

+ net::HTTP_INTERNAL_SERVER_ERROR,

+ net::URLRequestStatus::FAILED);

+ factory_.SetFakeResponse(GURL(kBadManifestURL), "bad protobuf", net::HTTP_OK,

+ net::URLRequestStatus::SUCCESS);

factory_.SetFakeResponse(GURL(kGoodManifestURL),

- good_manifest.SerializeAsString(), net::HTTP_OK);

+ good_manifest.SerializeAsString(), net::HTTP_OK,

+ net::URLRequestStatus::SUCCESS);

factory_.SetFakeResponse(GURL(kResourceFetchFailureURL),

- "",

- net::HTTP_INTERNAL_SERVER_ERROR);

- factory_.SetFakeResponse(GURL(kGoodResourceURL), "good", net::HTTP_OK);

+ "", net::HTTP_INTERNAL_SERVER_ERROR,

+ net::URLRequestStatus::FAILED);

+ factory_.SetFakeResponse(GURL(kGoodResourceURL), "good", net::HTTP_OK,

+ net::URLRequestStatus::SUCCESS);

PrecacheFetcher precache_fetcher(starting_urls, request_context_.get(),

&precache_delegate_);

@@ -163,9 +167,9 @@ TEST_F(PrecacheFetcherTest, ConfigFetchFailure) {

std::list<GURL> starting_urls(1, GURL("http://starting-url.com"));

- factory_.SetFakeResponse(GURL(kConfigURL),

- "",

- net::HTTP_INTERNAL_SERVER_ERROR);

+ factory_.SetFakeResponse(GURL(kConfigURL), "",

+ net::HTTP_INTERNAL_SERVER_ERROR,

+ net::URLRequestStatus::FAILED);

PrecacheFetcher precache_fetcher(starting_urls, request_context_.get(),

&precache_delegate_);

@@ -186,7 +190,8 @@ TEST_F(PrecacheFetcherTest, BadConfig) {

std::list<GURL> starting_urls(1, GURL("http://starting-url.com"));

- factory_.SetFakeResponse(GURL(kConfigURL), "bad protobuf", net::HTTP_OK);

+ factory_.SetFakeResponse(GURL(kConfigURL), "bad protobuf", net::HTTP_OK,

+ net::URLRequestStatus::SUCCESS);

PrecacheFetcher precache_fetcher(starting_urls, request_context_.get(),

&precache_delegate_);

@@ -211,9 +216,8 @@ TEST_F(PrecacheFetcherTest, Cancel) {

config.add_whitelisted_starting_url("http://starting-url.com");

config.set_maximum_rank_starting_url(1);

- factory_.SetFakeResponse(GURL(kConfigURL),

- config.SerializeAsString(),

- net::HTTP_OK);

+ factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(),

+ net::HTTP_OK, net::URLRequestStatus::SUCCESS);

scoped_ptr<PrecacheFetcher> precache_fetcher(new PrecacheFetcher(

starting_urls, request_context_.get(), &precache_delegate_));

@@ -241,7 +245,7 @@ TEST_F(PrecacheFetcherTest, PrecacheUsingDefaultConfigSettingsURL) {

factory_.SetFakeResponse(GURL(PRECACHE_CONFIG_SETTINGS_URL),

PrecacheConfigurationSettings().SerializeAsString(),

- net::HTTP_OK);

+ net::HTTP_OK, net::URLRequestStatus::SUCCESS);

PrecacheFetcher precache_fetcher(starting_urls, request_context_.get(),

&precache_delegate_);

@@ -275,12 +279,10 @@ TEST_F(PrecacheFetcherTest, PrecacheUsingDefaultManifestURLPrefix) {

GURL manifest_url(PRECACHE_MANIFEST_URL_PREFIX

"http%253A%252F%252Fstarting-url.com%252F");

- factory_.SetFakeResponse(GURL(kConfigURL),

- config.SerializeAsString(),

- net::HTTP_OK);

- factory_.SetFakeResponse(manifest_url,

- PrecacheManifest().SerializeAsString(),

- net::HTTP_OK);

+ factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(),

+ net::HTTP_OK, net::URLRequestStatus::SUCCESS);

+ factory_.SetFakeResponse(manifest_url, PrecacheManifest().SerializeAsString(),

+ net::HTTP_OK, net::URLRequestStatus::SUCCESS);

PrecacheFetcher precache_fetcher(starting_urls, request_context_.get(),

&precache_delegate_);