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

Unified Diff: content/browser/fileapi/file_system_operation_impl_unittest.cc

Issue 1455403003: Add an option to specify requested fields for fetching metadata. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleaned up. Created 5 years, 1 month 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: content/browser/fileapi/file_system_operation_impl_unittest.cc
diff --git a/content/browser/fileapi/file_system_operation_impl_unittest.cc b/content/browser/fileapi/file_system_operation_impl_unittest.cc
index b000da2d1e7de5380ec2fecc0f79044ec8a88a67..bb396243017b193c08ffab5771188964f0181af6 100644
--- a/content/browser/fileapi/file_system_operation_impl_unittest.cc
+++ b/content/browser/fileapi/file_system_operation_impl_unittest.cc
@@ -385,12 +385,12 @@ class FileSystemOperationImplTest
return status;
}
- base::File::Error GetMetadata(const FileSystemURL& url) {
+ base::File::Error GetMetadata(const FileSystemURL& url, int fields) {
base::File::Error status;
base::RunLoop run_loop;
update_observer_.Enable();
operation_runner()->GetMetadata(
- url, RecordMetadataCallback(run_loop.QuitClosure(), &status));
+ url, fields, RecordMetadataCallback(run_loop.QuitClosure(), &status));
run_loop.Run();
update_observer_.Disable();
return status;
@@ -938,7 +938,8 @@ TEST_F(FileSystemOperationImplTest, TestCreateDirSuccessExclusive) {
TEST_F(FileSystemOperationImplTest, TestExistsAndMetadataFailure) {
EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND,
- GetMetadata(URLForPath("nonexistent")));
+ GetMetadata(URLForPath("nonexistent"),
+ storage::FileSystemOperation::GET_METADATA_FIELD_NONE));
EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND,
FileExists(URLForPath("nonexistent")));
@@ -956,14 +957,20 @@ TEST_F(FileSystemOperationImplTest, TestExistsAndMetadataSuccess) {
EXPECT_EQ(base::File::FILE_OK, DirectoryExists(dir));
++read_access;
- EXPECT_EQ(base::File::FILE_OK, GetMetadata(dir));
+ EXPECT_EQ(
+ base::File::FILE_OK,
+ GetMetadata(
+ dir, storage::FileSystemOperation::GET_METADATA_FIELD_IS_DIRECTORY));
EXPECT_TRUE(info().is_directory);
++read_access;
EXPECT_EQ(base::File::FILE_OK, FileExists(file));
++read_access;
- EXPECT_EQ(base::File::FILE_OK, GetMetadata(file));
+ EXPECT_EQ(
+ base::File::FILE_OK,
+ GetMetadata(
+ file, storage::FileSystemOperation::GET_METADATA_FIELD_IS_DIRECTORY));
EXPECT_FALSE(info().is_directory);
++read_access;
@@ -1077,7 +1084,11 @@ TEST_F(FileSystemOperationImplTest, TestTruncate) {
base::WriteFile(platform_path, test_data, data_size));
// Check that its length is the size of the data written.
- EXPECT_EQ(base::File::FILE_OK, GetMetadata(file));
+ EXPECT_EQ(
+ base::File::FILE_OK,
+ GetMetadata(
+ file, storage::FileSystemOperation::GET_METADATA_FIELD_IS_DIRECTORY |
+ storage::FileSystemOperation::GET_METADATA_FIELD_SIZE));
EXPECT_FALSE(info().is_directory);
EXPECT_EQ(data_size, info().size);

Powered by Google App Engine
This is Rietveld 408576698