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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/sessions/sync_session_unittest.cc

Issue 10825137: FYI: Control Data + Per-Device Metadata (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add PER_USER_METADATA, refactor some encryption code Created 8 years, 4 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
« sync/protocol/per_device_specifics.proto ('K') | « sync/sessions/sync_session.cc ('k') | sync/sync.gyp » ('j') | sync/syncable/model_type.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/sync_session_unittest.cc
diff --git a/sync/sessions/sync_session_unittest.cc b/sync/sessions/sync_session_unittest.cc
index ae2922d0f3bff13b335281b10923f1660c07b70f..17501d83ae89d2a910e57cda10558906830728f7 100644
--- a/sync/sessions/sync_session_unittest.cc
+++ b/sync/sessions/sync_session_unittest.cc
@@ -46,11 +46,14 @@ class SyncSessionTest : public testing::Test,
routes_[AUTOFILL] = GROUP_DB;
scoped_refptr<ModelSafeWorker> passive_worker(
new FakeModelWorker(GROUP_PASSIVE));
+ scoped_refptr<ModelSafeWorker> control_worker(
+ new FakeModelWorker(GROUP_CONTROL));
scoped_refptr<ModelSafeWorker> ui_worker(
new FakeModelWorker(GROUP_UI));
scoped_refptr<ModelSafeWorker> db_worker(
new FakeModelWorker(GROUP_DB));
workers_.clear();
+ workers_.push_back(control_worker);
workers_.push_back(passive_worker);
workers_.push_back(ui_worker);
workers_.push_back(db_worker);
@@ -149,6 +152,7 @@ TEST_F(SyncSessionTest, EnabledGroupsEmpty) {
scoped_ptr<SyncSession> session(MakeSession());
std::set<ModelSafeGroup> expected_enabled_groups;
expected_enabled_groups.insert(GROUP_PASSIVE);
+ expected_enabled_groups.insert(GROUP_CONTROL);
EXPECT_EQ(expected_enabled_groups, session->GetEnabledGroups());
}
@@ -156,6 +160,7 @@ TEST_F(SyncSessionTest, EnabledGroups) {
scoped_ptr<SyncSession> session(MakeSession());
std::set<ModelSafeGroup> expected_enabled_groups;
expected_enabled_groups.insert(GROUP_PASSIVE);
+ expected_enabled_groups.insert(GROUP_CONTROL);
expected_enabled_groups.insert(GROUP_UI);
expected_enabled_groups.insert(GROUP_DB);
EXPECT_EQ(expected_enabled_groups, session->GetEnabledGroups());
@@ -285,11 +290,15 @@ TEST_F(SyncSessionTest, Coalesce) {
scoped_refptr<ModelSafeWorker> passive_worker(
new FakeModelWorker(GROUP_PASSIVE));
+ scoped_refptr<ModelSafeWorker> control_worker(
+ new FakeModelWorker(GROUP_CONTROL));
scoped_refptr<ModelSafeWorker> db_worker(new FakeModelWorker(GROUP_DB));
scoped_refptr<ModelSafeWorker> ui_worker(new FakeModelWorker(GROUP_UI));
workers_one.push_back(passive_worker);
+ workers_one.push_back(control_worker);
workers_one.push_back(db_worker);
workers_two.push_back(passive_worker);
+ workers_two.push_back(control_worker);
workers_two.push_back(db_worker);
workers_two.push_back(ui_worker);
routes_one[AUTOFILL] = GROUP_DB;
@@ -300,10 +309,12 @@ TEST_F(SyncSessionTest, Coalesce) {
std::set<ModelSafeGroup> expected_enabled_groups_one;
expected_enabled_groups_one.insert(GROUP_PASSIVE);
+ expected_enabled_groups_one.insert(GROUP_CONTROL);
expected_enabled_groups_one.insert(GROUP_DB);
std::set<ModelSafeGroup> expected_enabled_groups_two;
expected_enabled_groups_two.insert(GROUP_PASSIVE);
+ expected_enabled_groups_two.insert(GROUP_CONTROL);
expected_enabled_groups_two.insert(GROUP_DB);
expected_enabled_groups_two.insert(GROUP_UI);
@@ -342,11 +353,15 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
scoped_refptr<ModelSafeWorker> passive_worker(
new FakeModelWorker(GROUP_PASSIVE));
+ scoped_refptr<ModelSafeWorker> control_worker(
+ new FakeModelWorker(GROUP_CONTROL));
scoped_refptr<ModelSafeWorker> db_worker(new FakeModelWorker(GROUP_DB));
scoped_refptr<ModelSafeWorker> ui_worker(new FakeModelWorker(GROUP_UI));
workers_one.push_back(passive_worker);
+ workers_one.push_back(control_worker);
workers_one.push_back(db_worker);
workers_two.push_back(passive_worker);
+ workers_two.push_back(control_worker);
workers_two.push_back(db_worker);
workers_two.push_back(ui_worker);
routes_one[AUTOFILL] = GROUP_DB;
@@ -357,10 +372,12 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
std::set<ModelSafeGroup> expected_enabled_groups_one;
expected_enabled_groups_one.insert(GROUP_PASSIVE);
+ expected_enabled_groups_one.insert(GROUP_CONTROL);
expected_enabled_groups_one.insert(GROUP_DB);
std::set<ModelSafeGroup> expected_enabled_groups_two;
expected_enabled_groups_two.insert(GROUP_PASSIVE);
+ expected_enabled_groups_two.insert(GROUP_CONTROL);
expected_enabled_groups_two.insert(GROUP_DB);
expected_enabled_groups_two.insert(GROUP_UI);
@@ -386,7 +403,7 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
std::find(two.workers().begin(), two.workers().end(), ui_worker);
EXPECT_NE(it_db, two.workers().end());
EXPECT_EQ(it_ui, two.workers().end());
- EXPECT_EQ(two.workers().size(), 2U);
+ EXPECT_EQ(two.workers().size(), 3U);
// Make sure the model safe routing info is reduced to one type.
ModelSafeRoutingInfo::const_iterator it =
@@ -412,12 +429,16 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
scoped_refptr<ModelSafeWorker> passive_worker(
new FakeModelWorker(GROUP_PASSIVE));
+ scoped_refptr<ModelSafeWorker> control_worker(
+ new FakeModelWorker(GROUP_CONTROL));
scoped_refptr<FakeModelWorker> db_worker(new FakeModelWorker(GROUP_DB));
scoped_refptr<FakeModelWorker> ui_worker(new FakeModelWorker(GROUP_UI));
workers_first.push_back(passive_worker);
+ workers_first.push_back(control_worker);
workers_first.push_back(db_worker);
workers_first.push_back(ui_worker);
workers_second.push_back(passive_worker);
+ workers_second.push_back(control_worker);
workers_second.push_back(db_worker);
workers_second.push_back(ui_worker);
routes_first[AUTOFILL] = GROUP_DB;
@@ -431,6 +452,7 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
std::set<ModelSafeGroup> expected_enabled_groups;
expected_enabled_groups.insert(GROUP_PASSIVE);
+ expected_enabled_groups.insert(GROUP_CONTROL);
expected_enabled_groups.insert(GROUP_DB);
expected_enabled_groups.insert(GROUP_UI);
@@ -460,7 +482,7 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
EXPECT_NE(it_passive, second.workers().end());
EXPECT_NE(it_db, second.workers().end());
EXPECT_NE(it_ui, second.workers().end());
- EXPECT_EQ(second.workers().size(), 3U);
+ EXPECT_EQ(second.workers().size(), 4U);
// Make sure the model safe routing info is reduced to first type.
ModelSafeRoutingInfo::const_iterator it1 =
« sync/protocol/per_device_specifics.proto ('K') | « sync/sessions/sync_session.cc ('k') | sync/sync.gyp » ('j') | sync/syncable/model_type.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698