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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc

Issue 11421125: Implement polling part of DriveFileSyncService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: s/NotifyRemoteChangeAvailable/NotifyRemoteChangeQueueUpdated/ Created 8 years 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
« chrome/browser/sync_file_system/drive_file_sync_service.cc ('K') | « chrome/browser/sync_file_system/drive_file_sync_service.cc ('k') | chrome/browser/sync_file_system/mock_remote_file_sync_service.h » ('j') | chrome/browser/sync_file_system/sync_file_system_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc b/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc
index 2c57239758cb7ccf1a9c62316e502c5d84b5d860..19a4338f19ccd478d59583983504d063ecfa3820 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service_unittest.cc
@@ -74,7 +74,7 @@ class MockRemoteServiceObserver : public RemoteFileSyncService::Observer {
virtual ~MockRemoteServiceObserver() {}
// LocalChangeProcessor override.
- MOCK_METHOD1(OnRemoteChangeAvailable,
+ MOCK_METHOD1(OnRemoteChangeQueueUpdated,
void(int64 pending_changes));
MOCK_METHOD2(OnRemoteServiceStateUpdated,
void(RemoteServiceState state,
@@ -98,6 +98,7 @@ class DriveFileSyncServiceTest : public testing::Test {
sync_client_ = DriveFileSyncClient::CreateForTesting(
&profile_,
+ GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),
scoped_ptr<DriveServiceInterface>(mock_drive_service_),
scoped_ptr<DriveUploaderInterface>()).Pass();
ASSERT_TRUE(base_dir_.CreateUniqueTempDir());
@@ -258,7 +259,7 @@ class DriveFileSyncServiceTest : public testing::Test {
}
void AppendIncrementalRemoteChange(const GURL& origin,
- google_apis::DocumentEntry* entry,
+ const google_apis::DocumentEntry& entry,
int64 changestamp) {
sync_service_->AppendNewRemoteChange(
origin, entry, changestamp,
@@ -371,7 +372,7 @@ TEST_F(DriveFileSyncServiceTest, GetSyncRoot) {
EXPECT_CALL(*mock_remote_observer(),
OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
.Times(1);
- EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(0))
+ EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(0))
.Times(AnyNumber());
SetUpDriveSyncService();
@@ -399,8 +400,7 @@ TEST_F(DriveFileSyncServiceTest, BatchSyncOnInitialization) {
metadata_store()->AddBatchSyncOrigin(kOrigin2, kDirectoryResourceId2);
metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin2);
- EXPECT_CALL(*mock_remote_observer(),
- OnRemoteChangeAvailable(4))
+ EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(4))
.Times(AnyNumber());
InSequence sequence;
@@ -449,7 +449,7 @@ TEST_F(DriveFileSyncServiceTest, RegisterNewOrigin) {
EXPECT_CALL(*mock_remote_observer(),
OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
.Times(AtLeast(1));
- EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(0))
+ EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(0))
.Times(AnyNumber());
InSequence sequence;
@@ -530,7 +530,7 @@ TEST_F(DriveFileSyncServiceTest, RegisterExistingOrigin) {
EXPECT_CALL(*mock_remote_observer(),
OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
.Times(AtLeast(1));
- EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(4))
+ EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
.Times(AnyNumber());
InSequence sequence;
@@ -596,7 +596,7 @@ TEST_F(DriveFileSyncServiceTest, UnregisterOrigin) {
EXPECT_CALL(*mock_remote_observer(),
OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
.Times(AtLeast(1));
- EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
+ EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
.Times(AnyNumber());
InSequence sequence;
@@ -656,6 +656,8 @@ TEST_F(DriveFileSyncServiceTest, ResolveSyncOperationType) {
EXPECT_CALL(*mock_remote_observer(),
OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
.Times(1);
+ EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
+ .Times(AnyNumber());
SetUpDriveSyncService();
message_loop()->RunUntilIdle();
@@ -722,7 +724,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_NoChange) {
EXPECT_CALL(*mock_remote_observer(),
OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
+ EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
.Times(AnyNumber());
SetUpDriveSyncService();
@@ -748,7 +750,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_Busy) {
EXPECT_CALL(*mock_remote_observer(),
OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
+ EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
.Times(AnyNumber());
EXPECT_CALL(*mock_remote_processor(),
@@ -759,7 +761,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_Busy) {
scoped_ptr<DocumentEntry> entry(DocumentEntry::ExtractAndParse(
*LoadJSONFile("gdata/file_entry.json")));
- AppendIncrementalRemoteChange(kOrigin, entry.get(), 12345);
+ AppendIncrementalRemoteChange(kOrigin, *entry, 12345);
ProcessRemoteChange(fileapi::SYNC_STATUS_FILE_BUSY,
CreateURL(kOrigin, kFileName),
@@ -780,7 +782,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_NewFile) {
EXPECT_CALL(*mock_remote_observer(),
OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
+ EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
.Times(AnyNumber());
EXPECT_CALL(*mock_remote_processor(),
@@ -805,7 +807,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_NewFile) {
scoped_ptr<DocumentEntry> entry(DocumentEntry::ExtractAndParse(
*LoadJSONFile("gdata/file_entry.json")));
- AppendIncrementalRemoteChange(kOrigin, entry.get(), 12345);
+ AppendIncrementalRemoteChange(kOrigin, *entry, 12345);
ProcessRemoteChange(fileapi::SYNC_STATUS_OK,
CreateURL(kOrigin, kFileName),
@@ -826,7 +828,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_UpdateFile) {
EXPECT_CALL(*mock_remote_observer(),
OnRemoteServiceStateUpdated(REMOTE_SERVICE_OK, _))
.Times(AnyNumber());
- EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeAvailable(_))
+ EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
.Times(AnyNumber());
EXPECT_CALL(*mock_remote_processor(),
@@ -851,7 +853,7 @@ TEST_F(DriveFileSyncServiceTest, RemoteChange_UpdateFile) {
scoped_ptr<DocumentEntry> entry(DocumentEntry::ExtractAndParse(
*LoadJSONFile("gdata/file_entry.json")));
- AppendIncrementalRemoteChange(kOrigin, entry.get(), 12345);
+ AppendIncrementalRemoteChange(kOrigin, *entry, 12345);
ProcessRemoteChange(fileapi::SYNC_STATUS_OK,
CreateURL(kOrigin, kFileName),
fileapi::SYNC_OPERATION_UPDATE);
« chrome/browser/sync_file_system/drive_file_sync_service.cc ('K') | « chrome/browser/sync_file_system/drive_file_sync_service.cc ('k') | chrome/browser/sync_file_system/mock_remote_file_sync_service.h » ('j') | chrome/browser/sync_file_system/sync_file_system_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698