Clean up filter and content encoding handling ...

net/base/gzip_filter_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <fstream>
 #include <iostream>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_test.h"
@@ skipping 56 matching lines @@
     file_util::ReadFileToString(file_path, &source_buffer_);
 
     // Encode the data with deflate
     deflate_encode_buffer_ = new char[kDefaultBufferSize];
     ASSERT_TRUE(deflate_encode_buffer_ != NULL);
 
     deflate_encode_len_ = kDefaultBufferSize;
     int code = CompressAll(ENCODE_DEFLATE , source_buffer(), source_len(),
                            deflate_encode_buffer_, &deflate_encode_len_);
     ASSERT_TRUE(code == Z_STREAM_END);
-    ASSERT_TRUE(deflate_encode_len_ > 0);
+    ASSERT_GT(deflate_encode_len_, 0);
     ASSERT_TRUE(deflate_encode_len_ <= kDefaultBufferSize);
 
     // Encode the data with gzip
     gzip_encode_buffer_ = new char[kDefaultBufferSize];
     ASSERT_TRUE(gzip_encode_buffer_ != NULL);
 
     gzip_encode_len_ = kDefaultBufferSize;
     code = CompressAll(ENCODE_GZIP, source_buffer(), source_len(),
                            gzip_encode_buffer_, &gzip_encode_len_);
     ASSERT_TRUE(code == Z_STREAM_END);
