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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/elements_upload_data_stream_unittest.cc

Issue 649763002: git cl format the second third of the net/base directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/directory_lister_unittest.cc ('K') | « net/base/elements_upload_data_stream.h ('k') | net/base/file_stream.cc » ('j') | net/base/int128.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/elements_upload_data_stream_unittest.cc
diff --git a/net/base/elements_upload_data_stream_unittest.cc b/net/base/elements_upload_data_stream_unittest.cc
index 91c390cf91d6de520126cf2aae181cd05f2e6e7c..e4931670a6b48c3fddc652e22e473d36db867ad2 100644
--- a/net/base/elements_upload_data_stream_unittest.cc
+++ b/net/base/elements_upload_data_stream_unittest.cc
@@ -71,9 +71,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) {
@@ -153,8 +154,8 @@ TEST_F(ElementsUploadDataStreamTest, EmptyUploadData) {
}
TEST_F(ElementsUploadDataStreamTest, ConsumeAllBytes) {
- element_readers_.push_back(new UploadBytesElementReader(
- kTestData, kTestDataSize));
+ element_readers_.push_back(
+ new UploadBytesElementReader(kTestData, kTestDataSize));
scoped_ptr<UploadDataStream> stream(
new ElementsUploadDataStream(element_readers_.Pass(), 0));
ASSERT_EQ(OK, stream->Init(CompletionCallback()));
@@ -174,8 +175,8 @@ TEST_F(ElementsUploadDataStreamTest, ConsumeAllBytes) {
TEST_F(ElementsUploadDataStreamTest, 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));
@@ -209,11 +210,11 @@ TEST_F(ElementsUploadDataStreamTest, File) {
TEST_F(ElementsUploadDataStreamTest, 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);
@@ -261,15 +262,15 @@ TEST_F(ElementsUploadDataStreamTest, 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));
scoped_ptr<UploadDataStream> stream(
new ElementsUploadDataStream(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());
@@ -284,7 +285,7 @@ TEST_F(ElementsUploadDataStreamTest, 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));
}
@@ -297,8 +298,8 @@ TEST_F(ElementsUploadDataStreamTest, 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));
scoped_ptr<UploadDataStream> stream(
new ElementsUploadDataStream(element_readers_.Pass(), 0));
@@ -307,7 +308,7 @@ TEST_F(ElementsUploadDataStreamTest, 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());
@@ -320,18 +321,18 @@ TEST_F(ElementsUploadDataStreamTest, 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(ElementsUploadDataStreamTest, 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));
@@ -344,8 +345,8 @@ TEST_F(ElementsUploadDataStreamTest, 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;
@@ -446,8 +447,8 @@ TEST_F(ElementsUploadDataStreamTest, InitAsyncFailureSync) {
// Read with a buffer whose size is same as the data.
TEST_F(ElementsUploadDataStreamTest, ReadAsyncWithExactSizeBuffer) {
- element_readers_.push_back(new UploadBytesElementReader(
- kTestData, kTestDataSize));
+ element_readers_.push_back(
+ new UploadBytesElementReader(kTestData, kTestDataSize));
scoped_ptr<UploadDataStream> stream(
new ElementsUploadDataStream(element_readers_.Pass(), 0));
@@ -543,8 +544,8 @@ void ElementsUploadDataStreamTest::FileChangedHelper(
TEST_F(ElementsUploadDataStreamTest, 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));
@@ -562,14 +563,14 @@ TEST_F(ElementsUploadDataStreamTest, FileChanged) {
TEST_F(ElementsUploadDataStreamTest, 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,
@@ -587,7 +588,7 @@ TEST_F(ElementsUploadDataStreamTest, 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.get()));
@@ -598,7 +599,7 @@ TEST_F(ElementsUploadDataStreamTest, 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.get()));
@@ -607,15 +608,15 @@ TEST_F(ElementsUploadDataStreamTest, MultipleInit) {
TEST_F(ElementsUploadDataStreamTest, 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,
@@ -632,7 +633,7 @@ TEST_F(ElementsUploadDataStreamTest, 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.get()));
@@ -642,7 +643,7 @@ TEST_F(ElementsUploadDataStreamTest, 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.get()));
@@ -651,14 +652,14 @@ TEST_F(ElementsUploadDataStreamTest, MultipleInitAsync) {
TEST_F(ElementsUploadDataStreamTest, 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,
@@ -669,7 +670,8 @@ TEST_F(ElementsUploadDataStreamTest, InitToReset) {
new ElementsUploadDataStream(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().
@@ -677,16 +679,15 @@ TEST_F(ElementsUploadDataStreamTest, 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,
- stream->Read(wrapped_buffer.get(), buf.size(),
- read_callback1.callback()));
+ EXPECT_EQ(ERR_IO_PENDING,
+ stream->Read(
+ wrapped_buffer.get(), buf.size(), read_callback1.callback()));
EXPECT_EQ(static_cast<int>(buf.size()), read_callback1.WaitForResult());
EXPECT_EQ(buf.size(), stream->position());
@@ -695,11 +696,11 @@ TEST_F(ElementsUploadDataStreamTest, 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(
@@ -710,14 +711,14 @@ TEST_F(ElementsUploadDataStreamTest, InitToReset) {
TEST_F(ElementsUploadDataStreamTest, 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,
@@ -728,7 +729,8 @@ TEST_F(ElementsUploadDataStreamTest, InitDuringAsyncInit) {
new ElementsUploadDataStream(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.
@@ -740,11 +742,11 @@ TEST_F(ElementsUploadDataStreamTest, 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(
@@ -759,14 +761,14 @@ TEST_F(ElementsUploadDataStreamTest, InitDuringAsyncInit) {
TEST_F(ElementsUploadDataStreamTest, 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 +779,8 @@ TEST_F(ElementsUploadDataStreamTest, InitDuringAsyncRead) {
new ElementsUploadDataStream(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,27 +788,26 @@ TEST_F(ElementsUploadDataStreamTest, 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,
- stream->Read(wrapped_buffer.get(), buf.size(),
- read_callback1.callback()));
+ EXPECT_EQ(ERR_IO_PENDING,
+ stream->Read(
+ wrapped_buffer.get(), buf.size(), read_callback1.callback()));
// Call Init to cancel the previous read.
TestCompletionCallback init_callback2;
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(
« net/base/directory_lister_unittest.cc ('K') | « net/base/elements_upload_data_stream.h ('k') | net/base/file_stream.cc » ('j') | net/base/int128.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698