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

Unified Diff: chrome/browser/chromeos/drive/file_system/operation_test_base.h

Issue 15972002: Add MoveOperationTest for drive::file_system::MoveOperationTest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: I'm stupid Created 7 years, 7 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/operation_test_base.h
diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.h b/chrome/browser/chromeos/drive/file_system/operation_test_base.h
index e16a753e970136852271939e1d7651cd4401155a..4fbe5cf53de7d2f09f13bd6bcd9b7876d11cbd14 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h
+++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.h
@@ -5,8 +5,11 @@
#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
+#include <set>
+
#include "base/files/scoped_temp_dir.h"
#include "base/message_loop.h"
+#include "chrome/browser/chromeos/drive/drive.pb.h"
#include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
#include "chrome/browser/chromeos/drive/test_util.h"
#include "content/public/test/test_browser_thread.h"
@@ -39,10 +42,23 @@ namespace file_system {
// FakeDriveService for testing.
class OperationTestBase : public testing::Test {
protected:
- class DummyObserver : public OperationObserver {
+ // OperationObserver that records all the events.
+ class LoggingObserver : public OperationObserver {
+ public:
+ LoggingObserver();
+ ~LoggingObserver();
+
+ // OperationObserver overrides.
virtual void OnDirectoryChangedByOperation(
- const base::FilePath& path) OVERRIDE {
+ const base::FilePath& path) OVERRIDE;
+
+ // Gets the set of changed paths.
+ const std::set<base::FilePath>& get_changed_paths() {
+ return changed_paths_;
}
+
+ private:
+ std::set<base::FilePath> changed_paths_;
};
OperationTestBase();
@@ -52,10 +68,16 @@ class OperationTestBase : public testing::Test {
virtual void SetUp() OVERRIDE;
virtual void TearDown() OVERRIDE;
+ // Synchronously gets the resource entry corresponding to the path from local
+ // ResourceMetadta.
+ FileError GetLocalResourceEntry(const base::FilePath& path,
+ ResourceEntry* entry);
+
+ // Accessors for the components.
google_apis::FakeDriveService* fake_service() {
return fake_drive_service_.get();
}
- DummyObserver* dummy_observer() { return &dummy_observer_; }
+ LoggingObserver* observer() { return &observer_; }
JobScheduler* scheduler() { return scheduler_.get(); }
base::SequencedTaskRunner* blocking_task_runner() {
return blocking_task_runner_;
@@ -70,7 +92,7 @@ class OperationTestBase : public testing::Test {
scoped_ptr<TestingProfile> profile_;
base::ScopedTempDir temp_dir_;
- DummyObserver dummy_observer_;
+ LoggingObserver observer_;
scoped_ptr<google_apis::FakeDriveService> fake_drive_service_;
scoped_ptr<JobScheduler> scheduler_;
scoped_ptr<internal::ResourceMetadata, test_util::DestroyHelperForTests>

Powered by Google App Engine
This is Rietveld 408576698