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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 366263002: [fsp] Add support for creating directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 years, 5 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
« no previous file with comments | « chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc ('k') | chrome/browser/chromeos/file_system_provider/operations/create_directory.h » ('j') | chrome/browser/chromeos/file_system_provider/operations/create_directory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc
index 9438adf00830cf4b12dfb87839e3570d67eb91f2..c351d382d3b13391f675ed636ad6a9898f6fe2b8 100644
--- a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc
@@ -44,30 +44,30 @@ class EventLogger {
virtual ~EventLogger() {}
void OnStatus(base::File::Error error) {
- error_.reset(new base::File::Error(error));
+ result_.reset(new base::File::Error(error));
}
void OnCreateOrOpen(base::File file,
const base::Closure& on_close_callback) {
if (file.IsValid())
- error_.reset(new base::File::Error(base::File::FILE_OK));
+ result_.reset(new base::File::Error(base::File::FILE_OK));
- error_.reset(new base::File::Error(file.error_details()));
+ result_.reset(new base::File::Error(file.error_details()));
}
void OnEnsureFileExists(base::File::Error error, bool created) {
- error_.reset(new base::File::Error(error));
+ result_.reset(new base::File::Error(error));
}
void OnGetFileInfo(base::File::Error error,
const base::File::Info& file_info) {
- error_.reset(new base::File::Error(error));
+ result_.reset(new base::File::Error(error));
}
void OnReadDirectory(base::File::Error error,
const fileapi::AsyncFileUtil::EntryList& file_list,
bool has_more) {
- error_.reset(new base::File::Error(error));
+ result_.reset(new base::File::Error(error));
}
void OnCreateSnapshotFile(
@@ -75,7 +75,7 @@ class EventLogger {
const base::File::Info& file_info,
const base::FilePath& platform_path,
const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref) {
- error_.reset(new base::File::Error(error));
+ result_.reset(new base::File::Error(error));
}
void OnCopyFileProgress(int64 size) {}
@@ -84,10 +84,10 @@ class EventLogger {
return weak_ptr_factory_.GetWeakPtr();
}
- base::File::Error* error() { return error_.get(); }
+ base::File::Error* result() { return result_.get(); }
private:
- scoped_ptr<base::File::Error> error_;
+ scoped_ptr<base::File::Error> result_;
base::WeakPtrFactory<EventLogger> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(EventLogger);
@@ -190,8 +190,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateOrOpen_Create) {
base::File::FLAG_CREATE,
base::Bind(&EventLogger::OnCreateOrOpen, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateOrOpen_CreateAlways) {
@@ -203,8 +203,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateOrOpen_CreateAlways) {
base::File::FLAG_CREATE_ALWAYS,
base::Bind(&EventLogger::OnCreateOrOpen, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateOrOpen_OpenAlways) {
@@ -216,8 +216,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateOrOpen_OpenAlways) {
base::File::FLAG_OPEN_ALWAYS,
base::Bind(&EventLogger::OnCreateOrOpen, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest,
@@ -230,8 +230,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest,
base::File::FLAG_OPEN_TRUNCATED,
base::Bind(&EventLogger::OnCreateOrOpen, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateOrOpen_Open) {
@@ -243,8 +243,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateOrOpen_Open) {
base::File::FLAG_OPEN,
base::Bind(&EventLogger::OnCreateOrOpen, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_INVALID_OPERATION, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_INVALID_OPERATION, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, EnsureFileExists) {
@@ -255,8 +255,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, EnsureFileExists) {
file_url_,
base::Bind(&EventLogger::OnEnsureFileExists, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateDirectory) {
@@ -268,9 +268,10 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateDirectory) {
false, // exclusive
false, // recursive
base::Bind(&EventLogger::OnStatus, logger.GetWeakPtr()));
+ base::RunLoop().RunUntilIdle();
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_OK, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, GetFileInfo) {
@@ -282,8 +283,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, GetFileInfo) {
base::Bind(&EventLogger::OnGetFileInfo, logger.GetWeakPtr()));
base::RunLoop().RunUntilIdle();
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_OK, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_OK, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, ReadDirectory) {
@@ -295,8 +296,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, ReadDirectory) {
base::Bind(&EventLogger::OnReadDirectory, logger.GetWeakPtr()));
base::RunLoop().RunUntilIdle();
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_OK, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_OK, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, Touch) {
@@ -309,8 +310,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, Touch) {
false, // recursive
base::Bind(&EventLogger::OnStatus, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, Truncate) {
@@ -322,8 +323,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, Truncate) {
0, // length
base::Bind(&EventLogger::OnStatus, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CopyFileLocal) {
@@ -337,8 +338,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CopyFileLocal) {
base::Bind(&EventLogger::OnCopyFileProgress, logger.GetWeakPtr()),
base::Bind(&EventLogger::OnStatus, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, MoveFileLocal) {
@@ -351,8 +352,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, MoveFileLocal) {
fileapi::FileSystemOperation::OPTION_NONE,
base::Bind(&EventLogger::OnStatus, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CopyInForeignFile) {
@@ -364,8 +365,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CopyInForeignFile) {
file_url_, // dst_url
base::Bind(&EventLogger::OnStatus, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, DeleteFile) {
@@ -376,8 +377,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, DeleteFile) {
file_url_,
base::Bind(&EventLogger::OnStatus, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, DeleteDirectory) {
@@ -388,8 +389,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, DeleteDirectory) {
directory_url_,
base::Bind(&EventLogger::OnStatus, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, DeleteRecursively) {
@@ -400,8 +401,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, DeleteRecursively) {
directory_url_,
base::Bind(&EventLogger::OnStatus, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_ACCESS_DENIED, *logger.result());
}
TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateSnapshotFile) {
@@ -412,8 +413,8 @@ TEST_F(FileSystemProviderProviderAsyncFileUtilTest, CreateSnapshotFile) {
file_url_,
base::Bind(&EventLogger::OnCreateSnapshotFile, logger.GetWeakPtr()));
- ASSERT_TRUE(logger.error());
- EXPECT_EQ(base::File::FILE_ERROR_INVALID_OPERATION, *logger.error());
+ ASSERT_TRUE(logger.result());
+ EXPECT_EQ(base::File::FILE_ERROR_INVALID_OPERATION, *logger.result());
}
} // namespace file_system_provider
« no previous file with comments | « chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc ('k') | chrome/browser/chromeos/file_system_provider/operations/create_directory.h » ('j') | chrome/browser/chromeos/file_system_provider/operations/create_directory.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698