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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 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
« no previous file with comments | « chrome/browser/sync/profile_sync_service_autofill_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_harness.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
index 28253c90c297592a497a8f5c9c5c8c7d23f0b082..21ae983c5f5cf7882ee50d6b801a679869988f4c 100644
--- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
@@ -44,7 +44,7 @@
namespace browser_sync {
using content::BrowserThread;
-using csync::BaseNode;
+using syncer::BaseNode;
using testing::_;
using testing::InvokeWithoutArgs;
using testing::Mock;
@@ -54,7 +54,7 @@ class TestBookmarkModelAssociator : public BookmarkModelAssociator {
public:
TestBookmarkModelAssociator(
BookmarkModel* bookmark_model,
- csync::UserShare* user_share,
+ syncer::UserShare* user_share,
DataTypeErrorHandler* error_handler)
: BookmarkModelAssociator(bookmark_model, user_share,
error_handler,
@@ -69,11 +69,11 @@ class TestBookmarkModelAssociator : public BookmarkModelAssociator {
bool root_exists = false;
syncable::ModelType type = model_type();
{
- csync::WriteTransaction trans(FROM_HERE, user_share_);
- csync::ReadNode uber_root(&trans);
+ syncer::WriteTransaction trans(FROM_HERE, user_share_);
+ syncer::ReadNode uber_root(&trans);
uber_root.InitByRootLookup();
- csync::ReadNode root(&trans);
+ syncer::ReadNode root(&trans);
root_exists = root.InitByTagLookup(
ProfileSyncServiceTestHelper::GetTagForType(type)) ==
BaseNode::INIT_OK;
@@ -88,17 +88,17 @@ class TestBookmarkModelAssociator : public BookmarkModelAssociator {
return false;
}
- csync::WriteTransaction trans(FROM_HERE, user_share_);
- csync::ReadNode root(&trans);
+ syncer::WriteTransaction trans(FROM_HERE, user_share_);
+ syncer::ReadNode root(&trans);
EXPECT_EQ(BaseNode::INIT_OK, root.InitByTagLookup(
ProfileSyncServiceTestHelper::GetTagForType(type)));
// First, try to find a node with the title among the root's children.
// This will be the case if we are testing model persistence, and
// are reloading a sync repository created earlier in the test.
- int64 last_child_id = csync::kInvalidId;
- for (int64 id = root.GetFirstChildId(); id != csync::kInvalidId; /***/) {
- csync::ReadNode child(&trans);
+ int64 last_child_id = syncer::kInvalidId;
+ for (int64 id = root.GetFirstChildId(); id != syncer::kInvalidId; /***/) {
+ syncer::ReadNode child(&trans);
EXPECT_EQ(BaseNode::INIT_OK, child.InitByIdLookup(id));
last_child_id = id;
if (tag_str == child.GetTitle()) {
@@ -108,14 +108,14 @@ class TestBookmarkModelAssociator : public BookmarkModelAssociator {
id = child.GetSuccessorId();
}
- csync::ReadNode predecessor_node(&trans);
- csync::ReadNode* predecessor = NULL;
- if (last_child_id != csync::kInvalidId) {
+ syncer::ReadNode predecessor_node(&trans);
+ syncer::ReadNode* predecessor = NULL;
+ if (last_child_id != syncer::kInvalidId) {
EXPECT_EQ(BaseNode::INIT_OK,
predecessor_node.InitByIdLookup(last_child_id));
predecessor = &predecessor_node;
}
- csync::WriteNode node(&trans);
+ syncer::WriteNode node(&trans);
// Create new fake tagged nodes at the end of the ordering.
node.InitByCreation(type, root, predecessor);
node.SetIsFolder(true);
@@ -127,21 +127,21 @@ class TestBookmarkModelAssociator : public BookmarkModelAssociator {
}
private:
- csync::UserShare* user_share_;
- csync::TestIdFactory id_factory_;
+ syncer::UserShare* user_share_;
+ syncer::TestIdFactory id_factory_;
};
namespace {
-// FakeServerChange constructs a list of csync::ChangeRecords while modifying
+// FakeServerChange constructs a list of syncer::ChangeRecords while modifying
// the sync model, and can pass the ChangeRecord list to a
-// csync::SyncObserver (i.e., the ProfileSyncService) to test the client
+// syncer::SyncObserver (i.e., the ProfileSyncService) to test the client
// change-application behavior.
// Tests using FakeServerChange should be careful to avoid back-references,
// since FakeServerChange will send the edits in the order specified.
class FakeServerChange {
public:
- explicit FakeServerChange(csync::WriteTransaction* trans) : trans_(trans) {
+ explicit FakeServerChange(syncer::WriteTransaction* trans) : trans_(trans) {
}
// Pretend that the server told the syncer to add a bookmark object.
@@ -150,13 +150,13 @@ class FakeServerChange {
bool is_folder,
int64 parent_id,
int64 predecessor_id) {
- csync::ReadNode parent(trans_);
+ syncer::ReadNode parent(trans_);
EXPECT_EQ(BaseNode::INIT_OK, parent.InitByIdLookup(parent_id));
- csync::WriteNode node(trans_);
+ syncer::WriteNode node(trans_);
if (predecessor_id == 0) {
EXPECT_TRUE(node.InitByCreation(syncable::BOOKMARKS, parent, NULL));
} else {
- csync::ReadNode predecessor(trans_);
+ syncer::ReadNode predecessor(trans_);
EXPECT_EQ(BaseNode::INIT_OK, predecessor.InitByIdLookup(predecessor_id));
EXPECT_EQ(predecessor.GetParentId(), parent.GetId());
EXPECT_TRUE(node.InitByCreation(syncable::BOOKMARKS, parent,
@@ -168,8 +168,8 @@ class FakeServerChange {
node.SetTitle(title);
if (!is_folder)
node.SetURL(GURL(url));
- csync::ChangeRecord record;
- record.action = csync::ChangeRecord::ACTION_ADD;
+ syncer::ChangeRecord record;
+ record.action = syncer::ChangeRecord::ACTION_ADD;
record.id = node.GetId();
changes_.push_back(record);
return node.GetId();
@@ -194,19 +194,19 @@ class FakeServerChange {
void Delete(int64 id) {
{
// Delete the sync node.
- csync::WriteNode node(trans_);
+ syncer::WriteNode node(trans_);
EXPECT_EQ(BaseNode::INIT_OK, node.InitByIdLookup(id));
EXPECT_FALSE(node.GetFirstChildId());
node.Remove();
}
{
// Verify the deletion.
- csync::ReadNode node(trans_);
+ syncer::ReadNode node(trans_);
EXPECT_EQ(BaseNode::INIT_FAILED_ENTRY_IS_DEL, node.InitByIdLookup(id));
}
- csync::ChangeRecord record;
- record.action = csync::ChangeRecord::ACTION_DELETE;
+ syncer::ChangeRecord record;
+ record.action = syncer::ChangeRecord::ACTION_DELETE;
record.id = id;
// Deletions are always first in the changelist, but we can't actually do
// WriteNode::Remove() on the node until its children are moved. So, as
@@ -218,7 +218,7 @@ class FakeServerChange {
// Set a new title value, and return the old value.
std::wstring ModifyTitle(int64 id, const std::wstring& new_title) {
- csync::WriteNode node(trans_);
+ syncer::WriteNode node(trans_);
EXPECT_EQ(BaseNode::INIT_OK, node.InitByIdLookup(id));
std::string old_title = node.GetTitle();
node.SetTitle(new_title);
@@ -230,15 +230,15 @@ class FakeServerChange {
// We could return the old predecessor id, but it turns out not to be
// very useful for assertions.
int64 ModifyPosition(int64 id, int64 parent_id, int64 predecessor_id) {
- csync::ReadNode parent(trans_);
+ syncer::ReadNode parent(trans_);
EXPECT_EQ(BaseNode::INIT_OK, parent.InitByIdLookup(parent_id));
- csync::WriteNode node(trans_);
+ syncer::WriteNode node(trans_);
EXPECT_EQ(BaseNode::INIT_OK, node.InitByIdLookup(id));
int64 old_parent_id = node.GetParentId();
if (predecessor_id == 0) {
EXPECT_TRUE(node.SetPosition(parent, NULL));
} else {
- csync::ReadNode predecessor(trans_);
+ syncer::ReadNode predecessor(trans_);
EXPECT_EQ(BaseNode::INIT_OK, predecessor.InitByIdLookup(predecessor_id));
EXPECT_EQ(predecessor.GetParentId(), parent.GetId());
EXPECT_TRUE(node.SetPosition(parent, &predecessor));
@@ -250,10 +250,10 @@ class FakeServerChange {
// Pass the fake change list to |service|.
void ApplyPendingChanges(ChangeProcessor* processor) {
processor->ApplyChangesFromSyncModel(
- trans_, csync::ImmutableChangeRecordList(&changes_));
+ trans_, syncer::ImmutableChangeRecordList(&changes_));
}
- const csync::ChangeRecordList& changes() {
+ const syncer::ChangeRecordList& changes() {
return changes_;
}
@@ -264,19 +264,19 @@ class FakeServerChange {
// Coalesce multi-property edits.
if (!changes_.empty() && changes_.back().id == id &&
changes_.back().action ==
- csync::ChangeRecord::ACTION_UPDATE)
+ syncer::ChangeRecord::ACTION_UPDATE)
return;
- csync::ChangeRecord record;
- record.action = csync::ChangeRecord::ACTION_UPDATE;
+ syncer::ChangeRecord record;
+ record.action = syncer::ChangeRecord::ACTION_UPDATE;
record.id = id;
changes_.push_back(record);
}
// The transaction on which everything happens.
- csync::WriteTransaction *trans_;
+ syncer::WriteTransaction *trans_;
// The change list we construct.
- csync::ChangeRecordList changes_;
+ syncer::ChangeRecordList changes_;
};
class ExtensiveChangesBookmarkModelObserver : public BaseBookmarkModelObserver {
@@ -364,7 +364,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
profile_.GetBookmarkModel(),
test_user_share_.user_share(),
&mock_error_handler_));
- csync::SyncError error = model_associator_->AssociateModels();
+ syncer::SyncError error = model_associator_->AssociateModels();
EXPECT_FALSE(error.IsSet());
MessageLoop::current()->RunAllPending();
@@ -378,7 +378,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
void StopSync() {
change_processor_->Stop();
change_processor_.reset();
- csync::SyncError error = model_associator_->DisassociateModels();
+ syncer::SyncError error = model_associator_->DisassociateModels();
EXPECT_FALSE(error.IsSet());
model_associator_.reset();
@@ -396,14 +396,14 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
}
bool InitSyncNodeFromChromeNode(const BookmarkNode* bnode,
- csync::BaseNode* sync_node) {
+ syncer::BaseNode* sync_node) {
return model_associator_->InitSyncNodeFromChromeId(bnode->id(),
sync_node);
}
- void ExpectSyncerNodeMatching(csync::BaseTransaction* trans,
+ void ExpectSyncerNodeMatching(syncer::BaseTransaction* trans,
const BookmarkNode* bnode) {
- csync::ReadNode gnode(trans);
+ syncer::ReadNode gnode(trans);
ASSERT_TRUE(InitSyncNodeFromChromeNode(bnode, &gnode));
// Non-root node titles and parents must match.
if (!model_->is_permanent_node(bnode)) {
@@ -423,7 +423,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
} else {
const BookmarkNode* bprev =
bnode->parent()->GetChild(browser_index - 1);
- csync::ReadNode gprev(trans);
+ syncer::ReadNode gprev(trans);
ASSERT_TRUE(InitSyncNodeFromChromeNode(bprev, &gprev));
EXPECT_EQ(gnode.GetPredecessorId(), gprev.GetId());
EXPECT_EQ(gnode.GetParentId(), gprev.GetParentId());
@@ -433,7 +433,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
} else {
const BookmarkNode* bnext =
bnode->parent()->GetChild(browser_index + 1);
- csync::ReadNode gnext(trans);
+ syncer::ReadNode gnext(trans);
ASSERT_TRUE(InitSyncNodeFromChromeNode(bnext, &gnext));
EXPECT_EQ(gnode.GetSuccessorId(), gnext.GetId());
EXPECT_EQ(gnode.GetParentId(), gnext.GetParentId());
@@ -443,11 +443,11 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
}
void ExpectSyncerNodeMatching(const BookmarkNode* bnode) {
- csync::ReadTransaction trans(FROM_HERE, test_user_share_.user_share());
+ syncer::ReadTransaction trans(FROM_HERE, test_user_share_.user_share());
ExpectSyncerNodeMatching(&trans, bnode);
}
- void ExpectBrowserNodeMatching(csync::BaseTransaction* trans,
+ void ExpectBrowserNodeMatching(syncer::BaseTransaction* trans,
int64 sync_id) {
EXPECT_TRUE(sync_id);
const BookmarkNode* bnode =
@@ -468,12 +468,12 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
void ExpectSyncerNodeKnown(const BookmarkNode* node) {
int64 sync_id = model_associator_->GetSyncIdFromChromeId(node->id());
- EXPECT_NE(sync_id, csync::kInvalidId);
+ EXPECT_NE(sync_id, syncer::kInvalidId);
}
void ExpectSyncerNodeUnknown(const BookmarkNode* node) {
int64 sync_id = model_associator_->GetSyncIdFromChromeId(node->id());
- EXPECT_EQ(sync_id, csync::kInvalidId);
+ EXPECT_EQ(sync_id, syncer::kInvalidId);
}
void ExpectBrowserNodeTitle(int64 sync_id, const std::wstring& title) {
@@ -500,7 +500,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
EXPECT_EQ(node->parent(), parent);
}
- void ExpectModelMatch(csync::BaseTransaction* trans) {
+ void ExpectModelMatch(syncer::BaseTransaction* trans) {
const BookmarkNode* root = model_->root_node();
EXPECT_EQ(root->GetIndexOf(model_->bookmark_bar_node()), 0);
EXPECT_EQ(root->GetIndexOf(model_->other_node()), 1);
@@ -515,7 +515,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
ExpectBrowserNodeMatching(trans, id);
- csync::ReadNode gnode(trans);
+ syncer::ReadNode gnode(trans);
ASSERT_EQ(BaseNode::INIT_OK, gnode.InitByIdLookup(id));
stack.push(gnode.GetFirstChildId());
stack.push(gnode.GetSuccessorId());
@@ -523,7 +523,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
}
void ExpectModelMatch() {
- csync::ReadTransaction trans(FROM_HERE, test_user_share_.user_share());
+ syncer::ReadTransaction trans(FROM_HERE, test_user_share_.user_share());
ExpectModelMatch(&trans);
}
@@ -554,7 +554,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
protected:
BookmarkModel* model_;
- csync::TestUserShare test_user_share_;
+ syncer::TestUserShare test_user_share_;
scoped_ptr<BookmarkChangeProcessor> change_processor_;
StrictMock<DataTypeErrorHandlerMock> mock_error_handler_;
};
@@ -632,7 +632,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, ServerChangeProcessing) {
LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
StartSync();
- csync::WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
+ syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
FakeServerChange adds(&trans);
int64 f1 = adds.AddFolder(L"Server Folder B", bookmark_bar_id(), 0);
@@ -655,7 +655,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, ServerChangeProcessing) {
int64 u6 = adds.AddURL(L"Sync1", "http://www.syncable.edu/",
mobile_bookmarks_id(), 0);
- csync::ChangeRecordList::const_iterator it;
+ syncer::ChangeRecordList::const_iterator it;
// The bookmark model shouldn't yet have seen any of the nodes of |adds|.
for (it = adds.changes().begin(); it != adds.changes().end(); ++it)
ExpectBrowserNodeUnknown(it->id);
@@ -729,7 +729,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, ServerChangeRequiringFosterParent) {
LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
StartSync();
- csync::WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
+ syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
// Stress the immediate children of other_node because that's where
// ApplyModelChanges puts a temporary foster parent node.
@@ -744,7 +744,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, ServerChangeRequiringFosterParent) {
int64 f6 = adds.AddFolder(L"f6", f1, u5); // + f6
int64 u7 = adds.AddURL( L"u7", url, f0, f1); // + u7 NOLINT
- csync::ChangeRecordList::const_iterator it;
+ syncer::ChangeRecordList::const_iterator it;
// The bookmark model shouldn't yet have seen any of the nodes of |adds|.
for (it = adds.changes().begin(); it != adds.changes().end(); ++it)
ExpectBrowserNodeUnknown(it->id);
@@ -778,7 +778,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, ServerChangeWithNonCanonicalURL) {
StartSync();
{
- csync::WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
+ syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
FakeServerChange adds(&trans);
std::string url("http://dev.chromium.org");
@@ -809,7 +809,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, DISABLED_ServerChangeWithInvalidURL) {
int child_count = 0;
{
- csync::WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
+ syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
FakeServerChange adds(&trans);
std::string url("x");
@@ -926,8 +926,8 @@ TEST_F(ProfileSyncServiceBookmarkTest, UnrecoverableErrorSuspendsService) {
// updating the ProfileSyncService state. This should introduce
// inconsistency between the two models.
{
- csync::WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
- csync::WriteNode sync_node(&trans);
+ syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
+ syncer::WriteNode sync_node(&trans);
ASSERT_TRUE(InitSyncNodeFromChromeNode(node, &sync_node));
sync_node.Remove();
}
« no previous file with comments | « chrome/browser/sync/profile_sync_service_autofill_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_harness.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698