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

Side by Side Diff: chrome/browser/sync/engine/syncer_unittest.cc

Issue 8625005: [Sync] Make ModelSafeWorker a true interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to head Created 9 years, 1 month 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 // Syncer unit tests. Unfortunately a lot of these tests 5 // Syncer unit tests. Unfortunately a lot of these tests
6 // are outdated and need to be reworked and updated. 6 // are outdated and need to be reworked and updated.
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <limits> 9 #include <limits>
10 #include <list> 10 #include <list>
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/sync/engine/syncer.h" 30 #include "chrome/browser/sync/engine/syncer.h"
31 #include "chrome/browser/sync/engine/syncer_proto_util.h" 31 #include "chrome/browser/sync/engine/syncer_proto_util.h"
32 #include "chrome/browser/sync/engine/syncer_util.h" 32 #include "chrome/browser/sync/engine/syncer_util.h"
33 #include "chrome/browser/sync/engine/syncproto.h" 33 #include "chrome/browser/sync/engine/syncproto.h"
34 #include "chrome/browser/sync/protocol/sync.pb.h" 34 #include "chrome/browser/sync/protocol/sync.pb.h"
35 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" 35 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
36 #include "chrome/browser/sync/sessions/sync_session_context.h" 36 #include "chrome/browser/sync/sessions/sync_session_context.h"
37 #include "chrome/browser/sync/syncable/directory_manager.h" 37 #include "chrome/browser/sync/syncable/directory_manager.h"
38 #include "chrome/browser/sync/syncable/model_type.h" 38 #include "chrome/browser/sync/syncable/model_type.h"
39 #include "chrome/browser/sync/syncable/syncable.h" 39 #include "chrome/browser/sync/syncable/syncable.h"
40 #include "chrome/browser/sync/test/engine/fake_model_worker.h"
40 #include "chrome/browser/sync/test/engine/mock_connection_manager.h" 41 #include "chrome/browser/sync/test/engine/mock_connection_manager.h"
41 #include "chrome/browser/sync/test/engine/test_directory_setter_upper.h" 42 #include "chrome/browser/sync/test/engine/test_directory_setter_upper.h"
42 #include "chrome/browser/sync/test/engine/test_id_factory.h" 43 #include "chrome/browser/sync/test/engine/test_id_factory.h"
43 #include "chrome/browser/sync/test/engine/test_syncable_utils.h" 44 #include "chrome/browser/sync/test/engine/test_syncable_utils.h"
44 #include "chrome/browser/sync/util/time.h" 45 #include "chrome/browser/sync/util/time.h"
45 #include "testing/gtest/include/gtest/gtest.h" 46 #include "testing/gtest/include/gtest/gtest.h"
46 47
47 using base::TimeDelta; 48 using base::TimeDelta;
48 49
49 using std::map; 50 using std::map;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 should_loop = SyncShareAsDelegate(); 191 should_loop = SyncShareAsDelegate();
191 } while (should_loop); 192 } while (should_loop);
192 } 193 }
193 194
194 virtual void SetUp() { 195 virtual void SetUp() {
195 syncdb_.SetUp(); 196 syncdb_.SetUp();
196 197
197 mock_server_.reset( 198 mock_server_.reset(
198 new MockConnectionManager(syncdb_.manager(), syncdb_.name())); 199 new MockConnectionManager(syncdb_.manager(), syncdb_.name()));
199 EnableDatatype(syncable::BOOKMARKS); 200 EnableDatatype(syncable::BOOKMARKS);
200 worker_ = new ModelSafeWorker(); 201 worker_ = new FakeModelWorker(GROUP_PASSIVE);
201 std::vector<SyncEngineEventListener*> listeners; 202 std::vector<SyncEngineEventListener*> listeners;
202 listeners.push_back(this); 203 listeners.push_back(this);
203 context_.reset(new SyncSessionContext(mock_server_.get(), 204 context_.reset(new SyncSessionContext(mock_server_.get(),
204 syncdb_.manager(), this, listeners, NULL)); 205 syncdb_.manager(), this, listeners, NULL));
205 context_->set_account_name(syncdb_.name()); 206 context_->set_account_name(syncdb_.name());
206 ASSERT_FALSE(context_->resolver()); 207 ASSERT_FALSE(context_->resolver());
207 syncer_ = new Syncer(); 208 syncer_ = new Syncer();
208 session_.reset(MakeSession()); 209 session_.reset(MakeSession());
209 210
210 ScopedDirLookup dir(syncdb_.manager(), syncdb_.name()); 211 ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
(...skipping 5090 matching lines...) Expand 10 before | Expand all | Expand 10 after
5301 Add(low_id_); 5302 Add(low_id_);
5302 Add(high_id_); 5303 Add(high_id_);
5303 SyncShareAsDelegate(); 5304 SyncShareAsDelegate();
5304 ExpectLocalOrderIsByServerId(); 5305 ExpectLocalOrderIsByServerId();
5305 } 5306 }
5306 5307
5307 const SyncerTest::CommitOrderingTest 5308 const SyncerTest::CommitOrderingTest
5308 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()}; 5309 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()};
5309 5310
5310 } // namespace browser_sync 5311 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698