Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp - Issue 1311923004: Rename FormData/FormDataBuilder to EncodedFormData/FormDataEncoder respectively.

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

Issue 1311923004: Rename FormData/FormDataBuilder to EncodedFormData/FormDataEncoder respectively. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 years, 3 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/FetchFormDataConsumerHandle.cpp ('K') | « Source/modules/fetch/FetchFormDataConsumerHandle.cpp ('k') | Source/modules/fetch/RequestInit.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp

diff --git a/Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp b/Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp

index d789d9c56a411bee95a3d58880acb51849333c4f..ad73aec34a2cda2c46ff72d2e4717df734869c9f 100644

--- a/Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp

+++ b/Source/modules/fetch/FetchFormDataConsumerHandleTest.cpp

@@ -76,9 +76,9 @@ protected:

OwnPtr<DummyPageHolder> m_page;

};

-PassRefPtr<FormData> complexFormData()

+PassRefPtr<EncodedFormData> complexFormData()

{

- RefPtr<FormData> data = FormData::create();

+ RefPtr<EncodedFormData> data = EncodedFormData::create();

data->appendData("foo", 3);

data->appendFileRange("/foo/bar/baz", 3, 4, 5);

@@ -94,7 +94,7 @@ PassRefPtr<FormData> complexFormData()

return data.release();

}

-void verifyComplexFormData(FormData* data)

+void verifyComplexFormData(EncodedFormData* data)

{

const auto& elements = data->elements();

if (4 != elements.size()) {

@@ -180,7 +180,7 @@ TEST_F(FetchFormDataConsumerHandleTest, ReadFromArrayBufferView)

TEST_F(FetchFormDataConsumerHandleTest, ReadFromSimplFormData)

{

- RefPtr<FormData> data = FormData::create();

+ RefPtr<EncodedFormData> data = EncodedFormData::create();

data->appendData("foo", 3);

data->appendData("hoge", 4);

@@ -194,7 +194,7 @@ TEST_F(FetchFormDataConsumerHandleTest, ReadFromSimplFormData)

TEST_F(FetchFormDataConsumerHandleTest, ReadFromComplexFormData)

{

- RefPtr<FormData> data = complexFormData();

+ RefPtr<EncodedFormData> data = complexFormData();

OwnPtr<ReplayingHandle> src = ReplayingHandle::create();

src->add(Command(Command::Data, "bar"));

src->add(Command(Command::Done));

@@ -212,7 +212,7 @@ TEST_F(FetchFormDataConsumerHandleTest, ReadFromComplexFormData)

TEST_F(FetchFormDataConsumerHandleTest, TwoPhaseReadFromComplexFormData)

{

- RefPtr<FormData> data = complexFormData();

+ RefPtr<EncodedFormData> data = complexFormData();

OwnPtr<ReplayingHandle> src = ReplayingHandle::create();

src->add(Command(Command::Data, "bar"));

src->add(Command(Command::Done));

@@ -239,7 +239,7 @@ TEST_F(FetchFormDataConsumerHandleTest, DrainAsFormDataFromString)

{

OwnPtr<FetchDataConsumerHandle> handle = FetchFormDataConsumerHandle::create(String("hello, world"));

OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(nullptr);

- RefPtr<FormData> formData = reader->drainAsFormData();

+ RefPtr<EncodedFormData> formData = reader->drainAsFormData();

ASSERT_TRUE(formData);

EXPECT_TRUE(formData->isSafeToSendToAnotherThread());

EXPECT_EQ("hello, world", formData->flattenToString());

@@ -254,7 +254,7 @@ TEST_F(FetchFormDataConsumerHandleTest, DrainAsFormDataFromArrayBuffer)

{

OwnPtr<FetchDataConsumerHandle> handle = FetchFormDataConsumerHandle::create(DOMArrayBuffer::create("foo", 3));

OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(nullptr);

- RefPtr<FormData> formData = reader->drainAsFormData();

+ RefPtr<EncodedFormData> formData = reader->drainAsFormData();

ASSERT_TRUE(formData);

EXPECT_TRUE(formData->isSafeToSendToAnotherThread());

EXPECT_EQ("foo", formData->flattenToString());

@@ -265,11 +265,11 @@ TEST_F(FetchFormDataConsumerHandleTest, DrainAsFormDataFromSimpleFormData)

DOMFormData* data = DOMFormData::create(UTF8Encoding());

data->append("name1", "value1");

data->append("name2", "value2");

- RefPtr<FormData> inputFormData = data->createMultiPartFormData();

+ RefPtr<EncodedFormData> inputFormData = data->createMultiPartFormData();

OwnPtr<FetchDataConsumerHandle> handle = FetchFormDataConsumerHandle::create(document(), inputFormData);

OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(nullptr);

- RefPtr<FormData> outputFormData = reader->drainAsFormData();

+ RefPtr<EncodedFormData> outputFormData = reader->drainAsFormData();

ASSERT_TRUE(outputFormData);

EXPECT_TRUE(outputFormData->isSafeToSendToAnotherThread());

EXPECT_NE(outputFormData.get(), inputFormData.get());

@@ -278,11 +278,11 @@ TEST_F(FetchFormDataConsumerHandleTest, DrainAsFormDataFromSimpleFormData)

TEST_F(FetchFormDataConsumerHandleTest, DrainAsFormDataFromComplexFormData)

{

- RefPtr<FormData> inputFormData = complexFormData();

+ RefPtr<EncodedFormData> inputFormData = complexFormData();

OwnPtr<FetchDataConsumerHandle> handle = FetchFormDataConsumerHandle::create(document(), inputFormData);

OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(nullptr);

- RefPtr<FormData> outputFormData = reader->drainAsFormData();

+ RefPtr<EncodedFormData> outputFormData = reader->drainAsFormData();

ASSERT_TRUE(outputFormData);

EXPECT_TRUE(outputFormData->isSafeToSendToAnotherThread());

EXPECT_NE(outputFormData.get(), inputFormData.get());

@@ -295,7 +295,7 @@ TEST_F(FetchFormDataConsumerHandleTest, ZeroByteReadDoesNotAffectDraining)

OwnPtr<FetchDataConsumerHandle::Reader> reader = handle->obtainReader(nullptr);

size_t readSize;

EXPECT_EQ(kOk, reader->read(nullptr, 0, kNone, &readSize));

- RefPtr<FormData> formData = reader->drainAsFormData();

+ RefPtr<EncodedFormData> formData = reader->drainAsFormData();

ASSERT_TRUE(formData);

EXPECT_TRUE(formData->isSafeToSendToAnotherThread());

EXPECT_EQ("hello, world", formData->flattenToString());

@@ -338,7 +338,7 @@ TEST_F(FetchFormDataConsumerHandleTest, ZeroByteReadDoesNotAffectDrainingForComp

EXPECT_EQ(kShouldWait, reader->read(nullptr, 0, kNone, &readSize));

testing::runPendingTasks();

EXPECT_EQ(kOk, reader->read(nullptr, 0, kNone, &readSize));

- RefPtr<FormData> formData = reader->drainAsFormData();

+ RefPtr<EncodedFormData> formData = reader->drainAsFormData();

ASSERT_TRUE(formData);

EXPECT_TRUE(formData->isSafeToSendToAnotherThread());

verifyComplexFormData(formData.get());