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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1418813004: [Fetch API] Reflect spec changes of bodyUsed property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« third_party/WebKit/Source/modules/fetch/Body.h ('K') | « third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchRequestData.cpp » ('j') | third_party/WebKit/Source/modules/fetch/Request.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp b/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
index 769fc35bd6edb91f511a79dd37a88c618123d164..365ed516237298916b6299883120812911b43200 100644
--- a/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
+++ b/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
@@ -40,20 +40,23 @@ protected:
OwnPtr<DummyPageHolder> m_page;
};
-TEST_F(BodyStreamBufferTest, LockBodyStreamBuffer)
+TEST_F(BodyStreamBufferTest, ReleaseHandle)
{
OwnPtr<FetchDataConsumerHandle> handle = createFetchDataConsumerHandleFromWebHandle(createWaitingDataConsumerHandle());
FetchDataConsumerHandle* rawHandle = handle.get();
BodyStreamBuffer* buffer = new BodyStreamBuffer(handle.release());
- EXPECT_FALSE(buffer->isLocked());
EXPECT_FALSE(buffer->hasPendingActivity());
+ EXPECT_FALSE(buffer->stream()->isLocked());
+ EXPECT_FALSE(buffer->stream()->isDisturbed());
+ EXPECT_EQ(ReadableStream::Readable, buffer->stream()->stateInternal());
- OwnPtr<FetchDataConsumerHandle> handle2 = buffer->lock(executionContext());
+ OwnPtr<FetchDataConsumerHandle> handle2 = buffer->releaseHandle(executionContext());
ASSERT_EQ(rawHandle, handle2.get());
- EXPECT_TRUE(buffer->isLocked());
- EXPECT_TRUE(buffer->hasPendingActivity());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_EQ(ReadableStream::Closed, buffer->stream()->stateInternal());
}
TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsArrayBuffer)
@@ -73,15 +76,18 @@ TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsArrayBuffer)
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsArrayBuffer(), client);
- EXPECT_TRUE(buffer->isLocked());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
checkpoint.Call(1);
testing::runPendingTasks();
checkpoint.Call(2);
- EXPECT_FALSE(buffer->isLocked());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
+ ASSERT_TRUE(arrayBuffer);
EXPECT_EQ("hello", String(static_cast<const char*>(arrayBuffer->data()), arrayBuffer->byteLength()));
}
@@ -102,14 +108,16 @@ TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsBlob)
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsBlobHandle("text/plain"), client);
- EXPECT_TRUE(buffer->isLocked());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
checkpoint.Call(1);
testing::runPendingTasks();
checkpoint.Call(2);
- EXPECT_FALSE(buffer->isLocked());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
EXPECT_EQ(5u, blobDataHandle->size());
}
@@ -130,18 +138,20 @@ TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsString)
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsString(), client);
- EXPECT_TRUE(buffer->isLocked());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
checkpoint.Call(1);
testing::runPendingTasks();
checkpoint.Call(2);
- EXPECT_FALSE(buffer->isLocked());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
}
-TEST_F(BodyStreamBufferTest, LockClosedHandle)
+TEST_F(BodyStreamBufferTest, ReleaseClosedHandle)
{
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle()));
@@ -149,27 +159,25 @@ TEST_F(BodyStreamBufferTest, LockClosedHandle)
testing::runPendingTasks();
EXPECT_EQ(ReadableStream::Closed, buffer->stream()->stateInternal());
- EXPECT_FALSE(buffer->isLocked());
- OwnPtr<FetchDataConsumerHandle> handle = buffer->lock(executionContext());
- EXPECT_TRUE(handle);
- EXPECT_FALSE(buffer->isLocked());
+ EXPECT_FALSE(buffer->stream()->isLocked());
+ EXPECT_FALSE(buffer->stream()->isDisturbed());
+ EXPECT_FALSE(buffer->hasPendingActivity());
+ OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle(executionContext());
- OwnPtr<FetchDataConsumerHandle> handle2 = buffer->lock(executionContext());
- EXPECT_TRUE(handle2);
- EXPECT_FALSE(buffer->isLocked());
- EXPECT_TRUE(buffer->hasPendingActivity());
+ EXPECT_TRUE(handle);
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_FALSE(buffer->hasPendingActivity());
}
TEST_F(BodyStreamBufferTest, LoadClosedHandle)
{
Checkpoint checkpoint;
MockFetchDataLoaderClient* client1 = MockFetchDataLoaderClient::create();
hiroshige 2015/11/19 12:50:37 nit: |client1| can be |client| because now we have
yhirano 2015/11/19 13:19:03 Done.
- MockFetchDataLoaderClient* client2 = MockFetchDataLoaderClient::create();
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
EXPECT_CALL(*client1, didFetchDataLoadedString(String("")));
- EXPECT_CALL(*client2, didFetchDataLoadedString(String("")));
EXPECT_CALL(checkpoint, Call(2));
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle()));
@@ -178,21 +186,25 @@ TEST_F(BodyStreamBufferTest, LoadClosedHandle)
testing::runPendingTasks();
EXPECT_EQ(ReadableStream::Closed, buffer->stream()->stateInternal());
+ EXPECT_FALSE(buffer->stream()->isLocked());
+ EXPECT_FALSE(buffer->stream()->isDisturbed());
+ EXPECT_FALSE(buffer->hasPendingActivity());
+
buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsString(), client1);
- EXPECT_FALSE(buffer->isLocked());
- buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsString(), client2);
- EXPECT_FALSE(buffer->isLocked());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
checkpoint.Call(1);
testing::runPendingTasks();
checkpoint.Call(2);
- EXPECT_FALSE(buffer->isLocked());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
}
-TEST_F(BodyStreamBufferTest, LockErroredHandle)
+TEST_F(BodyStreamBufferTest, ReleaseErroredHandle)
{
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
@@ -200,27 +212,24 @@ TEST_F(BodyStreamBufferTest, LockErroredHandle)
testing::runPendingTasks();
EXPECT_EQ(ReadableStream::Errored, buffer->stream()->stateInternal());
- EXPECT_FALSE(buffer->isLocked());
- OwnPtr<FetchDataConsumerHandle> handle = buffer->lock(executionContext());
+ EXPECT_FALSE(buffer->stream()->isLocked());
+ EXPECT_FALSE(buffer->stream()->isDisturbed());
+ EXPECT_FALSE(buffer->hasPendingActivity());
+ OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle(executionContext());
EXPECT_TRUE(handle);
- EXPECT_FALSE(buffer->isLocked());
-
- OwnPtr<FetchDataConsumerHandle> handle2 = buffer->lock(executionContext());
- EXPECT_TRUE(handle2);
- EXPECT_FALSE(buffer->isLocked());
- EXPECT_TRUE(buffer->hasPendingActivity());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_FALSE(buffer->hasPendingActivity());
}
TEST_F(BodyStreamBufferTest, LoadErroredHandle)
{
Checkpoint checkpoint;
MockFetchDataLoaderClient* client1 = MockFetchDataLoaderClient::create();
hiroshige 2015/11/19 12:50:37 ditto.
yhirano 2015/11/19 13:19:03 Done.
- MockFetchDataLoaderClient* client2 = MockFetchDataLoaderClient::create();
InSequence s;
EXPECT_CALL(checkpoint, Call(1));
EXPECT_CALL(*client1, didFetchDataLoadFailed());
- EXPECT_CALL(*client2, didFetchDataLoadFailed());
EXPECT_CALL(checkpoint, Call(2));
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
@@ -229,17 +238,20 @@ TEST_F(BodyStreamBufferTest, LoadErroredHandle)
testing::runPendingTasks();
EXPECT_EQ(ReadableStream::Errored, buffer->stream()->stateInternal());
+ EXPECT_FALSE(buffer->stream()->isLocked());
+ EXPECT_FALSE(buffer->stream()->isDisturbed());
+ EXPECT_FALSE(buffer->hasPendingActivity());
buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsString(), client1);
- EXPECT_FALSE(buffer->isLocked());
- buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsString(), client2);
- EXPECT_FALSE(buffer->isLocked());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
checkpoint.Call(1);
testing::runPendingTasks();
checkpoint.Call(2);
- EXPECT_FALSE(buffer->isLocked());
+ EXPECT_TRUE(buffer->stream()->isLocked());
+ EXPECT_TRUE(buffer->stream()->isDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
}
« third_party/WebKit/Source/modules/fetch/Body.h ('K') | « third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp ('k') | third_party/WebKit/Source/modules/fetch/FetchRequestData.cpp » ('j') | third_party/WebKit/Source/modules/fetch/Request.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698