[Fetch API] Add streams predicates to BodyStreamBuffer

third_party/WebKit/Source/modules/fetch/BodyStreamBufferTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/fetch/BodyStreamBuffer.h"
 
 #include "core/testing/DummyPageHolder.h"
 #include "modules/fetch/DataConsumerHandleTestUtil.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 27 matching lines @@
     OwnPtr<DummyPageHolder> m_page;
 };
 
 TEST_F(BodyStreamBufferTest, ReleaseHandle)
 {
     OwnPtr<FetchDataConsumerHandle> handle = createFetchDataConsumerHandleFromWebHandle(createWaitingDataConsumerHandle());
     FetchDataConsumerHandle* rawHandle = handle.get();
     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());| here. Is this
intentional?

[yhirano, 2016/04/19 09:22:41]

Fixed.

 
 TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsArrayBuffer)
 {
     Checkpoint checkpoint;
     MockFetchDataLoaderClient* client = MockFetchDataLoaderClient::create();
     DOMArrayBuffer* arrayBuffer = nullptr;
 
     InSequence s;
     EXPECT_CALL(checkpoint, Call(1));
     EXPECT_CALL(*client, didFetchDataLoadedArrayBufferMock(_)).WillOnce(SaveArg<0>(&arrayBuffer));
     EXPECT_CALL(checkpoint, Call(2));
 
     OwnPtr<ReplayingHandle> handle = ReplayingHandle::create();
     handle->add(Command(Command::Data, "hello"));
     handle->add(Command(Command::Done));
     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()));
 }
 
 TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsBlob)
 {
     Checkpoint checkpoint;
     MockFetchDataLoaderClient* client = MockFetchDataLoaderClient::create();
     RefPtr<BlobDataHandle> blobDataHandle;
 
     InSequence s;
     EXPECT_CALL(checkpoint, Call(1));
     EXPECT_CALL(*client, didFetchDataLoadedBlobHandleMock(_)).WillOnce(SaveArg<0>(&blobDataHandle));
     EXPECT_CALL(checkpoint, Call(2));
 
     OwnPtr<ReplayingHandle> handle = ReplayingHandle::create();
     handle->add(Command(Command::Data, "hello"));
     handle->add(Command(Command::Done));
     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());
 }
 
 TEST_F(BodyStreamBufferTest, LoadBodyStreamBufferAsString)
 {
     Checkpoint checkpoint;
     MockFetchDataLoaderClient* client = MockFetchDataLoaderClient::create();
 
     InSequence s;
     EXPECT_CALL(checkpoint, Call(1));
     EXPECT_CALL(*client, didFetchDataLoadedString(String("hello")));
     EXPECT_CALL(checkpoint, Call(2));
 
     OwnPtr<ReplayingHandle> handle = ReplayingHandle::create();
     handle->add(Command(Command::Data, "hello"));
     handle->add(Command(Command::Done));
     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());
 }
 
 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());
 }
 
 TEST_F(BodyStreamBufferTest, LoadClosedHandle)
 {
     Checkpoint checkpoint;
     MockFetchDataLoaderClient* client = MockFetchDataLoaderClient::create();
 
     InSequence s;
     EXPECT_CALL(checkpoint, Call(1));
     EXPECT_CALL(*client, didFetchDataLoadedString(String("")));
     EXPECT_CALL(checkpoint, Call(2));
 
     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());
 }
 
 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());
 }
 
 TEST_F(BodyStreamBufferTest, LoadErroredHandle)
 {
     Checkpoint checkpoint;
     MockFetchDataLoaderClient* client = MockFetchDataLoaderClient::create();
 
     InSequence s;
     EXPECT_CALL(checkpoint, Call(1));
     EXPECT_CALL(*client, didFetchDataLoadFailed());
     EXPECT_CALL(checkpoint, Call(2));
 
     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());
 }
 
 TEST_F(BodyStreamBufferTest, LoaderShouldBeKeptAliveByBodyStreamBuffer)
 {
     Checkpoint checkpoint;
     MockFetchDataLoaderClient* client = MockFetchDataLoaderClient::create();
 
     InSequence s;
     EXPECT_CALL(checkpoint, Call(1));
@@ skipping 48 matching lines @@
     BodyStreamBuffer* buffer = new BodyStreamBuffer(handle.release());
     checkpoint.Call(1);
     ScriptValue reason(getScriptState(), v8String(getScriptState()->isolate(), "reason"));
     buffer->cancelSource(getScriptState(), reason);
     checkpoint.Call(2);
 }
 
 } // namespace
 
 } // namespace blink