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

Side by Side Diff: third_party/WebKit/Source/modules/fetch/ResponseTest.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/fetch/Response.h" 5 #include "modules/fetch/Response.h"
6 6
7 #include "bindings/core/v8/ExceptionState.h" 7 #include "bindings/core/v8/ExceptionState.h"
8 #include "bindings/core/v8/ScriptState.h" 8 #include "bindings/core/v8/ScriptState.h"
9 #include "core/dom/Document.h" 9 #include "core/dom/Document.h"
10 #include "core/frame/Frame.h" 10 #include "core/frame/Frame.h"
11 #include "core/testing/DummyPageHolder.h" 11 #include "core/testing/DummyPageHolder.h"
12 #include "modules/fetch/BodyStreamBuffer.h" 12 #include "modules/fetch/BodyStreamBuffer.h"
13 #include "modules/fetch/DataConsumerHandleTestUtil.h" 13 #include "modules/fetch/DataConsumerHandleTestUtil.h"
14 #include "modules/fetch/DataConsumerHandleUtil.h" 14 #include "modules/fetch/DataConsumerHandleUtil.h"
15 #include "modules/fetch/FetchResponseData.h" 15 #include "modules/fetch/FetchResponseData.h"
16 #include "platform/blob/BlobData.h" 16 #include "platform/blob/BlobData.h"
17 #include "platform/testing/UnitTestHelpers.h" 17 #include "platform/testing/UnitTestHelpers.h"
18 #include "public/platform/modules/serviceworker/WebServiceWorkerResponse.h" 18 #include "public/platform/modules/serviceworker/WebServiceWorkerResponse.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 #include "wtf/PtrUtil.h"
21 #include <memory>
20 22
21 namespace blink { 23 namespace blink {
22 namespace { 24 namespace {
23 25
24 PassOwnPtr<WebServiceWorkerResponse> createTestWebServiceWorkerResponse() 26 std::unique_ptr<WebServiceWorkerResponse> createTestWebServiceWorkerResponse()
25 { 27 {
26 const KURL url(ParsedURLString, "http://www.webresponse.com/"); 28 const KURL url(ParsedURLString, "http://www.webresponse.com/");
27 const unsigned short status = 200; 29 const unsigned short status = 200;
28 const String statusText = "the best status text"; 30 const String statusText = "the best status text";
29 struct { 31 struct {
30 const char* key; 32 const char* key;
31 const char* value; 33 const char* value;
32 } headers[] = { { "cache-control", "no-cache" }, { "set-cookie", "foop" }, { "foo", "bar" }, { 0, 0 } }; 34 } headers[] = { { "cache-control", "no-cache" }, { "set-cookie", "foop" }, { "foo", "bar" }, { 0, 0 } };
33 35
34 OwnPtr<WebServiceWorkerResponse> webResponse = adoptPtr(new WebServiceWorker Response()); 36 std::unique_ptr<WebServiceWorkerResponse> webResponse = wrapUnique(new WebSe rviceWorkerResponse());
35 webResponse->setURL(url); 37 webResponse->setURL(url);
36 webResponse->setStatus(status); 38 webResponse->setStatus(status);
37 webResponse->setStatusText(statusText); 39 webResponse->setStatusText(statusText);
38 webResponse->setResponseType(WebServiceWorkerResponseTypeDefault); 40 webResponse->setResponseType(WebServiceWorkerResponseTypeDefault);
39 for (int i = 0; headers[i].key; ++i) 41 for (int i = 0; headers[i].key; ++i)
40 webResponse->setHeader(WebString::fromUTF8(headers[i].key), WebString::f romUTF8(headers[i].value)); 42 webResponse->setHeader(WebString::fromUTF8(headers[i].key), WebString::f romUTF8(headers[i].value));
41 return webResponse; 43 return webResponse;
42 } 44 }
43 45
44 class ServiceWorkerResponseTest : public ::testing::Test { 46 class ServiceWorkerResponseTest : public ::testing::Test {
45 public: 47 public:
46 ServiceWorkerResponseTest() 48 ServiceWorkerResponseTest()
47 : m_page(DummyPageHolder::create(IntSize(1, 1))) { } 49 : m_page(DummyPageHolder::create(IntSize(1, 1))) { }
48 50
49 ScriptState* getScriptState() { return ScriptState::forMainWorld(m_page->doc ument().frame()); } 51 ScriptState* getScriptState() { return ScriptState::forMainWorld(m_page->doc ument().frame()); }
50 ExecutionContext* getExecutionContext() { return getScriptState()->getExecut ionContext(); } 52 ExecutionContext* getExecutionContext() { return getScriptState()->getExecut ionContext(); }
51 53
52 private: 54 private:
53 OwnPtr<DummyPageHolder> m_page; 55 std::unique_ptr<DummyPageHolder> m_page;
54 }; 56 };
55 57
56 58
57 TEST_F(ServiceWorkerResponseTest, FromFetchResponseData) 59 TEST_F(ServiceWorkerResponseTest, FromFetchResponseData)
58 { 60 {
59 const KURL url(ParsedURLString, "http://www.response.com"); 61 const KURL url(ParsedURLString, "http://www.response.com");
60 62
61 FetchResponseData* fetchResponseData = FetchResponseData::create(); 63 FetchResponseData* fetchResponseData = FetchResponseData::create();
62 fetchResponseData->setURL(url); 64 fetchResponseData->setURL(url);
63 65
64 Response* response = Response::create(getExecutionContext(), fetchResponseDa ta); 66 Response* response = Response::create(getExecutionContext(), fetchResponseDa ta);
65 ASSERT(response); 67 ASSERT(response);
66 EXPECT_EQ(url, response->url()); 68 EXPECT_EQ(url, response->url());
67 } 69 }
68 70
69 TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponse) 71 TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponse)
70 { 72 {
71 OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerRes ponse(); 73 std::unique_ptr<WebServiceWorkerResponse> webResponse = createTestWebService WorkerResponse();
72 Response* response = Response::create(getScriptState(), *webResponse); 74 Response* response = Response::create(getScriptState(), *webResponse);
73 ASSERT(response); 75 ASSERT(response);
74 EXPECT_EQ(webResponse->url(), response->url()); 76 EXPECT_EQ(webResponse->url(), response->url());
75 EXPECT_EQ(webResponse->status(), response->status()); 77 EXPECT_EQ(webResponse->status(), response->status());
76 EXPECT_STREQ(webResponse->statusText().utf8().c_str(), response->statusText( ).utf8().data()); 78 EXPECT_STREQ(webResponse->statusText().utf8().c_str(), response->statusText( ).utf8().data());
77 79
78 Headers* responseHeaders = response->headers(); 80 Headers* responseHeaders = response->headers();
79 81
80 WebVector<WebString> keys = webResponse->getHeaderKeys(); 82 WebVector<WebString> keys = webResponse->getHeaderKeys();
81 EXPECT_EQ(keys.size(), responseHeaders->headerList()->size()); 83 EXPECT_EQ(keys.size(), responseHeaders->headerList()->size());
82 for (size_t i = 0, max = keys.size(); i < max; ++i) { 84 for (size_t i = 0, max = keys.size(); i < max; ++i) {
83 WebString key = keys[i]; 85 WebString key = keys[i];
84 TrackExceptionState exceptionState; 86 TrackExceptionState exceptionState;
85 EXPECT_STREQ(webResponse->getHeader(key).utf8().c_str(), responseHeaders ->get(key, exceptionState).utf8().data()); 87 EXPECT_STREQ(webResponse->getHeader(key).utf8().c_str(), responseHeaders ->get(key, exceptionState).utf8().data());
86 EXPECT_FALSE(exceptionState.hadException()); 88 EXPECT_FALSE(exceptionState.hadException());
87 } 89 }
88 } 90 }
89 91
90 TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseDefault) 92 TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseDefault)
91 { 93 {
92 OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerRes ponse(); 94 std::unique_ptr<WebServiceWorkerResponse> webResponse = createTestWebService WorkerResponse();
93 webResponse->setResponseType(WebServiceWorkerResponseTypeDefault); 95 webResponse->setResponseType(WebServiceWorkerResponseTypeDefault);
94 Response* response = Response::create(getScriptState(), *webResponse); 96 Response* response = Response::create(getScriptState(), *webResponse);
95 97
96 Headers* responseHeaders = response->headers(); 98 Headers* responseHeaders = response->headers();
97 TrackExceptionState exceptionState; 99 TrackExceptionState exceptionState;
98 EXPECT_STREQ("foop", responseHeaders->get("set-cookie", exceptionState).utf8 ().data()); 100 EXPECT_STREQ("foop", responseHeaders->get("set-cookie", exceptionState).utf8 ().data());
99 EXPECT_STREQ("bar", responseHeaders->get("foo", exceptionState).utf8().data( )); 101 EXPECT_STREQ("bar", responseHeaders->get("foo", exceptionState).utf8().data( ));
100 EXPECT_STREQ("no-cache", responseHeaders->get("cache-control", exceptionStat e).utf8().data()); 102 EXPECT_STREQ("no-cache", responseHeaders->get("cache-control", exceptionStat e).utf8().data());
101 EXPECT_FALSE(exceptionState.hadException()); 103 EXPECT_FALSE(exceptionState.hadException());
102 } 104 }
103 105
104 TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseBasic) 106 TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseBasic)
105 { 107 {
106 OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerRes ponse(); 108 std::unique_ptr<WebServiceWorkerResponse> webResponse = createTestWebService WorkerResponse();
107 webResponse->setResponseType(WebServiceWorkerResponseTypeBasic); 109 webResponse->setResponseType(WebServiceWorkerResponseTypeBasic);
108 Response* response = Response::create(getScriptState(), *webResponse); 110 Response* response = Response::create(getScriptState(), *webResponse);
109 111
110 Headers* responseHeaders = response->headers(); 112 Headers* responseHeaders = response->headers();
111 TrackExceptionState exceptionState; 113 TrackExceptionState exceptionState;
112 EXPECT_STREQ("", responseHeaders->get("set-cookie", exceptionState).utf8().d ata()); 114 EXPECT_STREQ("", responseHeaders->get("set-cookie", exceptionState).utf8().d ata());
113 EXPECT_STREQ("bar", responseHeaders->get("foo", exceptionState).utf8().data( )); 115 EXPECT_STREQ("bar", responseHeaders->get("foo", exceptionState).utf8().data( ));
114 EXPECT_STREQ("no-cache", responseHeaders->get("cache-control", exceptionStat e).utf8().data()); 116 EXPECT_STREQ("no-cache", responseHeaders->get("cache-control", exceptionStat e).utf8().data());
115 EXPECT_FALSE(exceptionState.hadException()); 117 EXPECT_FALSE(exceptionState.hadException());
116 } 118 }
117 119
118 TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseCORS) 120 TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseCORS)
119 { 121 {
120 OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerRes ponse(); 122 std::unique_ptr<WebServiceWorkerResponse> webResponse = createTestWebService WorkerResponse();
121 webResponse->setResponseType(WebServiceWorkerResponseTypeCORS); 123 webResponse->setResponseType(WebServiceWorkerResponseTypeCORS);
122 Response* response = Response::create(getScriptState(), *webResponse); 124 Response* response = Response::create(getScriptState(), *webResponse);
123 125
124 Headers* responseHeaders = response->headers(); 126 Headers* responseHeaders = response->headers();
125 TrackExceptionState exceptionState; 127 TrackExceptionState exceptionState;
126 EXPECT_STREQ("", responseHeaders->get("set-cookie", exceptionState).utf8().d ata()); 128 EXPECT_STREQ("", responseHeaders->get("set-cookie", exceptionState).utf8().d ata());
127 EXPECT_STREQ("", responseHeaders->get("foo", exceptionState).utf8().data()); 129 EXPECT_STREQ("", responseHeaders->get("foo", exceptionState).utf8().data());
128 EXPECT_STREQ("no-cache", responseHeaders->get("cache-control", exceptionStat e).utf8().data()); 130 EXPECT_STREQ("no-cache", responseHeaders->get("cache-control", exceptionStat e).utf8().data());
129 EXPECT_FALSE(exceptionState.hadException()); 131 EXPECT_FALSE(exceptionState.hadException());
130 } 132 }
131 133
132 TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseOpaque) 134 TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseOpaque)
133 { 135 {
134 OwnPtr<WebServiceWorkerResponse> webResponse = createTestWebServiceWorkerRes ponse(); 136 std::unique_ptr<WebServiceWorkerResponse> webResponse = createTestWebService WorkerResponse();
135 webResponse->setResponseType(WebServiceWorkerResponseTypeOpaque); 137 webResponse->setResponseType(WebServiceWorkerResponseTypeOpaque);
136 Response* response = Response::create(getScriptState(), *webResponse); 138 Response* response = Response::create(getScriptState(), *webResponse);
137 139
138 Headers* responseHeaders = response->headers(); 140 Headers* responseHeaders = response->headers();
139 TrackExceptionState exceptionState; 141 TrackExceptionState exceptionState;
140 EXPECT_STREQ("", responseHeaders->get("set-cookie", exceptionState).utf8().d ata()); 142 EXPECT_STREQ("", responseHeaders->get("set-cookie", exceptionState).utf8().d ata());
141 EXPECT_STREQ("", responseHeaders->get("foo", exceptionState).utf8().data()); 143 EXPECT_STREQ("", responseHeaders->get("foo", exceptionState).utf8().data());
142 EXPECT_STREQ("", responseHeaders->get("cache-control", exceptionState).utf8( ).data()); 144 EXPECT_STREQ("", responseHeaders->get("cache-control", exceptionState).utf8( ).data());
143 EXPECT_FALSE(exceptionState.hadException()); 145 EXPECT_FALSE(exceptionState.hadException());
144 } 146 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 EXPECT_CALL(*client2, didFetchDataLoadedString(String("Hello, world"))); 182 EXPECT_CALL(*client2, didFetchDataLoadedString(String("Hello, world")));
181 183
182 response->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAs String(), client1); 184 response->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAs String(), client1);
183 clonedResponse->internalBodyBuffer()->startLoading(FetchDataLoader::createLo aderAsString(), client2); 185 clonedResponse->internalBodyBuffer()->startLoading(FetchDataLoader::createLo aderAsString(), client2);
184 blink::testing::runPendingTasks(); 186 blink::testing::runPendingTasks();
185 } 187 }
186 188
187 BodyStreamBuffer* createHelloWorldBuffer(ScriptState* scriptState) 189 BodyStreamBuffer* createHelloWorldBuffer(ScriptState* scriptState)
188 { 190 {
189 using Command = DataConsumerHandleTestUtil::Command; 191 using Command = DataConsumerHandleTestUtil::Command;
190 OwnPtr<DataConsumerHandleTestUtil::ReplayingHandle> src(DataConsumerHandleTe stUtil::ReplayingHandle::create()); 192 std::unique_ptr<DataConsumerHandleTestUtil::ReplayingHandle> src(DataConsume rHandleTestUtil::ReplayingHandle::create());
191 src->add(Command(Command::Data, "Hello, ")); 193 src->add(Command(Command::Data, "Hello, "));
192 src->add(Command(Command::Data, "world")); 194 src->add(Command(Command::Data, "world"));
193 src->add(Command(Command::Done)); 195 src->add(Command(Command::Done));
194 return new BodyStreamBuffer(scriptState, createFetchDataConsumerHandleFromWe bHandle(std::move(src))); 196 return new BodyStreamBuffer(scriptState, createFetchDataConsumerHandleFromWe bHandle(std::move(src)));
195 } 197 }
196 198
197 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneDefault) 199 TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneDefault)
198 { 200 {
199 BodyStreamBuffer* buffer = createHelloWorldBuffer(getScriptState()); 201 BodyStreamBuffer* buffer = createHelloWorldBuffer(getScriptState());
200 FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(b uffer); 202 FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(b uffer);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 EXPECT_CALL(*client1, didFetchDataLoadFailed()); 254 EXPECT_CALL(*client1, didFetchDataLoadFailed());
253 EXPECT_CALL(*client2, didFetchDataLoadFailed()); 255 EXPECT_CALL(*client2, didFetchDataLoadFailed());
254 256
255 response->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAs String(), client1); 257 response->internalBodyBuffer()->startLoading(FetchDataLoader::createLoaderAs String(), client1);
256 clonedResponse->internalBodyBuffer()->startLoading(FetchDataLoader::createLo aderAsString(), client2); 258 clonedResponse->internalBodyBuffer()->startLoading(FetchDataLoader::createLo aderAsString(), client2);
257 blink::testing::runPendingTasks(); 259 blink::testing::runPendingTasks();
258 } 260 }
259 261
260 } // namespace 262 } // namespace
261 } // namespace blink 263 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/fetch/Response.cpp ('k') | third_party/WebKit/Source/modules/filesystem/DOMFileSystem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698