diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 00:10:32 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 00:10:32 +0000 |
| commit | d07f0c801dbb2fdb6fcfaa671afa13400a615c85 (patch) | |
| tree | 24c422c32dd749ce8969b055b470c355e2e1401a /chrome/browser | |
| parent | b0f1a563d2b0ff26b9a6ad81258e08b966c9149a (diff) | |
| download | chromium_src-d07f0c801dbb2fdb6fcfaa671afa13400a615c85.zip chromium_src-d07f0c801dbb2fdb6fcfaa671afa13400a615c85.tar.gz chromium_src-d07f0c801dbb2fdb6fcfaa671afa13400a615c85.tar.bz2 | |
A few cleanups to the sync unit tests.
I didn't want to mix these in with other changes that are due
to real expectations changes.
BUG=46769 (related work)
TEST=sync_unit_tests
Review URL: http://codereview.chromium.org/2811031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
4 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/sync/engine/auth_watcher_unittest.cc b/chrome/browser/sync/engine/auth_watcher_unittest.cc index e795d31..66e7ff1 100644 --- a/chrome/browser/sync/engine/auth_watcher_unittest.cc +++ b/chrome/browser/sync/engine/auth_watcher_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/common/deprecated/event_sys-inl.h" #include "chrome/common/net/http_return.h" #include "chrome/common/net/gaia/gaia_authenticator.h" -#include "chrome/test/sync/engine/mock_server_connection.h" +#include "chrome/test/sync/engine/mock_connection_manager.h" #include "chrome/test/sync/engine/test_directory_setter_upper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/engine/syncer_proto_util_unittest.cc b/chrome/browser/sync/engine/syncer_proto_util_unittest.cc index 56ee0f0..cfdcca6 100644 --- a/chrome/browser/sync/engine/syncer_proto_util_unittest.cc +++ b/chrome/browser/sync/engine/syncer_proto_util_unittest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/sync/syncable/blob.h" #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/syncable.h" -#include "chrome/test/sync/engine/mock_server_connection.h" +#include "chrome/test/sync/engine/mock_connection_manager.h" #include "chrome/test/sync/engine/test_directory_setter_upper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/engine/syncer_thread_unittest.cc b/chrome/browser/sync/engine/syncer_thread_unittest.cc index 14f4e02..f0ed7ff 100644 --- a/chrome/browser/sync/engine/syncer_thread_unittest.cc +++ b/chrome/browser/sync/engine/syncer_thread_unittest.cc @@ -14,7 +14,7 @@ #include "chrome/browser/sync/engine/syncer_types.h" #include "chrome/browser/sync/sessions/sync_session_context.h" #include "chrome/browser/sync/util/channel.h" -#include "chrome/test/sync/engine/mock_server_connection.h" +#include "chrome/test/sync/engine/mock_connection_manager.h" #include "chrome/test/sync/engine/test_directory_setter_upper.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc index 6eebcd6..7a5a767 100644 --- a/chrome/browser/sync/engine/syncer_unittest.cc +++ b/chrome/browser/sync/engine/syncer_unittest.cc @@ -29,7 +29,7 @@ #include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/util/closure.h" #include "chrome/common/deprecated/event_sys-inl.h" -#include "chrome/test/sync/engine/mock_server_connection.h" +#include "chrome/test/sync/engine/mock_connection_manager.h" #include "chrome/test/sync/engine/test_directory_setter_upper.h" #include "chrome/test/sync/engine/test_id_factory.h" #include "chrome/test/sync/engine/test_syncable_utils.h" @@ -251,7 +251,7 @@ class SyncerTest : public testing::Test, } sync_pb::EntitySpecifics DefaultBookmarkSpecifics() { sync_pb::EntitySpecifics result; - result.MutableExtension(sync_pb::bookmark); + AddDefaultExtensionValue(syncable::BOOKMARKS, &result); return result; } // Enumeration of alterations to entries for commit ordering tests. @@ -3305,7 +3305,8 @@ TEST_F(SyncerTest, DuplicateIDReturn) { } mock_server_->set_next_new_id(10000); EXPECT_TRUE(1 == dir->unsynced_entity_count()); - syncer_->SyncShare(this); // we get back a bad id in here (should never happen). + // we get back a bad id in here (should never happen). + syncer_->SyncShare(this); EXPECT_TRUE(1 == dir->unsynced_entity_count()); syncer_->SyncShare(this); // another bad id in here. EXPECT_TRUE(0 == dir->unsynced_entity_count()); @@ -3962,7 +3963,7 @@ TEST_F(SyncerTest, TestUndeleteIgnoreCorrectlyUnappliedUpdate) { mock_server_->AddUpdateBookmark(id1, root, "foo", 1, 10); mock_server_->AddUpdateBookmark(id2, root, "foo", 1, 10); syncer_->SyncShare(this); - mock_server_->AddUpdateBookmark(id2, root, "foo2", 1, 10); + mock_server_->AddUpdateBookmark(id2, root, "foo2", 2, 20); syncer_->SyncShare(this); // Now just don't explode. } @@ -4054,6 +4055,7 @@ TEST_F(SyncerTest, ClientTagClientCreatedConflictUpdate) { MutableEntry perm_folder(&trans, CREATE, ids_.root(), "clientname"); ASSERT_TRUE(perm_folder.good()); perm_folder.Put(UNIQUE_CLIENT_TAG, "clientperm"); + perm_folder.Put(SPECIFICS, DefaultBookmarkSpecifics()); perm_folder.Put(IS_UNSYNCED, true); EXPECT_FALSE(perm_folder.Get(IS_UNAPPLIED_UPDATE)); EXPECT_FALSE(perm_folder.Get(ID).ServerKnows()); |