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

Unified Diff: chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc

Issue 318563002: [fsp] Introduce BufferingFileStreamReader to read files in bigger chunks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a test. Created 6 years, 6 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
Index: chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d8bbb9a297e8549c2181f58c069fa30123388097
--- /dev/null
+++ b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc
@@ -0,0 +1,292 @@
+// Copyright 2014 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 <string>
+#include <vector>
+
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "base/run_loop.h"
+#include "chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h"
+#include "content/public/test/test_browser_thread_bundle.h"
+#include "net/base/io_buffer.h"
+#include "net/base/net_errors.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace chromeos {
+namespace file_system_provider {
+namespace {
+
+// Size of the fake file in bytes.
+const int kFileSize = 1024;
+
+// Size of the preloading buffer in bytes.
+const int kBufferSize = 8;
+
+// Number of bytes requested per BufferingFileStreamReader::Read().
+const int kChunkSize = 3;
+
+// Behaviour tested by a test case.
+enum TestMode { SYNCHRONOUS, ASYNCHRONOUS };
+
+// Logs invocations on the fake file stream reader.
+class Logger {
+ public:
+ Logger() : weak_ptr_factory_(this) {}
+ virtual ~Logger() {}
+
+ // Registers calls to the internal file stream reader, for the Read() method.
+ void OnInnerReadRequested(int buf_len) {
+ inner_read_requested_events_.push_back(buf_len);
+ }
+
+ // Registers results returned asynchronously by the buffering stream reader,
+ // for the Read() method.
+ void OnReadResult(int result) { read_result_events_.push_back(result); }
+
+ // Registers eresults returned asynchronously by the buffering strem reader,
hashimoto 2014/06/05 03:18:36 nit: s/eresults/results/?
mtomasz 2014/06/05 09:22:27 Done.
+ // for the GetLength() method.
+ void OnGetLengthResult(int64 result) {
+ get_length_result_events_.push_back(result);
+ }
+
+ // Gets a weak pointer for asynchronous callback invocations on the logger.
+ base::WeakPtr<Logger> GetWeakPtr() { return weak_ptr_factory_.GetWeakPtr(); }
hashimoto 2014/06/05 03:18:36 No need to have this method? I don't see any dange
mtomasz 2014/06/05 09:22:27 We are passing it to the BufferingFileStreamReader
hashimoto 2014/06/05 10:07:10 I think it's OK to take advantage of the single th
mtomasz 2014/06/06 01:31:03 Even if all threads are backed by the same message
hashimoto 2014/06/06 03:36:52 (1) Here we know that doesn't happen with the test
mtomasz 2014/06/06 04:22:56 Your suggestion also uses vectors and base::Bind,
hashimoto 2014/06/09 11:12:04 I still don't understand why you need this class:
mtomasz 2014/06/09 13:51:15 I think we are talking about two different things.
hashimoto 2014/06/10 10:43:24 Sorry, I forgot to note that inner_read_requested_
mtomasz 2014/06/10 12:23:55 1. inner_read_requested_events_ can't be replaced.
hashimoto 2014/06/11 06:01:03 You can do it because you are passing a new callba
mtomasz 2014/06/12 04:10:09 I made the change as you suggested for comparison.
+
+ const std::vector<int>& inner_read_requested_events() const {
+ return inner_read_requested_events_;
+ }
+
+ const std::vector<int>& read_result_events() const {
+ return read_result_events_;
+ }
+
+ const std::vector<int64>& get_length_result_events() const {
+ return get_length_result_events_;
+ }
+
+ private:
+ std::vector<int> inner_read_requested_events_;
+ std::vector<int> read_result_events_;
+ std::vector<int64> get_length_result_events_;
+
+ base::WeakPtrFactory<Logger> weak_ptr_factory_;
+ DISALLOW_COPY_AND_ASSIGN(Logger);
+};
+
+// Fake internal file stream reader.
+class FakeFileStreamReader : public webkit_blob::FileStreamReader {
+ public:
+ FakeFileStreamReader(Logger* logger, TestMode mode, bool return_error)
+ : logger_(logger), mode_(mode), return_error_(return_error) {}
+ virtual ~FakeFileStreamReader() {}
+
+ // webkit_blob::FileStreamReader overrides.
+ virtual int Read(net::IOBuffer* buf,
+ int buf_len,
+ const net::CompletionCallback& callback) OVERRIDE {
+ logger_->OnInnerReadRequested(buf_len);
+
+ if (return_error_) {
+ if (mode_ == SYNCHRONOUS)
+ return net::ERR_ACCESS_DENIED;
+
+ base::MessageLoopProxy::current()->PostTask(
+ FROM_HERE, base::Bind(callback, net::ERR_ACCESS_DENIED));
+ return net::ERR_IO_PENDING;
+ }
+
+ const std::string fake_data('X', buf_len);
+ memcpy(buf->data(), fake_data.c_str(), buf_len);
+
+ if (mode_ == SYNCHRONOUS)
+ return buf_len;
+
+ base::MessageLoopProxy::current()->PostTask(FROM_HERE,
+ base::Bind(callback, buf_len));
+ return net::ERR_IO_PENDING;
+ }
+
+ virtual int64 GetLength(
+ const net::Int64CompletionCallback& callback) OVERRIDE {
+ if (mode_ == SYNCHRONOUS)
+ return kFileSize;
+
+ base::MessageLoopProxy::current()->PostTask(
+ FROM_HERE, base::Bind(callback, kFileSize));
+ return net::ERR_IO_PENDING;
+ }
+
+ private:
+ Logger* logger_; // Not owned.
+ TestMode mode_;
+ bool return_error_;
+ DISALLOW_COPY_AND_ASSIGN(FakeFileStreamReader);
+};
+
+} // namespace
+
+class FileSystemProviderBufferingFileStreamReaderTest
+ : public testing::Test,
+ public ::testing::WithParamInterface<TestMode> {
+ protected:
+ FileSystemProviderBufferingFileStreamReaderTest() {}
+ virtual ~FileSystemProviderBufferingFileStreamReaderTest() {}
+
+ content::TestBrowserThreadBundle thread_bundle_;
+};
+
+TEST_P(FileSystemProviderBufferingFileStreamReaderTest, Read) {
+ Logger logger;
+ BufferingFileStreamReader reader(
+ scoped_ptr<webkit_blob::FileStreamReader>(new FakeFileStreamReader(
+ &logger, GetParam(), false /* return_error */)),
+ kBufferSize);
+
+ // For the first read, the internal file stream reader is fired, as there is
+ // no data in the preloading buffer.
+ {
+ scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kChunkSize));
+ const int result =
+ reader.Read(buffer,
+ kChunkSize,
+ base::Bind(&Logger::OnReadResult, logger.GetWeakPtr()));
hashimoto 2014/06/05 03:18:36 How about using TestCompletionCallback? The same g
mtomasz 2014/06/05 09:22:27 With TestCompletionCallback we can't control how m
hashimoto 2014/06/06 03:36:52 What do you mean? TestCompletionCallback::WaitForR
mtomasz 2014/06/06 04:22:56 If the tested class by accident calls the callback
hashimoto 2014/06/09 11:12:04 At least, we can catch it because it crashes as yo
mtomasz 2014/06/09 13:51:15 It would crash. But I don't think crashing is bett
hashimoto 2014/06/10 10:43:24 You cannot prepare for every possible failure whic
mtomasz 2014/06/10 12:23:55 I cannot test everything, but I'm not sure if it i
hashimoto 2014/06/11 06:01:03 This doesn't affect the test coverage (i.e. how mu
mtomasz 2014/06/16 04:12:17 It affects how detailed the tests are. IMHO tests
hashimoto 2014/06/19 07:27:45 TestCompletionCallback is widely used and it makes
mtomasz 2014/06/20 04:20:23 TestCompletionCallback makes the code nice and sho
+ base::RunLoop().RunUntilIdle();
+
+ EXPECT_EQ(net::ERR_IO_PENDING, result);
+ ASSERT_EQ(1u, logger.inner_read_requested_events().size());
+ EXPECT_EQ(kBufferSize, logger.inner_read_requested_events()[0]);
+ ASSERT_EQ(1u, logger.read_result_events().size());
+ EXPECT_EQ(kChunkSize, logger.read_result_events()[0]);
+ }
+
+ // Second read should return data from the preloading buffer, without calling
+ // the internal file stream reader.
+ {
+ scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kChunkSize));
+ const int result =
+ reader.Read(buffer,
+ kChunkSize,
+ base::Bind(&Logger::OnReadResult, logger.GetWeakPtr()));
+ base::RunLoop().RunUntilIdle();
+
+ EXPECT_EQ(kChunkSize, result);
+ EXPECT_EQ(1u, logger.inner_read_requested_events().size());
+ // Results returned synchronously, so no new read result events.
+ EXPECT_EQ(1u, logger.read_result_events().size());
+ }
+
+ // Third read should return partial result from the preloading buffer. It is
+ // valid to return less bytes than requested.
+ {
+ scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kChunkSize));
+ const int result =
+ reader.Read(buffer,
+ kChunkSize,
+ base::Bind(&Logger::OnReadResult, logger.GetWeakPtr()));
+ base::RunLoop().RunUntilIdle();
+
+ EXPECT_EQ(kBufferSize - 2 * kChunkSize, result);
+ EXPECT_EQ(1u, logger.inner_read_requested_events().size());
+ // Results returned synchronously, so no new read result events.
+ EXPECT_EQ(1u, logger.read_result_events().size());
+ }
+
+ // The preloading buffer is now empty, so reading should invoke the internal
+ // file stream reader.
+ {
+ scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kChunkSize));
+ const int result =
+ reader.Read(buffer,
+ kChunkSize,
+ base::Bind(&Logger::OnReadResult, logger.GetWeakPtr()));
+ base::RunLoop().RunUntilIdle();
+
+ EXPECT_EQ(net::ERR_IO_PENDING, result);
+ ASSERT_EQ(2u, logger.inner_read_requested_events().size());
+ EXPECT_EQ(kBufferSize, logger.inner_read_requested_events()[0]);
+ ASSERT_EQ(2u, logger.read_result_events().size());
+ EXPECT_EQ(kChunkSize, logger.read_result_events()[1]);
+ }
+}
+
+TEST_P(FileSystemProviderBufferingFileStreamReaderTest,
+ Read_MoreThanBufferSize) {
+ Logger logger;
+ BufferingFileStreamReader reader(
+ scoped_ptr<webkit_blob::FileStreamReader>(new FakeFileStreamReader(
+ &logger, GetParam(), false /* return_error */)),
+ kBufferSize);
+
+ // Returning less than requested number of bytes is valid, and should not
+ // fail.
+ const int chunk_size = 20;
+ ASSERT_LT(kBufferSize, chunk_size);
+ scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(chunk_size));
+ const int result =
+ reader.Read(buffer,
+ chunk_size,
+ base::Bind(&Logger::OnReadResult, logger.GetWeakPtr()));
+ base::RunLoop().RunUntilIdle();
+
+ EXPECT_EQ(net::ERR_IO_PENDING, result);
+ ASSERT_EQ(1u, logger.inner_read_requested_events().size());
+ EXPECT_EQ(kBufferSize, logger.inner_read_requested_events()[0]);
+ ASSERT_EQ(1u, logger.read_result_events().size());
+ EXPECT_EQ(kBufferSize, logger.read_result_events()[0]);
+}
+
+TEST_P(FileSystemProviderBufferingFileStreamReaderTest, Read_WithError) {
+ Logger logger;
+ BufferingFileStreamReader reader(
+ scoped_ptr<webkit_blob::FileStreamReader>(new FakeFileStreamReader(
+ &logger, GetParam(), true /* return_error */)),
+ kBufferSize);
+
+ scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kChunkSize));
+ const int result =
+ reader.Read(buffer,
+ kChunkSize,
+ base::Bind(&Logger::OnReadResult, logger.GetWeakPtr()));
+ base::RunLoop().RunUntilIdle();
+
+ EXPECT_EQ(net::ERR_IO_PENDING, result);
+ ASSERT_EQ(1u, logger.inner_read_requested_events().size());
+ EXPECT_EQ(kBufferSize, logger.inner_read_requested_events()[0]);
+ ASSERT_EQ(1u, logger.read_result_events().size());
+ EXPECT_EQ(net::ERR_ACCESS_DENIED, logger.read_result_events()[0]);
+}
+
+TEST_P(FileSystemProviderBufferingFileStreamReaderTest, GetLength) {
+ Logger logger;
+ BufferingFileStreamReader reader(
+ scoped_ptr<webkit_blob::FileStreamReader>(new FakeFileStreamReader(
+ &logger, GetParam(), false /* return_error */)),
+ kBufferSize);
+
+ const int64 result = reader.GetLength(
+ base::Bind(&Logger::OnGetLengthResult, logger.GetWeakPtr()));
+ base::RunLoop().RunUntilIdle();
+
+ if (GetParam() == SYNCHRONOUS) {
+ EXPECT_EQ(kFileSize, result);
+ EXPECT_EQ(0u, logger.get_length_result_events().size());
+ } else {
+ EXPECT_EQ(net::ERR_IO_PENDING, result);
+ ASSERT_EQ(1u, logger.get_length_result_events().size());
+ EXPECT_EQ(kFileSize, logger.get_length_result_events()[0]);
+ }
+}
+
+INSTANTIATE_TEST_CASE_P(Synchronous,
+ FileSystemProviderBufferingFileStreamReaderTest,
+ testing::Values(SYNCHRONOUS));
+
+INSTANTIATE_TEST_CASE_P(Asynchronous,
+ FileSystemProviderBufferingFileStreamReaderTest,
+ testing::Values(ASYNCHRONOUS));
+
+} // namespace file_system_provider
+} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698