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

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

Issue 786893004: [ServiceWorker] Use BodyStreamBuffer as the body data of the Response object. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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 | « Source/modules/serviceworkers/Response.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/serviceworkers/ResponseTest.cpp
diff --git a/Source/modules/serviceworkers/ResponseTest.cpp b/Source/modules/serviceworkers/ResponseTest.cpp
index 987835c27e844fdd9aa26a4c6c64476f7679e104..66a113659f9de8078c2e7e2a9f6eb4d0869f5f09 100644
--- a/Source/modules/serviceworkers/ResponseTest.cpp
+++ b/Source/modules/serviceworkers/ResponseTest.cpp
@@ -10,13 +10,17 @@
#include "core/dom/Document.h"
#include "core/frame/Frame.h"
#include "core/testing/DummyPageHolder.h"
+#include "modules/serviceworkers/BodyStreamBuffer.h"
#include "modules/serviceworkers/FetchResponseData.h"
+#include "platform/blob/BlobData.h"
#include "public/platform/WebServiceWorkerResponse.h"
#include <gtest/gtest.h>
namespace blink {
namespace {
+const char kTestData[] = "Here is sample text for the blob.";
+
PassOwnPtr<WebServiceWorkerResponse> createTestWebServiceWorkerResponse()
{
const KURL url(ParsedURLString, "http://www.webresponse.com/");
@@ -37,6 +41,40 @@ PassOwnPtr<WebServiceWorkerResponse> createTestWebServiceWorkerResponse()
return webResponse.release();
}
+class BlobHandleCreatorClient final : public BodyStreamBuffer::BlobHandleCreatorClient {
+public:
+ BlobHandleCreatorClient()
+ {
+ }
+ ~BlobHandleCreatorClient() override { }
+ void trace(Visitor* visitor) override
+ {
+ visitor->trace(m_exception);
+ BodyStreamBuffer::BlobHandleCreatorClient::trace(visitor);
+ }
+ void didCreateBlobHandle(PassRefPtr<BlobDataHandle> blobHandle) override
+ {
+ m_blobHandle = blobHandle;
+ }
+ void didFail(PassRefPtrWillBeRawPtr<DOMException> exception) override
+ {
+ m_exception = exception;
+ }
+ PassRefPtr<BlobDataHandle> blobHandle()
+ {
+ return m_blobHandle;
+ }
+ PassRefPtrWillBeRawPtr<DOMException> exception()
+ {
+ return m_exception;
+ }
+
+private:
+ RefPtr<BlobDataHandle> m_blobHandle;
+ RefPtrWillBeMember<DOMException> m_exception;
+};
+
+
class ServiceWorkerResponseTest : public ::testing::Test {
public:
ServiceWorkerResponseTest()
@@ -139,5 +177,199 @@ TEST_F(ServiceWorkerResponseTest, FromWebServiceWorkerResponseOpaque)
EXPECT_FALSE(exceptionState.hadException());
}
+void checkResponseBlobHandle(Response* response, bool hasNonInternalBlobHandle, const unsigned long long blobSize)
+{
+ 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);
+}
+
+void checkResponseStream(Response* response, bool checkResponseBodyStreamBuffer)
+{
+ BodyStreamBuffer* buffer = response->internalBuffer();
+ EXPECT_FALSE(response->internalBlobDataHandle());
+ EXPECT_FALSE(response->blobDataHandle());
+ if (checkResponseBodyStreamBuffer) {
+ EXPECT_EQ(response->buffer(), buffer);
+ } else {
+ EXPECT_FALSE(response->buffer());
+ }
+
+ 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());
+ if (checkResponseBodyStreamBuffer) {
+ EXPECT_EQ(response->buffer(), response->internalBuffer());
+ EXPECT_EQ(clonedResponse->buffer(), clonedResponse->internalBuffer());
+ } else {
+ EXPECT_FALSE(response->buffer());
+ EXPECT_FALSE(clonedResponse->buffer());
+ }
+ BlobHandleCreatorClient* client1 = new BlobHandleCreatorClient();
+ BlobHandleCreatorClient* client2 = new BlobHandleCreatorClient();
+ EXPECT_TRUE(response->internalBuffer()->readAllAndCreateBlobHandle(response->internalContentTypeForBuffer(), client1));
+ EXPECT_TRUE(clonedResponse->internalBuffer()->readAllAndCreateBlobHandle(clonedResponse->internalContentTypeForBuffer(), 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());
+}
+
+TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneDefault)
+{
+ BodyStreamBuffer* buffer = new BodyStreamBuffer();
+ FetchResponseData* fetchResponseData = FetchResponseData::createWithBuffer(buffer);
+ fetchResponseData->setURL(KURL(ParsedURLString, "http://www.response.com"));
+ Response* response = Response::create(executionContext(), fetchResponseData);
+ EXPECT_EQ(response->internalBuffer(), buffer);
+ checkResponseStream(response, true);
+}
+
+TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneBasic)
+{
+ BodyStreamBuffer* buffer = new BodyStreamBuffer();
+ 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);
+ checkResponseStream(response, true);
+}
+
+TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneCORS)
+{
+ BodyStreamBuffer* buffer = new BodyStreamBuffer();
+ 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);
+ checkResponseStream(response, true);
+}
+
+TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneOpaque)
+{
+ BodyStreamBuffer* buffer = new BodyStreamBuffer();
+ 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);
+ checkResponseStream(response, false);
+}
+
+TEST_F(ServiceWorkerResponseTest, BodyStreamBufferCloneError)
+{
+ BodyStreamBuffer* buffer = new BodyStreamBuffer();
+ 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->internalContentTypeForBuffer(), client1));
+ EXPECT_TRUE(clonedResponse->internalBuffer()->readAllAndCreateBlobHandle(clonedResponse->internalContentTypeForBuffer(), 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());
+}
+
} // namespace
} // namespace blink
« no previous file with comments | « Source/modules/serviceworkers/Response.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698