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

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

Issue 1983783002: Remove OwnPtr::release() calls in modules/ (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/FetchBlobDataConsumerHandle.h" 5 #include "modules/fetch/FetchBlobDataConsumerHandle.h"
6 6
7 #include "core/dom/ExecutionContext.h" 7 #include "core/dom/ExecutionContext.h"
8 #include "core/fetch/ResourceLoaderOptions.h" 8 #include "core/fetch/ResourceLoaderOptions.h"
9 #include "core/loader/MockThreadableLoader.h" 9 #include "core/loader/MockThreadableLoader.h"
10 #include "core/loader/ThreadableLoaderClient.h" 10 #include "core/loader/ThreadableLoaderClient.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 } 58 }
59 59
60 MOCK_METHOD4(createInternal, ThreadableLoader*(ExecutionContext&, Threadable LoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&)); 60 MOCK_METHOD4(createInternal, ThreadableLoader*(ExecutionContext&, Threadable LoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&));
61 }; 61 };
62 62
63 PassRefPtr<BlobDataHandle> createBlobDataHandle(const char* s) 63 PassRefPtr<BlobDataHandle> createBlobDataHandle(const char* s)
64 { 64 {
65 OwnPtr<BlobData> data = BlobData::create(); 65 OwnPtr<BlobData> data = BlobData::create();
66 data->appendText(s, false); 66 data->appendText(s, false);
67 auto size = data->length(); 67 auto size = data->length();
68 return BlobDataHandle::create(data.release(), size); 68 return BlobDataHandle::create(std::move(data), size);
69 } 69 }
70 70
71 String toString(const Vector<char>& data) 71 String toString(const Vector<char>& data)
72 { 72 {
73 return String(data.data(), data.size()); 73 return String(data.data(), data.size());
74 } 74 }
75 75
76 class FetchBlobDataConsumerHandleTest : public ::testing::Test { 76 class FetchBlobDataConsumerHandleTest : public ::testing::Test {
77 public: 77 public:
78 FetchBlobDataConsumerHandleTest() 78 FetchBlobDataConsumerHandleTest()
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 src->add(Command(Command::Data, "hello, ")); 229 src->add(Command(Command::Data, "hello, "));
230 src->add(Command(Command::Data, "world")); 230 src->add(Command(Command::Data, "world"));
231 src->add(Command(Command::Wait)); 231 src->add(Command(Command::Wait));
232 src->add(Command(Command::Done)); 232 src->add(Command(Command::Done));
233 233
234 size_t size = 0; 234 size_t size = 0;
235 handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size); 235 handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size);
236 checkpoint.Call(1); 236 checkpoint.Call(1);
237 testing::runPendingTasks(); 237 testing::runPendingTasks();
238 checkpoint.Call(2); 238 checkpoint.Call(2);
239 client->didReceiveResponse(0, ResourceResponse(), src.release()); 239 client->didReceiveResponse(0, ResourceResponse(), std::move(src));
240 HandleReaderRunner<HandleReader> runner(handle.release()); 240 HandleReaderRunner<HandleReader> runner(std::move(handle));
241 OwnPtr<HandleReadResult> r = runner.wait(); 241 OwnPtr<HandleReadResult> r = runner.wait();
242 EXPECT_EQ(kDone, r->result()); 242 EXPECT_EQ(kDone, r->result());
243 EXPECT_EQ("hello, world", toString(r->data())); 243 EXPECT_EQ("hello, world", toString(r->data()));
244 } 244 }
245 245
246 TEST_F(FetchBlobDataConsumerHandleTest, TwoPhaseReadTest) 246 TEST_F(FetchBlobDataConsumerHandleTest, TwoPhaseReadTest)
247 { 247 {
248 auto factory = new StrictMock<MockLoaderFactory>; 248 auto factory = new StrictMock<MockLoaderFactory>;
249 Checkpoint checkpoint; 249 Checkpoint checkpoint;
250 250
(...skipping 17 matching lines...) Expand all
268 src->add(Command(Command::Data, "hello, ")); 268 src->add(Command(Command::Data, "hello, "));
269 src->add(Command(Command::Data, "world")); 269 src->add(Command(Command::Data, "world"));
270 src->add(Command(Command::Wait)); 270 src->add(Command(Command::Wait));
271 src->add(Command(Command::Done)); 271 src->add(Command(Command::Done));
272 272
273 size_t size = 0; 273 size_t size = 0;
274 handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size); 274 handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size);
275 checkpoint.Call(1); 275 checkpoint.Call(1);
276 testing::runPendingTasks(); 276 testing::runPendingTasks();
277 checkpoint.Call(2); 277 checkpoint.Call(2);
278 client->didReceiveResponse(0, ResourceResponse(), src.release()); 278 client->didReceiveResponse(0, ResourceResponse(), std::move(src));
279 HandleReaderRunner<HandleTwoPhaseReader> runner(handle.release()); 279 HandleReaderRunner<HandleTwoPhaseReader> runner(std::move(handle));
280 OwnPtr<HandleReadResult> r = runner.wait(); 280 OwnPtr<HandleReadResult> r = runner.wait();
281 EXPECT_EQ(kDone, r->result()); 281 EXPECT_EQ(kDone, r->result());
282 EXPECT_EQ("hello, world", toString(r->data())); 282 EXPECT_EQ("hello, world", toString(r->data()));
283 } 283 }
284 284
285 TEST_F(FetchBlobDataConsumerHandleTest, LoadErrorTest) 285 TEST_F(FetchBlobDataConsumerHandleTest, LoadErrorTest)
286 { 286 {
287 auto factory = new StrictMock<MockLoaderFactory>; 287 auto factory = new StrictMock<MockLoaderFactory>;
288 Checkpoint checkpoint; 288 Checkpoint checkpoint;
289 289
(...skipping 10 matching lines...) Expand all
300 RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a ti me"); 300 RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a ti me");
301 OwnPtr<WebDataConsumerHandle> handle 301 OwnPtr<WebDataConsumerHandle> handle
302 = FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, facto ry); 302 = FetchBlobDataConsumerHandle::create(&document(), blobDataHandle, facto ry);
303 303
304 size_t size = 0; 304 size_t size = 0;
305 handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size); 305 handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size);
306 checkpoint.Call(1); 306 checkpoint.Call(1);
307 testing::runPendingTasks(); 307 testing::runPendingTasks();
308 checkpoint.Call(2); 308 checkpoint.Call(2);
309 client->didFail(ResourceError()); 309 client->didFail(ResourceError());
310 HandleReaderRunner<HandleReader> runner(handle.release()); 310 HandleReaderRunner<HandleReader> runner(std::move(handle));
311 OwnPtr<HandleReadResult> r = runner.wait(); 311 OwnPtr<HandleReadResult> r = runner.wait();
312 EXPECT_EQ(kUnexpectedError, r->result()); 312 EXPECT_EQ(kUnexpectedError, r->result());
313 } 313 }
314 314
315 TEST_F(FetchBlobDataConsumerHandleTest, BodyLoadErrorTest) 315 TEST_F(FetchBlobDataConsumerHandleTest, BodyLoadErrorTest)
316 { 316 {
317 auto factory = new StrictMock<MockLoaderFactory>; 317 auto factory = new StrictMock<MockLoaderFactory>;
318 Checkpoint checkpoint; 318 Checkpoint checkpoint;
319 319
320 OwnPtr<MockThreadableLoader> loader = MockThreadableLoader::create(); 320 OwnPtr<MockThreadableLoader> loader = MockThreadableLoader::create();
(...skipping 14 matching lines...) Expand all
335 OwnPtr<ReplayingHandle> src = ReplayingHandle::create(); 335 OwnPtr<ReplayingHandle> src = ReplayingHandle::create();
336 src->add(Command(Command::Wait)); 336 src->add(Command(Command::Wait));
337 src->add(Command(Command::Data, "hello, ")); 337 src->add(Command(Command::Data, "hello, "));
338 src->add(Command(Command::Error)); 338 src->add(Command(Command::Error));
339 339
340 size_t size = 0; 340 size_t size = 0;
341 handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size); 341 handle->obtainReader(nullptr)->read(nullptr, 0, kNone, &size);
342 checkpoint.Call(1); 342 checkpoint.Call(1);
343 testing::runPendingTasks(); 343 testing::runPendingTasks();
344 checkpoint.Call(2); 344 checkpoint.Call(2);
345 client->didReceiveResponse(0, ResourceResponse(), src.release()); 345 client->didReceiveResponse(0, ResourceResponse(), std::move(src));
346 HandleReaderRunner<HandleReader> runner(handle.release()); 346 HandleReaderRunner<HandleReader> runner(std::move(handle));
347 OwnPtr<HandleReadResult> r = runner.wait(); 347 OwnPtr<HandleReadResult> r = runner.wait();
348 EXPECT_EQ(kUnexpectedError, r->result()); 348 EXPECT_EQ(kUnexpectedError, r->result());
349 } 349 }
350 350
351 TEST_F(FetchBlobDataConsumerHandleTest, DrainAsBlobDataHandle) 351 TEST_F(FetchBlobDataConsumerHandleTest, DrainAsBlobDataHandle)
352 { 352 {
353 auto factory = new StrictMock<MockLoaderFactory>; 353 auto factory = new StrictMock<MockLoaderFactory>;
354 354
355 RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a ti me"); 355 RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a ti me");
356 OwnPtr<FetchDataConsumerHandle> handle 356 OwnPtr<FetchDataConsumerHandle> handle
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(nullpt r); 423 OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(nullpt r);
424 424
425 const void* buffer; 425 const void* buffer;
426 size_t available; 426 size_t available;
427 EXPECT_EQ(kShouldWait, reader->beginRead(&buffer, kNone, &available)); 427 EXPECT_EQ(kShouldWait, reader->beginRead(&buffer, kNone, &available));
428 EXPECT_FALSE(reader->drainAsBlobDataHandle()); 428 EXPECT_FALSE(reader->drainAsBlobDataHandle());
429 } 429 }
430 430
431 } // namespace 431 } // namespace
432 } // namespace blink 432 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698