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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/file_stream_unittest.cc

Issue 642403002: git cl format the first third of the net/base directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit Created 6 years, 1 month 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/data_url_unittest.cc ('K') | « net/base/expiring_cache.h ('k') | net/base/filename_util.h » ('j') | net/base/filename_util_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/file_stream_unittest.cc
diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc
index fc9257e5d1c0af8d6f541191f02415862cc57da3..e1975327ecc3720379c0adc1ee6fbd4214302ee3 100644
--- a/net/base/file_stream_unittest.cc
+++ b/net/base/file_stream_unittest.cc
@@ -72,9 +72,8 @@ namespace {
TEST_F(FileStreamTest, OpenExplicitClose) {
TestCompletionCallback callback;
FileStream stream(base::MessageLoopProxy::current());
- int flags = base::File::FLAG_OPEN |
- base::File::FLAG_READ |
- base::File::FLAG_ASYNC;
+ int flags =
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
int rv = stream.Open(temp_file_path(), flags, callback.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(OK, callback.WaitForResult());
@@ -88,10 +87,10 @@ TEST_F(FileStreamTest, OpenExplicitClose) {
TEST_F(FileStreamTest, OpenExplicitCloseOrphaned) {
TestCompletionCallback callback;
- scoped_ptr<FileStream> stream(new FileStream(
- base::MessageLoopProxy::current()));
- int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
- base::File::FLAG_ASYNC;
+ scoped_ptr<FileStream> stream(
+ new FileStream(base::MessageLoopProxy::current()));
+ int flags =
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
int rv = stream->Open(temp_file_path(), flags, callback.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(OK, callback.WaitForResult());
@@ -120,9 +119,8 @@ TEST_F(FileStreamTest, UseFileHandle) {
// Seek to the beginning of the file and read.
scoped_ptr<FileStream> read_stream(
new FileStream(file.Pass(), base::MessageLoopProxy::current()));
- ASSERT_EQ(ERR_IO_PENDING,
- read_stream->Seek(base::File::FROM_BEGIN, 0,
- callback64.callback()));
+ ASSERT_EQ(ERR_IO_PENDING, read_stream->Seek(base::File::FROM_BEGIN, 0,
+ callback64.callback()));
ASSERT_EQ(0, callback64.WaitForResult());
// Read into buffer and compare.
scoped_refptr<IOBufferWithSize> read_buffer =
@@ -140,9 +138,8 @@ TEST_F(FileStreamTest, UseFileHandle) {
scoped_ptr<FileStream> write_stream(
new FileStream(file.Pass(), base::MessageLoopProxy::current()));
- ASSERT_EQ(ERR_IO_PENDING,
- write_stream->Seek(base::File::FROM_BEGIN, 0,
- callback64.callback()));
+ ASSERT_EQ(ERR_IO_PENDING, write_stream->Seek(base::File::FROM_BEGIN, 0,
+ callback64.callback()));
ASSERT_EQ(0, callback64.WaitForResult());
scoped_refptr<IOBufferWithSize> write_buffer = CreateTestDataBuffer();
rv = write_stream->Write(write_buffer.get(), kTestDataSize,
@@ -151,9 +148,8 @@ TEST_F(FileStreamTest, UseFileHandle) {
write_stream.reset();
// Read into buffer and compare to make sure the handle worked fine.
- ASSERT_EQ(kTestDataSize,
- base::ReadFile(temp_file_path(), read_buffer->data(),
- kTestDataSize));
+ ASSERT_EQ(kTestDataSize, base::ReadFile(temp_file_path(), read_buffer->data(),
+ kTestDataSize));
ASSERT_EQ(0, memcmp(kTestData, read_buffer->data(), kTestDataSize));
}
@@ -181,8 +177,8 @@ TEST_F(FileStreamTest, Read) {
EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
FileStream stream(base::MessageLoopProxy::current());
- int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
- base::File::FLAG_ASYNC;
+ int flags =
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream.Open(temp_file_path(), flags, callback.callback());
EXPECT_EQ(OK, callback.GetResult(rv));
@@ -210,8 +206,8 @@ TEST_F(FileStreamTest, Read_EarlyDelete) {
scoped_ptr<FileStream> stream(
new FileStream(base::MessageLoopProxy::current()));
- int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
- base::File::FLAG_ASYNC;
+ int flags =
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream->Open(temp_file_path(), flags, callback.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -235,8 +231,8 @@ TEST_F(FileStreamTest, Read_FromOffset) {
EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
FileStream stream(base::MessageLoopProxy::current());
- int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
- base::File::FLAG_ASYNC;
+ int flags =
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream.Open(temp_file_path(), flags, callback.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -269,8 +265,8 @@ TEST_F(FileStreamTest, Read_FromOffset) {
TEST_F(FileStreamTest, SeekAround) {
FileStream stream(base::MessageLoopProxy::current());
- int flags = base::File::FLAG_OPEN | base::File::FLAG_ASYNC |
- base::File::FLAG_READ;
+ int flags =
+ base::File::FLAG_OPEN | base::File::FLAG_ASYNC | base::File::FLAG_READ;
TestCompletionCallback callback;
int rv = stream.Open(temp_file_path(), flags, callback.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -360,8 +356,8 @@ TEST_F(FileStreamTest, Write_FromOffset) {
EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
FileStream stream(base::MessageLoopProxy::current());
- int flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE |
- base::File::FLAG_ASYNC;
+ int flags =
+ base::File::FLAG_OPEN | base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream.Open(temp_file_path(), flags, callback.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -557,10 +553,10 @@ class TestWriteReadCompletionCallback {
// Recurse to finish writing all data.
int total_bytes_written = 0, total_bytes_read = 0;
std::string data_read;
- TestWriteReadCompletionCallback callback(
- stream_, &total_bytes_written, &total_bytes_read, &data_read);
- rv = stream_->Write(
- drainable_.get(), drainable_->BytesRemaining(), callback.callback());
+ TestWriteReadCompletionCallback callback(stream_, &total_bytes_written,
+ &total_bytes_read, &data_read);
+ rv = stream_->Write(drainable_.get(), drainable_->BytesRemaining(),
+ callback.callback());
DCHECK_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
drainable_->DidConsume(total_bytes_written);
@@ -569,9 +565,8 @@ class TestWriteReadCompletionCallback {
*data_read_ += data_read;
} else { // We're done writing all data. Start reading the data.
TestInt64CompletionCallback callback64;
- EXPECT_EQ(ERR_IO_PENDING,
- stream_->Seek(base::File::FROM_BEGIN, 0,
- callback64.callback()));
+ EXPECT_EQ(ERR_IO_PENDING, stream_->Seek(base::File::FROM_BEGIN, 0,
+ callback64.callback()));
{
base::MessageLoop::ScopedNestableTaskAllower allow(
base::MessageLoop::current());
@@ -694,8 +689,8 @@ class TestWriteCloseCompletionCallback {
// Recurse to finish writing all data.
int total_bytes_written = 0;
TestWriteCloseCompletionCallback callback(stream_, &total_bytes_written);
- rv = stream_->Write(
- drainable_.get(), drainable_->BytesRemaining(), callback.callback());
+ rv = stream_->Write(drainable_.get(), drainable_->BytesRemaining(),
+ callback.callback());
DCHECK_EQ(ERR_IO_PENDING, rv);
rv = callback.WaitForResult();
drainable_->DidConsume(total_bytes_written);
@@ -760,8 +755,8 @@ TEST_F(FileStreamTest, OpenAndDelete) {
bool prev = base::ThreadRestrictions::SetIOAllowed(false);
scoped_ptr<FileStream> stream(new FileStream(pool.get()));
- int flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE |
- base::File::FLAG_ASYNC;
+ int flags =
+ base::File::FLAG_OPEN | base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
TestCompletionCallback open_callback;
int rv = stream->Open(temp_file_path(), flags, open_callback.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -788,14 +783,14 @@ TEST_F(FileStreamTest, OpenAndDelete) {
// Verify that Write() errors are mapped correctly.
TEST_F(FileStreamTest, WriteError) {
// Try opening file as read-only and then writing to it using FileStream.
- uint32 flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
- base::File::FLAG_ASYNC;
+ uint32 flags =
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
base::File file(temp_file_path(), flags);
ASSERT_TRUE(file.IsValid());
scoped_ptr<FileStream> stream(
- new FileStream(file.Pass(), base::MessageLoopProxy::current()));
+ new FileStream(file.Pass(), base::MessageLoopProxy::current()));
scoped_refptr<IOBuffer> buf = new IOBuffer(1);
buf->data()[0] = 0;
@@ -813,14 +808,14 @@ TEST_F(FileStreamTest, WriteError) {
// Verify that Read() errors are mapped correctly.
TEST_F(FileStreamTest, ReadError) {
// Try opening file for write and then reading from it using FileStream.
- uint32 flags = base::File::FLAG_OPEN | base::File::FLAG_WRITE |
- base::File::FLAG_ASYNC;
+ uint32 flags =
+ base::File::FLAG_OPEN | base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
base::File file(temp_file_path(), flags);
ASSERT_TRUE(file.IsValid());
scoped_ptr<FileStream> stream(
- new FileStream(file.Pass(), base::MessageLoopProxy::current()));
+ new FileStream(file.Pass(), base::MessageLoopProxy::current()));
scoped_refptr<IOBuffer> buf = new IOBuffer(1);
TestCompletionCallback callback;
@@ -853,8 +848,8 @@ TEST_F(FileStreamTest, ContentUriRead) {
EXPECT_LT(0, file_size);
FileStream stream(base::MessageLoopProxy::current());
- int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
- base::File::FLAG_ASYNC;
+ int flags =
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream.Open(path, flags, callback.callback());
EXPECT_EQ(ERR_IO_PENDING, rv);
« net/base/data_url_unittest.cc ('K') | « net/base/expiring_cache.h ('k') | net/base/filename_util.h » ('j') | net/base/filename_util_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698