third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp - Issue 2516353002: Introduce url_list to the Response scheme of CacheStorage.

Unified Diff: third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp

Issue 2516353002: Introduce url_list to the Response scheme of CacheStorage. (Closed)

Patch Set: incorporated falken's comment Created 4 years 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

« content/browser/cache_storage/cache_storage_cache.cc ('K') | « third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchManager.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp

diff --git a/third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp b/third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp

index ad94488caa8ea900f08824897e1356e93e27610e..d49ac422d7438334be7ec1eaf5df03028772fb50 100644

--- a/third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp

+++ b/third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp

@@ -194,9 +194,13 @@ class ErrorWebCacheForTests : public WebServiceWorkerCache {

const String expectedRequestUrl =

KURL(expectedBatchOperations[i].request.url());

EXPECT_EQ(expectedRequestUrl, KURL(batchOperations[i].request.url()));

- const String expectedResponseUrl =

- KURL(expectedBatchOperations[i].response.url());

- EXPECT_EQ(expectedResponseUrl, KURL(batchOperations[i].response.url()));

+ EXPECT_EQ(expectedBatchOperations[i].response.urlList().size(),

cmumford 2016/12/05 19:24:19 Should this be an ASSERT_EQ to avoid possible cras

horo 2016/12/06 05:47:36 Done.

+ batchOperations[i].response.urlList().size());

+ for (size_t j = 0;

+ j < expectedBatchOperations[i].response.urlList().size(); ++j) {

+ EXPECT_EQ(expectedBatchOperations[i].response.urlList()[j],

+ batchOperations[i].response.urlList()[j]);

+ }

CompareQueryParamsForTest(expectedBatchOperations[i].matchParams,

batchOperations[i].matchParams);

}

@@ -467,7 +471,9 @@ TEST_F(CacheStorageTest, BatchOperationArguments) {

ASSERT(request);

WebServiceWorkerResponse webResponse;

- webResponse.setURL(KURL(ParsedURLString, url));

+ std::vector<KURL> urlList;

+ urlList.push_back(KURL(ParsedURLString, url));

+ webResponse.setURLList(urlList);

Response* response = Response::create(getScriptState(), webResponse);

WebVector<WebServiceWorkerCache::BatchOperation> expectedDeleteOperations(

@@ -545,7 +551,9 @@ TEST_F(CacheStorageTest, MatchResponseTest) {

const String responseUrl = "http://match.response.test/";

WebServiceWorkerResponse webResponse;

- webResponse.setURL(KURL(ParsedURLString, responseUrl));

+ std::vector<KURL> urlList;

+ urlList.push_back(KURL(ParsedURLString, responseUrl));

+ webResponse.setURLList(urlList);

webResponse.setResponseType(WebServiceWorkerResponseTypeDefault);

Cache* cache = createCache(fetcher, new MatchTestCache(webResponse));

@@ -642,9 +650,13 @@ TEST_F(CacheStorageTest, MatchAllAndBatchResponseTest) {

expectedUrls[1] = url2;

WebVector<WebServiceWorkerResponse> webResponses(size_t(2));

- webResponses[0].setURL(KURL(ParsedURLString, url1));

+ std::vector<KURL> urlList1;

+ urlList1.push_back(KURL(ParsedURLString, url1));

+ webResponses[0].setURLList(urlList1);

webResponses[0].setResponseType(WebServiceWorkerResponseTypeDefault);

- webResponses[1].setURL(KURL(ParsedURLString, url2));

+ std::vector<KURL> urlList2;

+ urlList2.push_back(KURL(ParsedURLString, url2));

+ webResponses[1].setURLList(urlList2);

cmumford 2016/12/05 19:24:19 Do you think this is more simple, or more complex?

horo 2016/12/06 05:47:36 Done.

webResponses[1].setResponseType(WebServiceWorkerResponseTypeDefault);

Cache* cache =