summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/sync_manager_impl_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sync/internal_api/sync_manager_impl_unittest.cc')
-rw-r--r--sync/internal_api/sync_manager_impl_unittest.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
index d42c9376..7ef30146 100644
--- a/sync/internal_api/sync_manager_impl_unittest.cc
+++ b/sync/internal_api/sync_manager_impl_unittest.cc
@@ -3500,16 +3500,11 @@ TEST_F(SyncManagerChangeProcessingTest, MoveIntoPopulatedFolder) {
child_a.PutPredecessor(child_b.Get(syncable::ID));
}
- EXPECT_EQ(2UL, GetChangeListSize());
-
- // Verify that both child A and child B are in the change list, even though
- // only child A was moved. The rules state that all siblings of
- // position-modified items must be included in the list of changes.
- int64 child_a_pos = FindChangeInList(child_a_id, ChangeRecord::ACTION_UPDATE);
- int64 child_b_pos = FindChangeInList(child_b_id, ChangeRecord::ACTION_UPDATE);
+ EXPECT_EQ(1UL, GetChangeListSize());
- // Siblings should appear in left-to-right order.
- EXPECT_LT(child_b_pos, child_a_pos);
+ // Verify that only child a is in the change list.
+ // (This function will add a failure if the lookup fails.)
+ FindChangeInList(child_a_id, ChangeRecord::ACTION_UPDATE);
}
// Tests the ordering of deletion changes.