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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 513683002: [fsp] Add support for providing thumbnails. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use scoped_ptr for EntryMetadata. Created 6 years, 4 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
« chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc ('K') | « chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc ('k') | chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer_unittest.cc » ('j') | chrome/renderer/resources/extensions/file_system_provider_custom_bindings.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc
index 70f16fae522941516c6cec4c0d1a7063955e4e40..2a4f2e73f55b2b7def95a39948bfe7e78ee2224a 100644
--- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc
@@ -81,7 +81,7 @@ KeyedService* CreateService(content::BrowserContext* context) {
class FileSystemProviderFileStreamReader : public testing::Test {
protected:
- FileSystemProviderFileStreamReader() {}
+ FileSystemProviderFileStreamReader() : profile_(NULL), fake_file_(NULL) {}
virtual ~FileSystemProviderFileStreamReader() {}
virtual void SetUp() OVERRIDE {
@@ -105,8 +105,9 @@ class FileSystemProviderFileStreamReader : public testing::Test {
static_cast<FakeProvidedFileSystem*>(
service->GetProvidedFileSystem(kExtensionId, kFileSystemId));
ASSERT_TRUE(provided_file_system);
- ASSERT_TRUE(provided_file_system->GetEntry(
- base::FilePath::FromUTF8Unsafe(kFakeFilePath), &fake_file_));
+ fake_file_ = provided_file_system->GetEntry(
+ base::FilePath::FromUTF8Unsafe(kFakeFilePath));
+ ASSERT_TRUE(fake_file_);
const ProvidedFileSystemInfo& file_system_info =
service->GetProvidedFileSystem(kExtensionId, kFileSystemId)
->GetFileSystemInfo();
@@ -130,8 +131,8 @@ class FileSystemProviderFileStreamReader : public testing::Test {
content::TestBrowserThreadBundle thread_bundle_;
base::ScopedTempDir data_dir_;
scoped_ptr<TestingProfileManager> profile_manager_;
- TestingProfile* profile_; // Owned by TestingProfileManager.
- FakeEntry fake_file_;
+ TestingProfile* profile_; // Owned by TestingProfileManager.
+ const FakeEntry* fake_file_; // Owned by FakePRovidedFileSystem.
storage::FileSystemURL file_url_;
storage::FileSystemURL wrong_file_url_;
};
@@ -141,23 +142,23 @@ TEST_F(FileSystemProviderFileStreamReader, Read_AllAtOnce) {
const int64 initial_offset = 0;
FileStreamReader reader(
- NULL, file_url_, initial_offset, fake_file_.metadata.modification_time);
+ NULL, file_url_, initial_offset, fake_file_->metadata->modification_time);
scoped_refptr<net::IOBuffer> io_buffer(
- new net::IOBuffer(fake_file_.metadata.size));
+ new net::IOBuffer(fake_file_->metadata->size));
const int result =
reader.Read(io_buffer.get(),
- fake_file_.metadata.size,
+ fake_file_->metadata->size,
base::Bind(&EventLogger::OnRead, logger.GetWeakPtr()));
EXPECT_EQ(net::ERR_IO_PENDING, result);
base::RunLoop().RunUntilIdle();
ASSERT_EQ(1u, logger.results().size());
EXPECT_LT(0, logger.results()[0]);
- EXPECT_EQ(fake_file_.metadata.size, logger.results()[0]);
+ EXPECT_EQ(fake_file_->metadata->size, logger.results()[0]);
- std::string buffer_as_string(io_buffer->data(), fake_file_.metadata.size);
- EXPECT_EQ(fake_file_.contents, buffer_as_string);
+ std::string buffer_as_string(io_buffer->data(), fake_file_->metadata->size);
+ EXPECT_EQ(fake_file_->contents, buffer_as_string);
}
TEST_F(FileSystemProviderFileStreamReader, Read_WrongFile) {
@@ -167,13 +168,13 @@ TEST_F(FileSystemProviderFileStreamReader, Read_WrongFile) {
FileStreamReader reader(NULL,
wrong_file_url_,
initial_offset,
- fake_file_.metadata.modification_time);
+ fake_file_->metadata->modification_time);
scoped_refptr<net::IOBuffer> io_buffer(
- new net::IOBuffer(fake_file_.metadata.size));
+ new net::IOBuffer(fake_file_->metadata->size));
const int result =
reader.Read(io_buffer.get(),
- fake_file_.metadata.size,
+ fake_file_->metadata->size,
base::Bind(&EventLogger::OnRead, logger.GetWeakPtr()));
EXPECT_EQ(net::ERR_IO_PENDING, result);
base::RunLoop().RunUntilIdle();
@@ -187,9 +188,9 @@ TEST_F(FileSystemProviderFileStreamReader, Read_InChunks) {
const int64 initial_offset = 0;
FileStreamReader reader(
- NULL, file_url_, initial_offset, fake_file_.metadata.modification_time);
+ NULL, file_url_, initial_offset, fake_file_->metadata->modification_time);
- for (int64 offset = 0; offset < fake_file_.metadata.size; ++offset) {
+ for (int64 offset = 0; offset < fake_file_->metadata->size; ++offset) {
scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer(1));
const int result =
reader.Read(io_buffer.get(),
@@ -199,7 +200,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_InChunks) {
base::RunLoop().RunUntilIdle();
ASSERT_EQ(offset + 1, static_cast<int64>(logger.results().size()));
EXPECT_EQ(1, logger.results()[offset]);
- EXPECT_EQ(fake_file_.contents[offset], io_buffer->data()[0]);
+ EXPECT_EQ(fake_file_->contents[offset], io_buffer->data()[0]);
}
}
@@ -208,12 +209,12 @@ TEST_F(FileSystemProviderFileStreamReader, Read_Slice) {
// Trim first 3 and last 3 characters.
const int64 initial_offset = 3;
- const int length = fake_file_.metadata.size - initial_offset - 3;
- ASSERT_GT(fake_file_.metadata.size, initial_offset);
+ const int length = fake_file_->metadata->size - initial_offset - 3;
+ ASSERT_GT(fake_file_->metadata->size, initial_offset);
ASSERT_LT(0, length);
FileStreamReader reader(
- NULL, file_url_, initial_offset, fake_file_.metadata.modification_time);
+ NULL, file_url_, initial_offset, fake_file_->metadata->modification_time);
scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer(length));
const int result =
@@ -227,7 +228,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_Slice) {
EXPECT_EQ(length, logger.results()[0]);
std::string buffer_as_string(io_buffer->data(), length);
- std::string expected_buffer(fake_file_.contents.data() + initial_offset,
+ std::string expected_buffer(fake_file_->contents.data() + initial_offset,
length);
EXPECT_EQ(expected_buffer, buffer_as_string);
}
@@ -237,10 +238,10 @@ TEST_F(FileSystemProviderFileStreamReader, Read_Beyond) {
// Request reading 1KB more than available.
const int64 initial_offset = 0;
- const int length = fake_file_.metadata.size + 1024;
+ const int length = fake_file_->metadata->size + 1024;
FileStreamReader reader(
- NULL, file_url_, initial_offset, fake_file_.metadata.modification_time);
+ NULL, file_url_, initial_offset, fake_file_->metadata->modification_time);
scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer(length));
const int result =
@@ -252,10 +253,10 @@ TEST_F(FileSystemProviderFileStreamReader, Read_Beyond) {
ASSERT_EQ(1u, logger.results().size());
EXPECT_LT(0, logger.results()[0]);
- EXPECT_EQ(fake_file_.metadata.size, logger.results()[0]);
+ EXPECT_EQ(fake_file_->metadata->size, logger.results()[0]);
- std::string buffer_as_string(io_buffer->data(), fake_file_.metadata.size);
- EXPECT_EQ(fake_file_.contents, buffer_as_string);
+ std::string buffer_as_string(io_buffer->data(), fake_file_->metadata->size);
+ EXPECT_EQ(fake_file_->contents, buffer_as_string);
}
TEST_F(FileSystemProviderFileStreamReader, Read_ModifiedFile) {
@@ -265,10 +266,10 @@ TEST_F(FileSystemProviderFileStreamReader, Read_ModifiedFile) {
FileStreamReader reader(NULL, file_url_, initial_offset, base::Time::Max());
scoped_refptr<net::IOBuffer> io_buffer(
- new net::IOBuffer(fake_file_.metadata.size));
+ new net::IOBuffer(fake_file_->metadata->size));
const int result =
reader.Read(io_buffer.get(),
- fake_file_.metadata.size,
+ fake_file_->metadata->size,
base::Bind(&EventLogger::OnRead, logger.GetWeakPtr()));
EXPECT_EQ(net::ERR_IO_PENDING, result);
@@ -285,20 +286,20 @@ TEST_F(FileSystemProviderFileStreamReader, Read_ExpectedModificationTimeNull) {
FileStreamReader reader(NULL, file_url_, initial_offset, base::Time());
scoped_refptr<net::IOBuffer> io_buffer(
- new net::IOBuffer(fake_file_.metadata.size));
+ new net::IOBuffer(fake_file_->metadata->size));
const int result =
reader.Read(io_buffer.get(),
- fake_file_.metadata.size,
+ fake_file_->metadata->size,
base::Bind(&EventLogger::OnRead, logger.GetWeakPtr()));
EXPECT_EQ(net::ERR_IO_PENDING, result);
base::RunLoop().RunUntilIdle();
ASSERT_EQ(1u, logger.results().size());
- EXPECT_EQ(fake_file_.metadata.size, logger.results()[0]);
+ EXPECT_EQ(fake_file_->metadata->size, logger.results()[0]);
- std::string buffer_as_string(io_buffer->data(), fake_file_.metadata.size);
- EXPECT_EQ(fake_file_.contents, buffer_as_string);
+ std::string buffer_as_string(io_buffer->data(), fake_file_->metadata->size);
+ EXPECT_EQ(fake_file_->contents, buffer_as_string);
}
TEST_F(FileSystemProviderFileStreamReader, GetLength) {
@@ -306,7 +307,7 @@ TEST_F(FileSystemProviderFileStreamReader, GetLength) {
const int64 initial_offset = 0;
FileStreamReader reader(
- NULL, file_url_, initial_offset, fake_file_.metadata.modification_time);
+ NULL, file_url_, initial_offset, fake_file_->metadata->modification_time);
const int result = reader.GetLength(
base::Bind(&EventLogger::OnGetLength, logger.GetWeakPtr()));
@@ -315,7 +316,7 @@ TEST_F(FileSystemProviderFileStreamReader, GetLength) {
ASSERT_EQ(1u, logger.results().size());
EXPECT_LT(0, logger.results()[0]);
- EXPECT_EQ(fake_file_.metadata.size, logger.results()[0]);
+ EXPECT_EQ(fake_file_->metadata->size, logger.results()[0]);
}
TEST_F(FileSystemProviderFileStreamReader, GetLength_WrongFile) {
@@ -325,7 +326,7 @@ TEST_F(FileSystemProviderFileStreamReader, GetLength_WrongFile) {
FileStreamReader reader(NULL,
wrong_file_url_,
initial_offset,
- fake_file_.metadata.modification_time);
+ fake_file_->metadata->modification_time);
const int result = reader.GetLength(
base::Bind(&EventLogger::OnGetLength, logger.GetWeakPtr()));
@@ -365,7 +366,7 @@ TEST_F(FileSystemProviderFileStreamReader,
ASSERT_EQ(1u, logger.results().size());
EXPECT_LT(0, logger.results()[0]);
- EXPECT_EQ(fake_file_.metadata.size, logger.results()[0]);
+ EXPECT_EQ(fake_file_->metadata->size, logger.results()[0]);
}
} // namespace file_system_provider
« chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc ('K') | « chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc ('k') | chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer_unittest.cc » ('j') | chrome/renderer/resources/extensions/file_system_provider_custom_bindings.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698