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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1192913007: Change BodyStreamBuffer to be FetchDataConsumerHandle-based and enable backpressure in Fetch API (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Reflect comments. 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/Response.h ('K') | « Source/modules/fetch/Response.cpp ('k') | Source/modules/serviceworkers/RespondWithObserver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/fetch/ResponseTest.cpp
diff --git a/Source/modules/fetch/ResponseTest.cpp b/Source/modules/fetch/ResponseTest.cpp
index 49137c54042eaa6aa252c0547f35331767622daa..4e1829589ebe0d88858c4030c97e881a50c9862c 100644
--- a/Source/modules/fetch/ResponseTest.cpp
+++ b/Source/modules/fetch/ResponseTest.cpp
@@ -12,26 +12,17 @@
#include "core/frame/Frame.h"
#include "core/testing/DummyPageHolder.h"
#include "modules/fetch/BodyStreamBuffer.h"
+#include "modules/fetch/DataConsumerHandleTestUtil.h"
+#include "modules/fetch/DataConsumerHandleUtil.h"
#include "modules/fetch/FetchResponseData.h"
#include "platform/blob/BlobData.h"
+#include "platform/testing/UnitTestHelpers.h"
#include "public/platform/WebServiceWorkerResponse.h"
#include <gtest/gtest.h>
namespace blink {
namespace {
-const char kTestData[] = "Here is sample text for the blob.";
-
-class MockCanceller : public BodyStreamBuffer::Canceller {
-public:
- MockCanceller() : m_counter(0) { }
- void cancel() override { ++m_counter; }
- int counter() const { return m_counter; }
-
-private:
- int m_counter;
-};
-
PassOwnPtr<WebServiceWorkerResponse> createTestWebServiceWorkerResponse()
{
const KURL url(ParsedURLString, "http://www.webresponse.com/");
@@ -52,40 +43,6 @@ PassOwnPtr<WebServiceWorkerResponse> createTestWebServiceWorkerResponse()
return webResponse.release();
}
-class BlobHandleCreatorClient final : public BodyStreamBuffer::BlobHandleCreatorClient {
-public:
- BlobHandleCreatorClient()
- {
- }
- ~BlobHandleCreatorClient() override { }
- DEFINE_INLINE_VIRTUAL_TRACE()
- {
- visitor->trace(m_exception);
- BodyStreamBuffer::BlobHandleCreatorClient::trace(visitor);
- }
- void didCreateBlobHandle(PassRefPtr<BlobDataHandle> blobHandle) override
- {
- m_blobHandle = blobHandle;
- }
- void didFail(DOMException* exception) override
- {
- m_exception = exception;
- }
- PassRefPtr<BlobDataHandle> blobHandle()
- {
- return m_blobHandle;
- }
- DOMException* exception()
- {
- return m_exception;
- }
-
-private:
- RefPtr<BlobDataHandle> m_blobHandle;
- Member<DOMException> m_exception;
-};
-
-
class ServiceWorkerResponseTest : public ::testing::Test {
public:
ServiceWorkerResponseTest()
@@ -188,215 +145,119 @@ TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseOpaque)
EXPECT_FALSE(exceptionState.hadException());
}
-void checkResponseBlobHandle(Response* response, bool hasNonInternalBlobHandle, const unsigned long long blobSize)
+void loadInternalBufferAsString(Response* response, FetchDataLoader::Client* client)
{
- EXPECT_TRUE(response->internalBlobDataHandle());
- EXPECT_EQ(blobSize, response->internalBlobDataHandle()->size());
- EXPECT_FALSE(response->internalBuffer());
- if (hasNonInternalBlobHandle) {
- EXPECT_TRUE(response->blobDataHandle());
- EXPECT_EQ(response->blobDataHandle(), response->internalBlobDataHandle());
- EXPECT_EQ(blobSize, response->blobDataHandle()->size());
- } else {
- EXPECT_FALSE(response->blobDataHandle());
- }
- EXPECT_FALSE(response->buffer());
-
- TrackExceptionState exceptionState;
- Response* clonedResponse = response->clone(exceptionState);
- EXPECT_FALSE(exceptionState.hadException());
-
- EXPECT_TRUE(response->internalBlobDataHandle());
- EXPECT_EQ(blobSize, clonedResponse->internalBlobDataHandle()->size());
- EXPECT_EQ(response->internalBlobDataHandle(), clonedResponse->internalBlobDataHandle());
- EXPECT_FALSE(response->internalBuffer());
- EXPECT_FALSE(clonedResponse->internalBuffer());
- if (hasNonInternalBlobHandle) {
- EXPECT_EQ(response->internalBlobDataHandle(), response->blobDataHandle());
- EXPECT_EQ(clonedResponse->internalBlobDataHandle(), clonedResponse->blobDataHandle());
- } else {
- EXPECT_FALSE(response->blobDataHandle());
- EXPECT_FALSE(clonedResponse->blobDataHandle());
- }
- EXPECT_FALSE(response->buffer());
- EXPECT_FALSE(clonedResponse->buffer());
-}
-
-TEST_F(ServiceWorkerResponseTest, BlobHandleCloneDefault)
-{
- FetchResponseData* fetchResponseData = FetchResponseData::create();
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
- OwnPtr<BlobData> blobData(BlobData::create());
- blobData->appendBytes(kTestData, sizeof(kTestData) - 1);
- const unsigned long long size = blobData->length();
- fetchResponseData->setBlobDataHandle(BlobDataHandle::create(blobData.release(), size));
- checkResponseBlobHandle(Response::create(executionContext(), fetchResponseData), true, size);
-}
-
-TEST_F(ServiceWorkerResponseTest, BlobHandleCloneBasic)
-{
- FetchResponseData* fetchResponseData = FetchResponseData::create();
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
- OwnPtr<BlobData> blobData(BlobData::create());
- blobData->appendBytes(kTestData, sizeof(kTestData) - 1);
- const unsigned long long size = blobData->length();
- fetchResponseData->setBlobDataHandle(BlobDataHandle::create(blobData.release(), size));
- fetchResponseData = fetchResponseData->createBasicFilteredResponse();
- checkResponseBlobHandle(Response::create(executionContext(), fetchResponseData), true, size);
-}
-
-TEST_F(ServiceWorkerResponseTest, BlobHandleCloneCORS)
-{
- FetchResponseData* fetchResponseData = FetchResponseData::create();
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
- OwnPtr<BlobData> blobData(BlobData::create());
- blobData->appendBytes(kTestData, sizeof(kTestData) - 1);
- const unsigned long long size = blobData->length();
- fetchResponseData->setBlobDataHandle(BlobDataHandle::create(blobData.release(), size));
- fetchResponseData = fetchResponseData->createCORSFilteredResponse();
- checkResponseBlobHandle(Response::create(executionContext(), fetchResponseData), true, size);
-}
-
-TEST_F(ServiceWorkerResponseTest, BlobHandleCloneOpaque)
-{
- FetchResponseData* fetchResponseData = FetchResponseData::create();
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
- OwnPtr<BlobData> blobData(BlobData::create());
- blobData->appendBytes(kTestData, sizeof(kTestData) - 1);
- const unsigned long long size = blobData->length();
- fetchResponseData->setBlobDataHandle(BlobDataHandle::create(blobData.release(), size));
- fetchResponseData = fetchResponseData->createOpaqueFilteredResponse();
- checkResponseBlobHandle(Response::create(executionContext(), fetchResponseData), false, size);
+ FetchDataLoader* fetchDataLoader = FetchDataLoader::createLoaderAsString();
+ OwnPtr<DrainingBodyStreamBuffer> buffer = response->createInternalDrainingStream();
+ buffer->startLoading(fetchDataLoader, client);
}
void checkResponseStream(Response* response, bool checkResponseBodyStreamBuffer)
{
- BodyStreamBuffer* buffer = response->internalBuffer();
- EXPECT_FALSE(response->internalBlobDataHandle());
- EXPECT_FALSE(response->blobDataHandle());
+ void* buffer = response->internalBufferForTest();
if (checkResponseBodyStreamBuffer) {
- EXPECT_EQ(response->buffer(), buffer);
+ EXPECT_EQ(response->bufferForTest(), buffer);
} else {
- EXPECT_FALSE(response->buffer());
+ EXPECT_FALSE(response->bufferForTest());
}
TrackExceptionState exceptionState;
Response* clonedResponse = response->clone(exceptionState);
EXPECT_FALSE(exceptionState.hadException());
- EXPECT_FALSE(response->internalBlobDataHandle());
- EXPECT_FALSE(response->blobDataHandle());
- EXPECT_FALSE(clonedResponse->internalBlobDataHandle());
- EXPECT_FALSE(clonedResponse->blobDataHandle());
-
- EXPECT_TRUE(response->internalBuffer());
- EXPECT_TRUE(clonedResponse->internalBuffer());
- EXPECT_NE(response->internalBuffer(), buffer);
- EXPECT_NE(clonedResponse->internalBuffer(), buffer);
- EXPECT_NE(response->internalBuffer(), clonedResponse->internalBuffer());
+
+ EXPECT_TRUE(response->internalBufferForTest());
+ EXPECT_TRUE(clonedResponse->internalBufferForTest());
+ EXPECT_NE(response->internalBufferForTest(), buffer);
+ EXPECT_NE(clonedResponse->internalBufferForTest(), buffer);
+ EXPECT_NE(response->internalBufferForTest(), clonedResponse->internalBufferForTest());
if (checkResponseBodyStreamBuffer) {
- EXPECT_EQ(response->buffer(), response->internalBuffer());
- EXPECT_EQ(clonedResponse->buffer(), clonedResponse->internalBuffer());
+ EXPECT_EQ(response->bufferForTest(), response->internalBufferForTest());
+ EXPECT_EQ(clonedResponse->bufferForTest(), clonedResponse->internalBufferForTest());
} else {
- EXPECT_FALSE(response->buffer());
- EXPECT_FALSE(clonedResponse->buffer());
+ EXPECT_FALSE(response->bufferForTest());
+ EXPECT_FALSE(clonedResponse->bufferForTest());
}
- BlobHandleCreatorClient* client1 = new BlobHandleCreatorClient();
- BlobHandleCreatorClient* client2 = new BlobHandleCreatorClient();
- EXPECT_TRUE(response->internalBuffer()->readAllAndCreateBlobHandle(response->internalMIMEType(), client1));
- EXPECT_TRUE(clonedResponse->internalBuffer()->readAllAndCreateBlobHandle(clonedResponse->internalMIMEType(), client2));
- buffer->write(DOMArrayBuffer::create("foobar", 6));
- buffer->write(DOMArrayBuffer::create("piyo", 4));
- EXPECT_FALSE(client1->blobHandle());
- EXPECT_FALSE(client2->blobHandle());
- buffer->close();
- EXPECT_TRUE(client1->blobHandle());
- EXPECT_TRUE(client2->blobHandle());
- EXPECT_EQ(10u, client1->blobHandle()->size());
- EXPECT_EQ(10u, client2->blobHandle()->size());
+ DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client1 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
+ DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client2 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
+ EXPECT_CALL(*client1, didFetchDataLoadedString(String("Hello, world")));
+ EXPECT_CALL(*client2, didFetchDataLoadedString(String("Hello, world")));
+
+ loadInternalBufferAsString(response, client1);
+ loadInternalBufferAsString(clonedResponse, client2);
+ blink::testing::runPendingTasks();
+}
+
+BodyStreamBuffer* createHelloWorldBuffer()
+{
+ using Command = DataConsumerHandleTestUtil::Command;
+ OwnPtr<DataConsumerHandleTestUtil::ReplayingHandle> src(DataConsumerHandleTestUtil::ReplayingHandle::create());
+ src->add(Command(Command::Data, "Hello, "));
+ src->add(Command(Command::Data, "world"));
+ src->add(Command(Command::Done));
+ return BodyStreamBuffer::create(createFetchDataConsumerHandleFromWebHandle(src.release()));
}
TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneDefault)
{
- BodyStreamBuffer* buffer = new BodyStreamBuffer(new MockCanceller);
+ BodyStreamBuffer* buffer = createHelloWorldBuffer();
FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
Response* response = Response::create(executionContext(), fetchResponseData);
- EXPECT_EQ(response->internalBuffer(), buffer);
+ EXPECT_EQ(response->internalBufferForTest(), buffer);
checkResponseStream(response, true);
}
TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneBasic)
{
- BodyStreamBuffer* buffer = new BodyStreamBuffer(new MockCanceller);
+ BodyStreamBuffer* buffer = createHelloWorldBuffer();
FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
fetchResponseData = fetchResponseData->createBasicFilteredResponse();
Response* response = Response::create(executionContext(), fetchResponseData);
- EXPECT_EQ(response->internalBuffer(), buffer);
+ EXPECT_EQ(response->internalBufferForTest(), buffer);
checkResponseStream(response, true);
}
TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneCORS)
{
- BodyStreamBuffer* buffer = new BodyStreamBuffer(new MockCanceller);
+ BodyStreamBuffer* buffer = createHelloWorldBuffer();
FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
fetchResponseData = fetchResponseData->createCORSFilteredResponse();
Response* response = Response::create(executionContext(), fetchResponseData);
- EXPECT_EQ(response->internalBuffer(), buffer);
+ EXPECT_EQ(response->internalBufferForTest(), buffer);
checkResponseStream(response, true);
}
TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneOpaque)
{
- BodyStreamBuffer* buffer = new BodyStreamBuffer(new MockCanceller);
+ BodyStreamBuffer* buffer = createHelloWorldBuffer();
FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
fetchResponseData = fetchResponseData->createOpaqueFilteredResponse();
Response* response = Response::create(executionContext(), fetchResponseData);
- EXPECT_EQ(response->internalBuffer(), buffer);
+ EXPECT_EQ(response->internalBufferForTest(), buffer);
checkResponseStream(response, false);
}
TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneError)
{
- BodyStreamBuffer* buffer = new BodyStreamBuffer(new MockCanceller);
+ BodyStreamBuffer* buffer = BodyStreamBuffer::create(createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle()));
FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
Response* response = Response::create(executionContext(), fetchResponseData);
TrackExceptionState exceptionState;
Response* clonedResponse = response->clone(exceptionState);
EXPECT_FALSE(exceptionState.hadException());
- BlobHandleCreatorClient* client1 = new BlobHandleCreatorClient();
- BlobHandleCreatorClient* client2 = new BlobHandleCreatorClient();
- EXPECT_TRUE(response->internalBuffer()->readAllAndCreateBlobHandle(response->internalMIMEType(), client1));
- EXPECT_TRUE(clonedResponse->internalBuffer()->readAllAndCreateBlobHandle(clonedResponse->internalMIMEType(), client2));
- buffer->write(DOMArrayBuffer::create("foobar", 6));
- buffer->write(DOMArrayBuffer::create("piyo", 4));
- EXPECT_FALSE(client1->blobHandle());
- EXPECT_FALSE(client2->blobHandle());
- buffer->error(DOMException::create(NetworkError, "Error Message"));
- EXPECT_EQ("NetworkError", client1->exception()->name());
- EXPECT_EQ("Error Message", client1->exception()->message());
- EXPECT_EQ("NetworkError", client2->exception()->name());
- EXPECT_EQ("Error Message", client2->exception()->message());
-}
-TEST_F(ServiceWorkerResponseTest, CloneAndCancel)
-{
- auto canceller = new MockCanceller;
- BodyStreamBuffer* buffer = new BodyStreamBuffer(canceller);
- FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
- fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
- Response* response = Response::create(executionContext(), fetchResponseData);
- TrackExceptionState exceptionState;
- Response* clonedResponse = response->clone(exceptionState);
+ DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client1 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
+ DataConsumerHandleTestUtil::MockFetchDataLoaderClient* client2 = new DataConsumerHandleTestUtil::MockFetchDataLoaderClient();
+ EXPECT_CALL(*client1, didFetchDataLoadFailed());
+ EXPECT_CALL(*client2, didFetchDataLoadFailed());
- EXPECT_EQ(0, canceller->counter());
- response->bufferForTest()->cancel();
- EXPECT_EQ(0, canceller->counter());
- clonedResponse->bufferForTest()->cancel();
- EXPECT_EQ(1, canceller->counter());
+ loadInternalBufferAsString(response, client1);
+ loadInternalBufferAsString(clonedResponse, client2);
+ blink::testing::runPendingTasks();
}
} // namespace
« Source/modules/fetch/Response.h ('K') | « Source/modules/fetch/Response.cpp ('k') | Source/modules/serviceworkers/RespondWithObserver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698