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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/sdch_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
« net/base/filter.cc ('K') | « net/base/mock_filter_context.cc ('k') | net/url_request/url_request_job.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/sdch_filter_unittest.cc
diff --git a/net/base/sdch_filter_unittest.cc b/net/base/sdch_filter_unittest.cc
index 45ed6f07ea67c575cacf018d72cb109081830012..0a97ae7be8bf8da719a03e57596c2f175d20b305 100644
--- a/net/base/sdch_filter_unittest.cc
+++ b/net/base/sdch_filter_unittest.cc
@@ -158,9 +158,8 @@ static std::string NewSdchDictionary(const std::string& domain) {
TEST_F(SdchFilterTest, EmptyInputOk) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(30);
char output_buffer[20];
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
std::string url_string("http://ignore.com");
filter_context.SetURL(GURL(url_string));
scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
@@ -179,9 +178,8 @@ TEST_F(SdchFilterTest, PassThroughWhenTentative) {
std::vector<Filter::FilterType> filter_types;
// Selective a tentative filter (which can fall back to pass through).
filter_types.push_back(Filter::FILTER_TYPE_GZIP_HELPING_SDCH);
- const int kInputBufferSize(30);
char output_buffer[20];
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
// Response code needs to be 200 to allow a pass through.
filter_context.SetResponseCode(200);
std::string url_string("http://ignore.com");
@@ -193,7 +191,6 @@ TEST_F(SdchFilterTest, PassThroughWhenTentative) {
char* input_buffer = filter->stream_buffer()->data();
int input_buffer_size = filter->stream_buffer_size();
- EXPECT_EQ(kInputBufferSize, input_buffer_size);
EXPECT_LT(static_cast<int>(non_gzip_content.size()),
input_buffer_size);
@@ -219,9 +216,8 @@ TEST_F(SdchFilterTest, RefreshBadReturnCode) {
std::vector<Filter::FilterType> filter_types;
// Selective a tentative filter (which can fall back to pass through).
filter_types.push_back(Filter::FILTER_TYPE_SDCH_POSSIBLE);
- const int kInputBufferSize(30);
char output_buffer[20];
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
// Response code needs to be 200 to allow a pass through.
filter_context.SetResponseCode(403);
// Meta refresh will only appear for html content
@@ -236,7 +232,6 @@ TEST_F(SdchFilterTest, RefreshBadReturnCode) {
char* input_buffer = filter->stream_buffer()->data();
int input_buffer_size = filter->stream_buffer_size();
- EXPECT_EQ(kInputBufferSize, input_buffer_size);
EXPECT_LT(static_cast<int>(non_sdch_content.size()),
input_buffer_size);
@@ -262,9 +257,8 @@ TEST_F(SdchFilterTest, ErrorOnBadReturnCode) {
std::vector<Filter::FilterType> filter_types;
// Selective a tentative filter (which can fall back to pass through).
filter_types.push_back(Filter::FILTER_TYPE_SDCH_POSSIBLE);
- const int kInputBufferSize(30);
char output_buffer[20];
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
// Response code needs to be 200 to allow a pass through.
filter_context.SetResponseCode(403);
// Meta refresh will only appear for html content, so set to something else
@@ -280,7 +274,6 @@ TEST_F(SdchFilterTest, ErrorOnBadReturnCode) {
char* input_buffer = filter->stream_buffer()->data();
int input_buffer_size = filter->stream_buffer_size();
- EXPECT_EQ(kInputBufferSize, input_buffer_size);
EXPECT_LT(static_cast<int>(non_sdch_content.size()),
input_buffer_size);
@@ -301,9 +294,8 @@ TEST_F(SdchFilterTest, ErrorOnBadReturnCodeWithHtml) {
std::vector<Filter::FilterType> filter_types;
// Selective a tentative filter (which can fall back to pass through).
filter_types.push_back(Filter::FILTER_TYPE_SDCH_POSSIBLE);
- const int kInputBufferSize(30);
char output_buffer[20];
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
// Response code needs to be 200 to allow a pass through.
filter_context.SetResponseCode(403);
// Meta refresh will only appear for html content
@@ -318,7 +310,6 @@ TEST_F(SdchFilterTest, ErrorOnBadReturnCodeWithHtml) {
char* input_buffer = filter->stream_buffer()->data();
int input_buffer_size = filter->stream_buffer_size();
- EXPECT_EQ(kInputBufferSize, input_buffer_size);
EXPECT_LT(static_cast<int>(non_sdch_content.size()),
input_buffer_size);
@@ -344,9 +335,8 @@ TEST_F(SdchFilterTest, ErrorOnBadReturnCodeWithHtml) {
TEST_F(SdchFilterTest, BasicBadDictionary) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(30);
char output_buffer[20];
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
std::string url_string("http://ignore.com");
filter_context.SetURL(GURL(url_string));
scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
@@ -357,7 +347,6 @@ TEST_F(SdchFilterTest, BasicBadDictionary) {
char* input_buffer = filter->stream_buffer()->data();
int input_buffer_size = filter->stream_buffer_size();
- EXPECT_EQ(kInputBufferSize, input_buffer_size);
EXPECT_LT(static_cast<int>(dictionary_hash_prefix.size()),
input_buffer_size);
@@ -432,9 +421,7 @@ TEST_F(SdchFilterTest, BasicDictionary) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- // Decode with a large buffer (larger than test input, or compressed data).
- const int kInputBufferSize(100);
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetURL(url);
scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
@@ -472,8 +459,7 @@ TEST_F(SdchFilterTest, NoDecodeHttps) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(100);
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetURL(GURL("https://" + kSampleDomain));
scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
@@ -504,8 +490,7 @@ TEST_F(SdchFilterTest, NoDecodeFtp) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(100);
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetURL(GURL("ftp://" + kSampleDomain));
scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
@@ -532,8 +517,7 @@ TEST_F(SdchFilterTest, NoDecodeFileColon) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(100);
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetURL(GURL("file://" + kSampleDomain));
scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
@@ -560,8 +544,7 @@ TEST_F(SdchFilterTest, NoDecodeAboutColon) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(100);
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetURL(GURL("about://" + kSampleDomain));
scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
@@ -588,8 +571,7 @@ TEST_F(SdchFilterTest, NoDecodeJavaScript) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(100);
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetURL(GURL("javascript://" + kSampleDomain));
scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
@@ -616,8 +598,7 @@ TEST_F(SdchFilterTest, CanStillDecodeHttp) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(100);
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetURL(GURL("http://" + kSampleDomain));
scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
@@ -643,11 +624,10 @@ TEST_F(SdchFilterTest, CrossDomainDictionaryUse) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(100);
// Decode with content arriving from the "wrong" domain.
// This tests SdchManager::CanSet().
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
GURL wrong_domain_url("http://www.wrongdomain.com");
filter_context.SetURL(wrong_domain_url);
scoped_ptr<Filter> filter((Filter::Factory(filter_types, filter_context)));
@@ -685,10 +665,9 @@ TEST_F(SdchFilterTest, DictionaryPathValidation) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(100);
// Test decode the path data, arriving from a valid path.
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetURL(GURL(url_string + path));
scoped_ptr<Filter> filter((Filter::Factory(filter_types, filter_context)));
@@ -739,10 +718,9 @@ TEST_F(SdchFilterTest, DictionaryPortValidation) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(100);
// Test decode the port data, arriving from a valid port.
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetURL(GURL(url_string + ":" + port));
scoped_ptr<Filter> filter((Filter::Factory(filter_types, filter_context)));
@@ -860,15 +838,16 @@ TEST_F(SdchFilterTest, FilterChaining) {
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
filter_types.push_back(Filter::FILTER_TYPE_GZIP);
- // First try with a large buffer (larger than test input, or compressed data).
- const size_t kLargeInputBufferSize(1000); // Used internally in filters.
- CHECK_GT(kLargeInputBufferSize, gzip_compressed_sdch.size());
- CHECK_GT(kLargeInputBufferSize, sdch_compressed.size());
- CHECK_GT(kLargeInputBufferSize, expanded_.size());
- MockFilterContext filter_context(kLargeInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetURL(url);
scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
+ const size_t kLargeInputBufferSize(1000);
+ ASSERT_LE(static_cast<int>(kLargeInputBufferSize), filter->stream_buffer_size());
+ ASSERT_GT(kLargeInputBufferSize, gzip_compressed_sdch.size());
+ ASSERT_GT(kLargeInputBufferSize, sdch_compressed.size());
+ ASSERT_GT(kLargeInputBufferSize, expanded_.size());
+
// Verify that chained filter is waiting for data.
char tiny_output_buffer[10];
int tiny_output_size = sizeof(tiny_output_buffer);
@@ -886,14 +865,14 @@ TEST_F(SdchFilterTest, FilterChaining) {
// Next try with a mid-sized internal buffer size.
const size_t kMidSizedInputBufferSize(100);
// Buffer should be big enough to swallow whole gzip content.
- CHECK_GT(kMidSizedInputBufferSize, gzip_compressed_sdch.size());
+ ASSERT_GT(kMidSizedInputBufferSize, gzip_compressed_sdch.size());
// Buffer should be small enough that entire SDCH content can't fit.
// We'll go even further, and force the chain to flush the buffer between the
// two filters more than once (that is why we multiply by 2).
- CHECK_LT(kMidSizedInputBufferSize * 2, sdch_compressed.size());
- filter_context.SetBufferSize(kMidSizedInputBufferSize);
+ ASSERT_LT(kMidSizedInputBufferSize * 2, sdch_compressed.size());
filter_context.SetURL(url);
filter.reset(Filter::Factory(filter_types, filter_context));
+ filter->ResetInputBufferForTest(kMidSizedInputBufferSize);
feed_block_size = kMidSizedInputBufferSize;
output_block_size = kMidSizedInputBufferSize;
@@ -903,8 +882,8 @@ TEST_F(SdchFilterTest, FilterChaining) {
EXPECT_EQ(output, expanded_);
// Next try with a tiny input and output buffer to cover edge effects.
- filter_context.SetBufferSize(kLargeInputBufferSize);
filter.reset(Filter::Factory(filter_types, filter_context));
+ filter->ResetInputBufferForTest(kLargeInputBufferSize);
feed_block_size = 1;
output_block_size = 1;
@@ -934,8 +913,7 @@ TEST_F(SdchFilterTest, DefaultGzipIfSdch) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_SDCH);
- const int kInputBufferSize(100);
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetMimeType("anything/mime");
filter_context.SetSdchResponse(true);
Filter::FixupEncodingTypes(filter_context, &filter_types);
@@ -994,8 +972,7 @@ TEST_F(SdchFilterTest, AcceptGzipSdchIfGzip) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_GZIP);
- const int kInputBufferSize(100);
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetMimeType("anything/mime");
filter_context.SetSdchResponse(true);
Filter::FixupEncodingTypes(filter_context, &filter_types);
@@ -1053,8 +1030,7 @@ TEST_F(SdchFilterTest, DefaultSdchGzipIfEmpty) {
// System should automatically add the missing (optional) sdch,gzip.
std::vector<Filter::FilterType> filter_types;
- const int kInputBufferSize(100);
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetMimeType("anything/mime");
filter_context.SetSdchResponse(true);
Filter::FixupEncodingTypes(filter_context, &filter_types);
@@ -1116,8 +1092,7 @@ TEST_F(SdchFilterTest, AcceptGzipGzipSdchIfGzip) {
std::vector<Filter::FilterType> filter_types;
filter_types.push_back(Filter::FILTER_TYPE_GZIP);
- const int kInputBufferSize(100);
- MockFilterContext filter_context(kInputBufferSize);
+ MockFilterContext filter_context;
filter_context.SetMimeType("anything/mime");
filter_context.SetSdchResponse(true);
Filter::FixupEncodingTypes(filter_context, &filter_types);
« net/base/filter.cc ('K') | « net/base/mock_filter_context.cc ('k') | net/url_request/url_request_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698