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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/internal_api/sync_manager_impl_unittest.cc

Issue 11571092: sync: Move unique_client_tag hashing code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Undo some changes and move a test to syncable_util_unittest Created 8 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/read_node.cc ('k') | sync/internal_api/write_node.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/sync_manager_impl_unittest.cc
diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
index d27b56e1fa81b112cbbdb0b929e5abe769937edb..b4ca259b301edf2d78fdcfd520bfb0ca55a43290 100644
--- a/sync/internal_api/sync_manager_impl_unittest.cc
+++ b/sync/internal_api/sync_manager_impl_unittest.cc
@@ -63,6 +63,7 @@
#include "sync/syncable/nigori_util.h"
#include "sync/syncable/syncable_id.h"
#include "sync/syncable/syncable_read_transaction.h"
+#include "sync/syncable/syncable_util.h"
#include "sync/syncable/syncable_write_transaction.h"
#include "sync/test/callback_counter.h"
#include "sync/test/engine/fake_sync_scheduler.h"
@@ -279,22 +280,6 @@ TEST_F(SyncApiTest, BasicTagWrite) {
}
}
-TEST_F(SyncApiTest, GenerateSyncableHash) {
- EXPECT_EQ("OyaXV5mEzrPS4wbogmtKvRfekAI=",
- BaseNode::GenerateSyncableHash(BOOKMARKS, "tag1"));
- EXPECT_EQ("iNFQtRFQb+IZcn1kKUJEZDDkLs4=",
- BaseNode::GenerateSyncableHash(PREFERENCES, "tag1"));
- EXPECT_EQ("gO1cPZQXaM73sHOvSA+tKCKFs58=",
- BaseNode::GenerateSyncableHash(AUTOFILL, "tag1"));
-
- EXPECT_EQ("A0eYIHXM1/jVwKDDp12Up20IkKY=",
- BaseNode::GenerateSyncableHash(BOOKMARKS, "tag2"));
- EXPECT_EQ("XYxkF7bhS4eItStFgiOIAU23swI=",
- BaseNode::GenerateSyncableHash(PREFERENCES, "tag2"));
- EXPECT_EQ("GFiWzo5NGhjLlN+OyCfhy28DJTQ=",
- BaseNode::GenerateSyncableHash(AUTOFILL, "tag2"));
-}
-
TEST_F(SyncApiTest, ModelTypesSiloed) {
{
WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
@@ -956,7 +941,7 @@ class SyncManagerTest : public testing::Test,
UserShare* share = sync_manager_.GetUserShare();
syncable::WriteTransaction trans(
FROM_HERE, syncable::UNITTEST, share->directory.get());
- const std::string hash = BaseNode::GenerateSyncableHash(type, client_tag);
+ const std::string hash = syncable::GenerateSyncableHash(type, client_tag);
syncable::MutableEntry entry(&trans, syncable::GET_BY_CLIENT_TAG,
hash);
EXPECT_TRUE(entry.good());
@@ -2197,7 +2182,7 @@ TEST_F(SyncManagerTest, UpdateEntryWithEncryption) {
entity_specifics.mutable_bookmark()->set_url("url");
entity_specifics.mutable_bookmark()->set_title("title");
MakeServerNode(sync_manager_.GetUserShare(), BOOKMARKS, client_tag,
- BaseNode::GenerateSyncableHash(BOOKMARKS,
+ syncable::GenerateSyncableHash(BOOKMARKS,
client_tag),
entity_specifics);
// New node shouldn't start off unsynced.
@@ -2346,7 +2331,7 @@ TEST_F(SyncManagerTest, UpdatePasswordSetEntitySpecificsNoChange) {
mutable_encrypted());
}
MakeServerNode(sync_manager_.GetUserShare(), PASSWORDS, client_tag,
- BaseNode::GenerateSyncableHash(PASSWORDS,
+ syncable::GenerateSyncableHash(PASSWORDS,
client_tag),
entity_specifics);
// New node shouldn't start off unsynced.
@@ -2381,7 +2366,7 @@ TEST_F(SyncManagerTest, UpdatePasswordSetPasswordSpecifics) {
mutable_encrypted());
}
MakeServerNode(sync_manager_.GetUserShare(), PASSWORDS, client_tag,
- BaseNode::GenerateSyncableHash(PASSWORDS,
+ syncable::GenerateSyncableHash(PASSWORDS,
client_tag),
entity_specifics);
// New node shouldn't start off unsynced.
@@ -2432,7 +2417,7 @@ TEST_F(SyncManagerTest, UpdatePasswordNewPassphrase) {
entity_specifics.mutable_password()->mutable_encrypted());
}
MakeServerNode(sync_manager_.GetUserShare(), PASSWORDS, client_tag,
- BaseNode::GenerateSyncableHash(PASSWORDS,
+ syncable::GenerateSyncableHash(PASSWORDS,
client_tag),
entity_specifics);
// New node shouldn't start off unsynced.
@@ -2471,7 +2456,7 @@ TEST_F(SyncManagerTest, UpdatePasswordReencryptEverything) {
entity_specifics.mutable_password()->mutable_encrypted());
}
MakeServerNode(sync_manager_.GetUserShare(), PASSWORDS, client_tag,
- BaseNode::GenerateSyncableHash(PASSWORDS,
+ syncable::GenerateSyncableHash(PASSWORDS,
client_tag),
entity_specifics);
// New node shouldn't start off unsynced.
@@ -2495,7 +2480,7 @@ TEST_F(SyncManagerTest, SetBookmarkTitle) {
entity_specifics.mutable_bookmark()->set_url("url");
entity_specifics.mutable_bookmark()->set_title("title");
MakeServerNode(sync_manager_.GetUserShare(), BOOKMARKS, client_tag,
- BaseNode::GenerateSyncableHash(BOOKMARKS,
+ syncable::GenerateSyncableHash(BOOKMARKS,
client_tag),
entity_specifics);
// New node shouldn't start off unsynced.
@@ -2531,7 +2516,7 @@ TEST_F(SyncManagerTest, SetBookmarkTitleWithEncryption) {
entity_specifics.mutable_bookmark()->set_url("url");
entity_specifics.mutable_bookmark()->set_title("title");
MakeServerNode(sync_manager_.GetUserShare(), BOOKMARKS, client_tag,
- BaseNode::GenerateSyncableHash(BOOKMARKS,
+ syncable::GenerateSyncableHash(BOOKMARKS,
client_tag),
entity_specifics);
// New node shouldn't start off unsynced.
@@ -2590,7 +2575,7 @@ TEST_F(SyncManagerTest, SetNonBookmarkTitle) {
MakeServerNode(sync_manager_.GetUserShare(),
PREFERENCES,
client_tag,
- BaseNode::GenerateSyncableHash(PREFERENCES,
+ syncable::GenerateSyncableHash(PREFERENCES,
client_tag),
entity_specifics);
// New node shouldn't start off unsynced.
@@ -2628,7 +2613,7 @@ TEST_F(SyncManagerTest, SetNonBookmarkTitleWithEncryption) {
MakeServerNode(sync_manager_.GetUserShare(),
PREFERENCES,
client_tag,
- BaseNode::GenerateSyncableHash(PREFERENCES,
+ syncable::GenerateSyncableHash(PREFERENCES,
client_tag),
entity_specifics);
// New node shouldn't start off unsynced.
@@ -2699,7 +2684,7 @@ TEST_F(SyncManagerTest, SetPreviouslyEncryptedSpecifics) {
AddDefaultFieldValue(BOOKMARKS, &entity_specifics);
}
MakeServerNode(sync_manager_.GetUserShare(), BOOKMARKS, client_tag,
- BaseNode::GenerateSyncableHash(BOOKMARKS,
+ syncable::GenerateSyncableHash(BOOKMARKS,
client_tag),
entity_specifics);
@@ -2764,7 +2749,7 @@ TEST_F(SyncManagerTest, IncrementTransactionVersion) {
entity_specifics.mutable_bookmark()->set_url("url");
entity_specifics.mutable_bookmark()->set_title("title");
MakeServerNode(sync_manager_.GetUserShare(), BOOKMARKS, client_tag,
- BaseNode::GenerateSyncableHash(BOOKMARKS,
+ syncable::GenerateSyncableHash(BOOKMARKS,
client_tag),
entity_specifics);
« no previous file with comments | « sync/internal_api/read_node.cc ('k') | sync/internal_api/write_node.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698