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

Unified Diff: third_party/WebKit/Source/modules/fetch/ResponseTest.cpp

Issue 2516353002: Introduce url_list to the Response scheme of CacheStorage. (Closed)
Patch Set: Created 4 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
Index: third_party/WebKit/Source/modules/fetch/ResponseTest.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp b/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp
index ab7d6137010e3964b80487238befe327913a7da0..9d5b5d54e168462a933c9039efd779c1305bab1d 100644
--- a/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp
+++ b/third_party/WebKit/Source/modules/fetch/ResponseTest.cpp
@@ -36,10 +36,11 @@ std::unique_ptr<WebServiceWorkerResponse> createTestWebServiceWorkerResponse() {
{"set-cookie", "foop"},
{"foo", "bar"},
{0, 0}};
-
+ std::vector<WebURL> urlList;
+ urlList.push_back(url);
std::unique_ptr<WebServiceWorkerResponse> webResponse =
makeUnique<WebServiceWorkerResponse>();
- webResponse->setURL(url);
+ webResponse->setURLList(urlList);
webResponse->setStatus(status);
webResponse->setStatusText(statusText);
webResponse->setResponseType(WebServiceWorkerResponseTypeDefault);
@@ -55,8 +56,9 @@ TEST(ServiceWorkerResponseTest, FromFetchResponseData) {
const KURL url(ParsedURLString, "http://www.response.com");
FetchResponseData* fetchResponseData = FetchResponseData::create();
- fetchResponseData->setURL(url);
-
+ Vector<KURL> urlList;
+ urlList.append(url);
+ fetchResponseData->setURLList(urlList);
Response* response = Response::create(&page->document(), fetchResponseData);
ASSERT(response);
EXPECT_EQ(url, response->url());
@@ -68,7 +70,7 @@ TEST(ServiceWorkerResponseTest, FromWebServiceWorkerResponse) {
createTestWebServiceWorkerResponse();
Response* response = Response::create(scope.getScriptState(), *webResponse);
ASSERT(response);
falken 2016/11/30 14:57:38 should we do ASSERT_EQ(1, webResponse->urlList()->
horo 2016/12/01 07:42:14 Done.
- EXPECT_EQ(webResponse->url(), response->url());
+ EXPECT_EQ(webResponse->urlList()[0], response->url());
EXPECT_EQ(webResponse->status(), response->status());
EXPECT_STREQ(webResponse->statusText().utf8().c_str(),
response->statusText().utf8().data());
@@ -223,7 +225,9 @@ TEST(ServiceWorkerResponseTest, BodyStreamBufferCloneDefault) {
BodyStreamBuffer* buffer = createHelloWorldBuffer(scope.getScriptState());
FetchResponseData* fetchResponseData =
FetchResponseData::createWithBuffer(buffer);
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
+ Vector<KURL> urlList;
+ urlList.append(KURL(ParsedURLString, "http://www.response.com"));
+ fetchResponseData->setURLList(urlList);
Response* response =
Response::create(scope.getExecutionContext(), fetchResponseData);
EXPECT_EQ(response->internalBodyBuffer(), buffer);
@@ -235,7 +239,9 @@ TEST(ServiceWorkerResponseTest, BodyStreamBufferCloneBasic) {
BodyStreamBuffer* buffer = createHelloWorldBuffer(scope.getScriptState());
FetchResponseData* fetchResponseData =
FetchResponseData::createWithBuffer(buffer);
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
+ Vector<KURL> urlList;
+ urlList.append(KURL(ParsedURLString, "http://www.response.com"));
+ fetchResponseData->setURLList(urlList);
fetchResponseData = fetchResponseData->createBasicFilteredResponse();
Response* response =
Response::create(scope.getExecutionContext(), fetchResponseData);
@@ -248,7 +254,9 @@ TEST(ServiceWorkerResponseTest, BodyStreamBufferCloneCORS) {
BodyStreamBuffer* buffer = createHelloWorldBuffer(scope.getScriptState());
FetchResponseData* fetchResponseData =
FetchResponseData::createWithBuffer(buffer);
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
+ Vector<KURL> urlList;
+ urlList.append(KURL(ParsedURLString, "http://www.response.com"));
+ fetchResponseData->setURLList(urlList);
fetchResponseData = fetchResponseData->createCORSFilteredResponse();
Response* response =
Response::create(scope.getExecutionContext(), fetchResponseData);
@@ -261,7 +269,9 @@ TEST(ServiceWorkerResponseTest, BodyStreamBufferCloneOpaque) {
BodyStreamBuffer* buffer = createHelloWorldBuffer(scope.getScriptState());
FetchResponseData* fetchResponseData =
FetchResponseData::createWithBuffer(buffer);
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
+ Vector<KURL> urlList;
+ urlList.append(KURL(ParsedURLString, "http://www.response.com"));
+ fetchResponseData->setURLList(urlList);
fetchResponseData = fetchResponseData->createOpaqueFilteredResponse();
Response* response =
Response::create(scope.getExecutionContext(), fetchResponseData);
@@ -276,7 +286,9 @@ TEST(ServiceWorkerResponseTest, BodyStreamBufferCloneError) {
BytesConsumer::createErrored(BytesConsumer::Error()));
FetchResponseData* fetchResponseData =
FetchResponseData::createWithBuffer(buffer);
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
+ Vector<KURL> urlList;
+ urlList.append(KURL(ParsedURLString, "http://www.response.com"));
+ fetchResponseData->setURLList(urlList);
Response* response =
Response::create(scope.getExecutionContext(), fetchResponseData);
TrackExceptionState exceptionState;

Powered by Google App Engine
This is Rietveld 408576698