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

Unified Diff: chrome/browser/chromeos/drive/file_system_unittest.cc

Issue 343073003: Files.app: Provide detailed change information on onDirectoryChanged event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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
Index: chrome/browser/chromeos/drive/file_system_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc
index 74e26b54a1154b66cff6165796d8936e442a2077..0ff8ccd7dc336546a1016b11f6f1d0be1cba4f7f 100644
--- a/chrome/browser/chromeos/drive/file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_unittest.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/chromeos/drive/change_list_loader.h"
#include "chrome/browser/chromeos/drive/drive.pb.h"
#include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
+#include "chrome/browser/chromeos/drive/file_change.h"
#include "chrome/browser/chromeos/drive/file_system_observer.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/chromeos/drive/job_scheduler.h"
@@ -65,12 +66,19 @@ class MockDirectoryChangeObserver : public FileSystemObserver {
changed_directories_.push_back(directory_path);
}
+ virtual void OnFileChanged(const FileChange& new_file_change) OVERRIDE {
+ changed_files_.Apply(new_file_change);
+ }
+
const std::vector<base::FilePath>& changed_directories() const {
return changed_directories_;
}
+ const FileChange& changed_files() const { return changed_files_; }
+
private:
std::vector<base::FilePath> changed_directories_;
+ FileChange changed_files_;
DISALLOW_COPY_AND_ASSIGN(MockDirectoryChangeObserver);
};
@@ -705,7 +713,8 @@ TEST_F(FileSystemTest, LoadFileSystemFromCacheWhileOffline) {
EXPECT_EQ(1, fake_drive_service_->about_resource_load_count());
EXPECT_EQ(1, fake_drive_service_->change_list_load_count());
- ASSERT_LE(1u, mock_directory_observer_->changed_directories().size());
+ ASSERT_LE(0u, mock_directory_observer_->changed_directories().size());
+ ASSERT_LE(1u, mock_directory_observer_->changed_files().size());
}
TEST_F(FileSystemTest, ReadDirectoryWhileRefreshing) {
@@ -804,9 +813,11 @@ TEST_F(FileSystemTest, PinAndUnpin) {
EXPECT_FALSE(entry->file_specific_info().cache_state().is_pinned());
// Pinned file gets synced and it results in entry state changes.
- ASSERT_EQ(1u, mock_directory_observer_->changed_directories().size());
- EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("drive/root")),
- mock_directory_observer_->changed_directories()[0]);
+ ASSERT_EQ(0u, mock_directory_observer_->changed_directories().size());
+ ASSERT_EQ(1u, mock_directory_observer_->changed_files().size());
+ EXPECT_EQ(1u,
+ mock_directory_observer_->changed_files().CountDirectory(
+ base::FilePath(FILE_PATH_LITERAL("drive/root"))));
}
TEST_F(FileSystemTest, PinAndUnpin_NotSynced) {
« no previous file with comments | « chrome/browser/chromeos/drive/file_system_observer.h ('k') | chrome/browser/chromeos/drive/sync/entry_revert_performer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698