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

Side by Side Diff: chrome/browser/sync/sessions/status_controller_unittest.cc

Issue 9149017: Remove broken variables from sync's AllStatus (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix sync_unit_test failure Created 8 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/sessions/status_controller.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/sessions/sync_session.h" 5 #include "chrome/browser/sync/sessions/sync_session.h"
6 #include "chrome/browser/sync/test/engine/test_id_factory.h" 6 #include "chrome/browser/sync/test/engine/test_id_factory.h"
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 8
9 namespace browser_sync { 9 namespace browser_sync {
10 namespace sessions { 10 namespace sessions {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 EXPECT_FALSE(status.TestAndClearIsDirty()); 48 EXPECT_FALSE(status.TestAndClearIsDirty());
49 49
50 status.set_num_server_changes_remaining(30); 50 status.set_num_server_changes_remaining(30);
51 EXPECT_TRUE(status.TestAndClearIsDirty()); 51 EXPECT_TRUE(status.TestAndClearIsDirty());
52 52
53 status.set_invalid_store(true); 53 status.set_invalid_store(true);
54 EXPECT_TRUE(status.TestAndClearIsDirty()); 54 EXPECT_TRUE(status.TestAndClearIsDirty());
55 status.set_invalid_store(false); 55 status.set_invalid_store(false);
56 EXPECT_TRUE(status.TestAndClearIsDirty()); 56 EXPECT_TRUE(status.TestAndClearIsDirty());
57 57
58 status.set_syncer_stuck(true);
59 EXPECT_TRUE(status.TestAndClearIsDirty());
60 status.set_syncer_stuck(false);
61 EXPECT_TRUE(status.TestAndClearIsDirty());
62
63 status.increment_num_successful_commits(); 58 status.increment_num_successful_commits();
64 EXPECT_TRUE(status.TestAndClearIsDirty()); 59 EXPECT_TRUE(status.TestAndClearIsDirty());
65 status.increment_num_successful_commits(); 60 status.increment_num_successful_commits();
66 EXPECT_TRUE(status.TestAndClearIsDirty()); 61 EXPECT_TRUE(status.TestAndClearIsDirty());
67 62
68 { 63 {
69 ScopedModelSafeGroupRestriction r(&status, GROUP_UI); 64 ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
70 status.mutable_conflict_progress()->AddConflictingItemById(syncable::Id()); 65 status.mutable_conflict_progress()->AddConflictingItemById(syncable::Id());
71 } 66 }
72 EXPECT_TRUE(status.TestAndClearIsDirty()); 67 EXPECT_TRUE(status.TestAndClearIsDirty());
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 status.increment_num_consecutive_errors_by(2); 114 status.increment_num_consecutive_errors_by(2);
120 EXPECT_EQ(11, status.error().consecutive_errors); 115 EXPECT_EQ(11, status.error().consecutive_errors);
121 116
122 status.set_num_server_changes_remaining(13); 117 status.set_num_server_changes_remaining(13);
123 EXPECT_EQ(13, status.num_server_changes_remaining()); 118 EXPECT_EQ(13, status.num_server_changes_remaining());
124 119
125 EXPECT_FALSE(status.syncer_status().invalid_store); 120 EXPECT_FALSE(status.syncer_status().invalid_store);
126 status.set_invalid_store(true); 121 status.set_invalid_store(true);
127 EXPECT_TRUE(status.syncer_status().invalid_store); 122 EXPECT_TRUE(status.syncer_status().invalid_store);
128 123
129 EXPECT_FALSE(status.syncer_status().syncer_stuck);
130 status.set_syncer_stuck(true);
131 EXPECT_TRUE(status.syncer_status().syncer_stuck);
132
133 EXPECT_FALSE(status.conflicts_resolved()); 124 EXPECT_FALSE(status.conflicts_resolved());
134 status.update_conflicts_resolved(true); 125 status.update_conflicts_resolved(true);
135 EXPECT_TRUE(status.conflicts_resolved()); 126 EXPECT_TRUE(status.conflicts_resolved());
136 127
137 EXPECT_FALSE(status.conflict_sets_built()); 128 EXPECT_FALSE(status.conflict_sets_built());
138 status.update_conflict_sets_built(true); 129 status.update_conflict_sets_built(true);
139 EXPECT_TRUE(status.conflict_sets_built()); 130 EXPECT_TRUE(status.conflict_sets_built());
140 131
141 status.set_last_download_updates_result(SYNCER_OK); 132 status.set_last_download_updates_result(SYNCER_OK);
142 EXPECT_EQ(SYNCER_OK, status.error().last_download_updates_result); 133 EXPECT_EQ(SYNCER_OK, status.error().last_download_updates_result);
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 status.num_server_changes_remaining(); 218 status.num_server_changes_remaining();
228 status.commit_ids(); 219 status.commit_ids();
229 status.HasBookmarkCommitActivity(); 220 status.HasBookmarkCommitActivity();
230 status.download_updates_succeeded(); 221 status.download_updates_succeeded();
231 status.ServerSaysNothingMoreToDownload(); 222 status.ServerSaysNothingMoreToDownload();
232 status.group_restriction(); 223 status.group_restriction();
233 } 224 }
234 225
235 } // namespace sessions 226 } // namespace sessions
236 } // namespace browser_sync 227 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/sessions/status_controller.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698