summaryrefslogtreecommitdiffstats
path: root/chromium/content/browser/fileapi/dragged_file_util_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/browser/fileapi/dragged_file_util_unittest.cc')
-rw-r--r--chromium/content/browser/fileapi/dragged_file_util_unittest.cc139
1 files changed, 76 insertions, 63 deletions
diff --git a/chromium/content/browser/fileapi/dragged_file_util_unittest.cc b/chromium/content/browser/fileapi/dragged_file_util_unittest.cc
index 17b29cc6be5..6bd6e100253 100644
--- a/chromium/content/browser/fileapi/dragged_file_util_unittest.cc
+++ b/chromium/content/browser/fileapi/dragged_file_util_unittest.cc
@@ -15,18 +15,24 @@
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/time/time.h"
+#include "content/public/test/async_file_test_helper.h"
#include "content/public/test/test_file_system_context.h"
+#include "content/test/fileapi_test_file_set.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/fileapi/async_file_test_helper.h"
#include "webkit/browser/fileapi/dragged_file_util.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_operation_context.h"
#include "webkit/browser/fileapi/isolated_context.h"
#include "webkit/browser/fileapi/local_file_util.h"
#include "webkit/browser/fileapi/native_file_util.h"
-#include "webkit/browser/fileapi/test_file_set.h"
-namespace fileapi {
+using content::AsyncFileTestHelper;
+using fileapi::FileSystemContext;
+using fileapi::FileSystemOperationContext;
+using fileapi::FileSystemType;
+using fileapi::FileSystemURL;
+
+namespace content {
namespace {
@@ -50,7 +56,7 @@ base::FilePath GetTopLevelPath(const base::FilePath& path) {
bool IsDirectoryEmpty(FileSystemContext* context, const FileSystemURL& url) {
FileEntryList entries;
- EXPECT_EQ(base::PLATFORM_FILE_OK,
+ EXPECT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::ReadDirectory(context, url, &entries));
return entries.empty();
}
@@ -94,7 +100,7 @@ class DraggedFileUtilTest : public testing::Test {
virtual void SetUp() {
ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
ASSERT_TRUE(partition_dir_.CreateUniqueTempDir());
- file_util_.reset(new DraggedFileUtil());
+ file_util_.reset(new fileapi::DraggedFileUtil());
// Register the files/directories of RegularTestCases (with random
// root paths) as dropped files.
@@ -112,8 +118,8 @@ class DraggedFileUtilTest : public testing::Test {
}
protected:
- IsolatedContext* isolated_context() const {
- return IsolatedContext::GetInstance();
+ fileapi::IsolatedContext* isolated_context() const {
+ return fileapi::IsolatedContext::GetInstance();
}
const base::FilePath& root_path() const {
return data_dir_.path();
@@ -121,7 +127,7 @@ class DraggedFileUtilTest : public testing::Test {
FileSystemContext* file_system_context() const {
return file_system_context_.get();
}
- FileSystemFileUtil* file_util() const { return file_util_.get(); }
+ fileapi::FileSystemFileUtil* file_util() const { return file_util_.get(); }
std::string filesystem_id() const { return filesystem_id_; }
base::FilePath GetTestCasePlatformPath(
@@ -142,36 +148,36 @@ class DraggedFileUtilTest : public testing::Test {
filesystem_id()).Append(path);
return file_system_context_->CreateCrackedFileSystemURL(
GURL("http://example.com"),
- kFileSystemTypeIsolated,
+ fileapi::kFileSystemTypeIsolated,
virtual_path);
}
FileSystemURL GetOtherFileSystemURL(const base::FilePath& path) const {
return file_system_context()->CreateCrackedFileSystemURL(
GURL("http://example.com"),
- kFileSystemTypeTemporary,
+ fileapi::kFileSystemTypeTemporary,
base::FilePath().AppendASCII("dest").Append(path));
}
void VerifyFilesHaveSameContent(const FileSystemURL& url1,
const FileSystemURL& url2) {
// Get the file info and the platform path for url1.
- base::PlatformFileInfo info1;
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ base::File::Info info1;
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::GetMetadata(
file_system_context(), url1, &info1));
base::FilePath platform_path1;
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::GetPlatformPath(
file_system_context(), url1, &platform_path1));
// Get the file info and the platform path for url2.
- base::PlatformFileInfo info2;
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ base::File::Info info2;
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::GetMetadata(
file_system_context(), url2, &info2));
base::FilePath platform_path2;
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::GetPlatformPath(
file_system_context(), url2, &platform_path2));
@@ -201,7 +207,7 @@ class DraggedFileUtilTest : public testing::Test {
FileSystemURL dir = directories.front();
directories.pop();
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::ReadDirectory(
file_system_context(), dir, &entries));
for (size_t i = 0; i < entries.size(); ++i) {
@@ -220,7 +226,7 @@ class DraggedFileUtilTest : public testing::Test {
FileSystemURL dir = directories.front();
directories.pop();
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::ReadDirectory(
file_system_context(), dir, &entries));
for (size_t i = 0; i < entries.size(); ++i) {
@@ -241,9 +247,9 @@ class DraggedFileUtilTest : public testing::Test {
}
}
- scoped_ptr<FileSystemOperationContext> GetOperationContext() {
+ scoped_ptr<fileapi::FileSystemOperationContext> GetOperationContext() {
return make_scoped_ptr(
- new FileSystemOperationContext(file_system_context())).Pass();
+ new fileapi::FileSystemOperationContext(file_system_context())).Pass();
}
@@ -251,9 +257,10 @@ class DraggedFileUtilTest : public testing::Test {
void SimulateDropFiles() {
size_t root_path_index = 0;
- IsolatedContext::FileInfoSet toplevels;
- for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) {
- const test::TestCaseRecord& test_case = test::kRegularTestCases[i];
+ fileapi::IsolatedContext::FileInfoSet toplevels;
+ for (size_t i = 0; i < kRegularFileSystemTestCaseSize; ++i) {
+ const FileSystemTestCaseRecord& test_case =
+ kRegularFileSystemTestCases[i];
base::FilePath path(test_case.path);
base::FilePath toplevel = GetTopLevelPath(path);
@@ -266,7 +273,7 @@ class DraggedFileUtilTest : public testing::Test {
toplevels.AddPath(root.Append(path), NULL);
}
- test::SetUpOneTestCase(toplevel_root_map_[toplevel], test_case);
+ SetUpOneFileSystemTestCase(toplevel_root_map_[toplevel], test_case);
}
// Register the toplevel entries.
@@ -279,24 +286,25 @@ class DraggedFileUtilTest : public testing::Test {
std::string filesystem_id_;
scoped_refptr<FileSystemContext> file_system_context_;
std::map<base::FilePath, base::FilePath> toplevel_root_map_;
- scoped_ptr<DraggedFileUtil> file_util_;
+ scoped_ptr<fileapi::DraggedFileUtil> file_util_;
DISALLOW_COPY_AND_ASSIGN(DraggedFileUtilTest);
};
TEST_F(DraggedFileUtilTest, BasicTest) {
- for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) {
+ for (size_t i = 0; i < kRegularFileSystemTestCaseSize; ++i) {
SCOPED_TRACE(testing::Message() << "Testing RegularTestCases " << i);
- const test::TestCaseRecord& test_case = test::kRegularTestCases[i];
+ const FileSystemTestCaseRecord& test_case =
+ kRegularFileSystemTestCases[i];
FileSystemURL url = GetFileSystemURL(base::FilePath(test_case.path));
// See if we can query the file info via the isolated FileUtil.
// (This should succeed since we have registered all the top-level
// entries of the test cases in SetUp())
- base::PlatformFileInfo info;
+ base::File::Info info;
base::FilePath platform_path;
FileSystemOperationContext context(file_system_context());
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
file_util()->GetFileInfo(&context, url, &info, &platform_path));
// See if the obtained file info is correct.
@@ -309,7 +317,7 @@ TEST_F(DraggedFileUtilTest, BasicTest) {
}
TEST_F(DraggedFileUtilTest, UnregisteredPathsTest) {
- static const fileapi::test::TestCaseRecord kUnregisteredCases[] = {
+ static const FileSystemTestCaseRecord kUnregisteredCases[] = {
{true, FILE_PATH_LITERAL("nonexistent"), 0},
{true, FILE_PATH_LITERAL("nonexistent/dir foo"), 0},
{false, FILE_PATH_LITERAL("nonexistent/false"), 0},
@@ -319,13 +327,13 @@ TEST_F(DraggedFileUtilTest, UnregisteredPathsTest) {
for (size_t i = 0; i < arraysize(kUnregisteredCases); ++i) {
SCOPED_TRACE(testing::Message() << "Creating kUnregisteredCases " << i);
- const test::TestCaseRecord& test_case = kUnregisteredCases[i];
+ const FileSystemTestCaseRecord& test_case = kUnregisteredCases[i];
// Prepare the test file/directory.
- SetUpOneTestCase(root_path(), test_case);
+ SetUpOneFileSystemTestCase(root_path(), test_case);
// Make sure regular GetFileInfo succeeds.
- base::PlatformFileInfo info;
+ base::File::Info info;
ASSERT_TRUE(base::GetFileInfo(root_path().Append(test_case.path), &info));
if (!test_case.is_directory)
ASSERT_EQ(test_case.data_file_size, info.size);
@@ -334,7 +342,7 @@ TEST_F(DraggedFileUtilTest, UnregisteredPathsTest) {
for (size_t i = 0; i < arraysize(kUnregisteredCases); ++i) {
SCOPED_TRACE(testing::Message() << "Creating kUnregisteredCases " << i);
- const test::TestCaseRecord& test_case = kUnregisteredCases[i];
+ const FileSystemTestCaseRecord& test_case = kUnregisteredCases[i];
FileSystemURL url = GetFileSystemURL(base::FilePath(test_case.path));
// We should not be able to get the valid URL for unregistered files.
@@ -343,8 +351,9 @@ TEST_F(DraggedFileUtilTest, UnregisteredPathsTest) {
}
TEST_F(DraggedFileUtilTest, ReadDirectoryTest) {
- for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) {
- const test::TestCaseRecord& test_case = test::kRegularTestCases[i];
+ for (size_t i = 0; i < kRegularFileSystemTestCaseSize; ++i) {
+ const FileSystemTestCaseRecord& test_case =
+ kRegularFileSystemTestCases[i];
if (!test_case.is_directory)
continue;
@@ -352,7 +361,8 @@ TEST_F(DraggedFileUtilTest, ReadDirectoryTest) {
<< ": " << test_case.path);
// Read entries in the directory to construct the expected results map.
- typedef std::map<base::FilePath::StringType, DirectoryEntry> EntryMap;
+ typedef std::map<base::FilePath::StringType, fileapi::DirectoryEntry>
+ EntryMap;
EntryMap expected_entry_map;
base::FilePath dir_path = GetTestCasePlatformPath(test_case.path);
@@ -362,7 +372,7 @@ TEST_F(DraggedFileUtilTest, ReadDirectoryTest) {
base::FilePath current;
while (!(current = file_enum.Next()).empty()) {
base::FileEnumerator::FileInfo file_info = file_enum.GetInfo();
- DirectoryEntry entry;
+ fileapi::DirectoryEntry entry;
entry.is_directory = file_info.IsDirectory();
entry.name = current.BaseName().value();
entry.size = file_info.GetSize();
@@ -383,13 +393,13 @@ TEST_F(DraggedFileUtilTest, ReadDirectoryTest) {
// Perform ReadDirectory in the isolated filesystem.
FileSystemURL url = GetFileSystemURL(base::FilePath(test_case.path));
FileEntryList entries;
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::ReadDirectory(
file_system_context(), url, &entries));
EXPECT_EQ(expected_entry_map.size(), entries.size());
for (size_t i = 0; i < entries.size(); ++i) {
- const DirectoryEntry& entry = entries[i];
+ const fileapi::DirectoryEntry& entry = entries[i];
EntryMap::iterator found = expected_entry_map.find(entry.name);
EXPECT_TRUE(found != expected_entry_map.end());
EXPECT_EQ(found->second.name, entry.name);
@@ -402,14 +412,15 @@ TEST_F(DraggedFileUtilTest, ReadDirectoryTest) {
}
TEST_F(DraggedFileUtilTest, GetLocalFilePathTest) {
- for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) {
- const test::TestCaseRecord& test_case = test::kRegularTestCases[i];
+ for (size_t i = 0; i < kRegularFileSystemTestCaseSize; ++i) {
+ const FileSystemTestCaseRecord& test_case =
+ kRegularFileSystemTestCases[i];
FileSystemURL url = GetFileSystemURL(base::FilePath(test_case.path));
FileSystemOperationContext context(file_system_context());
base::FilePath local_file_path;
- EXPECT_EQ(base::PLATFORM_FILE_OK,
+ EXPECT_EQ(base::File::FILE_OK,
file_util()->GetLocalFilePath(&context, url, &local_file_path));
EXPECT_EQ(GetTestCasePlatformPath(test_case.path).value(),
local_file_path.value());
@@ -424,14 +435,14 @@ TEST_F(DraggedFileUtilTest, CopyOutFileTest) {
std::queue<FileSystemURL> directories;
directories.push(src_root);
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::CreateDirectory(file_system_context(),
dest_root));
while (!directories.empty()) {
FileSystemURL dir = directories.front();
directories.pop();
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::ReadDirectory(file_system_context(),
dir, &entries));
for (size_t i = 0; i < entries.size(); ++i) {
@@ -441,7 +452,7 @@ TEST_F(DraggedFileUtilTest, CopyOutFileTest) {
src_root, dest_root, src_url);
if (entries[i].is_directory) {
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::CreateDirectory(file_system_context(),
dest_url));
directories.push(src_url);
@@ -449,7 +460,7 @@ TEST_F(DraggedFileUtilTest, CopyOutFileTest) {
}
SCOPED_TRACE(testing::Message() << "Testing file copy "
<< src_url.path().value());
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::Copy(file_system_context(),
src_url, dest_url));
VerifyFilesHaveSameContent(src_url, dest_url);
@@ -461,12 +472,12 @@ TEST_F(DraggedFileUtilTest, CopyOutDirectoryTest) {
FileSystemURL src_root = GetFileSystemURL(base::FilePath());
FileSystemURL dest_root = GetOtherFileSystemURL(base::FilePath());
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::CreateDirectory(file_system_context(),
dest_root));
FileEntryList entries;
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::ReadDirectory(file_system_context(),
src_root, &entries));
for (size_t i = 0; i < entries.size(); ++i) {
@@ -478,7 +489,7 @@ TEST_F(DraggedFileUtilTest, CopyOutDirectoryTest) {
src_root, dest_root, src_url);
SCOPED_TRACE(testing::Message() << "Testing file copy "
<< src_url.path().value());
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
AsyncFileTestHelper::Copy(file_system_context(),
src_url, dest_url));
VerifyDirectoriesHaveSameContent(src_url, dest_url);
@@ -486,8 +497,9 @@ TEST_F(DraggedFileUtilTest, CopyOutDirectoryTest) {
}
TEST_F(DraggedFileUtilTest, TouchTest) {
- for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) {
- const test::TestCaseRecord& test_case = test::kRegularTestCases[i];
+ for (size_t i = 0; i < kRegularFileSystemTestCaseSize; ++i) {
+ const FileSystemTestCaseRecord& test_case =
+ kRegularFileSystemTestCases[i];
if (test_case.is_directory)
continue;
SCOPED_TRACE(testing::Message() << test_case.path);
@@ -496,15 +508,15 @@ TEST_F(DraggedFileUtilTest, TouchTest) {
base::Time last_access_time = base::Time::FromTimeT(1000);
base::Time last_modified_time = base::Time::FromTimeT(2000);
- EXPECT_EQ(base::PLATFORM_FILE_OK,
+ EXPECT_EQ(base::File::FILE_OK,
file_util()->Touch(GetOperationContext().get(), url,
last_access_time,
last_modified_time));
// Verification.
- base::PlatformFileInfo info;
+ base::File::Info info;
base::FilePath platform_path;
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
file_util()->GetFileInfo(GetOperationContext().get(), url,
&info, &platform_path));
EXPECT_EQ(last_access_time.ToTimeT(), info.last_accessed.ToTimeT());
@@ -513,8 +525,9 @@ TEST_F(DraggedFileUtilTest, TouchTest) {
}
TEST_F(DraggedFileUtilTest, TruncateTest) {
- for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) {
- const test::TestCaseRecord& test_case = test::kRegularTestCases[i];
+ for (size_t i = 0; i < kRegularFileSystemTestCaseSize; ++i) {
+ const FileSystemTestCaseRecord& test_case =
+ kRegularFileSystemTestCases[i];
if (test_case.is_directory)
continue;
@@ -522,23 +535,23 @@ TEST_F(DraggedFileUtilTest, TruncateTest) {
FileSystemURL url = GetFileSystemURL(base::FilePath(test_case.path));
// Truncate to 0.
- base::PlatformFileInfo info;
+ base::File::Info info;
base::FilePath platform_path;
- EXPECT_EQ(base::PLATFORM_FILE_OK,
+ EXPECT_EQ(base::File::FILE_OK,
file_util()->Truncate(GetOperationContext().get(), url, 0));
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
file_util()->GetFileInfo(GetOperationContext().get(), url,
&info, &platform_path));
EXPECT_EQ(0, info.size);
// Truncate (extend) to 999.
- EXPECT_EQ(base::PLATFORM_FILE_OK,
+ EXPECT_EQ(base::File::FILE_OK,
file_util()->Truncate(GetOperationContext().get(), url, 999));
- ASSERT_EQ(base::PLATFORM_FILE_OK,
+ ASSERT_EQ(base::File::FILE_OK,
file_util()->GetFileInfo(GetOperationContext().get(), url,
&info, &platform_path));
EXPECT_EQ(999, info.size);
}
}
-} // namespace fileapi
+} // namespace content
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 02:00:37 +0000