-    ASSERT_TRUE(gzip_encode_len_ > 0);
+    ASSERT_GT(gzip_encode_len_, 0);
     ASSERT_TRUE(gzip_encode_len_ <= kDefaultBufferSize);
   }
 
   virtual void TearDown() {
     delete[] deflate_encode_buffer_;
     deflate_encode_buffer_ = NULL;
 
     delete[] gzip_encode_buffer_;
     gzip_encode_buffer_ = NULL;
 
@@ skipping 122 matching lines @@
   char* deflate_encode_buffer_;
   int deflate_encode_len_;
 
   char* gzip_encode_buffer_;
   int gzip_encode_len_;
 };
 
 // Basic scenario: decoding deflate data with big enough buffer.
 TEST_F(GZipUnitTest, DecodeDeflate) {
   // Decode the compressed data with filter
-  std::vector<std::string> filters;
-  filters.push_back("deflate");
-  scoped_ptr<Filter> filter(
-    Filter::Factory(filters, kApplicationOctetStream, kDefaultBufferSize));
+  std::vector<Filter::FilterType> filter_types;
+  filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);
+  scoped_ptr<Filter> filter(Filter::Factory(filter_types, kDefaultBufferSize));
   ASSERT_TRUE(filter.get());
   memcpy(filter->stream_buffer(), deflate_encode_buffer_, deflate_encode_len_);
   filter->FlushStreamBuffer(deflate_encode_len_);
 
   char deflate_decode_buffer[kDefaultBufferSize];
   int deflate_decode_size = kDefaultBufferSize;
   filter->ReadData(deflate_decode_buffer, &deflate_decode_size);
 
   // Compare the decoding result with source data
   EXPECT_TRUE(deflate_decode_size == source_len());
   EXPECT_EQ(memcmp(source_buffer(), deflate_decode_buffer, source_len()), 0);
 }
 
 // Basic scenario: decoding gzip data with big enough buffer.
 TEST_F(GZipUnitTest, DecodeGZip) {
   // Decode the compressed data with filter
-  std::vector<std::string> filters;
-  filters.push_back("gzip");
-  scoped_ptr<Filter> filter(
-      Filter::Factory(filters, kApplicationOctetStream, kDefaultBufferSize));
+  std::vector<Filter::FilterType> filter_types;
+  filter_types.push_back(Filter::FILTER_TYPE_GZIP);
+  scoped_ptr<Filter> filter(Filter::Factory(filter_types, kDefaultBufferSize));
   ASSERT_TRUE(filter.get());
   memcpy(filter->stream_buffer(), gzip_encode_buffer_, gzip_encode_len_);
   filter->FlushStreamBuffer(gzip_encode_len_);
 
   char gzip_decode_buffer[kDefaultBufferSize];
   int gzip_decode_size = kDefaultBufferSize;
   filter->ReadData(gzip_decode_buffer, &gzip_decode_size);
 
   // Compare the decoding result with source data
   EXPECT_TRUE(gzip_decode_size == source_len());
   EXPECT_EQ(memcmp(source_buffer(), gzip_decode_buffer, source_len()), 0);
 }
 
 // Tests we can call filter repeatedly to get all the data decoded.
 // To do that, we create a filter with a small buffer that can not hold all
 // the input data.
 TEST_F(GZipUnitTest, DecodeWithSmallBuffer) {
-  std::vector<std::string> filters;
-  filters.push_back("deflate");
-  scoped_ptr<Filter> filter(
-      Filter::Factory(filters, kApplicationOctetStream, kSmallBufferSize));
+  std::vector<Filter::FilterType> filter_types;
+  filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);
+  scoped_ptr<Filter> filter(Filter::Factory(filter_types, kSmallBufferSize));
   ASSERT_TRUE(filter.get());
   DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),
                              deflate_encode_buffer_, deflate_encode_len_,
                              kDefaultBufferSize);
 }
 
 // Tests we can still decode with just 1 byte buffer in the filter.
 // The purpose of this tests are two: (1) Verify filter can parse partial GZip
 // header correctly. (2) Sometimes the filter will consume input without
 // generating output. Verify filter can handle it correctly.
 TEST_F(GZipUnitTest, DecodeWithOneByteBuffer) {
-  std::vector<std::string> filters;
-  filters.push_back("gzip");
-  scoped_ptr<Filter> filter(
-      Filter::Factory(filters, kApplicationOctetStream, 1));
+  std::vector<Filter::FilterType> filter_types;
+  filter_types.push_back(Filter::FILTER_TYPE_GZIP);
+  scoped_ptr<Filter> filter(Filter::Factory(filter_types, 1));
   ASSERT_TRUE(filter.get());
   DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),
                              gzip_encode_buffer_, gzip_encode_len_,
                              kDefaultBufferSize);
 }
 
 // Tests we can decode when caller has small buffer to read out from filter.
 TEST_F(GZipUnitTest, DecodeWithSmallOutputBuffer) {
-  std::vector<std::string> filters;
-  filters.push_back("deflate");
-  scoped_ptr<Filter> filter(
-      Filter::Factory(filters, kApplicationOctetStream, kDefaultBufferSize));
+  std::vector<Filter::FilterType> filter_types;
+  filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);
+  scoped_ptr<Filter> filter(Filter::Factory(filter_types, kDefaultBufferSize));
   ASSERT_TRUE(filter.get());
   DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),
                              deflate_encode_buffer_, deflate_encode_len_,
                              kSmallBufferSize);
 }
 
 // Tests we can still decode with just 1 byte buffer in the filter and just 1
 // byte buffer in the caller.
 TEST_F(GZipUnitTest, DecodeWithOneByteInputAndOutputBuffer) {
-  std::vector<std::string> filters;
-  filters.push_back("gzip");
-  scoped_ptr<Filter> filter(
-      Filter::Factory(filters, kApplicationOctetStream, 1));
+  std::vector<Filter::FilterType> filter_types;
+  filter_types.push_back(Filter::FILTER_TYPE_GZIP);
+  scoped_ptr<Filter> filter(Filter::Factory(filter_types, 1));
   ASSERT_TRUE(filter.get());
   DecodeAndCompareWithFilter(filter.get(), source_buffer(), source_len(),
                              gzip_encode_buffer_, gzip_encode_len_, 1);
 }
 
 // Decoding deflate stream with corrupted data.
 TEST_F(GZipUnitTest, DecodeCorruptedData) {
   char corrupt_data[kDefaultBufferSize];
   int corrupt_data_len = deflate_encode_len_;
   memcpy(corrupt_data, deflate_encode_buffer_, deflate_encode_len_);
 
   int pos = corrupt_data_len / 2;
   corrupt_data[pos] = !corrupt_data[pos];
 
   // Decode the corrupted data with filter
-  std::vector<std::string> filters;
-  filters.push_back("deflate");
-  scoped_ptr<Filter> filter(
-      Filter::Factory(filters, kApplicationOctetStream, kDefaultBufferSize));
+  std::vector<Filter::FilterType> filter_types;
+  filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);
+  scoped_ptr<Filter> filter(Filter::Factory(filter_types, kDefaultBufferSize));
   ASSERT_TRUE(filter.get());
   char corrupt_decode_buffer[kDefaultBufferSize];
   int corrupt_decode_size = kDefaultBufferSize;
 
   int code = DecodeAllWithFilter(filter.get(), corrupt_data, corrupt_data_len,
                                  corrupt_decode_buffer, &corrupt_decode_size);
 
   // Expect failures
   EXPECT_TRUE(code == Filter::FILTER_ERROR);
 }
 
 // Decoding deflate stream with missing data.
 TEST_F(GZipUnitTest, DecodeMissingData) {
   char corrupt_data[kDefaultBufferSize];
   int corrupt_data_len = deflate_encode_len_;
   memcpy(corrupt_data, deflate_encode_buffer_, deflate_encode_len_);
 
   int pos = corrupt_data_len / 2;
   int len = corrupt_data_len - pos - 1;
   memmove(&corrupt_data[pos], &corrupt_data[pos+1], len);
   --corrupt_data_len;
 
   // Decode the corrupted data with filter
-  std::vector<std::string> filters;
-  filters.push_back("deflate");
-  scoped_ptr<Filter> filter(
-      Filter::Factory(filters, kApplicationOctetStream, kDefaultBufferSize));
+  std::vector<Filter::FilterType> filter_types;
+  filter_types.push_back(Filter::FILTER_TYPE_DEFLATE);
+  scoped_ptr<Filter> filter(Filter::Factory(filter_types, kDefaultBufferSize));
   ASSERT_TRUE(filter.get());
   char corrupt_decode_buffer[kDefaultBufferSize];
   int corrupt_decode_size = kDefaultBufferSize;
 
   int code = DecodeAllWithFilter(filter.get(), corrupt_data, corrupt_data_len,
                                  corrupt_decode_buffer, &corrupt_decode_size);
 
   // Expect failures
   EXPECT_EQ(Filter::FILTER_ERROR, code);
 }
 
 // Decoding gzip stream with corrupted header.
 TEST_F(GZipUnitTest, DecodeCorruptedHeader) {
   char corrupt_data[kDefaultBufferSize];
   int corrupt_data_len = gzip_encode_len_;
   memcpy(corrupt_data, gzip_encode_buffer_, gzip_encode_len_);
 
   corrupt_data[2] = !corrupt_data[2];
 
   // Decode the corrupted data with filter
-  std::vector<std::string> filters;
-  filters.push_back("gzip");
-  scoped_ptr<Filter> filter(
-      Filter::Factory(filters, kApplicationOctetStream, kDefaultBufferSize));
+  std::vector<Filter::FilterType> filter_types;
+  filter_types.push_back(Filter::FILTER_TYPE_GZIP);
+  scoped_ptr<Filter> filter(Filter::Factory(filter_types, kDefaultBufferSize));
   ASSERT_TRUE(filter.get());
   char corrupt_decode_buffer[kDefaultBufferSize];
   int corrupt_decode_size = kDefaultBufferSize;
 
   int code = DecodeAllWithFilter(filter.get(), corrupt_data, corrupt_data_len,
                                  corrupt_decode_buffer, &corrupt_decode_size);
 
   // Expect failures
   EXPECT_TRUE(code == Filter::FILTER_ERROR);
 }
 
