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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/fileapi/file_writer_delegate_unittest.cc

Issue 10956064: Send OnModifyFile Notification when File Write Finishes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed typo from last upload Created 8 years, 3 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_writer_delegate.cc ('k') | webkit/fileapi/local_file_system_operation.h » ('j') | webkit/fileapi/local_file_system_operation.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/file_writer_delegate_unittest.cc
diff --git a/webkit/fileapi/file_writer_delegate_unittest.cc b/webkit/fileapi/file_writer_delegate_unittest.cc
index edce01702673d509043b223945226b651a3eba61..a1bc9bc4a44841701a9faccdd6e3f0f669f80225 100644
--- a/webkit/fileapi/file_writer_delegate_unittest.cc
+++ b/webkit/fileapi/file_writer_delegate_unittest.cc
@@ -31,26 +31,21 @@ class Result {
Result()
: status_(base::PLATFORM_FILE_OK),
bytes_written_(0),
- complete_(false) {}
+ write_status_(FileWriterDelegate::SUCCESS_IO_PENDING) {}
base::PlatformFileError status() const { return status_; }
- void add_bytes_written(int64 bytes, bool complete) {
- bytes_written_ += bytes;
- EXPECT_FALSE(complete_);
- complete_ = complete;
- }
int64 bytes_written() const { return bytes_written_; }
- bool complete() const { return complete_; }
+ bool write_status() const { return write_status_; }
kinuko 2012/09/26 06:31:15 should this return WriteProgressStatus?
calvinlo 2012/09/26 07:43:40 Done.
- void DidWrite(base::PlatformFileError status, int64 bytes, bool complete) {
+ void DidWrite(base::PlatformFileError status, int64 bytes,
+ FileWriterDelegate::WriteProgressStatus write_status) {
+ write_status_ = write_status;
if (status == base::PLATFORM_FILE_OK) {
- add_bytes_written(bytes, complete);
- if (complete)
+ bytes_written_ += bytes;
+ if (write_status_ != FileWriterDelegate::SUCCESS_IO_PENDING)
MessageLoop::current()->Quit();
} else {
- EXPECT_FALSE(complete_);
- EXPECT_EQ(status_, base::PLATFORM_FILE_OK);
- complete_ = true;
+ EXPECT_EQ(base::PLATFORM_FILE_OK, status_);
status_ = status;
MessageLoop::current()->Quit();
}
@@ -60,7 +55,7 @@ class Result {
// For post-operation status.
base::PlatformFileError status_;
int64 bytes_written_;
- bool complete_;
+ FileWriterDelegate::WriteProgressStatus write_status_;
};
const char kData[] = "The quick brown fox jumps over the lazy dog.\n";
@@ -237,7 +232,7 @@ TEST_F(FileWriterDelegateTest, MAYBE_WriteSuccessWithoutQuotaLimit) {
file_writer_delegate_->Start(request_.Pass());
MessageLoop::current()->Run();
- ASSERT_TRUE(result_->complete());
+ ASSERT_EQ(FileWriterDelegate::SUCCESS_COMPLETED, result_->write_status());
file_writer_delegate_.reset();
ASSERT_EQ(kDataSize, test_helper_.GetCachedOriginUsage());
@@ -263,7 +258,7 @@ TEST_F(FileWriterDelegateTest, MAYBE_WriteSuccessWithJustQuota) {
ASSERT_EQ(0, test_helper_.GetCachedOriginUsage());
file_writer_delegate_->Start(request_.Pass());
MessageLoop::current()->Run();
- ASSERT_TRUE(result_->complete());
+ ASSERT_EQ(FileWriterDelegate::SUCCESS_COMPLETED, result_->write_status());
file_writer_delegate_.reset();
ASSERT_EQ(kAllowedGrowth, test_helper_.GetCachedOriginUsage());
@@ -282,7 +277,7 @@ TEST_F(FileWriterDelegateTest, DISABLED_WriteFailureByQuota) {
ASSERT_EQ(0, test_helper_.GetCachedOriginUsage());
file_writer_delegate_->Start(request_.Pass());
MessageLoop::current()->Run();
- ASSERT_TRUE(result_->complete());
+ ASSERT_EQ(FileWriterDelegate::ERROR_WRITE_STARTED, result_->write_status());
file_writer_delegate_.reset();
ASSERT_EQ(kAllowedGrowth, test_helper_.GetCachedOriginUsage());
@@ -290,7 +285,7 @@ TEST_F(FileWriterDelegateTest, DISABLED_WriteFailureByQuota) {
EXPECT_EQ(kAllowedGrowth, result_->bytes_written());
EXPECT_EQ(base::PLATFORM_FILE_ERROR_NO_SPACE, result_->status());
- EXPECT_TRUE(result_->complete());
+ ASSERT_EQ(FileWriterDelegate::ERROR_WRITE_STARTED, result_->write_status());
}
TEST_F(FileWriterDelegateTest, WriteZeroBytesSuccessfullyWithZeroQuota) {
@@ -302,7 +297,7 @@ TEST_F(FileWriterDelegateTest, WriteZeroBytesSuccessfullyWithZeroQuota) {
ASSERT_EQ(0, test_helper_.GetCachedOriginUsage());
file_writer_delegate_->Start(request_.Pass());
MessageLoop::current()->Run();
- ASSERT_TRUE(result_->complete());
+ ASSERT_EQ(FileWriterDelegate::SUCCESS_COMPLETED, result_->write_status());
file_writer_delegate_.reset();
ASSERT_EQ(kAllowedGrowth, test_helper_.GetCachedOriginUsage());
@@ -310,7 +305,7 @@ TEST_F(FileWriterDelegateTest, WriteZeroBytesSuccessfullyWithZeroQuota) {
EXPECT_EQ(kAllowedGrowth, result_->bytes_written());
EXPECT_EQ(base::PLATFORM_FILE_OK, result_->status());
- EXPECT_TRUE(result_->complete());
+ ASSERT_EQ(FileWriterDelegate::SUCCESS_COMPLETED, result_->write_status());
}
#if defined(OS_WIN)
@@ -352,11 +347,12 @@ TEST_F(FileWriterDelegateTest, MAYBE_WriteSuccessWithoutQuotaLimitConcurrent) {
file_writer_delegate_->Start(request_.Pass());
file_writer_delegate2->Start(request2.Pass());
MessageLoop::current()->Run();
- if (!result_->complete() || !result2->complete())
+ if (result_->write_status() == FileWriterDelegate::SUCCESS_IO_PENDING ||
+ result2->write_status() == FileWriterDelegate::SUCCESS_IO_PENDING)
MessageLoop::current()->Run();
- ASSERT_TRUE(result_->complete());
- ASSERT_TRUE(result2->complete());
+ ASSERT_EQ(FileWriterDelegate::SUCCESS_COMPLETED, result_->write_status());
+ ASSERT_EQ(FileWriterDelegate::SUCCESS_COMPLETED, result2->write_status());
file_writer_delegate_.reset();
file_writer_delegate2.reset();
@@ -391,7 +387,7 @@ TEST_F(FileWriterDelegateTest, MAYBE_WritesWithQuotaAndOffset) {
ASSERT_EQ(0, test_helper_.GetCachedOriginUsage());
file_writer_delegate_->Start(request_.Pass());
MessageLoop::current()->Run();
- ASSERT_TRUE(result_->complete());
+ ASSERT_EQ(FileWriterDelegate::SUCCESS_COMPLETED, result_->write_status());
file_writer_delegate_.reset();
ASSERT_EQ(kDataSize, test_helper_.GetCachedOriginUsage());
@@ -410,7 +406,7 @@ TEST_F(FileWriterDelegateTest, MAYBE_WritesWithQuotaAndOffset) {
EXPECT_EQ(ComputeCurrentOriginUsage(), test_helper_.GetCachedOriginUsage());
EXPECT_EQ(kDataSize, result_->bytes_written());
EXPECT_EQ(base::PLATFORM_FILE_OK, result_->status());
- EXPECT_TRUE(result_->complete());
+ ASSERT_EQ(FileWriterDelegate::SUCCESS_COMPLETED, result_->write_status());
// Trying to write kDataSize bytes data from offset 25 while
// allowed_growth is 55.
@@ -420,7 +416,7 @@ TEST_F(FileWriterDelegateTest, MAYBE_WritesWithQuotaAndOffset) {
file_writer_delegate_->Start(request_.Pass());
MessageLoop::current()->Run();
- ASSERT_TRUE(result_->complete());
+ ASSERT_EQ(FileWriterDelegate::SUCCESS_COMPLETED, result_->write_status());
file_writer_delegate_.reset();
EXPECT_EQ(offset + kDataSize, test_helper_.GetCachedOriginUsage());
@@ -436,7 +432,7 @@ TEST_F(FileWriterDelegateTest, MAYBE_WritesWithQuotaAndOffset) {
int64 pre_write_usage = ComputeCurrentOriginUsage();
file_writer_delegate_->Start(request_.Pass());
MessageLoop::current()->Run();
- ASSERT_TRUE(result_->complete());
+ ASSERT_EQ(FileWriterDelegate::SUCCESS_COMPLETED, result_->write_status());
file_writer_delegate_.reset();
EXPECT_EQ(pre_write_usage, test_helper_.GetCachedOriginUsage());
@@ -453,7 +449,7 @@ TEST_F(FileWriterDelegateTest, MAYBE_WritesWithQuotaAndOffset) {
file_writer_delegate_->Start(request_.Pass());
MessageLoop::current()->Run();
- ASSERT_TRUE(result_->complete());
+ ASSERT_EQ(FileWriterDelegate::SUCCESS_COMPLETED, result_->write_status());
file_writer_delegate_.reset();
EXPECT_EQ(pre_write_usage + allowed_growth,
« no previous file with comments | « webkit/fileapi/file_writer_delegate.cc ('k') | webkit/fileapi/local_file_system_operation.h » ('j') | webkit/fileapi/local_file_system_operation.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698