net: FileStream::Read/Write() to take IOBuffer* instead of char*

net/base/file_stream_unittest.cc

 // Copyright (c) 2012 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 "net/base/file_stream.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/platform_file.h"
+#include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace net {
 
 namespace {
 
 const char kTestData[] = "0123456789";
 const int kTestDataSize = arraysize(kTestData) - 1;
 
+// Creates an IOBufferWithSize that contains the kTestDataSize.
+IOBufferWithSize* CreateTestDataBuffer() {
+  IOBufferWithSize* buf = new IOBufferWithSize(kTestDataSize);
+  memcpy(buf->data(), kTestData, kTestDataSize);
+  return buf;
+}
+
 }  // namespace
 
 class FileStreamTest : public PlatformTest {
  public:
   virtual void SetUp() {
     PlatformTest::SetUp();
 
     file_util::CreateTemporaryFile(&temp_file_path_);
     file_util::WriteFile(temp_file_path_, kTestData, kTestDataSize);
   }
@@ skipping 155 matching lines @@
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   TestCompletionCallback callback;
 
   int total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
-    char buf[4];
-    rv = stream.Read(buf, arraysize(buf), callback.callback());
+    scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
+    rv = stream.Read(buf, buf->size(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
-    data_read.append(buf, rv);
+    data_read.append(buf->data(), rv);
   }
   EXPECT_EQ(file_size, total_bytes_read);
   EXPECT_EQ(kTestData, data_read);
 }
 
 TEST_F(FileStreamTest, AsyncRead_EarlyClose) {
   int64 file_size;
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
 
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ |
               base::PLATFORM_FILE_ASYNC;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   TestCompletionCallback callback;
 
-  char buf[4];
-  rv = stream.Read(buf, arraysize(buf), callback.callback());
+  scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
+  rv = stream.Read(buf, buf->size(), callback.callback());
   stream.CloseSync();
   if (rv < 0) {
     EXPECT_EQ(ERR_IO_PENDING, rv);
     // The callback should not be called if the request is cancelled.
     MessageLoop::current()->RunAllPending();
     EXPECT_FALSE(callback.have_result());
   } else {
-    EXPECT_EQ(std::string(kTestData, rv), std::string(buf, rv));
+    EXPECT_EQ(std::string(kTestData, rv), std::string(buf->data(), rv));
   }
 }
 
 TEST_F(FileStreamTest, BasicRead_FromOffset) {
   int64 file_size;
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
 
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_OPEN |
@@ skipping 43 matching lines @@
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size - kOffset, total_bytes_avail);
 
   TestCompletionCallback callback;
 
   int total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
-    char buf[4];
-    rv = stream.Read(buf, arraysize(buf), callback.callback());
+    scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
+    rv = stream.Read(buf, buf->size(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
-    data_read.append(buf, rv);
+    data_read.append(buf->data(), rv);
   }
   EXPECT_EQ(file_size - kOffset, total_bytes_read);
   EXPECT_EQ(kTestData + kOffset, data_read);
 }
 
 TEST_F(FileStreamTest, SeekAround) {
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ;
   int rv = stream.OpenSync(temp_file_path(), flags);
@@ skipping 45 matching lines @@
   EXPECT_EQ(OK, rv);
 
   int64 file_size;
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(0, file_size);
 
   TestCompletionCallback callback;
   int total_bytes_written = 0;
 
+  scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
+  scoped_refptr<DrainableIOBuffer> drainable =
+      new DrainableIOBuffer(buf, buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream.Write(kTestData + total_bytes_written,
-                      kTestDataSize - total_bytes_written,
+    rv = stream.Write(drainable, drainable->BytesRemaining(),
                       callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
+    drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(file_size, total_bytes_written);
 }
 
 TEST_F(FileStreamTest, AsyncWrite_EarlyClose) {
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_CREATE_ALWAYS |
               base::PLATFORM_FILE_WRITE |
               base::PLATFORM_FILE_ASYNC;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 file_size;
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(0, file_size);
 
   TestCompletionCallback callback;
-  int total_bytes_written = 0;
 
-  rv = stream.Write(kTestData + total_bytes_written,
-                    kTestDataSize - total_bytes_written,
-                    callback.callback());
+  scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
+  rv = stream.Write(buf, buf->size(), callback.callback());
   stream.CloseSync();
   if (rv < 0) {
     EXPECT_EQ(ERR_IO_PENDING, rv);
     // The callback should not be called if the request is cancelled.
     MessageLoop::current()->RunAllPending();
     EXPECT_FALSE(callback.have_result());
   } else {
     ok = file_util::GetFileSize(temp_file_path(), &file_size);
     EXPECT_TRUE(ok);
     EXPECT_EQ(file_size, rv);
@@ skipping 37 matching lines @@
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   const int64 kOffset = 0;
   int64 new_offset = stream.Seek(FROM_END, kOffset);
   EXPECT_EQ(kTestDataSize, new_offset);
 
   TestCompletionCallback callback;
   int total_bytes_written = 0;
 
+  scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
+  scoped_refptr<DrainableIOBuffer> drainable =
+      new DrainableIOBuffer(buf, buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream.Write(kTestData + total_bytes_written,
-                      kTestDataSize - total_bytes_written,
+    rv = stream.Write(drainable, drainable->BytesRemaining(),
                       callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
+    drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(file_size, kTestDataSize * 2);
 }
 
 TEST_F(FileStreamTest, BasicReadWrite) {
   int64 file_size;
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
@@ skipping 95 matching lines @@
   EXPECT_EQ(OK, rv);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   TestCompletionCallback callback;
   int64 total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
-    char buf[4];
-    rv = stream.Read(buf, arraysize(buf), callback.callback());
+    scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
+    rv = stream.Read(buf, buf->size(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
-    data_read.append(buf, rv);
+    data_read.append(buf->data(), rv);
   }
   EXPECT_EQ(file_size, total_bytes_read);
   EXPECT_TRUE(data_read == kTestData);
 
   int total_bytes_written = 0;
 
+  scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
+  scoped_refptr<DrainableIOBuffer> drainable =
+      new DrainableIOBuffer(buf, buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream.Write(kTestData + total_bytes_written,
-                      kTestDataSize - total_bytes_written,
+    rv = stream.Write(drainable, drainable->BytesRemaining(),
                       callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
+    drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
 
   stream.CloseSync();
 
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(kTestDataSize * 2, file_size);
 }
 
@@ skipping 12 matching lines @@
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   int64 offset = stream.Seek(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   TestCompletionCallback callback;
   int total_bytes_written = 0;
 
+  scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
+  scoped_refptr<DrainableIOBuffer> drainable =
+      new DrainableIOBuffer(buf, buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream.Write(kTestData + total_bytes_written,
-                      kTestDataSize - total_bytes_written,
+    rv = stream.Write(drainable, drainable->BytesRemaining(),
                       callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
+    drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
 
   EXPECT_EQ(kTestDataSize, total_bytes_written);
 
   offset = stream.Seek(FROM_BEGIN, 0);
   EXPECT_EQ(0, offset);
 
   int total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
-    char buf[4];
-    rv = stream.Read(buf, arraysize(buf), callback.callback());
+    scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
+    rv = stream.Read(buf, buf->size(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
-    data_read.append(buf, rv);
+    data_read.append(buf->data(), rv);
   }
   stream.CloseSync();
 
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(kTestDataSize * 2, file_size);
 
   EXPECT_EQ(kTestDataSize * 2, total_bytes_read);
   const std::string kExpectedFileData =
       std::string(kTestData) + std::string(kTestData);
   EXPECT_EQ(kExpectedFileData, data_read);
 }
 
 class TestWriteReadCompletionCallback {
  public:
   TestWriteReadCompletionCallback(
       FileStream* stream,
       int* total_bytes_written,
       int* total_bytes_read,
       std::string* data_read)
       : result_(0),
         have_result_(false),
         waiting_for_result_(false),
         stream_(stream),
         total_bytes_written_(total_bytes_written),
         total_bytes_read_(total_bytes_read),
         data_read_(data_read),
         callback_(base::Bind(&TestWriteReadCompletionCallback::OnComplete,
-                             base::Unretained(this))) {}
+                             base::Unretained(this))),
+        test_data_(CreateTestDataBuffer()),
+        drainable_(new DrainableIOBuffer(test_data_, kTestDataSize)) {
+  }
 
   int WaitForResult() {
     DCHECK(!waiting_for_result_);
     while (!have_result_) {
       waiting_for_result_ = true;
       MessageLoop::current()->Run();
       waiting_for_result_ = false;
     }
     have_result_ = false;  // auto-reset for next callback
     return result_;
   }
 
   const CompletionCallback& callback() const { return callback_; }
 
  private:
   void OnComplete(int result) {
     DCHECK_LT(0, result);
     *total_bytes_written_ += result;
 
     int rv;
 
     if (*total_bytes_written_ != kTestDataSize) {
       // 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(kTestData + *total_bytes_written_,
-                          kTestDataSize - *total_bytes_written_,
+      rv = stream_->Write(drainable_, drainable_->BytesRemaining(),
                           callback.callback());
       DCHECK_EQ(ERR_IO_PENDING, rv);
       rv = callback.WaitForResult();
+      drainable_->DidConsume(total_bytes_written);
       *total_bytes_written_ += total_bytes_written;
       *total_bytes_read_ += total_bytes_read;
       *data_read_ += data_read;
     } else {  // We're done writing all data.  Start reading the data.
       stream_->Seek(FROM_BEGIN, 0);
 
       TestCompletionCallback callback;
       for (;;) {
-        char buf[4];
-        rv = stream_->Read(buf, arraysize(buf), callback.callback());
+        scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
+        rv = stream_->Read(buf, buf->size(), callback.callback());
         if (rv == ERR_IO_PENDING) {
           MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
           rv = callback.WaitForResult();
         }
         EXPECT_LE(0, rv);
         if (rv <= 0)
           break;
         *total_bytes_read_ += rv;
-        data_read_->append(buf, rv);
+        data_read_->append(buf->data(), rv);
       }
     }
 
     result_ = *total_bytes_written_;
     have_result_ = true;
     if (waiting_for_result_)
       MessageLoop::current()->Quit();
   }
 
   int result_;
   bool have_result_;
   bool waiting_for_result_;
   FileStream* stream_;
   int* total_bytes_written_;
   int* total_bytes_read_;
   std::string* data_read_;
   const CompletionCallback callback_;
+  scoped_refptr<IOBufferWithSize> test_data_;
+  scoped_refptr<DrainableIOBuffer> drainable_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWriteReadCompletionCallback);
 };
 
 TEST_F(FileStreamTest, AsyncWriteRead) {
   int64 file_size;
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
 
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ |
               base::PLATFORM_FILE_WRITE |
               base::PLATFORM_FILE_ASYNC;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   int64 offset = stream.Seek(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   int total_bytes_written = 0;
   int total_bytes_read = 0;
   std::string data_read;
   TestWriteReadCompletionCallback callback(&stream, &total_bytes_written,
                                            &total_bytes_read, &data_read);
 
-  rv = stream.Write(kTestData + total_bytes_written,
-                    kTestDataSize - static_cast<int>(total_bytes_written),
-                    callback.callback());
+  scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
+  rv = stream.Write(buf, buf->size(), callback.callback());
   if (rv == ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_LT(0, rv);
   EXPECT_EQ(kTestDataSize, total_bytes_written);
 
   stream.CloseSync();
 
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(kTestDataSize * 2, file_size);
 
   EXPECT_EQ(kTestDataSize * 2, total_bytes_read);
   const std::string kExpectedFileData =
       std::string(kTestData) + std::string(kTestData);
   EXPECT_EQ(kExpectedFileData, data_read);
 }
 
 class TestWriteCloseCompletionCallback {
  public:
   TestWriteCloseCompletionCallback(FileStream* stream, int* total_bytes_written)
       : result_(0),
         have_result_(false),
         waiting_for_result_(false),
         stream_(stream),
         total_bytes_written_(total_bytes_written),
         callback_(base::Bind(&TestWriteCloseCompletionCallback::OnComplete,
-                             base::Unretained(this))) {}
+                             base::Unretained(this))),
+        test_data_(CreateTestDataBuffer()),
+        drainable_(new DrainableIOBuffer(test_data_, kTestDataSize)) {
+  }
 
   int WaitForResult() {
     DCHECK(!waiting_for_result_);
     while (!have_result_) {
       waiting_for_result_ = true;
       MessageLoop::current()->Run();
       waiting_for_result_ = false;
     }
     have_result_ = false;  // auto-reset for next callback
     return result_;
   }
 
   const CompletionCallback& callback() const { return callback_; }
 
  private:
   void OnComplete(int result) {
     DCHECK_LT(0, result);
     *total_bytes_written_ += result;
 
     int rv;
 
     if (*total_bytes_written_ != kTestDataSize) {
       // Recurse to finish writing all data.
       int total_bytes_written = 0;
       TestWriteCloseCompletionCallback callback(stream_, &total_bytes_written);
-      rv = stream_->Write(kTestData + *total_bytes_written_,
-                          kTestDataSize - *total_bytes_written_,
+      rv = stream_->Write(drainable_, drainable_->BytesRemaining(),
                           callback.callback());
       DCHECK_EQ(ERR_IO_PENDING, rv);
       rv = callback.WaitForResult();
+      drainable_->DidConsume(total_bytes_written);
       *total_bytes_written_ += total_bytes_written;
     } else {  // We're done writing all data.  Close the file.
       stream_->CloseSync();
     }
 
     result_ = *total_bytes_written_;
     have_result_ = true;
     if (waiting_for_result_)
       MessageLoop::current()->Quit();
   }
 
   int result_;
   bool have_result_;
   bool waiting_for_result_;
   FileStream* stream_;
   int* total_bytes_written_;
   const CompletionCallback callback_;
+  scoped_refptr<IOBufferWithSize> test_data_;
+  scoped_refptr<DrainableIOBuffer> drainable_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWriteCloseCompletionCallback);
 };
 
 TEST_F(FileStreamTest, AsyncWriteClose) {
   int64 file_size;
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
 
   FileStream stream(NULL);
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ |
               base::PLATFORM_FILE_WRITE |
               base::PLATFORM_FILE_ASYNC;
   int rv = stream.OpenSync(temp_file_path(), flags);
   EXPECT_EQ(OK, rv);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   int64 offset = stream.Seek(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   int total_bytes_written = 0;
   TestWriteCloseCompletionCallback callback(&stream, &total_bytes_written);
 
-  rv = stream.Write(kTestData, kTestDataSize, callback.callback());
+  scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
+  rv = stream.Write(buf, buf->size(), callback.callback());
   if (rv == ERR_IO_PENDING)
     total_bytes_written = callback.WaitForResult();
   EXPECT_LT(0, total_bytes_written);
   EXPECT_EQ(kTestDataSize, total_bytes_written);
 
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(kTestDataSize * 2, file_size);
 }
 
@@ skipping 20 matching lines @@
   // Read in the contents and make sure we get back what we expected.
   std::string read_contents;
   EXPECT_TRUE(file_util::ReadFileToString(temp_file_path(), &read_contents));
 
   EXPECT_EQ("01230123", read_contents);
 }
 
 }  // namespace
 
 }  // namespace net