-TEST_F(GZipUnitTest, ApacheWorkaround) {
-  const int kBufferSize = kDefaultBufferSize;  // To fit in 80 cols.
-  scoped_ptr<Filter> filter;
-
-  std::vector<std::string> gzip_filters, x_gzip_filters;
-  gzip_filters.push_back("gzip");
-  x_gzip_filters.push_back("x-gzip");
-
-  filter.reset(Filter::Factory(gzip_filters, kApplicationXGzip, kBufferSize));
-  EXPECT_FALSE(filter.get());
-  filter.reset(Filter::Factory(gzip_filters, kApplicationGzip, kBufferSize));
-  EXPECT_FALSE(filter.get());
-  filter.reset(Filter::Factory(gzip_filters, kApplicationXGunzip, kBufferSize));
-  EXPECT_FALSE(filter.get());
-
-  filter.reset(Filter::Factory(x_gzip_filters, kApplicationXGzip, kBufferSize));
-  EXPECT_FALSE(filter.get());
-  filter.reset(Filter::Factory(x_gzip_filters, kApplicationGzip, kBufferSize));
-  EXPECT_FALSE(filter.get());
-  filter.reset(Filter::Factory(x_gzip_filters, kApplicationXGunzip,
-                               kBufferSize));
-  EXPECT_FALSE(filter.get());
-}
-
 }  // namespace