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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/engine/syncer_unittest.cc

Issue 8638001: [Sync] Made some sync session member functions const (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix latent bug in StatusController Created 9 years, 1 month 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/engine/syncer_proto_util.cc ('k') | chrome/browser/sync/engine/verify_updates_command.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncer_unittest.cc
diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc
index 2e47dfaf577eca3efafe04ddc977327c4a741012..360c6d2c5bac4c479e7bdc33bfd33cb395eec16f 100644
--- a/chrome/browser/sync/engine/syncer_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_unittest.cc
@@ -213,7 +213,7 @@ class SyncerTest : public testing::Test,
ReadTransaction trans(FROM_HERE, dir);
syncable::Directory::ChildHandles children;
dir->GetChildHandlesById(&trans, trans.root_id(), &children);
- ASSERT_TRUE(0 == children.size());
+ ASSERT_EQ(0u, children.size());
saw_syncer_event_ = false;
root_id_ = TestIdFactory::root();
parent_id_ = ids_.MakeServer("parent id");
@@ -351,7 +351,7 @@ class SyncerTest : public testing::Test,
mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
for (size_t i = 0; i < expected_positions.size(); ++i) {
- EXPECT_TRUE(1 == expected_positions.count(i));
+ EXPECT_EQ(1u, expected_positions.count(i));
EXPECT_TRUE(expected_positions[i] == mock_server_->committed_ids()[i]);
}
}
@@ -361,7 +361,7 @@ class SyncerTest : public testing::Test,
const vector<syncable::Id>& expected_id_order) {
// The expected order is "x", "b", "c", "e", truncated appropriately.
for (size_t limit = expected_id_order.size() + 2; limit > 0; --limit) {
- StatusController* status = session_->status_controller();
+ StatusController* status = session_->mutable_status_controller();
WriteTransaction wtrans(FROM_HERE, UNITTEST, dir);
ScopedSetSessionWriteTransaction set_trans(session_.get(), &wtrans);
status->set_unsynced_handles(unsynced_handle_view);
@@ -369,7 +369,8 @@ class SyncerTest : public testing::Test,
ModelSafeRoutingInfo routes;
GetModelSafeRoutingInfo(&routes);
GetCommitIdsCommand command(limit);
- command.BuildCommitIds(session_->status_controller()->unsynced_handles(),
+ command.BuildCommitIds(
+ session_->status_controller().unsynced_handles(),
session_->write_transaction(), routes);
vector<syncable::Id> output =
command.ordered_commit_set_->GetAllCommitIds();
@@ -509,7 +510,7 @@ TEST_F(SyncerTest, TestCallGatherUnsyncedEntries) {
ReadTransaction trans(FROM_HERE, dir);
SyncerUtil::GetUnsyncedEntries(&trans, &handles);
}
- ASSERT_TRUE(0 == handles.size());
+ ASSERT_EQ(0u, handles.size());
}
// TODO(sync): When we can dynamically connect and disconnect the mock
// ServerConnectionManager test disconnected GetUnsyncedEntries here. It's a
@@ -611,7 +612,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {
{
// We remove any unready entries from the status controller's unsynced
// handles, so this should remain 0 even though the entries didn't commit.
- ASSERT_EQ(0U, session_->status_controller()->unsynced_handles().size());
+ ASSERT_EQ(0U, session_->status_controller().unsynced_handles().size());
// Nothing should have commited due to bookmarks being encrypted and
// the cryptographer having pending keys. A would have been resolved
// as a simple conflict, but still be unsynced until the next sync cycle.
@@ -635,7 +636,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {
}
SyncShareAsDelegate();
{
- ASSERT_EQ(0U, session_->status_controller()->unsynced_handles().size());
+ ASSERT_EQ(0U, session_->status_controller().unsynced_handles().size());
// All properly encrypted and non-conflicting items should commit. "A" was
// conflicting, but last sync cycle resolved it as simple conflict, so on
// this sync cycle it committed succesfullly.
@@ -675,7 +676,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {
}
SyncShareAsDelegate();
{
- ASSERT_EQ(0U, session_->status_controller()->unsynced_handles().size());
+ ASSERT_EQ(0U, session_->status_controller().unsynced_handles().size());
// None should be unsynced anymore.
ReadTransaction rtrans(FROM_HERE, dir);
Entry entryA(&rtrans, syncable::GET_BY_ID, ids_.FromNumber(1));
@@ -701,7 +702,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {
TEST_F(SyncerTest, TestCommitMetahandleIterator) {
ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
ASSERT_TRUE(dir.good());
- StatusController* status = session_->status_controller();
+ StatusController* status = session_->mutable_status_controller();
const vector<int64>& unsynced(status->unsynced_handles());
{
@@ -764,10 +765,10 @@ TEST_F(SyncerTest, TestGetUnsyncedAndSimpleCommit) {
WriteTestDataToEntry(&wtrans, &child);
}
- StatusController* status = session_->status_controller();
+ const StatusController& status = session_->status_controller();
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- EXPECT_TRUE(2 == status->unsynced_handles().size());
- ASSERT_TRUE(2 == mock_server_->committed_ids().size());
+ EXPECT_EQ(2u, status.unsynced_handles().size());
+ ASSERT_EQ(2u, mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
EXPECT_TRUE(parent_id_ == mock_server_->committed_ids()[0]);
EXPECT_TRUE(child_id_ == mock_server_->committed_ids()[1]);
@@ -812,9 +813,9 @@ TEST_F(SyncerTest, TestPurgeWhileUnsynced) {
types_to_purge.insert(syncable::PREFERENCES);
dir->PurgeEntriesWithTypeIn(types_to_purge);
- StatusController* status = session_->status_controller();
+ const StatusController& status = session_->status_controller();
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- EXPECT_EQ(2U, status->unsynced_handles().size());
+ EXPECT_EQ(2U, status.unsynced_handles().size());
ASSERT_EQ(2U, mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
EXPECT_TRUE(parent_id_ == mock_server_->committed_ids()[0]);
@@ -1058,8 +1059,8 @@ TEST_F(SyncerTest, TestCommitListOrderingWithNesting) {
}
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- EXPECT_TRUE(6 == session_->status_controller()->unsynced_handles().size());
- ASSERT_TRUE(6 == mock_server_->committed_ids().size());
+ EXPECT_EQ(6u, session_->status_controller().unsynced_handles().size());
+ ASSERT_EQ(6u, mock_server_->committed_ids().size());
// This test will NOT unroll deletes because SERVER_PARENT_ID is not set.
// It will treat these like moves.
vector<syncable::Id> commit_ids(mock_server_->committed_ids());
@@ -1128,8 +1129,8 @@ TEST_F(SyncerTest, TestCommitListOrderingWithNewItems) {
}
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- EXPECT_TRUE(6 == session_->status_controller()->unsynced_handles().size());
- ASSERT_TRUE(6 == mock_server_->committed_ids().size());
+ EXPECT_EQ(6u, session_->status_controller().unsynced_handles().size());
+ ASSERT_EQ(6u, mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
EXPECT_TRUE(parent_id_ == mock_server_->committed_ids()[0]);
EXPECT_TRUE(child_id_ == mock_server_->committed_ids()[1]);
@@ -1170,8 +1171,8 @@ TEST_F(SyncerTest, TestCommitListOrderingCounterexample) {
}
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- EXPECT_TRUE(3 == session_->status_controller()->unsynced_handles().size());
- ASSERT_TRUE(3 == mock_server_->committed_ids().size());
+ EXPECT_EQ(3u, session_->status_controller().unsynced_handles().size());
+ ASSERT_EQ(3u, mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
EXPECT_TRUE(parent_id_ == mock_server_->committed_ids()[0]);
EXPECT_TRUE(child_id_ == mock_server_->committed_ids()[1]);
@@ -1219,8 +1220,8 @@ TEST_F(SyncerTest, TestCommitListOrderingAndNewParent) {
}
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- EXPECT_TRUE(3 == session_->status_controller()->unsynced_handles().size());
- ASSERT_TRUE(3 == mock_server_->committed_ids().size());
+ EXPECT_EQ(3u, session_->status_controller().unsynced_handles().size());
+ ASSERT_EQ(3u, mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
EXPECT_TRUE(parent_id_ == mock_server_->committed_ids()[0]);
EXPECT_TRUE(parent2_id == mock_server_->committed_ids()[1]);
@@ -1293,8 +1294,8 @@ TEST_F(SyncerTest, TestCommitListOrderingAndNewParentAndChild) {
}
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- EXPECT_TRUE(3 == session_->status_controller()->unsynced_handles().size());
- ASSERT_TRUE(3 == mock_server_->committed_ids().size());
+ EXPECT_EQ(3u, session_->status_controller().unsynced_handles().size());
+ ASSERT_EQ(3u, mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
EXPECT_TRUE(parent_id_ == mock_server_->committed_ids()[0]);
EXPECT_TRUE(parent2_local_id == mock_server_->committed_ids()[1]);
@@ -1347,7 +1348,7 @@ TEST_F(SyncerTest, DontGetStuckWithTwoSameNames) {
SyncShareAsDelegate();
mock_server_->AddUpdateDirectory(2, 0, "foo:", 1, 20);
SyncRepeatedlyToTriggerStuckSignal(session_.get());
- EXPECT_FALSE(session_->status_controller()->syncer_status().syncer_stuck);
+ EXPECT_FALSE(session_->status_controller().syncer_status().syncer_stuck);
saw_syncer_event_ = false;
}
@@ -1395,13 +1396,14 @@ TEST_F(SyncerTest, IllegalAndLegalUpdates) {
mock_server_->AddUpdateDirectory(3, -80, "bad_parent", 10, 10);
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- StatusController* status = session_->status_controller();
+ StatusController* status = session_->mutable_status_controller();
// Id 3 should be in conflict now.
EXPECT_EQ(1, status->TotalNumConflictingItems());
{
sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE);
- EXPECT_EQ(1, status->conflict_progress().ConflictingItemsSize());
+ ASSERT_TRUE(status->conflict_progress());
+ EXPECT_EQ(1, status->conflict_progress()->ConflictingItemsSize());
}
// These entries will be used in the second set of updates.
@@ -1418,7 +1420,8 @@ TEST_F(SyncerTest, IllegalAndLegalUpdates) {
EXPECT_EQ(3, status->TotalNumConflictingItems());
{
sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE);
- EXPECT_EQ(3, status->conflict_progress().ConflictingItemsSize());
+ ASSERT_TRUE(status->conflict_progress());
+ EXPECT_EQ(3, status->conflict_progress()->ConflictingItemsSize());
}
{
@@ -1464,8 +1467,8 @@ TEST_F(SyncerTest, IllegalAndLegalUpdates) {
Entry still_a_dir(&trans, GET_BY_ID, ids_.FromNumber(10));
ASSERT_TRUE(still_a_dir.good());
EXPECT_FALSE(still_a_dir.Get(IS_UNAPPLIED_UPDATE));
- EXPECT_TRUE(10 == still_a_dir.Get(BASE_VERSION));
- EXPECT_TRUE(10 == still_a_dir.Get(SERVER_VERSION));
+ EXPECT_EQ(10u, still_a_dir.Get(BASE_VERSION));
+ EXPECT_EQ(10u, still_a_dir.Get(SERVER_VERSION));
EXPECT_TRUE(still_a_dir.Get(IS_DIR));
Entry rename(&trans, GET_BY_ID, ids_.FromNumber(1));
@@ -1474,13 +1477,13 @@ TEST_F(SyncerTest, IllegalAndLegalUpdates) {
EXPECT_EQ("new_name", rename.Get(NON_UNIQUE_NAME));
EXPECT_FALSE(rename.Get(IS_UNAPPLIED_UPDATE));
EXPECT_TRUE(ids_.FromNumber(1) == rename.Get(ID));
- EXPECT_TRUE(20 == rename.Get(BASE_VERSION));
+ EXPECT_EQ(20u, rename.Get(BASE_VERSION));
Entry name_clash(&trans, GET_BY_ID, ids_.FromNumber(2));
ASSERT_TRUE(name_clash.good());
EXPECT_EQ(root, name_clash.Get(PARENT_ID));
EXPECT_TRUE(ids_.FromNumber(2) == name_clash.Get(ID));
- EXPECT_TRUE(10 == name_clash.Get(BASE_VERSION));
+ EXPECT_EQ(10u, name_clash.Get(BASE_VERSION));
EXPECT_EQ("in_root", name_clash.Get(NON_UNIQUE_NAME));
Entry ignored_old_version(&trans, GET_BY_ID, ids_.FromNumber(4));
@@ -1488,7 +1491,7 @@ TEST_F(SyncerTest, IllegalAndLegalUpdates) {
EXPECT_TRUE(
ignored_old_version.Get(NON_UNIQUE_NAME) == "newer_version");
EXPECT_FALSE(ignored_old_version.Get(IS_UNAPPLIED_UPDATE));
- EXPECT_TRUE(20 == ignored_old_version.Get(BASE_VERSION));
+ EXPECT_EQ(20u, ignored_old_version.Get(BASE_VERSION));
Entry circular_parent_issue(&trans, GET_BY_ID, ids_.FromNumber(5));
ASSERT_TRUE(circular_parent_issue.good());
@@ -1497,21 +1500,22 @@ TEST_F(SyncerTest, IllegalAndLegalUpdates) {
EXPECT_TRUE(circular_parent_issue.Get(PARENT_ID) == root_id_);
EXPECT_TRUE(circular_parent_issue.Get(SERVER_PARENT_ID) ==
ids_.FromNumber(6));
- EXPECT_TRUE(10 == circular_parent_issue.Get(BASE_VERSION));
+ EXPECT_EQ(10u, circular_parent_issue.Get(BASE_VERSION));
Entry circular_parent_target(&trans, GET_BY_ID, ids_.FromNumber(6));
ASSERT_TRUE(circular_parent_target.good());
EXPECT_FALSE(circular_parent_target.Get(IS_UNAPPLIED_UPDATE));
EXPECT_TRUE(circular_parent_issue.Get(ID) ==
circular_parent_target.Get(PARENT_ID));
- EXPECT_TRUE(10 == circular_parent_target.Get(BASE_VERSION));
+ EXPECT_EQ(10u, circular_parent_target.Get(BASE_VERSION));
}
EXPECT_FALSE(saw_syncer_event_);
EXPECT_EQ(4, status->TotalNumConflictingItems());
{
sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE);
- EXPECT_EQ(4, status->conflict_progress().ConflictingItemsSize());
+ ASSERT_TRUE(status->conflict_progress());
+ EXPECT_EQ(4, status->conflict_progress()->ConflictingItemsSize());
}
}
@@ -1959,7 +1963,7 @@ TEST_F(EntryCreatedInNewFolderTest, EntryCreatedInNewFolderMidSync) {
NewCallback<EntryCreatedInNewFolderTest>(this,
&EntryCreatedInNewFolderTest::CreateFolderInBob));
syncer_->SyncShare(session_.get(), BUILD_COMMIT_REQUEST, SYNCER_END);
- EXPECT_TRUE(1 == mock_server_->committed_ids().size());
+ EXPECT_EQ(1u, mock_server_->committed_ids().size());
{
ReadTransaction trans(FROM_HERE, dir);
Entry parent_entry(&trans, syncable::GET_BY_ID,
@@ -1998,7 +2002,7 @@ TEST_F(SyncerTest, UnappliedUpdateOnCreatedItemItemDoesNotCrash) {
}
// Commit it.
SyncShareAsDelegate();
- EXPECT_TRUE(1 == mock_server_->committed_ids().size());
+ EXPECT_EQ(1u, mock_server_->committed_ids().size());
mock_server_->set_conflict_all_commits(true);
syncable::Id fred_match_id;
{
@@ -2058,7 +2062,7 @@ TEST_F(SyncerTest, DoublyChangedWithResolver) {
}
// Only one entry, since we just overwrite one.
- EXPECT_TRUE(1 == children.size());
+ EXPECT_EQ(1u, children.size());
saw_syncer_event_ = false;
}
@@ -2141,15 +2145,15 @@ TEST_F(SyncerTest, ParentAndChildBothMatch) {
ReadTransaction trans(FROM_HERE, dir);
Directory::ChildHandles children;
dir->GetChildHandlesById(&trans, root_id_, &children);
- EXPECT_TRUE(1 == children.size());
+ EXPECT_EQ(1u, children.size());
dir->GetChildHandlesById(&trans, parent_id, &children);
- EXPECT_TRUE(1 == children.size());
+ EXPECT_EQ(1u, children.size());
Directory::UnappliedUpdateMetaHandles unapplied;
dir->GetUnappliedUpdateMetaHandles(&trans, &unapplied);
- EXPECT_TRUE(0 == unapplied.size());
+ EXPECT_EQ(0u, unapplied.size());
syncable::Directory::UnsyncedMetaHandles unsynced;
dir->GetUnsyncedMetaHandles(&trans, &unsynced);
- EXPECT_TRUE(0 == unsynced.size());
+ EXPECT_EQ(0u, unsynced.size());
saw_syncer_event_ = false;
}
}
@@ -2164,7 +2168,7 @@ TEST_F(SyncerTest, CommittingNewDeleted) {
entry.Put(IS_DEL, true);
}
SyncShareAsDelegate();
- EXPECT_TRUE(0 == mock_server_->committed_ids().size());
+ EXPECT_EQ(0u, mock_server_->committed_ids().size());
}
// Original problem synopsis:
@@ -2195,7 +2199,7 @@ TEST_F(SyncerTest, UnappliedUpdateDuringCommit) {
}
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- EXPECT_TRUE(0 == session_->status_controller()->TotalNumConflictingItems());
+ EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
saw_syncer_event_ = false;
}
@@ -2243,8 +2247,8 @@ TEST_F(SyncerTest, DeletingEntryInFolder) {
existing.Put(IS_DEL, true);
}
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- StatusController* status(session_->status_controller());
- EXPECT_TRUE(0 == status->error().num_conflicting_commits);
+ const StatusController& status(session_->status_controller());
+ EXPECT_EQ(0, status.error().num_conflicting_commits);
}
TEST_F(SyncerTest, DeletingEntryWithLocalEdits) {
@@ -3238,7 +3242,7 @@ class SusanDeletingTest : public SyncerTest {
MutableEntry susan(&trans, GET_BY_ID, susan_id);
Directory::ChildHandles children;
dir->GetChildHandlesById(&trans, susan.Get(ID), &children);
- ASSERT_TRUE(0 == children.size());
+ ASSERT_EQ(0u, children.size());
susan.Put(IS_DEL, true);
susan.Put(IS_UNSYNCED, true);
}
@@ -3303,7 +3307,7 @@ TEST_F(SusanDeletingTest,
EXPECT_TRUE(bob.Get(IS_UNSYNCED));
EXPECT_TRUE(joe.Get(IS_UNSYNCED));
}
- EXPECT_TRUE(0 == countdown_till_delete_);
+ EXPECT_EQ(0, countdown_till_delete_);
delete syncer_->pre_conflict_resolution_closure_;
syncer_->pre_conflict_resolution_closure_ = NULL;
LoopSyncShare();
@@ -3503,12 +3507,12 @@ TEST_F(SyncerTest, DuplicateIDReturn) {
folder2.Put(ID, syncable::Id::CreateFromServerId("mock_server:10000"));
}
mock_server_->set_next_new_id(10000);
- EXPECT_TRUE(1 == dir->unsynced_entity_count());
+ EXPECT_EQ(1u, dir->unsynced_entity_count());
// we get back a bad id in here (should never happen).
SyncShareAsDelegate();
- EXPECT_TRUE(1 == dir->unsynced_entity_count());
+ EXPECT_EQ(1u, dir->unsynced_entity_count());
SyncShareAsDelegate(); // another bad id in here.
- EXPECT_TRUE(0 == dir->unsynced_entity_count());
+ EXPECT_EQ(0u, dir->unsynced_entity_count());
saw_syncer_event_ = false;
}
@@ -3650,7 +3654,7 @@ TEST(SyncerSyncProcessState, MergeSetsTest) {
c.MergeSets(id[2], id[3]);
c.MergeSets(id[4], id[5]);
c.MergeSets(id[5], id[6]);
- EXPECT_TRUE(6 == c.IdToConflictSetSize());
+ EXPECT_EQ(6u, c.IdToConflictSetSize());
EXPECT_FALSE(is_dirty);
for (int i = 1; i < 7; i++) {
EXPECT_TRUE(NULL != c.IdToConflictSetGet(id[i]));
@@ -3703,7 +3707,7 @@ TEST_F(SyncerTest, OneBajillionUpdates) {
}
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- EXPECT_FALSE(session_->status_controller()->syncer_status().syncer_stuck);
+ EXPECT_FALSE(session_->status_controller().syncer_status().syncer_stuck);
}
// In this test a long changelog contains a child at the start of the changelog
@@ -3733,7 +3737,7 @@ TEST_F(SyncerTest, LongChangelistWithApplicationConflict) {
}
syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
- EXPECT_FALSE(session_->status_controller()->syncer_status().syncer_stuck);
+ EXPECT_FALSE(session_->status_controller().syncer_status().syncer_stuck);
// Ensure our folder hasn't somehow applied.
{
@@ -4026,7 +4030,7 @@ TEST_F(SyncerTest, EnsureWeSendUpOldParent) {
}
SyncShareAsDelegate();
const sync_pb::CommitMessage& commit = mock_server_->last_sent_commit();
- ASSERT_TRUE(2 == commit.entries_size());
+ ASSERT_EQ(2, commit.entries_size());
EXPECT_TRUE(commit.entries(0).parent_id_string() == "2");
EXPECT_TRUE(commit.entries(0).old_parent_id() == "0");
EXPECT_FALSE(commit.entries(1).has_old_parent_id());
@@ -4765,14 +4769,14 @@ class SyncerUndeletionTest : public SyncerTest {
};
TEST_F(SyncerUndeletionTest, UndeleteDuringCommit) {
- StatusController* status = session_->status_controller();
+ const StatusController& status = session_->status_controller();
Create();
ExpectUnsyncedCreation();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
// Delete, begin committing the delete, then undelete while committing.
@@ -4785,7 +4789,7 @@ TEST_F(SyncerUndeletionTest, UndeleteDuringCommit) {
// The item ought to exist as an unsynced undeletion (meaning,
// we think that the next commit ought to be a recreation commit).
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectUnsyncedUndeletion();
@@ -4796,20 +4800,20 @@ TEST_F(SyncerUndeletionTest, UndeleteDuringCommit) {
mock_server_->SetMidCommitCallback(NULL);
mock_server_->AddUpdateTombstone(Get(metahandle_, ID));
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
}
TEST_F(SyncerUndeletionTest, UndeleteBeforeCommit) {
- StatusController* status = session_->status_controller();
+ const StatusController& status = session_->status_controller();
Create();
ExpectUnsyncedCreation();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
// Delete and undelete, then sync to pick up the result.
@@ -4820,7 +4824,7 @@ TEST_F(SyncerUndeletionTest, UndeleteBeforeCommit) {
SyncShareAsDelegate();
// The item ought to have committed successfully.
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
EXPECT_EQ(2, Get(metahandle_, BASE_VERSION));
@@ -4829,20 +4833,20 @@ TEST_F(SyncerUndeletionTest, UndeleteBeforeCommit) {
// update.
mock_server_->AddUpdateFromLastCommit();
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
}
TEST_F(SyncerUndeletionTest, UndeleteAfterCommitButBeforeGetUpdates) {
- StatusController* status = session_->status_controller();
+ const StatusController& status = session_->status_controller();
Create();
ExpectUnsyncedCreation();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
// Delete and commit.
@@ -4851,7 +4855,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterCommitButBeforeGetUpdates) {
SyncShareAsDelegate();
// The item ought to have committed successfully.
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndDeleted();
@@ -4863,26 +4867,26 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterCommitButBeforeGetUpdates) {
// deletion update. The undeletion should prevail.
mock_server_->AddUpdateFromLastCommit();
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
}
TEST_F(SyncerUndeletionTest, UndeleteAfterDeleteAndGetUpdates) {
- StatusController* status = session_->status_controller();
+ const StatusController& status = session_->status_controller();
Create();
ExpectUnsyncedCreation();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
mock_server_->AddUpdateFromLastCommit();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
// Delete and commit.
@@ -4891,7 +4895,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterDeleteAndGetUpdates) {
SyncShareAsDelegate();
// The item ought to have committed successfully.
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndDeleted();
@@ -4899,7 +4903,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterDeleteAndGetUpdates) {
// deletion update. Should be consistent.
mock_server_->AddUpdateFromLastCommit();
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndDeleted();
@@ -4910,28 +4914,28 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterDeleteAndGetUpdates) {
// Now, encounter a GetUpdates corresponding to the just-committed
// deletion update. The undeletion should prevail.
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
}
// Test processing of undeletion GetUpdateses.
TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletes) {
- StatusController* status = session_->status_controller();
+ const StatusController& status = session_->status_controller();
Create();
ExpectUnsyncedCreation();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
// Add a delete from the server.
mock_server_->AddUpdateFromLastCommit();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
// Some other client deletes the item.
@@ -4939,7 +4943,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletes) {
SyncShareAsDelegate();
// The update ought to have applied successfully.
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndDeleted();
@@ -4947,7 +4951,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletes) {
Undelete();
ExpectUnsyncedUndeletion();
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -4955,20 +4959,20 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletes) {
// deletion update. The undeletion should prevail.
mock_server_->AddUpdateFromLastCommit();
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
}
TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletesImmediately) {
- StatusController* status = session_->status_controller();
+ const StatusController& status = session_->status_controller();
Create();
ExpectUnsyncedCreation();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
// Some other client deletes the item before we get a chance
@@ -4977,7 +4981,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletesImmediately) {
SyncShareAsDelegate();
// The update ought to have applied successfully.
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndDeleted();
@@ -4985,7 +4989,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletesImmediately) {
Undelete();
ExpectUnsyncedUndeletion();
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -4993,27 +4997,27 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletesImmediately) {
// deletion update. The undeletion should prevail.
mock_server_->AddUpdateFromLastCommit();
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
}
TEST_F(SyncerUndeletionTest, OtherClientUndeletes) {
- StatusController* status = session_->status_controller();
+ const StatusController& status = session_->status_controller();
Create();
ExpectUnsyncedCreation();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
// Get the updates of our just-committed entry.
mock_server_->AddUpdateFromLastCommit();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
// We delete the item.
@@ -5022,7 +5026,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletes) {
SyncShareAsDelegate();
// The update ought to have applied successfully.
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndDeleted();
@@ -5030,7 +5034,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletes) {
// deletion update.
mock_server_->AddUpdateFromLastCommit();
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndDeleted();
@@ -5040,28 +5044,28 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletes) {
"Thadeusz", 100, 1000);
mock_server_->SetLastUpdateClientTag(client_tag_);
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
EXPECT_EQ("Thadeusz", Get(metahandle_, NON_UNIQUE_NAME));
}
TEST_F(SyncerUndeletionTest, OtherClientUndeletesImmediately) {
- StatusController* status = session_->status_controller();
+ const StatusController& status = session_->status_controller();
Create();
ExpectUnsyncedCreation();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
// Get the updates of our just-committed entry.
mock_server_->AddUpdateFromLastCommit();
SyncShareAsDelegate();
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
ExpectSyncedAndCreated();
// We delete the item.
@@ -5070,7 +5074,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletesImmediately) {
SyncShareAsDelegate();
// The update ought to have applied successfully.
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndDeleted();
@@ -5081,7 +5085,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletesImmediately) {
"Thadeusz", 100, 1000);
mock_server_->SetLastUpdateClientTag(client_tag_);
SyncShareAsDelegate();
- EXPECT_EQ(0, status->TotalNumConflictingItems());
+ EXPECT_EQ(0, status.TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
EXPECT_EQ("Thadeusz", Get(metahandle_, NON_UNIQUE_NAME));
« no previous file with comments | « chrome/browser/sync/engine/syncer_proto_util.cc ('k') | chrome/browser/sync/engine/verify_updates_command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698