net/base/gzip_filter_unittest.cc - Issue 6516025: Remove GetInputStreamBufferSize() method from FilterContext.

Unified Diff: net/base/gzip_filter_unittest.cc

Issue 6516025: Remove GetInputStreamBufferSize() method from FilterContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed signed/unsigned error Created 9 years, 10 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

Index: net/base/gzip_filter_unittest.cc

diff --git a/net/base/gzip_filter_unittest.cc b/net/base/gzip_filter_unittest.cc

index 758418ca4b69a285b342a5a22a05baab3e236994..ad844c8a09f3c7cbfe5a62f94f2490d7a2852075 100644

--- a/net/base/gzip_filter_unittest.cc

+++ b/net/base/gzip_filter_unittest.cc

@@ -30,7 +30,6 @@ namespace {

const int kDefaultBufferSize = 4096;

const int kSmallBufferSize = 128;

-const int kMaxBufferSize = 1048576; // 1048576 == 2^20 == 1 MB

const char kApplicationOctetStream[] = "application/octet-stream";

const char kApplicationXGzip[] = "application/x-gzip";

@@ -243,7 +242,7 @@ TEST_F(GZipUnitTest, DecodeDeflate) {

// Decode the compressed data with filter

std::vector<Filter::FilterType> filter_types;

filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);

- net::MockFilterContext filter_context(kDefaultBufferSize);

+ net::MockFilterContext filter_context;

scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));

ASSERT_TRUE(filter.get());

memcpy(filter->stream_buffer()->data(), deflate_encode_buffer_,

@@ -264,7 +263,7 @@ TEST_F(GZipUnitTest, DecodeGZip) {

// Decode the compressed data with filter

std::vector<Filter::FilterType> filter_types;

filter_types.push_back(Filter::FILTER_TYPE_GZIP);

- net::MockFilterContext filter_context(kDefaultBufferSize);

+ net::MockFilterContext filter_context;

scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));

ASSERT_TRUE(filter.get());

memcpy(filter->stream_buffer()->data(), gzip_encode_buffer_,

@@ -286,9 +285,10 @@ TEST_F(GZipUnitTest, DecodeGZip) {

TEST_F(GZipUnitTest, DecodeWithSmallBuffer) {

std::vector<Filter::FilterType> filter_types;

filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);

- net::MockFilterContext filter_context(kSmallBufferSize);

+ net::MockFilterContext filter_context;

scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));

ASSERT_TRUE(filter.get());

+ filter->ResetInputBufferForTest(kSmallBufferSize);

DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),

deflate_encode_buffer_, deflate_encode_len_,

kDefaultBufferSize);

@@ -301,9 +301,10 @@ TEST_F(GZipUnitTest, DecodeWithSmallBuffer) {

TEST_F(GZipUnitTest, DecodeWithOneByteBuffer) {

std::vector<Filter::FilterType> filter_types;

filter_types.push_back(Filter::FILTER_TYPE_GZIP);

- net::MockFilterContext filter_context(1);

+ net::MockFilterContext filter_context;

scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));

ASSERT_TRUE(filter.get());

+ filter->ResetInputBufferForTest(1);

DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),

gzip_encode_buffer_, gzip_encode_len_,

kDefaultBufferSize);

@@ -313,7 +314,7 @@ TEST_F(GZipUnitTest, DecodeWithOneByteBuffer) {

TEST_F(GZipUnitTest, DecodeWithSmallOutputBuffer) {

std::vector<Filter::FilterType> filter_types;

filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);

- net::MockFilterContext filter_context(kDefaultBufferSize);

+ net::MockFilterContext filter_context;

scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));

ASSERT_TRUE(filter.get());

DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),

@@ -326,9 +327,10 @@ TEST_F(GZipUnitTest, DecodeWithSmallOutputBuffer) {

TEST_F(GZipUnitTest, DecodeWithOneByteInputAndOutputBuffer) {

std::vector<Filter::FilterType> filter_types;

filter_types.push_back(Filter::FILTER_TYPE_GZIP);

- net::MockFilterContext filter_context(1);

+ net::MockFilterContext filter_context;

scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));

ASSERT_TRUE(filter.get());

+ filter->ResetInputBufferForTest(1);

DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),

gzip_encode_buffer_, gzip_encode_len_, 1);

}

@@ -345,7 +347,7 @@ TEST_F(GZipUnitTest, DecodeCorruptedData) {

// Decode the corrupted data with filter

std::vector<Filter::FilterType> filter_types;

filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);

- net::MockFilterContext filter_context(kDefaultBufferSize);

+ net::MockFilterContext filter_context;

scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));

ASSERT_TRUE(filter.get());

char corrupt_decode_buffer[kDefaultBufferSize];

@@ -372,7 +374,7 @@ TEST_F(GZipUnitTest, DecodeMissingData) {

// Decode the corrupted data with filter

std::vector<Filter::FilterType> filter_types;

filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);

- net::MockFilterContext filter_context(kDefaultBufferSize);

+ net::MockFilterContext filter_context;

scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));

ASSERT_TRUE(filter.get());

char corrupt_decode_buffer[kDefaultBufferSize];

@@ -396,7 +398,7 @@ TEST_F(GZipUnitTest, DecodeCorruptedHeader) {

// Decode the corrupted data with filter

std::vector<Filter::FilterType> filter_types;

filter_types.push_back(Filter::FILTER_TYPE_GZIP);

- net::MockFilterContext filter_context(kDefaultBufferSize);

+ net::MockFilterContext filter_context;

scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));

ASSERT_TRUE(filter.get());

char corrupt_decode_buffer[kDefaultBufferSize];

« net/base/filter.cc ('K') | « net/base/filter_unittest.cc ('k') | net/base/mock_filter_context.h » ('j') | no next file with comments »