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

Unified Diff: chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc

Issue 287673004: [fsp] First part of support for reading files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 years, 7 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/operations/read_file_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc
similarity index 61%
copy from chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc
copy to chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc
index 4b091ac3a0d97f680cc2b6bbd57eac8eeecc6cdb..3f39e4a0b46dc556f226a2ae285ba51d3b0a4cc4 100644
--- a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc
@@ -7,12 +7,14 @@
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/json/json_reader.h"
+#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
-#include "chrome/browser/chromeos/file_system_provider/operations/get_metadata.h"
+#include "chrome/browser/chromeos/file_system_provider/operations/read_file.h"
#include "chrome/common/extensions/api/file_system_provider.h"
#include "chrome/common/extensions/api/file_system_provider_internal.h"
#include "extensions/browser/event_router.h"
+#include "net/base/io_buffer.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/browser/fileapi/async_file_util.h"
@@ -24,7 +26,9 @@ namespace {
const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
const int kFileSystemId = 1;
const int kRequestId = 2;
-const base::FilePath::CharType kDirectoryPath[] = "/directory";
+const int kFileHandle = 3;
+const int kOffset = 10;
+const int kLength = 5;
// Fake event dispatcher implementation with extra logging capability. Acts as
// a providing extension end-point.
@@ -53,16 +57,18 @@ class CallbackLogger {
public:
class Event {
public:
- Event(base::File::Error result, const base::File::Info& file_info)
- : result_(result), file_info_(file_info) {}
+ Event(int chunk_length, bool has_next, base::File::Error result)
+ : chunk_length_(chunk_length), has_next_(has_next), result_(result) {}
virtual ~Event() {}
- base::File::Error result() { return result_; }
- const base::File::Info& file_info() { return file_info_; }
+ int chunk_length() const { return chunk_length_; }
+ bool has_next() const { return has_next_; }
+ base::File::Error result() const { return result_; }
private:
+ int chunk_length_;
+ bool has_next_;
base::File::Error result_;
- base::File::Info file_info_;
DISALLOW_COPY_AND_ASSIGN(Event);
};
@@ -70,9 +76,8 @@ class CallbackLogger {
CallbackLogger() : weak_ptr_factory_(this) {}
virtual ~CallbackLogger() {}
- void OnGetMetadata(base::File::Error result,
- const base::File::Info& file_info) {
- events_.push_back(new Event(result, file_info));
+ void OnReadFile(int chunk_length, bool has_next, base::File::Error result) {
+ events_.push_back(new Event(chunk_length, has_next, result));
}
ScopedVector<Event>& events() { return events_; }
@@ -91,10 +96,10 @@ class CallbackLogger {
} // namespace
-class FileSystemProviderOperationsGetMetadataTest : public testing::Test {
+class FileSystemProviderOperationsReadFileTest : public testing::Test {
protected:
- FileSystemProviderOperationsGetMetadataTest() {}
- virtual ~FileSystemProviderOperationsGetMetadataTest() {}
+ FileSystemProviderOperationsReadFileTest() {}
+ virtual ~FileSystemProviderOperationsReadFileTest() {}
virtual void SetUp() OVERRIDE {
file_system_info_ =
@@ -102,33 +107,38 @@ class FileSystemProviderOperationsGetMetadataTest : public testing::Test {
kFileSystemId,
"" /* file_system_name */,
base::FilePath() /* mount_path */);
+ io_buffer_ = make_scoped_refptr(new net::IOBuffer(kOffset + kLength));
}
ProvidedFileSystemInfo file_system_info_;
+ scoped_refptr<net::IOBuffer> io_buffer_;
};
-TEST_F(FileSystemProviderOperationsGetMetadataTest, Execute) {
+TEST_F(FileSystemProviderOperationsReadFileTest, Execute) {
LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
CallbackLogger callback_logger;
- GetMetadata get_metadata(
+ ReadFile read_file(
NULL,
file_system_info_,
- base::FilePath::FromUTF8Unsafe(kDirectoryPath),
- base::Bind(&CallbackLogger::OnGetMetadata, callback_logger.GetWeakPtr()));
- get_metadata.SetDispatchEventImplForTesting(
+ kFileHandle,
+ io_buffer_.get(),
+ kOffset,
+ kLength,
+ base::Bind(&CallbackLogger::OnReadFile, callback_logger.GetWeakPtr()));
+ read_file.SetDispatchEventImplForTesting(
base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
base::Unretained(&dispatcher)));
- EXPECT_TRUE(get_metadata.Execute(kRequestId));
+ EXPECT_TRUE(read_file.Execute(kRequestId));
ASSERT_EQ(1u, dispatcher.events().size());
extensions::Event* event = dispatcher.events()[0];
EXPECT_EQ(
- extensions::api::file_system_provider::OnGetMetadataRequested::kEventName,
+ extensions::api::file_system_provider::OnReadFileRequested::kEventName,
event->event_name);
base::ListValue* event_args = event->event_args.get();
- ASSERT_EQ(3u, event_args->GetSize());
+ ASSERT_EQ(5u, event_args->GetSize());
int event_file_system_id = -1;
EXPECT_TRUE(event_args->GetInteger(0, &event_file_system_id));
@@ -138,61 +148,69 @@ TEST_F(FileSystemProviderOperationsGetMetadataTest, Execute) {
EXPECT_TRUE(event_args->GetInteger(1, &event_request_id));
EXPECT_EQ(kRequestId, event_request_id);
- std::string event_directory_path;
- EXPECT_TRUE(event_args->GetString(2, &event_directory_path));
- EXPECT_EQ(kDirectoryPath, event_directory_path);
+ int event_file_handle = -1;
+ EXPECT_TRUE(event_args->GetInteger(2, &event_file_handle));
+ EXPECT_EQ(kFileHandle, event_file_handle);
+
+ double event_offset = -1;
+ EXPECT_TRUE(event_args->GetDouble(3, &event_offset));
+ EXPECT_EQ(kOffset, static_cast<double>(event_offset));
+
+ int event_length = -1;
+ EXPECT_TRUE(event_args->GetInteger(4, &event_length));
+ EXPECT_EQ(kLength, event_length);
}
-TEST_F(FileSystemProviderOperationsGetMetadataTest, Execute_NoListener) {
+TEST_F(FileSystemProviderOperationsReadFileTest, Execute_NoListener) {
LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
CallbackLogger callback_logger;
- GetMetadata get_metadata(
+ ReadFile read_file(
NULL,
file_system_info_,
- base::FilePath::FromUTF8Unsafe(kDirectoryPath),
- base::Bind(&CallbackLogger::OnGetMetadata, callback_logger.GetWeakPtr()));
- get_metadata.SetDispatchEventImplForTesting(
+ kFileHandle,
+ io_buffer_.get(),
+ kOffset,
+ kLength,
+ base::Bind(&CallbackLogger::OnReadFile, callback_logger.GetWeakPtr()));
+ read_file.SetDispatchEventImplForTesting(
base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
base::Unretained(&dispatcher)));
- EXPECT_FALSE(get_metadata.Execute(kRequestId));
+ EXPECT_FALSE(read_file.Execute(kRequestId));
}
-TEST_F(FileSystemProviderOperationsGetMetadataTest, OnSuccess) {
+TEST_F(FileSystemProviderOperationsReadFileTest, OnSuccess) {
using extensions::api::file_system_provider::EntryMetadata;
using extensions::api::file_system_provider_internal::
- GetMetadataRequestedSuccess::Params;
+ ReadFileRequestedSuccess::Params;
LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
CallbackLogger callback_logger;
- GetMetadata get_metadata(
+ ReadFile read_file(
NULL,
file_system_info_,
- base::FilePath::FromUTF8Unsafe(kDirectoryPath),
- base::Bind(&CallbackLogger::OnGetMetadata, callback_logger.GetWeakPtr()));
- get_metadata.SetDispatchEventImplForTesting(
+ kFileHandle,
+ io_buffer_.get(),
+ kOffset,
+ kLength,
+ base::Bind(&CallbackLogger::OnReadFile, callback_logger.GetWeakPtr()));
+ read_file.SetDispatchEventImplForTesting(
base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
base::Unretained(&dispatcher)));
- EXPECT_TRUE(get_metadata.Execute(kRequestId));
+ EXPECT_TRUE(read_file.Execute(kRequestId));
// Sample input as JSON. Keep in sync with file_system_provider_api.idl.
// As for now, it is impossible to create *::Params class directly, not from
// base::Value.
const std::string input =
"[\n"
- " 1,\n" // kFileSystemId
- " 2,\n" // kRequestId
- " {\n"
- " \"isDirectory\": false,\n"
- " \"name\": \"blueberries.txt\",\n"
- " \"size\": 4096,\n"
- " \"modificationTime\": {\n"
- " \"value\": \"Thu Apr 24 00:46:52 UTC 2014\"\n"
- " }\n"
- " }\n"
+ " 1,\n" // kFileSystemId
+ " 2,\n" // kRequestId
+ " \"ABCDE\",\n" // 5 bytes
+ " false\n" // has_next
"]\n";
int json_error_code;
@@ -206,45 +224,43 @@ TEST_F(FileSystemProviderOperationsGetMetadataTest, OnSuccess) {
scoped_ptr<Params> params(Params::Create(*value_as_list));
ASSERT_TRUE(params.get());
scoped_ptr<RequestValue> request_value(
- RequestValue::CreateForGetMetadataSuccess(params.Pass()));
+ RequestValue::CreateForReadFileSuccess(params.Pass()));
ASSERT_TRUE(request_value.get());
const bool has_next = false;
- get_metadata.OnSuccess(kRequestId, request_value.Pass(), has_next);
+ read_file.OnSuccess(kRequestId, request_value.Pass(), has_next);
ASSERT_EQ(1u, callback_logger.events().size());
CallbackLogger::Event* event = callback_logger.events()[0];
+ EXPECT_EQ(kLength, event->chunk_length());
+ EXPECT_FALSE(event->has_next());
+ EXPECT_EQ("ABCDE", std::string(io_buffer_->data() + kOffset, kLength));
EXPECT_EQ(base::File::FILE_OK, event->result());
-
- const base::File::Info& file_info = event->file_info();
- EXPECT_FALSE(file_info.is_directory);
- EXPECT_EQ(4096, file_info.size);
- base::Time expected_time;
- EXPECT_TRUE(
- base::Time::FromString("Thu Apr 24 00:46:52 UTC 2014", &expected_time));
- EXPECT_EQ(expected_time, file_info.last_modified);
}
-TEST_F(FileSystemProviderOperationsGetMetadataTest, OnError) {
+TEST_F(FileSystemProviderOperationsReadFileTest, OnError) {
using extensions::api::file_system_provider::EntryMetadata;
- using extensions::api::file_system_provider_internal::
- GetMetadataRequestedError::Params;
+ using extensions::api::file_system_provider_internal::ReadFileRequestedError::
+ Params;
LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
CallbackLogger callback_logger;
- GetMetadata get_metadata(
+ ReadFile read_file(
NULL,
file_system_info_,
- base::FilePath::FromUTF8Unsafe(kDirectoryPath),
- base::Bind(&CallbackLogger::OnGetMetadata, callback_logger.GetWeakPtr()));
- get_metadata.SetDispatchEventImplForTesting(
+ kFileHandle,
+ io_buffer_.get(),
+ kOffset,
+ kLength,
+ base::Bind(&CallbackLogger::OnReadFile, callback_logger.GetWeakPtr()));
+ read_file.SetDispatchEventImplForTesting(
base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
base::Unretained(&dispatcher)));
- EXPECT_TRUE(get_metadata.Execute(kRequestId));
+ EXPECT_TRUE(read_file.Execute(kRequestId));
- get_metadata.OnError(kRequestId, base::File::FILE_ERROR_TOO_MANY_OPENED);
+ read_file.OnError(kRequestId, base::File::FILE_ERROR_TOO_MANY_OPENED);
ASSERT_EQ(1u, callback_logger.events().size());
CallbackLogger::Event* event = callback_logger.events()[0];

Powered by Google App Engine
This is Rietveld 408576698