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

Side by Side Diff: sync/sessions/nudge_tracker_unittest.cc

Issue 891123003: Revert of Sync commit errors should temporarily re-enable trigger pre-commit getupdates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « sync/sessions/nudge_tracker.cc ('k') | sync/sessions/test_util.h » ('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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "base/run_loop.h" 6 #include "base/run_loop.h"
7 #include "sync/internal_api/public/base/model_type_test_util.h" 7 #include "sync/internal_api/public/base/model_type_test_util.h"
8 #include "sync/sessions/nudge_tracker.h" 8 #include "sync/sessions/nudge_tracker.h"
9 #include "sync/test/mock_invalidation.h" 9 #include "sync/test/mock_invalidation.h"
10 #include "sync/test/mock_invalidation_tracker.h" 10 #include "sync/test/mock_invalidation_tracker.h"
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 // Basic tests for the IsSyncRequired() flag. 362 // Basic tests for the IsSyncRequired() flag.
363 TEST_F(NudgeTrackerTest, IsSyncRequired) { 363 TEST_F(NudgeTrackerTest, IsSyncRequired) {
364 EXPECT_FALSE(nudge_tracker_.IsSyncRequired()); 364 EXPECT_FALSE(nudge_tracker_.IsSyncRequired());
365 365
366 // Initial sync request. 366 // Initial sync request.
367 nudge_tracker_.RecordInitialSyncRequired(BOOKMARKS); 367 nudge_tracker_.RecordInitialSyncRequired(BOOKMARKS);
368 EXPECT_TRUE(nudge_tracker_.IsSyncRequired()); 368 EXPECT_TRUE(nudge_tracker_.IsSyncRequired());
369 nudge_tracker_.RecordSuccessfulSyncCycle(); 369 nudge_tracker_.RecordSuccessfulSyncCycle();
370 EXPECT_FALSE(nudge_tracker_.IsSyncRequired()); 370 EXPECT_FALSE(nudge_tracker_.IsSyncRequired());
371 371
372 // Sync request for resolve conflict.
373 nudge_tracker_.RecordCommitConflict(BOOKMARKS);
374 EXPECT_TRUE(nudge_tracker_.IsSyncRequired());
375 nudge_tracker_.RecordSuccessfulSyncCycle();
376 EXPECT_FALSE(nudge_tracker_.IsSyncRequired());
377
378 // Local changes. 372 // Local changes.
379 nudge_tracker_.RecordLocalChange(ModelTypeSet(SESSIONS)); 373 nudge_tracker_.RecordLocalChange(ModelTypeSet(SESSIONS));
380 EXPECT_TRUE(nudge_tracker_.IsSyncRequired()); 374 EXPECT_TRUE(nudge_tracker_.IsSyncRequired());
381 nudge_tracker_.RecordSuccessfulSyncCycle(); 375 nudge_tracker_.RecordSuccessfulSyncCycle();
382 EXPECT_FALSE(nudge_tracker_.IsSyncRequired()); 376 EXPECT_FALSE(nudge_tracker_.IsSyncRequired());
383 377
384 // Refresh requests. 378 // Refresh requests.
385 nudge_tracker_.RecordLocalRefreshRequest(ModelTypeSet(SESSIONS)); 379 nudge_tracker_.RecordLocalRefreshRequest(ModelTypeSet(SESSIONS));
386 EXPECT_TRUE(nudge_tracker_.IsSyncRequired()); 380 EXPECT_TRUE(nudge_tracker_.IsSyncRequired());
387 nudge_tracker_.RecordSuccessfulSyncCycle(); 381 nudge_tracker_.RecordSuccessfulSyncCycle();
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 EXPECT_TRUE(IsInvalidationAcknowledged(inv2_id)); 959 EXPECT_TRUE(IsInvalidationAcknowledged(inv2_id));
966 EXPECT_TRUE(IsInvalidationAcknowledged(inv3_id)); 960 EXPECT_TRUE(IsInvalidationAcknowledged(inv3_id));
967 EXPECT_TRUE(IsInvalidationAcknowledged(inv4_id)); 961 EXPECT_TRUE(IsInvalidationAcknowledged(inv4_id));
968 EXPECT_TRUE(IsInvalidationAcknowledged(inv5_id)); 962 EXPECT_TRUE(IsInvalidationAcknowledged(inv5_id));
969 963
970 EXPECT_TRUE(AllInvalidationsAccountedFor()); 964 EXPECT_TRUE(AllInvalidationsAccountedFor());
971 } 965 }
972 966
973 } // namespace sessions 967 } // namespace sessions
974 } // namespace syncer 968 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/sessions/nudge_tracker.cc ('k') | sync/sessions/test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698