Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp - Issue 1264453002: Split the constructor of ThreadableLoader into two methods (ctor and start())

Unified Diff: Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

Issue 1264453002: Split the constructor of ThreadableLoader into two methods (ctor and start()) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments

Download patch

« Source/modules/fetch/FetchBlobDataConsumerHandle.cpp ('K') | « Source/modules/fetch/FetchBlobDataConsumerHandle.cpp ('k') | Source/modules/fetch/FetchManager.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

diff --git a/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp b/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

index 83ac968f6b004d2a2d6c0010a32e6e8e86a8b2fb..142e71526f11b86c24e7000742bdf2f5bc133a31 100644

--- a/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

+++ b/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp

@@ -52,13 +52,14 @@ using Checkpoint = StrictMock<::testing::MockFunction<void(int)>>;

class MockLoaderFactory : public FetchBlobDataConsumerHandle::LoaderFactory {

public:

- MOCK_METHOD5(create, PassRefPtr<ThreadableLoader>(ExecutionContext&, ThreadableLoaderClient*, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&));

+ MOCK_METHOD4(create, PassRefPtr<ThreadableLoader>(ExecutionContext&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&));

};

class MockThreadableLoader : public ThreadableLoader {

public:

static PassRefPtr<MockThreadableLoader> create() { return adoptRef(new StrictMock<MockThreadableLoader>); }

+ MOCK_METHOD1(start, void(const ResourceRequest&));

MOCK_METHOD1(overrideTimeout, void(unsigned long));

MOCK_METHOD0(cancel, void());

@@ -109,11 +110,11 @@ TEST_F(FetchBlobDataConsumerHandleTest, CreateLoader)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(DoAll(

- SaveArg<2>(&request),

- SaveArg<3>(&options),

- SaveArg<4>(&resourceLoaderOptions),

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(

+ SaveArg<2>(&options),

+ SaveArg<3>(&resourceLoaderOptions),

Return(loader.get())));

+ EXPECT_CALL(*loader, start(_));

hiroshige 2015/07/28 11:35:37 saveArg<1>(&request) might fix the unit test failu

tyoshino (SeeGerritForStatus) 2015/07/28 12:21:51 Done.

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*loader, cancel());

@@ -153,7 +154,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, CancelLoaderWhenStopped)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(Return(loader.get()));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(Return(loader.get()));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*loader, cancel());

EXPECT_CALL(checkpoint, Call(3));

@@ -181,7 +183,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, CancelLoaderWhenDestinationDetached)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(Return(loader.get()));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(Return(loader.get()));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(checkpoint, Call(3));

EXPECT_CALL(*loader, cancel());

@@ -215,7 +218,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, ReadTest)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*loader, cancel());

@@ -252,7 +256,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, TwoPhaseReadTest)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*loader, cancel());

@@ -289,7 +294,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, LoadErrorTest)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

RefPtr<BlobDataHandle> blobDataHandle = createBlobDataHandle("Once upon a time");

@@ -317,7 +323,8 @@ TEST_F(FetchBlobDataConsumerHandleTest, BodyLoadErrorTest)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

- EXPECT_CALL(*factory, create(Ref(document()), _, _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*factory, create(Ref(document()), _, _, _)).WillOnce(DoAll(SaveArg<1>(&client), Return(loader.get())));

+ EXPECT_CALL(*loader, start(_));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*loader, cancel());