| Index: chrome/browser/chromeos/file_system_provider/operations/create_directory_unittest.cc
|
| diff --git a/chrome/browser/chromeos/file_system_provider/operations/close_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/create_directory_unittest.cc
|
| similarity index 52%
|
| copy from chrome/browser/chromeos/file_system_provider/operations/close_file_unittest.cc
|
| copy to chrome/browser/chromeos/file_system_provider/operations/create_directory_unittest.cc
|
| index 0821b78966e1d4c517d40b6f730c3c4fa9f89c17..8336db43c373f118fcf9e874ca7daff2f70e581f 100644
|
| --- a/chrome/browser/chromeos/file_system_provider/operations/close_file_unittest.cc
|
| +++ b/chrome/browser/chromeos/file_system_provider/operations/create_directory_unittest.cc
|
| @@ -8,7 +8,8 @@
|
| #include "base/files/file.h"
|
| #include "base/files/file_path.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "chrome/browser/chromeos/file_system_provider/operations/close_file.h"
|
| +#include "base/memory/scoped_vector.h"
|
| +#include "chrome/browser/chromeos/file_system_provider/operations/create_directory.h"
|
| #include "chrome/browser/chromeos/file_system_provider/operations/test_util.h"
|
| #include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"
|
| #include "chrome/common/extensions/api/file_system_provider.h"
|
| @@ -25,14 +26,14 @@ namespace {
|
| const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
|
| const char kFileSystemId[] = "testing-file-system";
|
| const int kRequestId = 2;
|
| -const int kOpenRequestId = 3;
|
| +const base::FilePath::CharType kDirectoryPath[] = "/kitty/and/puppy/happy";
|
|
|
| } // namespace
|
|
|
| -class FileSystemProviderOperationsCloseFileTest : public testing::Test {
|
| +class FileSystemProviderOperationsCreateDirectoryTest : public testing::Test {
|
| protected:
|
| - FileSystemProviderOperationsCloseFileTest() {}
|
| - virtual ~FileSystemProviderOperationsCloseFileTest() {}
|
| + FileSystemProviderOperationsCreateDirectoryTest() {}
|
| + virtual ~FileSystemProviderOperationsCreateDirectoryTest() {}
|
|
|
| virtual void SetUp() OVERRIDE {
|
| file_system_info_ =
|
| @@ -45,25 +46,28 @@ class FileSystemProviderOperationsCloseFileTest : public testing::Test {
|
| ProvidedFileSystemInfo file_system_info_;
|
| };
|
|
|
| -TEST_F(FileSystemProviderOperationsCloseFileTest, Execute) {
|
| +TEST_F(FileSystemProviderOperationsCreateDirectoryTest, Execute) {
|
| util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
|
| util::StatusCallbackLog callback_log;
|
|
|
| - CloseFile close_file(NULL,
|
| - file_system_info_,
|
| - kOpenRequestId,
|
| - base::Bind(&util::LogStatusCallback, &callback_log));
|
| - close_file.SetDispatchEventImplForTesting(
|
| + CreateDirectory create_directory(
|
| + NULL,
|
| + file_system_info_,
|
| + base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| + false /* exclusive */,
|
| + true /* recursive */,
|
| + base::Bind(&util::LogStatusCallback, &callback_log));
|
| + create_directory.SetDispatchEventImplForTesting(
|
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
|
| base::Unretained(&dispatcher)));
|
|
|
| - EXPECT_TRUE(close_file.Execute(kRequestId));
|
| + EXPECT_TRUE(create_directory.Execute(kRequestId));
|
|
|
| ASSERT_EQ(1u, dispatcher.events().size());
|
| extensions::Event* event = dispatcher.events()[0];
|
| - EXPECT_EQ(
|
| - extensions::api::file_system_provider::OnCloseFileRequested::kEventName,
|
| - event->event_name);
|
| + EXPECT_EQ(extensions::api::file_system_provider::OnCreateDirectoryRequested::
|
| + kEventName,
|
| + event->event_name);
|
| base::ListValue* event_args = event->event_args.get();
|
| ASSERT_EQ(1u, event_args->GetSize());
|
|
|
| @@ -78,64 +82,81 @@ TEST_F(FileSystemProviderOperationsCloseFileTest, Execute) {
|
| EXPECT_TRUE(options->GetInteger("requestId", &event_request_id));
|
| EXPECT_EQ(kRequestId, event_request_id);
|
|
|
| - int event_open_request_id = -1;
|
| - EXPECT_TRUE(options->GetInteger("openRequestId", &event_open_request_id));
|
| - EXPECT_EQ(kOpenRequestId, event_open_request_id);
|
| + std::string event_directory_path;
|
| + EXPECT_TRUE(options->GetString("directoryPath", &event_directory_path));
|
| + EXPECT_EQ(kDirectoryPath, event_directory_path);
|
| +
|
| + bool event_exclusive;
|
| + EXPECT_TRUE(options->GetBoolean("exclusive", &event_exclusive));
|
| + EXPECT_FALSE(event_exclusive);
|
| +
|
| + bool event_recursive;
|
| + EXPECT_TRUE(options->GetBoolean("recursive", &event_recursive));
|
| + EXPECT_TRUE(event_recursive);
|
| }
|
|
|
| -TEST_F(FileSystemProviderOperationsCloseFileTest, Execute_NoListener) {
|
| +TEST_F(FileSystemProviderOperationsCreateDirectoryTest, Execute_NoListener) {
|
| util::LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
|
| util::StatusCallbackLog callback_log;
|
|
|
| - CloseFile close_file(NULL,
|
| - file_system_info_,
|
| - kOpenRequestId,
|
| - base::Bind(&util::LogStatusCallback, &callback_log));
|
| - close_file.SetDispatchEventImplForTesting(
|
| + CreateDirectory create_directory(
|
| + NULL,
|
| + file_system_info_,
|
| + base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| + false /* exclusive */,
|
| + true /* recursive */,
|
| + base::Bind(&util::LogStatusCallback, &callback_log));
|
| + create_directory.SetDispatchEventImplForTesting(
|
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
|
| base::Unretained(&dispatcher)));
|
|
|
| - EXPECT_FALSE(close_file.Execute(kRequestId));
|
| + EXPECT_FALSE(create_directory.Execute(kRequestId));
|
| }
|
|
|
| -TEST_F(FileSystemProviderOperationsCloseFileTest, OnSuccess) {
|
| +TEST_F(FileSystemProviderOperationsCreateDirectoryTest, OnSuccess) {
|
| util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
|
| util::StatusCallbackLog callback_log;
|
|
|
| - CloseFile close_file(NULL,
|
| - file_system_info_,
|
| - kOpenRequestId,
|
| - base::Bind(&util::LogStatusCallback, &callback_log));
|
| - close_file.SetDispatchEventImplForTesting(
|
| + CreateDirectory create_directory(
|
| + NULL,
|
| + file_system_info_,
|
| + base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| + false /* exclusive */,
|
| + true /* recursive */,
|
| + base::Bind(&util::LogStatusCallback, &callback_log));
|
| + create_directory.SetDispatchEventImplForTesting(
|
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
|
| base::Unretained(&dispatcher)));
|
|
|
| - EXPECT_TRUE(close_file.Execute(kRequestId));
|
| + EXPECT_TRUE(create_directory.Execute(kRequestId));
|
|
|
| - close_file.OnSuccess(kRequestId,
|
| - scoped_ptr<RequestValue>(new RequestValue()),
|
| - false /* has_more */);
|
| + create_directory.OnSuccess(kRequestId,
|
| + scoped_ptr<RequestValue>(new RequestValue()),
|
| + false /* has_more */);
|
| ASSERT_EQ(1u, callback_log.size());
|
| EXPECT_EQ(base::File::FILE_OK, callback_log[0]);
|
| }
|
|
|
| -TEST_F(FileSystemProviderOperationsCloseFileTest, OnError) {
|
| +TEST_F(FileSystemProviderOperationsCreateDirectoryTest, OnError) {
|
| util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
|
| util::StatusCallbackLog callback_log;
|
|
|
| - CloseFile close_file(NULL,
|
| - file_system_info_,
|
| - kOpenRequestId,
|
| - base::Bind(&util::LogStatusCallback, &callback_log));
|
| - close_file.SetDispatchEventImplForTesting(
|
| + CreateDirectory create_directory(
|
| + NULL,
|
| + file_system_info_,
|
| + base::FilePath::FromUTF8Unsafe(kDirectoryPath),
|
| + false /* exclusive */,
|
| + true /* recursive */,
|
| + base::Bind(&util::LogStatusCallback, &callback_log));
|
| + create_directory.SetDispatchEventImplForTesting(
|
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
|
| base::Unretained(&dispatcher)));
|
|
|
| - EXPECT_TRUE(close_file.Execute(kRequestId));
|
| + EXPECT_TRUE(create_directory.Execute(kRequestId));
|
|
|
| - close_file.OnError(kRequestId,
|
| - scoped_ptr<RequestValue>(new RequestValue()),
|
| - base::File::FILE_ERROR_TOO_MANY_OPENED);
|
| + create_directory.OnError(kRequestId,
|
| + scoped_ptr<RequestValue>(new RequestValue()),
|
| + base::File::FILE_ERROR_TOO_MANY_OPENED);
|
| ASSERT_EQ(1u, callback_log.size());
|
| EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, callback_log[0]);
|
| }
|
|
|