summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/sessions/status_controller_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync/sessions/status_controller_unittest.cc')
-rw-r--r--chrome/browser/sync/sessions/status_controller_unittest.cc37
1 files changed, 29 insertions, 8 deletions
diff --git a/chrome/browser/sync/sessions/status_controller_unittest.cc b/chrome/browser/sync/sessions/status_controller_unittest.cc
index a207893..c640e53 100644
--- a/chrome/browser/sync/sessions/status_controller_unittest.cc
+++ b/chrome/browser/sync/sessions/status_controller_unittest.cc
@@ -43,7 +43,8 @@ TEST_F(StatusControllerTest, GetsDirty) {
{
ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
- status.mutable_conflict_progress()->AddConflictingItemById(syncable::Id());
+ status.mutable_conflict_progress()->
+ AddSimpleConflictingItemById(syncable::Id());
}
EXPECT_TRUE(status.TestAndClearIsDirty());
@@ -118,7 +119,7 @@ TEST_F(StatusControllerTest, HasConflictingUpdates) {
EXPECT_FALSE(status.update_progress());
status.mutable_update_progress()->AddAppliedUpdate(SUCCESS,
syncable::Id());
- status.mutable_update_progress()->AddAppliedUpdate(CONFLICT,
+ status.mutable_update_progress()->AddAppliedUpdate(CONFLICT_SIMPLE,
syncable::Id());
EXPECT_TRUE(status.update_progress()->HasConflictingUpdates());
}
@@ -131,6 +132,22 @@ TEST_F(StatusControllerTest, HasConflictingUpdates) {
}
}
+TEST_F(StatusControllerTest, HasConflictingUpdates_NonBlockingUpdates) {
+ StatusController status(routes_);
+ EXPECT_FALSE(status.HasConflictingUpdates());
+ {
+ ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
+ EXPECT_FALSE(status.update_progress());
+ status.mutable_update_progress()->AddAppliedUpdate(SUCCESS,
+ syncable::Id());
+ status.mutable_update_progress()->AddAppliedUpdate(CONFLICT_HIERARCHY,
+ syncable::Id());
+ EXPECT_TRUE(status.update_progress()->HasConflictingUpdates());
+ }
+
+ EXPECT_TRUE(status.HasConflictingUpdates());
+}
+
TEST_F(StatusControllerTest, CountUpdates) {
StatusController status(routes_);
EXPECT_EQ(0, status.CountUpdates());
@@ -148,17 +165,21 @@ TEST_F(StatusControllerTest, TotalNumConflictingItems) {
{
ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
EXPECT_FALSE(status.conflict_progress());
- status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
- status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
- EXPECT_EQ(2, status.conflict_progress()->ConflictingItemsSize());
+ status.mutable_conflict_progress()->
+ AddSimpleConflictingItemById(f.NewLocalId());
+ status.mutable_conflict_progress()->
+ AddSimpleConflictingItemById(f.NewLocalId());
+ EXPECT_EQ(2, status.conflict_progress()->SimpleConflictingItemsSize());
}
EXPECT_EQ(2, status.TotalNumConflictingItems());
{
ScopedModelSafeGroupRestriction r(&status, GROUP_DB);
EXPECT_FALSE(status.conflict_progress());
- status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
- status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
- EXPECT_EQ(2, status.conflict_progress()->ConflictingItemsSize());
+ status.mutable_conflict_progress()->
+ AddSimpleConflictingItemById(f.NewLocalId());
+ status.mutable_conflict_progress()->
+ AddSimpleConflictingItemById(f.NewLocalId());
+ EXPECT_EQ(2, status.conflict_progress()->SimpleConflictingItemsSize());
}
EXPECT_EQ(4, status.TotalNumConflictingItems());
}