| Index: net/tools/balsa/balsa_headers_test.cc
|
| diff --git a/net/tools/balsa/balsa_headers_test.cc b/net/tools/balsa/balsa_headers_test.cc
|
| index da2ad198a4dc002b438cbb4973a9903fc6fd7044..6e10175d2d49b6baa18f28e8e235356ac82833fe 100644
|
| --- a/net/tools/balsa/balsa_headers_test.cc
|
| +++ b/net/tools/balsa/balsa_headers_test.cc
|
| @@ -31,11 +31,9 @@ class BalsaBufferTest : public ::testing::Test {
|
|
|
| namespace {
|
|
|
| -class BalsaHeadersTest: public ::testing::Test {
|
| +class BalsaHeadersTest : public ::testing::Test {
|
| public:
|
| - virtual void SetUp() OVERRIDE {
|
| - headers_.reset(new BalsaHeaders);
|
| - }
|
| + virtual void SetUp() OVERRIDE { headers_.reset(new BalsaHeaders); }
|
|
|
| protected:
|
| scoped_ptr<BalsaHeaders> headers_;
|
| @@ -43,10 +41,8 @@ class BalsaHeadersTest: public ::testing::Test {
|
|
|
| class StringBuffer {
|
| public:
|
| - void Write(const char* p, size_t size) {
|
| - string_ += std::string(p, size);
|
| - }
|
| - const std::string& string() {return string_;}
|
| + void Write(const char* p, size_t size) { string_ += std::string(p, size); }
|
| + const std::string& string() { return string_; }
|
|
|
| private:
|
| std::string string_;
|
| @@ -137,9 +133,9 @@ TEST_F(BalsaBufferTest, Swap) {
|
|
|
| ASSERT_EQ(1u, buffer_->num_blocks());
|
| ASSERT_EQ(2u, anotherBuffer_->num_blocks());
|
| - ASSERT_EQ("hello",
|
| - StringPiece(anotherBuffer_->GetPtr(1),
|
| - anotherBuffer_->bytes_used(1)));
|
| + ASSERT_EQ(
|
| + "hello",
|
| + StringPiece(anotherBuffer_->GetPtr(1), anotherBuffer_->bytes_used(1)));
|
| }
|
|
|
| TEST_F(BalsaBufferTest, CopyFrom) {
|
| @@ -153,9 +149,9 @@ TEST_F(BalsaBufferTest, CopyFrom) {
|
| ASSERT_EQ(2u, buffer_->num_blocks());
|
| ASSERT_EQ(2u, anotherBuffer_->num_blocks());
|
| ASSERT_EQ("hello", StringPiece(buffer_->GetPtr(1), buffer_->bytes_used(1)));
|
| - ASSERT_EQ("hello",
|
| - StringPiece(anotherBuffer_->GetPtr(1),
|
| - anotherBuffer_->bytes_used(1)));
|
| + ASSERT_EQ(
|
| + "hello",
|
| + StringPiece(anotherBuffer_->GetPtr(1), anotherBuffer_->bytes_used(1)));
|
| }
|
|
|
| TEST_F(BalsaHeadersTest, AppendHeader) {
|
| @@ -165,8 +161,9 @@ TEST_F(BalsaHeadersTest, AppendHeader) {
|
| headers_->AppendHeader("key3", "value3.1");
|
| headers_->AppendHeader("key3", "value3.2");
|
|
|
| - ASSERT_EQ(5, std::distance(headers_->header_lines_begin(),
|
| - headers_->header_lines_end()));
|
| + ASSERT_EQ(5,
|
| + std::distance(headers_->header_lines_begin(),
|
| + headers_->header_lines_end()));
|
| ASSERT_EQ("value1", headers_->GetHeader("key1"));
|
| ASSERT_EQ("value2", headers_->GetHeader("key2"));
|
| ASSERT_EQ("value3", headers_->GetHeader("key3"));
|
| @@ -197,8 +194,9 @@ TEST_F(BalsaHeadersTest, ReplaceOrAppendHeader) {
|
| headers_->ReplaceOrAppendHeader("key1", "value1");
|
| headers_->ReplaceOrAppendHeader("key1", "value2");
|
|
|
| - ASSERT_EQ(1, std::distance(headers_->header_lines_begin(),
|
| - headers_->header_lines_end()));
|
| + ASSERT_EQ(1,
|
| + std::distance(headers_->header_lines_begin(),
|
| + headers_->header_lines_end()));
|
| ASSERT_EQ("value2", headers_->GetHeader("key1"));
|
|
|
| std::vector<base::StringPiece> v;
|
| @@ -212,8 +210,9 @@ TEST_F(BalsaHeadersTest, AppendToHeader) {
|
| headers_->AppendToHeader("key1", "value1");
|
| headers_->AppendToHeader("keY1", "value2");
|
|
|
| - ASSERT_EQ(1, std::distance(headers_->header_lines_begin(),
|
| - headers_->header_lines_end()));
|
| + ASSERT_EQ(1,
|
| + std::distance(headers_->header_lines_begin(),
|
| + headers_->header_lines_end()));
|
| ASSERT_EQ("value1,value2", headers_->GetHeader("key1"));
|
|
|
| std::vector<base::StringPiece> v;
|
| @@ -230,8 +229,9 @@ TEST_F(BalsaHeadersTest, PrepentToHeader) {
|
| headers_->PrependToHeader("key1", "value1");
|
| headers_->PrependToHeader("key1", "value2");
|
|
|
| - ASSERT_EQ(1, std::distance(headers_->header_lines_begin(),
|
| - headers_->header_lines_end()));
|
| + ASSERT_EQ(1,
|
| + std::distance(headers_->header_lines_begin(),
|
| + headers_->header_lines_end()));
|
| ASSERT_EQ("value2,value1", headers_->GetHeader("key1"));
|
|
|
| std::vector<base::StringPiece> v;
|
| @@ -316,11 +316,13 @@ TEST_F(BalsaHeadersTest, RemoveAllOfHeader) {
|
| headers_->AppendHeader("key1", "value1.2");
|
| headers_->AppendHeader("kEY1", "value1.3");
|
|
|
| - ASSERT_EQ(6, std::distance(headers_->header_lines_begin(),
|
| - headers_->header_lines_end()));
|
| + ASSERT_EQ(6,
|
| + std::distance(headers_->header_lines_begin(),
|
| + headers_->header_lines_end()));
|
| headers_->RemoveAllOfHeader("key1");
|
| - ASSERT_EQ(2, std::distance(headers_->header_lines_begin(),
|
| - headers_->header_lines_end()));
|
| + ASSERT_EQ(2,
|
| + std::distance(headers_->header_lines_begin(),
|
| + headers_->header_lines_end()));
|
| }
|
|
|
| TEST_F(BalsaHeadersTest, RemoveAllHeadersWithPrefix) {
|
| @@ -330,11 +332,13 @@ TEST_F(BalsaHeadersTest, RemoveAllHeadersWithPrefix) {
|
| headers_->AppendHeader("key3", "value3");
|
| headers_->AppendHeader("1KEEjkladf", "value1.2");
|
|
|
| - ASSERT_EQ(5, std::distance(headers_->header_lines_begin(),
|
| - headers_->header_lines_end()));
|
| + ASSERT_EQ(5,
|
| + std::distance(headers_->header_lines_begin(),
|
| + headers_->header_lines_end()));
|
| headers_->RemoveAllHeadersWithPrefix("1ke");
|
| - ASSERT_EQ(2, std::distance(headers_->header_lines_begin(),
|
| - headers_->header_lines_end()));
|
| + ASSERT_EQ(2,
|
| + std::distance(headers_->header_lines_begin(),
|
| + headers_->header_lines_end()));
|
| }
|
|
|
| TEST_F(BalsaHeadersTest, WriteRequestHeaderAndEndingToBuffer) {
|
| @@ -344,7 +348,8 @@ TEST_F(BalsaHeadersTest, WriteRequestHeaderAndEndingToBuffer) {
|
|
|
| headers_->SetRequestFirstlineFromStringPieces("GET", "/", "HTTP/1.0");
|
|
|
| - std::string expected = "GET / HTTP/1.0\r\n"
|
| + std::string expected =
|
| + "GET / HTTP/1.0\r\n"
|
| "key1: value1\r\n"
|
| "key2: value2\r\n"
|
| "key1: value1.1\r\n\r\n";
|
| @@ -360,7 +365,8 @@ TEST_F(BalsaHeadersTest, WriteResponseHeaderAndEndingToBuffer) {
|
|
|
| headers_->SetResponseFirstlineFromStringPieces("HTTP/1.0", "200", "OK");
|
|
|
| - std::string expected = "HTTP/1.0 200 OK\r\n"
|
| + std::string expected =
|
| + "HTTP/1.0 200 OK\r\n"
|
| "key1: value1\r\n"
|
| "key2: value2\r\n"
|
| "key1: value1.1\r\n\r\n";
|
|
|