summaryrefslogtreecommitdiffstats
path: root/chromium/content/browser/fileapi/file_system_operation_impl_write_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/browser/fileapi/file_system_operation_impl_write_unittest.cc')
-rw-r--r--chromium/content/browser/fileapi/file_system_operation_impl_write_unittest.cc90
1 files changed, 47 insertions, 43 deletions
diff --git a/chromium/content/browser/fileapi/file_system_operation_impl_write_unittest.cc b/chromium/content/browser/fileapi/file_system_operation_impl_write_unittest.cc
index a92288af0fd..47b0e2d122b 100644
--- a/chromium/content/browser/fileapi/file_system_operation_impl_write_unittest.cc
+++ b/chromium/content/browser/fileapi/file_system_operation_impl_write_unittest.cc
@@ -9,6 +9,9 @@
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/run_loop.h"
+#include "content/browser/fileapi/mock_file_change_observer.h"
+#include "content/browser/quota/mock_quota_manager.h"
+#include "content/public/test/mock_blob_url_request_context.h"
#include "content/public/test/test_file_system_backend.h"
#include "content/public/test/test_file_system_context.h"
#include "net/url_request/url_request.h"
@@ -19,29 +22,29 @@
#include "url/gurl.h"
#include "webkit/browser/blob/blob_storage_context.h"
#include "webkit/browser/blob/blob_url_request_job.h"
-#include "webkit/browser/blob/mock_blob_url_request_context.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_file_util.h"
#include "webkit/browser/fileapi/file_system_operation_context.h"
#include "webkit/browser/fileapi/file_system_operation_runner.h"
#include "webkit/browser/fileapi/local_file_util.h"
-#include "webkit/browser/fileapi/mock_file_change_observer.h"
-#include "webkit/browser/quota/mock_quota_manager.h"
#include "webkit/common/blob/blob_data.h"
#include "webkit/common/fileapi/file_system_util.h"
-using webkit_blob::MockBlobURLRequestContext;
-using webkit_blob::ScopedTextBlob;
+using fileapi::FileSystemOperation;
+using fileapi::FileSystemOperationRunner;
+using fileapi::FileSystemURL;
+using content::MockBlobURLRequestContext;
+using content::ScopedTextBlob;
-namespace fileapi {
+namespace content {
namespace {
const GURL kOrigin("http://example.com");
-const FileSystemType kFileSystemType = kFileSystemTypeTest;
+const fileapi::FileSystemType kFileSystemType = fileapi::kFileSystemTypeTest;
-void AssertStatusEq(base::PlatformFileError expected,
- base::PlatformFileError actual) {
+void AssertStatusEq(base::File::Error expected,
+ base::File::Error actual) {
ASSERT_EQ(expected, actual);
}
@@ -51,19 +54,20 @@ class FileSystemOperationImplWriteTest
: public testing::Test {
public:
FileSystemOperationImplWriteTest()
- : status_(base::PLATFORM_FILE_OK),
- cancel_status_(base::PLATFORM_FILE_ERROR_FAILED),
+ : status_(base::File::FILE_OK),
+ cancel_status_(base::File::FILE_ERROR_FAILED),
bytes_written_(0),
complete_(false),
weak_factory_(this) {
- change_observers_ = MockFileChangeObserver::CreateList(&change_observer_);
+ change_observers_ = fileapi::MockFileChangeObserver::CreateList(
+ &change_observer_);
}
virtual void SetUp() {
ASSERT_TRUE(dir_.CreateUniqueTempDir());
quota_manager_ =
- new quota::MockQuotaManager(false /* is_incognito */,
+ new MockQuotaManager(false /* is_incognito */,
dir_.path(),
base::MessageLoopProxy::current().get(),
base::MessageLoopProxy::current().get(),
@@ -77,7 +81,7 @@ class FileSystemOperationImplWriteTest
file_system_context_->operation_runner()->CreateFile(
URLForPath(virtual_path_), true /* exclusive */,
- base::Bind(&AssertStatusEq, base::PLATFORM_FILE_OK));
+ base::Bind(&AssertStatusEq, base::File::FILE_OK));
static_cast<TestFileSystemBackend*>(
file_system_context_->GetFileSystemBackend(kFileSystemType))
@@ -90,8 +94,8 @@ class FileSystemOperationImplWriteTest
base::RunLoop().RunUntilIdle();
}
- base::PlatformFileError status() const { return status_; }
- base::PlatformFileError cancel_status() const { return cancel_status_; }
+ base::File::Error status() const { return status_; }
+ base::File::Error cancel_status() const { return cancel_status_; }
void add_bytes_written(int64 bytes, bool complete) {
bytes_written_ += bytes;
EXPECT_FALSE(complete_);
@@ -101,11 +105,11 @@ class FileSystemOperationImplWriteTest
bool complete() const { return complete_; }
protected:
- const ChangeObserverList& change_observers() const {
+ const fileapi::ChangeObserverList& change_observers() const {
return change_observers_;
}
- MockFileChangeObserver* change_observer() {
+ fileapi::MockFileChangeObserver* change_observer() {
return &change_observer_;
}
@@ -125,14 +129,14 @@ class FileSystemOperationImplWriteTest
weak_factory_.GetWeakPtr());
}
- void DidWrite(base::PlatformFileError status, int64 bytes, bool complete) {
- if (status == base::PLATFORM_FILE_OK) {
+ void DidWrite(base::File::Error status, int64 bytes, bool complete) {
+ if (status == base::File::FILE_OK) {
add_bytes_written(bytes, complete);
if (complete)
base::MessageLoop::current()->Quit();
} else {
EXPECT_FALSE(complete_);
- EXPECT_EQ(status_, base::PLATFORM_FILE_OK);
+ EXPECT_EQ(status_, base::File::FILE_OK);
complete_ = true;
status_ = status;
if (base::MessageLoop::current()->is_running())
@@ -140,7 +144,7 @@ class FileSystemOperationImplWriteTest
}
}
- void DidCancel(base::PlatformFileError status) {
+ void DidCancel(base::File::Error status) {
cancel_status_ = status;
}
@@ -148,8 +152,8 @@ class FileSystemOperationImplWriteTest
return *url_request_context_;
}
- scoped_refptr<FileSystemContext> file_system_context_;
- scoped_refptr<quota::MockQuotaManager> quota_manager_;
+ scoped_refptr<fileapi::FileSystemContext> file_system_context_;
+ scoped_refptr<MockQuotaManager> quota_manager_;
base::MessageLoopForIO loop_;
@@ -157,15 +161,15 @@ class FileSystemOperationImplWriteTest
base::FilePath virtual_path_;
// For post-operation status.
- base::PlatformFileError status_;
- base::PlatformFileError cancel_status_;
+ base::File::Error status_;
+ base::File::Error cancel_status_;
int64 bytes_written_;
bool complete_;
scoped_ptr<MockBlobURLRequestContext> url_request_context_;
- MockFileChangeObserver change_observer_;
- ChangeObserverList change_observers_;
+ fileapi::MockFileChangeObserver change_observer_;
+ fileapi::ChangeObserverList change_observers_;
base::WeakPtrFactory<FileSystemOperationImplWriteTest> weak_factory_;
@@ -183,7 +187,7 @@ TEST_F(FileSystemOperationImplWriteTest, TestWriteSuccess) {
base::MessageLoop::current()->Run();
EXPECT_EQ(14, bytes_written());
- EXPECT_EQ(base::PLATFORM_FILE_OK, status());
+ EXPECT_EQ(base::File::FILE_OK, status());
EXPECT_TRUE(complete());
EXPECT_EQ(1, change_observer()->get_and_reset_modify_file_count());
@@ -197,7 +201,7 @@ TEST_F(FileSystemOperationImplWriteTest, TestWriteZero) {
base::MessageLoop::current()->Run();
EXPECT_EQ(0, bytes_written());
- EXPECT_EQ(base::PLATFORM_FILE_OK, status());
+ EXPECT_EQ(base::File::FILE_OK, status());
EXPECT_TRUE(complete());
EXPECT_EQ(1, change_observer()->get_and_reset_modify_file_count());
@@ -212,7 +216,7 @@ TEST_F(FileSystemOperationImplWriteTest, TestWriteInvalidBlobUrl) {
base::MessageLoop::current()->Run();
EXPECT_EQ(0, bytes_written());
- EXPECT_EQ(base::PLATFORM_FILE_ERROR_FAILED, status());
+ EXPECT_EQ(base::File::FILE_ERROR_FAILED, status());
EXPECT_TRUE(complete());
EXPECT_EQ(0, change_observer()->get_and_reset_modify_file_count());
@@ -228,7 +232,7 @@ TEST_F(FileSystemOperationImplWriteTest, TestWriteInvalidFile) {
base::MessageLoop::current()->Run();
EXPECT_EQ(0, bytes_written());
- EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status());
+ EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, status());
EXPECT_TRUE(complete());
EXPECT_EQ(1, change_observer()->get_and_reset_modify_file_count());
@@ -239,7 +243,7 @@ TEST_F(FileSystemOperationImplWriteTest, TestWriteDir) {
file_system_context_->operation_runner()->CreateDirectory(
URLForPath(virtual_dir_path),
true /* exclusive */, false /* recursive */,
- base::Bind(&AssertStatusEq, base::PLATFORM_FILE_OK));
+ base::Bind(&AssertStatusEq, base::File::FILE_OK));
ScopedTextBlob blob(url_request_context(), "blob:writedir",
"It\'ll not be written, too.");
@@ -250,10 +254,10 @@ TEST_F(FileSystemOperationImplWriteTest, TestWriteDir) {
EXPECT_EQ(0, bytes_written());
// TODO(kinuko): This error code is platform- or fileutil- dependent
- // right now. Make it return PLATFORM_FILE_ERROR_NOT_A_FILE in every case.
- EXPECT_TRUE(status() == base::PLATFORM_FILE_ERROR_NOT_A_FILE ||
- status() == base::PLATFORM_FILE_ERROR_ACCESS_DENIED ||
- status() == base::PLATFORM_FILE_ERROR_FAILED);
+ // right now. Make it return File::FILE_ERROR_NOT_A_FILE in every case.
+ EXPECT_TRUE(status() == base::File::FILE_ERROR_NOT_A_FILE ||
+ status() == base::File::FILE_ERROR_ACCESS_DENIED ||
+ status() == base::File::FILE_ERROR_FAILED);
EXPECT_TRUE(complete());
EXPECT_EQ(1, change_observer()->get_and_reset_modify_file_count());
@@ -270,7 +274,7 @@ TEST_F(FileSystemOperationImplWriteTest, TestWriteFailureByQuota) {
base::MessageLoop::current()->Run();
EXPECT_EQ(10, bytes_written());
- EXPECT_EQ(base::PLATFORM_FILE_ERROR_NO_SPACE, status());
+ EXPECT_EQ(base::File::FILE_ERROR_NO_SPACE, status());
EXPECT_TRUE(complete());
EXPECT_EQ(1, change_observer()->get_and_reset_modify_file_count());
@@ -292,8 +296,8 @@ TEST_F(FileSystemOperationImplWriteTest, TestImmediateCancelSuccessfulWrite) {
// Issued Cancel() before receiving any response from Write(),
// so nothing should have happen.
EXPECT_EQ(0, bytes_written());
- EXPECT_EQ(base::PLATFORM_FILE_ERROR_ABORT, status());
- EXPECT_EQ(base::PLATFORM_FILE_OK, cancel_status());
+ EXPECT_EQ(base::File::FILE_ERROR_ABORT, status());
+ EXPECT_EQ(base::File::FILE_OK, cancel_status());
EXPECT_TRUE(complete());
EXPECT_EQ(0, change_observer()->get_and_reset_modify_file_count());
@@ -316,8 +320,8 @@ TEST_F(FileSystemOperationImplWriteTest, TestImmediateCancelFailingWrite) {
// Issued Cancel() before receiving any response from Write(),
// so nothing should have happen.
EXPECT_EQ(0, bytes_written());
- EXPECT_EQ(base::PLATFORM_FILE_ERROR_ABORT, status());
- EXPECT_EQ(base::PLATFORM_FILE_OK, cancel_status());
+ EXPECT_EQ(base::File::FILE_ERROR_ABORT, status());
+ EXPECT_EQ(base::File::FILE_OK, cancel_status());
EXPECT_TRUE(complete());
EXPECT_EQ(0, change_observer()->get_and_reset_modify_file_count());
@@ -325,4 +329,4 @@ TEST_F(FileSystemOperationImplWriteTest, TestImmediateCancelFailingWrite) {
// TODO(ericu,dmikurube,kinuko): Add more tests for cancel cases.
-} // namespace fileapi
+} // namespace content
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 23:45:56 +0000