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

Side by Side Diff: chrome/browser/sync/sessions/session_state_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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/session_state.h" 5 #include "chrome/browser/sync/sessions/session_state.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 27 matching lines...) Expand all
38 38
39 scoped_ptr<DictionaryValue> value(source_info.ToValue()); 39 scoped_ptr<DictionaryValue> value(source_info.ToValue());
40 EXPECT_EQ(2u, value->size()); 40 EXPECT_EQ(2u, value->size());
41 ExpectDictStringValue("PERIODIC", *value, "updatesSource"); 41 ExpectDictStringValue("PERIODIC", *value, "updatesSource");
42 ExpectDictDictionaryValue(*expected_types_value, *value, "types"); 42 ExpectDictDictionaryValue(*expected_types_value, *value, "types");
43 } 43 }
44 44
45 TEST_F(SessionStateTest, SyncerStatusToValue) { 45 TEST_F(SessionStateTest, SyncerStatusToValue) {
46 SyncerStatus status; 46 SyncerStatus status;
47 status.invalid_store = true; 47 status.invalid_store = true;
48 status.syncer_stuck = false;
49 status.num_successful_commits = 5; 48 status.num_successful_commits = 5;
50 status.num_successful_bookmark_commits = 10; 49 status.num_successful_bookmark_commits = 10;
51 status.num_updates_downloaded_total = 100; 50 status.num_updates_downloaded_total = 100;
52 status.num_tombstone_updates_downloaded_total = 200; 51 status.num_tombstone_updates_downloaded_total = 200;
53 status.num_local_overwrites = 15; 52 status.num_local_overwrites = 15;
54 status.num_server_overwrites = 18; 53 status.num_server_overwrites = 18;
55 54
56 scoped_ptr<DictionaryValue> value(status.ToValue()); 55 scoped_ptr<DictionaryValue> value(status.ToValue());
57 EXPECT_EQ(8u, value->size()); 56 EXPECT_EQ(7u, value->size());
58 ExpectDictBooleanValue(status.invalid_store, *value, "invalidStore"); 57 ExpectDictBooleanValue(status.invalid_store, *value, "invalidStore");
59 ExpectDictBooleanValue(status.syncer_stuck, *value, "syncerStuck");
60 ExpectDictIntegerValue(status.num_successful_commits, 58 ExpectDictIntegerValue(status.num_successful_commits,
61 *value, "numSuccessfulCommits"); 59 *value, "numSuccessfulCommits");
62 ExpectDictIntegerValue(status.num_successful_bookmark_commits, 60 ExpectDictIntegerValue(status.num_successful_bookmark_commits,
63 *value, "numSuccessfulBookmarkCommits"); 61 *value, "numSuccessfulBookmarkCommits");
64 ExpectDictIntegerValue(status.num_updates_downloaded_total, 62 ExpectDictIntegerValue(status.num_updates_downloaded_total,
65 *value, "numUpdatesDownloadedTotal"); 63 *value, "numUpdatesDownloadedTotal");
66 ExpectDictIntegerValue(status.num_tombstone_updates_downloaded_total, 64 ExpectDictIntegerValue(status.num_tombstone_updates_downloaded_total,
67 *value, "numTombstoneUpdatesDownloadedTotal"); 65 *value, "numTombstoneUpdatesDownloadedTotal");
68 ExpectDictIntegerValue(status.num_local_overwrites, 66 ExpectDictIntegerValue(status.num_local_overwrites,
69 *value, "numLocalOverwrites"); 67 *value, "numLocalOverwrites");
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 ExpectDictIntegerValue(kNumConflictingUpdates, *value, 178 ExpectDictIntegerValue(kNumConflictingUpdates, *value,
181 "numConflictingUpdates"); 179 "numConflictingUpdates");
182 ExpectDictBooleanValue(kDidCommitItems, *value, 180 ExpectDictBooleanValue(kDidCommitItems, *value,
183 "didCommitItems"); 181 "didCommitItems");
184 ExpectDictDictionaryValue(*expected_source_value, *value, "source"); 182 ExpectDictDictionaryValue(*expected_source_value, *value, "source");
185 } 183 }
186 184
187 } // namespace 185 } // namespace
188 } // namespace sessions 186 } // namespace sessions
189 } // namespace browser_sync 187 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/sessions/session_state.cc ('k') | chrome/browser/sync/sessions/status_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698