Index: net/base/upload_data_stream_unittest.cc |
diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc |
index 90a78d24b52de5db96a5fc956ab0cabe06e45f17..1ab55340b6e784f80c0a16cbcaa65c682406c15c 100644 |
--- a/net/base/upload_data_stream_unittest.cc |
+++ b/net/base/upload_data_stream_unittest.cc |
@@ -70,9 +70,10 @@ class MockUploadElementReader : public UploadElementReader { |
virtual uint64 GetContentLength() const OVERRIDE { return content_length_; } |
virtual uint64 BytesRemaining() const OVERRIDE { return bytes_remaining_; } |
virtual bool IsInMemory() const OVERRIDE { return is_in_memory_; } |
- MOCK_METHOD3(Read, int(IOBuffer* buf, |
- int buf_length, |
- const CompletionCallback& callback)); |
+ MOCK_METHOD3(Read, |
+ int(IOBuffer* buf, |
+ int buf_length, |
+ const CompletionCallback& callback)); |
// Sets expectation to return the specified result from Init() asynchronously. |
void SetAsyncInitExpectation(int result) { |
@@ -151,8 +152,8 @@ TEST_F(UploadDataStreamTest, EmptyUploadData) { |
} |
TEST_F(UploadDataStreamTest, ConsumeAllBytes) { |
- element_readers_.push_back(new UploadBytesElementReader( |
- kTestData, kTestDataSize)); |
+ element_readers_.push_back( |
+ new UploadBytesElementReader(kTestData, kTestDataSize)); |
UploadDataStream stream(element_readers_.Pass(), 0); |
ASSERT_EQ(OK, stream.Init(CompletionCallback())); |
EXPECT_TRUE(stream.IsInMemory()); |
@@ -171,8 +172,8 @@ TEST_F(UploadDataStreamTest, ConsumeAllBytes) { |
TEST_F(UploadDataStreamTest, File) { |
base::FilePath temp_file_path; |
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), |
- &temp_file_path)); |
+ ASSERT_TRUE( |
+ base::CreateTemporaryFileInDir(temp_dir_.path(), &temp_file_path)); |
ASSERT_EQ(static_cast<int>(kTestDataSize), |
base::WriteFile(temp_file_path, kTestData, kTestDataSize)); |
@@ -205,11 +206,11 @@ TEST_F(UploadDataStreamTest, File) { |
TEST_F(UploadDataStreamTest, FileSmallerThanLength) { |
base::FilePath temp_file_path; |
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), |
- &temp_file_path)); |
+ ASSERT_TRUE( |
+ base::CreateTemporaryFileInDir(temp_dir_.path(), &temp_file_path)); |
ASSERT_EQ(static_cast<int>(kTestDataSize), |
base::WriteFile(temp_file_path, kTestData, kTestDataSize)); |
- const uint64 kFakeSize = kTestDataSize*2; |
+ const uint64 kFakeSize = kTestDataSize * 2; |
UploadFileElementReader::ScopedOverridingContentLengthForTests |
overriding_content_length(kFakeSize); |
@@ -256,14 +257,14 @@ TEST_F(UploadDataStreamTest, ReadErrorSync) { |
element_readers_.push_back(reader); |
// This element is ignored because of the error from the previous reader. |
- element_readers_.push_back(new UploadBytesElementReader( |
- kTestData, kTestDataSize)); |
+ element_readers_.push_back( |
+ new UploadBytesElementReader(kTestData, kTestDataSize)); |
UploadDataStream stream(element_readers_.Pass(), 0); |
// Run Init(). |
ASSERT_EQ(OK, stream.Init(CompletionCallback())); |
- EXPECT_EQ(kTestDataSize*2, stream.size()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.size()); |
EXPECT_EQ(0U, stream.position()); |
EXPECT_FALSE(stream.IsEOF()); |
@@ -278,7 +279,7 @@ TEST_F(UploadDataStreamTest, ReadErrorSync) { |
EXPECT_TRUE(stream.IsEOF()); |
// The buffer is filled with zero. |
- EXPECT_EQ(static_cast<int>(kTestDataSize*2), |
+ EXPECT_EQ(static_cast<int>(kTestDataSize * 2), |
std::count(buf->data(), buf->data() + kTestBufferSize, 0)); |
} |
@@ -291,8 +292,8 @@ TEST_F(UploadDataStreamTest, ReadErrorAsync) { |
element_readers_.push_back(reader); |
// This element is ignored because of the error from the previous reader. |
- element_readers_.push_back(new UploadBytesElementReader( |
- kTestData, kTestDataSize)); |
+ element_readers_.push_back( |
+ new UploadBytesElementReader(kTestData, kTestDataSize)); |
UploadDataStream stream(element_readers_.Pass(), 0); |
@@ -300,7 +301,7 @@ TEST_F(UploadDataStreamTest, ReadErrorAsync) { |
TestCompletionCallback init_callback; |
ASSERT_EQ(ERR_IO_PENDING, stream.Init(init_callback.callback())); |
EXPECT_EQ(OK, init_callback.WaitForResult()); |
- EXPECT_EQ(kTestDataSize*2, stream.size()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.size()); |
EXPECT_EQ(0U, stream.position()); |
EXPECT_FALSE(stream.IsEOF()); |
@@ -313,18 +314,18 @@ TEST_F(UploadDataStreamTest, ReadErrorAsync) { |
ASSERT_EQ(ERR_IO_PENDING, |
stream.Read(buf.get(), kTestBufferSize, read_callback.callback())); |
EXPECT_EQ(static_cast<int>(kTestDataSize * 2), read_callback.WaitForResult()); |
- EXPECT_EQ(kTestDataSize*2, stream.position()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.position()); |
EXPECT_TRUE(stream.IsEOF()); |
// The buffer is filled with zero. |
- EXPECT_EQ(static_cast<int>(kTestDataSize*2), |
+ EXPECT_EQ(static_cast<int>(kTestDataSize * 2), |
std::count(buf->data(), buf->data() + kTestBufferSize, 0)); |
} |
TEST_F(UploadDataStreamTest, FileAndBytes) { |
base::FilePath temp_file_path; |
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), |
- &temp_file_path)); |
+ ASSERT_TRUE( |
+ base::CreateTemporaryFileInDir(temp_dir_.path(), &temp_file_path)); |
ASSERT_EQ(static_cast<int>(kTestDataSize), |
base::WriteFile(temp_file_path, kTestData, kTestDataSize)); |
@@ -337,8 +338,8 @@ TEST_F(UploadDataStreamTest, FileAndBytes) { |
kFileRangeLength, |
base::Time())); |
- element_readers_.push_back(new UploadBytesElementReader( |
- kTestData, kTestDataSize)); |
+ element_readers_.push_back( |
+ new UploadBytesElementReader(kTestData, kTestDataSize)); |
const uint64 kStreamSize = kTestDataSize + kFileRangeLength; |
TestCompletionCallback init_callback; |
@@ -363,7 +364,7 @@ TEST_F(UploadDataStreamTest, FileAndBytes) { |
} |
TEST_F(UploadDataStreamTest, Chunk) { |
- const uint64 kStreamSize = kTestDataSize*2; |
+ const uint64 kStreamSize = kTestDataSize * 2; |
UploadDataStream stream(UploadDataStream::CHUNKED, 0); |
stream.AppendChunk(kTestData, kTestDataSize, false); |
stream.AppendChunk(kTestData, kTestDataSize, true); |
@@ -456,8 +457,8 @@ TEST_F(UploadDataStreamTest, InitAsyncFailureSync) { |
// Read with a buffer whose size is same as the data. |
TEST_F(UploadDataStreamTest, ReadAsyncWithExactSizeBuffer) { |
- element_readers_.push_back(new UploadBytesElementReader( |
- kTestData, kTestDataSize)); |
+ element_readers_.push_back( |
+ new UploadBytesElementReader(kTestData, kTestDataSize)); |
UploadDataStream stream(element_readers_.Pass(), 0); |
ASSERT_EQ(OK, stream.Init(CompletionCallback())); |
@@ -549,8 +550,8 @@ void UploadDataStreamTest::FileChangedHelper(const base::FilePath& file_path, |
TEST_F(UploadDataStreamTest, FileChanged) { |
base::FilePath temp_file_path; |
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), |
- &temp_file_path)); |
+ ASSERT_TRUE( |
+ base::CreateTemporaryFileInDir(temp_dir_.path(), &temp_file_path)); |
ASSERT_EQ(static_cast<int>(kTestDataSize), |
base::WriteFile(temp_file_path, kTestData, kTestDataSize)); |
@@ -568,14 +569,14 @@ TEST_F(UploadDataStreamTest, FileChanged) { |
TEST_F(UploadDataStreamTest, MultipleInit) { |
base::FilePath temp_file_path; |
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), |
- &temp_file_path)); |
+ ASSERT_TRUE( |
+ base::CreateTemporaryFileInDir(temp_dir_.path(), &temp_file_path)); |
ASSERT_EQ(static_cast<int>(kTestDataSize), |
base::WriteFile(temp_file_path, kTestData, kTestDataSize)); |
// Prepare data. |
- element_readers_.push_back(new UploadBytesElementReader( |
- kTestData, kTestDataSize)); |
+ element_readers_.push_back( |
+ new UploadBytesElementReader(kTestData, kTestDataSize)); |
element_readers_.push_back( |
new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
temp_file_path, |
@@ -592,7 +593,7 @@ TEST_F(UploadDataStreamTest, MultipleInit) { |
ASSERT_EQ(ERR_IO_PENDING, stream.Init(init_callback1.callback())); |
ASSERT_EQ(OK, init_callback1.WaitForResult()); |
EXPECT_FALSE(stream.IsEOF()); |
- EXPECT_EQ(kTestDataSize*2, stream.size()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.size()); |
// Read. |
EXPECT_EQ(expected_data, ReadFromUploadDataStream(&stream)); |
@@ -603,7 +604,7 @@ TEST_F(UploadDataStreamTest, MultipleInit) { |
ASSERT_EQ(ERR_IO_PENDING, stream.Init(init_callback2.callback())); |
ASSERT_EQ(OK, init_callback2.WaitForResult()); |
EXPECT_FALSE(stream.IsEOF()); |
- EXPECT_EQ(kTestDataSize*2, stream.size()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.size()); |
// Read again. |
EXPECT_EQ(expected_data, ReadFromUploadDataStream(&stream)); |
@@ -612,15 +613,15 @@ TEST_F(UploadDataStreamTest, MultipleInit) { |
TEST_F(UploadDataStreamTest, MultipleInitAsync) { |
base::FilePath temp_file_path; |
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), |
- &temp_file_path)); |
+ ASSERT_TRUE( |
+ base::CreateTemporaryFileInDir(temp_dir_.path(), &temp_file_path)); |
ASSERT_EQ(static_cast<int>(kTestDataSize), |
base::WriteFile(temp_file_path, kTestData, kTestDataSize)); |
TestCompletionCallback test_callback; |
// Prepare data. |
- element_readers_.push_back(new UploadBytesElementReader( |
- kTestData, kTestDataSize)); |
+ element_readers_.push_back( |
+ new UploadBytesElementReader(kTestData, kTestDataSize)); |
element_readers_.push_back( |
new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
temp_file_path, |
@@ -636,7 +637,7 @@ TEST_F(UploadDataStreamTest, MultipleInitAsync) { |
ASSERT_EQ(ERR_IO_PENDING, stream.Init(test_callback.callback())); |
EXPECT_EQ(OK, test_callback.WaitForResult()); |
EXPECT_FALSE(stream.IsEOF()); |
- EXPECT_EQ(kTestDataSize*2, stream.size()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.size()); |
// Read. |
EXPECT_EQ(expected_data, ReadFromUploadDataStream(&stream)); |
@@ -646,7 +647,7 @@ TEST_F(UploadDataStreamTest, MultipleInitAsync) { |
ASSERT_EQ(ERR_IO_PENDING, stream.Init(test_callback.callback())); |
EXPECT_EQ(OK, test_callback.WaitForResult()); |
EXPECT_FALSE(stream.IsEOF()); |
- EXPECT_EQ(kTestDataSize*2, stream.size()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.size()); |
// Read again. |
EXPECT_EQ(expected_data, ReadFromUploadDataStream(&stream)); |
@@ -655,14 +656,14 @@ TEST_F(UploadDataStreamTest, MultipleInitAsync) { |
TEST_F(UploadDataStreamTest, InitToReset) { |
base::FilePath temp_file_path; |
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), |
- &temp_file_path)); |
+ ASSERT_TRUE( |
+ base::CreateTemporaryFileInDir(temp_dir_.path(), &temp_file_path)); |
ASSERT_EQ(static_cast<int>(kTestDataSize), |
base::WriteFile(temp_file_path, kTestData, kTestDataSize)); |
// Prepare data. |
- element_readers_.push_back(new UploadBytesElementReader( |
- kTestData, kTestDataSize)); |
+ element_readers_.push_back( |
+ new UploadBytesElementReader(kTestData, kTestDataSize)); |
element_readers_.push_back( |
new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
temp_file_path, |
@@ -672,7 +673,8 @@ TEST_F(UploadDataStreamTest, InitToReset) { |
UploadDataStream stream(element_readers_.Pass(), 0); |
std::vector<char> expected_data(kTestData, kTestData + kTestDataSize); |
- expected_data.insert(expected_data.end(), expected_data.begin(), |
+ expected_data.insert(expected_data.end(), |
+ expected_data.begin(), |
expected_data.begin() + kTestDataSize); |
// Call Init(). |
@@ -680,11 +682,11 @@ TEST_F(UploadDataStreamTest, InitToReset) { |
ASSERT_EQ(ERR_IO_PENDING, stream.Init(init_callback1.callback())); |
EXPECT_EQ(OK, init_callback1.WaitForResult()); |
EXPECT_FALSE(stream.IsEOF()); |
- EXPECT_EQ(kTestDataSize*2, stream.size()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.size()); |
// Read some. |
TestCompletionCallback read_callback1; |
- std::vector<char> buf(kTestDataSize + kTestDataSize/2); |
+ std::vector<char> buf(kTestDataSize + kTestDataSize / 2); |
scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]); |
EXPECT_EQ( |
ERR_IO_PENDING, |
@@ -697,11 +699,11 @@ TEST_F(UploadDataStreamTest, InitToReset) { |
ASSERT_EQ(ERR_IO_PENDING, stream.Init(init_callback2.callback())); |
EXPECT_EQ(OK, init_callback2.WaitForResult()); |
EXPECT_FALSE(stream.IsEOF()); |
- EXPECT_EQ(kTestDataSize*2, stream.size()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.size()); |
// Read. |
TestCompletionCallback read_callback2; |
- std::vector<char> buf2(kTestDataSize*2); |
+ std::vector<char> buf2(kTestDataSize * 2); |
scoped_refptr<IOBuffer> wrapped_buffer2 = new WrappedIOBuffer(&buf2[0]); |
EXPECT_EQ(ERR_IO_PENDING, |
stream.Read( |
@@ -712,14 +714,14 @@ TEST_F(UploadDataStreamTest, InitToReset) { |
TEST_F(UploadDataStreamTest, InitDuringAsyncInit) { |
base::FilePath temp_file_path; |
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), |
- &temp_file_path)); |
+ ASSERT_TRUE( |
+ base::CreateTemporaryFileInDir(temp_dir_.path(), &temp_file_path)); |
ASSERT_EQ(static_cast<int>(kTestDataSize), |
base::WriteFile(temp_file_path, kTestData, kTestDataSize)); |
// Prepare data. |
- element_readers_.push_back(new UploadBytesElementReader( |
- kTestData, kTestDataSize)); |
+ element_readers_.push_back( |
+ new UploadBytesElementReader(kTestData, kTestDataSize)); |
element_readers_.push_back( |
new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
temp_file_path, |
@@ -729,7 +731,8 @@ TEST_F(UploadDataStreamTest, InitDuringAsyncInit) { |
UploadDataStream stream(element_readers_.Pass(), 0); |
std::vector<char> expected_data(kTestData, kTestData + kTestDataSize); |
- expected_data.insert(expected_data.end(), expected_data.begin(), |
+ expected_data.insert(expected_data.end(), |
+ expected_data.begin(), |
expected_data.begin() + kTestDataSize); |
// Start Init. |
@@ -741,11 +744,11 @@ TEST_F(UploadDataStreamTest, InitDuringAsyncInit) { |
EXPECT_EQ(ERR_IO_PENDING, stream.Init(init_callback2.callback())); |
EXPECT_EQ(OK, init_callback2.WaitForResult()); |
EXPECT_FALSE(stream.IsEOF()); |
- EXPECT_EQ(kTestDataSize*2, stream.size()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.size()); |
// Read. |
TestCompletionCallback read_callback2; |
- std::vector<char> buf2(kTestDataSize*2); |
+ std::vector<char> buf2(kTestDataSize * 2); |
scoped_refptr<IOBuffer> wrapped_buffer2 = new WrappedIOBuffer(&buf2[0]); |
EXPECT_EQ(ERR_IO_PENDING, |
stream.Read( |
@@ -760,14 +763,14 @@ TEST_F(UploadDataStreamTest, InitDuringAsyncInit) { |
TEST_F(UploadDataStreamTest, InitDuringAsyncRead) { |
base::FilePath temp_file_path; |
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), |
- &temp_file_path)); |
+ ASSERT_TRUE( |
+ base::CreateTemporaryFileInDir(temp_dir_.path(), &temp_file_path)); |
ASSERT_EQ(static_cast<int>(kTestDataSize), |
base::WriteFile(temp_file_path, kTestData, kTestDataSize)); |
// Prepare data. |
- element_readers_.push_back(new UploadBytesElementReader( |
- kTestData, kTestDataSize)); |
+ element_readers_.push_back( |
+ new UploadBytesElementReader(kTestData, kTestDataSize)); |
element_readers_.push_back( |
new UploadFileElementReader(base::MessageLoopProxy::current().get(), |
temp_file_path, |
@@ -777,7 +780,8 @@ TEST_F(UploadDataStreamTest, InitDuringAsyncRead) { |
UploadDataStream stream(element_readers_.Pass(), 0); |
std::vector<char> expected_data(kTestData, kTestData + kTestDataSize); |
- expected_data.insert(expected_data.end(), expected_data.begin(), |
+ expected_data.insert(expected_data.end(), |
+ expected_data.begin(), |
expected_data.begin() + kTestDataSize); |
// Call Init(). |
@@ -785,11 +789,11 @@ TEST_F(UploadDataStreamTest, InitDuringAsyncRead) { |
ASSERT_EQ(ERR_IO_PENDING, stream.Init(init_callback1.callback())); |
EXPECT_EQ(OK, init_callback1.WaitForResult()); |
EXPECT_FALSE(stream.IsEOF()); |
- EXPECT_EQ(kTestDataSize*2, stream.size()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.size()); |
// Start reading. |
TestCompletionCallback read_callback1; |
- std::vector<char> buf(kTestDataSize*2); |
+ std::vector<char> buf(kTestDataSize * 2); |
scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]); |
EXPECT_EQ( |
ERR_IO_PENDING, |
@@ -800,11 +804,11 @@ TEST_F(UploadDataStreamTest, InitDuringAsyncRead) { |
EXPECT_EQ(ERR_IO_PENDING, stream.Init(init_callback2.callback())); |
EXPECT_EQ(OK, init_callback2.WaitForResult()); |
EXPECT_FALSE(stream.IsEOF()); |
- EXPECT_EQ(kTestDataSize*2, stream.size()); |
+ EXPECT_EQ(kTestDataSize * 2, stream.size()); |
// Read. |
TestCompletionCallback read_callback2; |
- std::vector<char> buf2(kTestDataSize*2); |
+ std::vector<char> buf2(kTestDataSize * 2); |
scoped_refptr<IOBuffer> wrapped_buffer2 = new WrappedIOBuffer(&buf2[0]); |
EXPECT_EQ(ERR_IO_PENDING, |
stream.Read( |