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

Side by Side Diff: chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comments Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 EXPECT_CALL(model_load_callback_, Run(_, _)); 83 EXPECT_CALL(model_load_callback_, Run(_, _));
84 } 84 }
85 85
86 void SetAssociateExpectations() { 86 void SetAssociateExpectations() {
87 EXPECT_CALL(*model_associator_, CryptoReadyIfNecessary()). 87 EXPECT_CALL(*model_associator_, CryptoReadyIfNecessary()).
88 WillRepeatedly(Return(true)); 88 WillRepeatedly(Return(true));
89 EXPECT_CALL(*profile_sync_factory_, CreateBookmarkSyncComponents(_, _)); 89 EXPECT_CALL(*profile_sync_factory_, CreateBookmarkSyncComponents(_, _));
90 EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)). 90 EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
91 WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true))); 91 WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
92 EXPECT_CALL(*model_associator_, AssociateModels()). 92 EXPECT_CALL(*model_associator_, AssociateModels()).
93 WillRepeatedly(Return(SyncError())); 93 WillRepeatedly(Return(csync::SyncError()));
94 EXPECT_CALL(service_, ActivateDataType(_, _, _)); 94 EXPECT_CALL(service_, ActivateDataType(_, _, _));
95 } 95 }
96 96
97 void SetStopExpectations() { 97 void SetStopExpectations() {
98 EXPECT_CALL(service_, DeactivateDataType(_)); 98 EXPECT_CALL(service_, DeactivateDataType(_));
99 EXPECT_CALL(*model_associator_, DisassociateModels()). 99 EXPECT_CALL(*model_associator_, DisassociateModels()).
100 WillOnce(Return(SyncError())); 100 WillOnce(Return(csync::SyncError()));
101 } 101 }
102 102
103 void Start() { 103 void Start() {
104 bookmark_dtc_->LoadModels( 104 bookmark_dtc_->LoadModels(
105 base::Bind(&ModelLoadCallbackMock::Run, 105 base::Bind(&ModelLoadCallbackMock::Run,
106 base::Unretained(&model_load_callback_))); 106 base::Unretained(&model_load_callback_)));
107 bookmark_dtc_->StartAssociating( 107 bookmark_dtc_->StartAssociating(
108 base::Bind(&StartCallbackMock::Run, 108 base::Bind(&StartCallbackMock::Run,
109 base::Unretained(&start_callback_))); 109 base::Unretained(&start_callback_)));
110 } 110 }
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 220
221 TEST_F(SyncBookmarkDataTypeControllerTest, StartAssociationFailed) { 221 TEST_F(SyncBookmarkDataTypeControllerTest, StartAssociationFailed) {
222 SetStartExpectations(); 222 SetStartExpectations();
223 // Set up association to fail. 223 // Set up association to fail.
224 EXPECT_CALL(*profile_sync_factory_, CreateBookmarkSyncComponents(_, _)); 224 EXPECT_CALL(*profile_sync_factory_, CreateBookmarkSyncComponents(_, _));
225 EXPECT_CALL(*model_associator_, CryptoReadyIfNecessary()). 225 EXPECT_CALL(*model_associator_, CryptoReadyIfNecessary()).
226 WillRepeatedly(Return(true)); 226 WillRepeatedly(Return(true));
227 EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)). 227 EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
228 WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true))); 228 WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
229 EXPECT_CALL(*model_associator_, AssociateModels()). 229 EXPECT_CALL(*model_associator_, AssociateModels()).
230 WillRepeatedly(Return(SyncError(FROM_HERE, 230 WillRepeatedly(Return(csync::SyncError(FROM_HERE,
231 "error", 231 "error",
232 syncable::BOOKMARKS))); 232 syncable::BOOKMARKS)));
233 233
234 EXPECT_CALL(start_callback_, 234 EXPECT_CALL(start_callback_,
235 Run(DataTypeController::ASSOCIATION_FAILED, _)); 235 Run(DataTypeController::ASSOCIATION_FAILED, _));
236 Start(); 236 Start();
237 EXPECT_EQ(DataTypeController::DISABLED, bookmark_dtc_->state()); 237 EXPECT_EQ(DataTypeController::DISABLED, bookmark_dtc_->state());
238 } 238 }
239 239
240 TEST_F(SyncBookmarkDataTypeControllerTest, 240 TEST_F(SyncBookmarkDataTypeControllerTest,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 WillOnce(InvokeWithoutArgs(bookmark_dtc_.get(), 288 WillOnce(InvokeWithoutArgs(bookmark_dtc_.get(),
289 &BookmarkDataTypeController::Stop)); 289 &BookmarkDataTypeController::Stop));
290 SetStopExpectations(); 290 SetStopExpectations();
291 291
292 EXPECT_CALL(start_callback_, Run(DataTypeController::OK, _)); 292 EXPECT_CALL(start_callback_, Run(DataTypeController::OK, _));
293 Start(); 293 Start();
294 // This should cause bookmark_dtc_->Stop() to be called. 294 // This should cause bookmark_dtc_->Stop() to be called.
295 bookmark_dtc_->OnSingleDatatypeUnrecoverableError(FROM_HERE, "Test"); 295 bookmark_dtc_->OnSingleDatatypeUnrecoverableError(FROM_HERE, "Test");
296 PumpLoop(); 296 PumpLoop();
297 } 297 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698