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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1895693004: [Fetch API] Add streams predicates to BodyStreamBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp ('k') | third_party/WebKit/Source/modules/fetch/Response.cpp » ('j') | no next file with comments »
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 ffe11214bacc012b5e0628f2d2a819f039b670cb..22f82baaf203df56de5c628e083ba3e0a913850b 100644
--- a/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
+++ b/third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp
@@ -45,16 +45,15 @@ TEST_F(BodyStreamBufferTest, ReleaseHandle)
BodyStreamBuffer* buffer = new BodyStreamBuffer(handle.release());
EXPECT_FALSE(buffer->hasPendingActivity());
- EXPECT_FALSE(buffer->stream()->isLocked());
- EXPECT_FALSE(buffer->stream()->isDisturbed());
- EXPECT_EQ(ReadableStream::Readable, buffer->stream()->stateInternal());
+ EXPECT_FALSE(buffer->isStreamLocked());
+ EXPECT_FALSE(buffer->isStreamDisturbed());
+ EXPECT_TRUE(buffer->isStreamReadable());
OwnPtr<FetchDataConsumerHandle> handle2 = buffer->releaseHandle(getExecutionContext());
ASSERT_EQ(rawHandle, handle2.get());
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
- EXPECT_EQ(ReadableStream::Closed, buffer->stream()->stateInternal());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
}
hiroshige 2016/04/19 07:58:55 We don't have |EXPECT_TRUE(buffer->isStreamClosed(
yhirano 2016/04/19 09:22:41 Fixed.
TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsArrayBuffer)
@@ -74,16 +73,16 @@ TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsArrayBuffer)
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsArrayBuffer(), client);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
checkpoint.Call(1);
testing::runPendingTasks();
checkpoint.Call(2);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
ASSERT_TRUE(arrayBuffer);
EXPECT_EQ("hello", String(static_cast<const char*>(arrayBuffer->data()), arrayBuffer->byteLength()));
@@ -106,16 +105,16 @@ TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsBlob)
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsBlobHandle("text/plain"), client);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
checkpoint.Call(1);
testing::runPendingTasks();
checkpoint.Call(2);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
EXPECT_EQ(5u, blobDataHandle->size());
}
@@ -136,16 +135,16 @@ TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsString)
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle.release()));
buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsString(), client);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
checkpoint.Call(1);
testing::runPendingTasks();
checkpoint.Call(2);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
}
@@ -153,18 +152,18 @@ TEST_F(BodyStreamBufferTest, ReleaseClosedHandle)
{
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle()));
- EXPECT_EQ(ReadableStream::Readable, buffer->stream()->stateInternal());
+ EXPECT_TRUE(buffer->isStreamReadable());
testing::runPendingTasks();
- EXPECT_EQ(ReadableStream::Closed, buffer->stream()->stateInternal());
+ EXPECT_TRUE(buffer->isStreamClosed());
- EXPECT_FALSE(buffer->stream()->isLocked());
- EXPECT_FALSE(buffer->stream()->isDisturbed());
+ EXPECT_FALSE(buffer->isStreamLocked());
+ EXPECT_FALSE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle(getExecutionContext());
EXPECT_TRUE(handle);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
}
@@ -180,25 +179,25 @@ TEST_F(BodyStreamBufferTest, LoadClosedHandle)
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle()));
- EXPECT_EQ(ReadableStream::Readable, buffer->stream()->stateInternal());
+ EXPECT_TRUE(buffer->isStreamReadable());
testing::runPendingTasks();
- EXPECT_EQ(ReadableStream::Closed, buffer->stream()->stateInternal());
+ EXPECT_TRUE(buffer->isStreamClosed());
- EXPECT_FALSE(buffer->stream()->isLocked());
- EXPECT_FALSE(buffer->stream()->isDisturbed());
+ EXPECT_FALSE(buffer->isStreamLocked());
+ EXPECT_FALSE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsString(), client);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
checkpoint.Call(1);
testing::runPendingTasks();
checkpoint.Call(2);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
}
@@ -206,17 +205,17 @@ TEST_F(BodyStreamBufferTest, ReleaseErroredHandle)
{
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
- EXPECT_EQ(ReadableStream::Readable, buffer->stream()->stateInternal());
+ EXPECT_TRUE(buffer->isStreamReadable());
testing::runPendingTasks();
- EXPECT_EQ(ReadableStream::Errored, buffer->stream()->stateInternal());
+ EXPECT_TRUE(buffer->isStreamErrored());
- EXPECT_FALSE(buffer->stream()->isLocked());
- EXPECT_FALSE(buffer->stream()->isDisturbed());
+ EXPECT_FALSE(buffer->isStreamLocked());
+ EXPECT_FALSE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
OwnPtr<FetchDataConsumerHandle> handle = buffer->releaseHandle(getExecutionContext());
EXPECT_TRUE(handle);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
}
@@ -232,24 +231,24 @@ TEST_F(BodyStreamBufferTest, LoadErroredHandle)
BodyStreamBuffer* buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
- EXPECT_EQ(ReadableStream::Readable, buffer->stream()->stateInternal());
+ EXPECT_TRUE(buffer->isStreamReadable());
testing::runPendingTasks();
- EXPECT_EQ(ReadableStream::Errored, buffer->stream()->stateInternal());
+ EXPECT_TRUE(buffer->isStreamErrored());
- EXPECT_FALSE(buffer->stream()->isLocked());
- EXPECT_FALSE(buffer->stream()->isDisturbed());
+ EXPECT_FALSE(buffer->isStreamLocked());
+ EXPECT_FALSE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsString(), client);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_TRUE(buffer->hasPendingActivity());
checkpoint.Call(1);
testing::runPendingTasks();
checkpoint.Call(2);
- EXPECT_TRUE(buffer->stream()->isLocked());
- EXPECT_TRUE(buffer->stream()->isDisturbed());
+ EXPECT_TRUE(buffer->isStreamLocked());
+ EXPECT_TRUE(buffer->isStreamDisturbed());
EXPECT_FALSE(buffer->hasPendingActivity());
}
« no previous file with comments | « third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp ('k') | third_party/WebKit/Source/modules/fetch/Response.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698