Source/modules/fetch/FetchDataLoaderTest.cpp - Issue 1217943007: Call Client methods synchronously in FetchDataLoader if the first read is Done or error

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

Issue 1217943007: Call Client methods synchronously in FetchDataLoader if the first read is Done or error (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

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

Download patch

Index: Source/modules/fetch/FetchDataLoaderTest.cpp

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

index d5c6d2824434241fddcb92f00213b9f99ab2fa16..857870a45bde34a5bfba2a1f22db4c62da5e6ef4 100644

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

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

@@ -27,6 +27,7 @@ using MockFetchDataLoaderClient = DataConsumerHandleTestUtil::MockFetchDataLoade

const WebDataConsumerHandle::Result kOk = WebDataConsumerHandle::Ok;

const WebDataConsumerHandle::Result kUnexpectedError = WebDataConsumerHandle::UnexpectedError;

const WebDataConsumerHandle::Result kDone = WebDataConsumerHandle::Done;

+const WebDataConsumerHandle::Result kShouldWait = WebDataConsumerHandle::ShouldWait;

const WebDataConsumerHandle::Flags kNone = WebDataConsumerHandle::FlagNone;

const FetchDataConsumerHandle::Reader::BlobSizePolicy kDisallowBlobWithInvalidSize = FetchDataConsumerHandle::Reader::DisallowBlobWithInvalidSize;

@@ -74,6 +75,7 @@ TEST(FetchDataLoaderTest, LoadAsBlob)

EXPECT_CALL(checkpoint, Call(1));

EXPECT_CALL(*handle, obtainReaderInternal(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(reader.get())));

EXPECT_CALL(*reader, drainAsBlobDataHandle(kDisallowBlobWithInvalidSize)).WillOnce(Return(nullptr));

+ EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(Return(kShouldWait));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLengthWithTerminatingNull), Return(kOk)));

EXPECT_CALL(*reader, endRead(kQuickBrownFoxLengthWithTerminatingNull)).WillOnce(Return(kOk));

@@ -114,6 +116,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobFailed)

EXPECT_CALL(checkpoint, Call(1));

EXPECT_CALL(*handle, obtainReaderInternal(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(reader.get())));

EXPECT_CALL(*reader, drainAsBlobDataHandle(kDisallowBlobWithInvalidSize)).WillOnce(Return(nullptr));

+ EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(Return(kShouldWait));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLengthWithTerminatingNull), Return(kOk)));

EXPECT_CALL(*reader, endRead(kQuickBrownFoxLengthWithTerminatingNull)).WillOnce(Return(kOk));

@@ -149,6 +152,7 @@ TEST(FetchDataLoaderTest, LoadAsBlobCancel)

EXPECT_CALL(checkpoint, Call(1));

EXPECT_CALL(*handle, obtainReaderInternal(_)).WillOnce(Return(reader.get()));

EXPECT_CALL(*reader, drainAsBlobDataHandle(kDisallowBlobWithInvalidSize)).WillOnce(Return(nullptr));

+ EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(Return(kShouldWait));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*reader, destruct());

EXPECT_CALL(checkpoint, Call(3));

@@ -255,6 +259,7 @@ TEST(FetchDataLoaderTest, LoadAsArrayBuffer)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

EXPECT_CALL(*handle, obtainReaderInternal(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(reader.get())));

+ EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(Return(kShouldWait));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLengthWithTerminatingNull), Return(kOk)));

EXPECT_CALL(*reader, endRead(kQuickBrownFoxLengthWithTerminatingNull)).WillOnce(Return(kOk));

@@ -294,6 +299,7 @@ TEST(FetchDataLoaderTest, LoadAsArrayBufferFailed)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

EXPECT_CALL(*handle, obtainReaderInternal(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(reader.get())));

+ EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(Return(kShouldWait));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLengthWithTerminatingNull), Return(kOk)));

EXPECT_CALL(*reader, endRead(kQuickBrownFoxLengthWithTerminatingNull)).WillOnce(Return(kOk));

@@ -328,6 +334,7 @@ TEST(FetchDataLoaderTest, LoadAsArrayBufferCancel)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

EXPECT_CALL(*handle, obtainReaderInternal(_)).WillOnce(Return(reader.get()));

+ EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(Return(kShouldWait));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*reader, destruct());

EXPECT_CALL(checkpoint, Call(3));

@@ -355,6 +362,7 @@ TEST(FetchDataLoaderTest, LoadAsString)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

EXPECT_CALL(*handle, obtainReaderInternal(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(reader.get())));

+ EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(Return(kShouldWait));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLength), Return(kOk)));

EXPECT_CALL(*reader, endRead(kQuickBrownFoxLength)).WillOnce(Return(kOk));

@@ -390,6 +398,7 @@ TEST(FetchDataLoaderTest, LoadAsStringWithNullBytes)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

EXPECT_CALL(*handle, obtainReaderInternal(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(reader.get())));

+ EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(Return(kShouldWait));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>("Quick\0brown\0fox")), SetArgPointee<2>(16), Return(kOk)));

EXPECT_CALL(*reader, endRead(kQuickBrownFoxLengthWithTerminatingNull)).WillOnce(Return(kOk));

@@ -425,6 +434,7 @@ TEST(FetchDataLoaderTest, LoadAsStringError)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

EXPECT_CALL(*handle, obtainReaderInternal(_)).WillOnce(DoAll(SaveArg<0>(&client), Return(reader.get())));

+ EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(Return(kShouldWait));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(DoAll(SetArgPointee<0>(static_cast<const void*>(kQuickBrownFox)), SetArgPointee<2>(kQuickBrownFoxLength), Return(kOk)));

EXPECT_CALL(*reader, endRead(kQuickBrownFoxLength)).WillOnce(Return(kOk));

@@ -459,6 +469,7 @@ TEST(FetchDataLoaderTest, LoadAsStringCancel)

InSequence s;

EXPECT_CALL(checkpoint, Call(1));

EXPECT_CALL(*handle, obtainReaderInternal(_)).WillOnce(Return(reader.get()));

+ EXPECT_CALL(*reader, beginRead(_, kNone, _)).WillOnce(Return(kShouldWait));

EXPECT_CALL(checkpoint, Call(2));

EXPECT_CALL(*reader, destruct());

EXPECT_CALL(checkpoint, Call(3));

« no previous file with comments | « Source/modules/fetch/FetchDataLoader.cpp ('k') | no next file » | no next file with comments »