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

Unified Diff: webkit/fileapi/file_system_operation_unittest.cc

Issue 6731033: Remove the path from PlatformFileInfo; it's cleaner just to pass it along as a (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 | « webkit/fileapi/file_system_operation.cc ('k') | webkit/fileapi/local_file_system_file_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/file_system_operation_unittest.cc
===================================================================
--- webkit/fileapi/file_system_operation_unittest.cc (revision 79607)
+++ webkit/fileapi/file_system_operation_unittest.cc (working copy)
@@ -43,6 +43,8 @@
int status() const { return status_; }
void set_info(const base::PlatformFileInfo& info) { info_ = info; }
const base::PlatformFileInfo& info() const { return info_; }
+ void set_path(const FilePath& path) { path_ = path; }
+ const FilePath& path() const { return path_; }
void set_entries(const std::vector<base::FileUtilProxy::Entry>& entries) {
entries_ = entries;
}
@@ -57,6 +59,7 @@
// For post-operation status.
int status_;
base::PlatformFileInfo info_;
+ FilePath path_;
std::vector<base::FileUtilProxy::Entry> entries_;
DISALLOW_COPY_AND_ASSIGN(FileSystemOperationTest);
@@ -74,8 +77,11 @@
test_->set_status(kFileOperationSucceeded);
}
- virtual void DidReadMetadata(const base::PlatformFileInfo& info) {
+ virtual void DidReadMetadata(
+ const base::PlatformFileInfo& info,
+ const FilePath& platform_path) {
test_->set_info(info);
+ test_->set_path(platform_path);
test_->set_status(kFileOperationSucceeded);
}
@@ -564,6 +570,7 @@
MessageLoop::current()->RunAllPending();
EXPECT_EQ(kFileOperationSucceeded, status());
EXPECT_TRUE(info().is_directory);
+ EXPECT_EQ(dir.path(), path());
FilePath file;
file_util::CreateTemporaryFileInDir(dir.path(), &file);
@@ -575,6 +582,7 @@
MessageLoop::current()->RunAllPending();
EXPECT_EQ(kFileOperationSucceeded, status());
EXPECT_FALSE(info().is_directory);
+ EXPECT_EQ(file, path());
}
TEST_F(FileSystemOperationTest, TestTypeMismatchErrors) {
@@ -592,9 +600,9 @@
}
TEST_F(FileSystemOperationTest, TestReadDirFailure) {
- // Path doesn't exists
- FilePath nonexisting_dir_path(base_.path().Append(
- FILE_PATH_LITERAL("NonExistingDir")));
+ // Path doesn't exist
+ FilePath nonexisting_dir_path(base_.path().Append(
+ FILE_PATH_LITERAL("NonExistingDir")));
file_util::EnsureEndsWithSeparator(&nonexisting_dir_path);
operation()->ReadDirectory(nonexisting_dir_path);
MessageLoop::current()->RunAllPending();
« no previous file with comments | « webkit/fileapi/file_system_operation.cc ('k') | webkit/fileapi/local_file_system_file_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698