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

Unified Diff: components/bookmarks/core/browser/bookmark_codec_unittest.cc

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: components/bookmarks/core/browser/bookmark_codec_unittest.cc
diff --git a/components/bookmarks/core/browser/bookmark_codec_unittest.cc b/components/bookmarks/core/browser/bookmark_codec_unittest.cc
deleted file mode 100644
index 4321eb91c7e30184b39a346156610b91c3c70d26..0000000000000000000000000000000000000000
--- a/components/bookmarks/core/browser/bookmark_codec_unittest.cc
+++ /dev/null
@@ -1,475 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/bookmarks/core/browser/bookmark_codec.h"
-
-#include "base/file_util.h"
-#include "base/files/file_path.h"
-#include "base/json/json_file_value_serializer.h"
-#include "base/json/json_string_value_serializer.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/path_service.h"
-#include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/values.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
-#include "components/bookmarks/core/test/test_bookmark_client.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using base::ASCIIToUTF16;
-
-namespace {
-
-const char kUrl1Title[] = "url1";
-const char kUrl1Url[] = "http://www.url1.com";
-const char kUrl2Title[] = "url2";
-const char kUrl2Url[] = "http://www.url2.com";
-const char kUrl3Title[] = "url3";
-const char kUrl3Url[] = "http://www.url3.com";
-const char kUrl4Title[] = "url4";
-const char kUrl4Url[] = "http://www.url4.com";
-const char kFolder1Title[] = "folder1";
-const char kFolder2Title[] = "folder2";
-
-const base::FilePath& GetTestDataDir() {
- CR_DEFINE_STATIC_LOCAL(base::FilePath, dir, ());
- if (dir.empty()) {
- PathService::Get(base::DIR_SOURCE_ROOT, &dir);
- dir = dir.AppendASCII("components");
- dir = dir.AppendASCII("test");
- dir = dir.AppendASCII("data");
- }
- return dir;
-}
-
-// Helper to get a mutable bookmark node.
-BookmarkNode* AsMutable(const BookmarkNode* node) {
- return const_cast<BookmarkNode*>(node);
-}
-
-// Helper to verify the two given bookmark nodes.
-void AssertNodesEqual(const BookmarkNode* expected,
- const BookmarkNode* actual) {
- ASSERT_TRUE(expected);
- ASSERT_TRUE(actual);
- EXPECT_EQ(expected->id(), actual->id());
- EXPECT_EQ(expected->GetTitle(), actual->GetTitle());
- EXPECT_EQ(expected->type(), actual->type());
- EXPECT_TRUE(expected->date_added() == actual->date_added());
- if (expected->is_url()) {
- EXPECT_EQ(expected->url(), actual->url());
- } else {
- EXPECT_TRUE(expected->date_folder_modified() ==
- actual->date_folder_modified());
- ASSERT_EQ(expected->child_count(), actual->child_count());
- for (int i = 0; i < expected->child_count(); ++i)
- AssertNodesEqual(expected->GetChild(i), actual->GetChild(i));
- }
-}
-
-// Verifies that the two given bookmark models are the same.
-void AssertModelsEqual(BookmarkModel* expected, BookmarkModel* actual) {
- ASSERT_NO_FATAL_FAILURE(AssertNodesEqual(expected->bookmark_bar_node(),
- actual->bookmark_bar_node()));
- ASSERT_NO_FATAL_FAILURE(
- AssertNodesEqual(expected->other_node(), actual->other_node()));
- ASSERT_NO_FATAL_FAILURE(
- AssertNodesEqual(expected->mobile_node(), actual->mobile_node()));
-}
-
-} // namespace
-
-class BookmarkCodecTest : public testing::Test {
- protected:
- // Helpers to create bookmark models with different data.
- BookmarkModel* CreateTestModel1() {
- scoped_ptr<BookmarkModel> model(client_.CreateModel(false));
- const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
- model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url));
- return model.release();
- }
- BookmarkModel* CreateTestModel2() {
- scoped_ptr<BookmarkModel> model(client_.CreateModel(false));
- const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
- model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url));
- model->AddURL(bookmark_bar, 1, ASCIIToUTF16(kUrl2Title), GURL(kUrl2Url));
- return model.release();
- }
- BookmarkModel* CreateTestModel3() {
- scoped_ptr<BookmarkModel> model(client_.CreateModel(false));
- const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
- model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url));
- const BookmarkNode* folder1 =
- model->AddFolder(bookmark_bar, 1, ASCIIToUTF16(kFolder1Title));
- model->AddURL(folder1, 0, ASCIIToUTF16(kUrl2Title), GURL(kUrl2Url));
- return model.release();
- }
-
- void GetBookmarksBarChildValue(base::Value* value,
- size_t index,
- base::DictionaryValue** result_value) {
- ASSERT_EQ(base::Value::TYPE_DICTIONARY, value->GetType());
-
- base::DictionaryValue* d_value = static_cast<base::DictionaryValue*>(value);
- base::Value* roots;
- ASSERT_TRUE(d_value->Get(BookmarkCodec::kRootsKey, &roots));
- ASSERT_EQ(base::Value::TYPE_DICTIONARY, roots->GetType());
-
- base::DictionaryValue* roots_d_value =
- static_cast<base::DictionaryValue*>(roots);
- base::Value* bb_value;
- ASSERT_TRUE(
- roots_d_value->Get(BookmarkCodec::kRootFolderNameKey, &bb_value));
- ASSERT_EQ(base::Value::TYPE_DICTIONARY, bb_value->GetType());
-
- base::DictionaryValue* bb_d_value =
- static_cast<base::DictionaryValue*>(bb_value);
- base::Value* bb_children_value;
- ASSERT_TRUE(
- bb_d_value->Get(BookmarkCodec::kChildrenKey, &bb_children_value));
- ASSERT_EQ(base::Value::TYPE_LIST, bb_children_value->GetType());
-
- base::ListValue* bb_children_l_value =
- static_cast<base::ListValue*>(bb_children_value);
- base::Value* child_value;
- ASSERT_TRUE(bb_children_l_value->Get(index, &child_value));
- ASSERT_EQ(base::Value::TYPE_DICTIONARY, child_value->GetType());
-
- *result_value = static_cast<base::DictionaryValue*>(child_value);
- }
-
- base::Value* EncodeHelper(BookmarkModel* model, std::string* checksum) {
- BookmarkCodec encoder;
- // Computed and stored checksums should be empty.
- EXPECT_EQ("", encoder.computed_checksum());
- EXPECT_EQ("", encoder.stored_checksum());
-
- scoped_ptr<base::Value> value(encoder.Encode(model));
- const std::string& computed_checksum = encoder.computed_checksum();
- const std::string& stored_checksum = encoder.stored_checksum();
-
- // Computed and stored checksums should not be empty and should be equal.
- EXPECT_FALSE(computed_checksum.empty());
- EXPECT_FALSE(stored_checksum.empty());
- EXPECT_EQ(computed_checksum, stored_checksum);
-
- *checksum = computed_checksum;
- return value.release();
- }
-
- bool Decode(BookmarkCodec* codec,
- BookmarkModel* model,
- const base::Value& value) {
- int64 max_id;
- bool result = codec->Decode(AsMutable(model->bookmark_bar_node()),
- AsMutable(model->other_node()),
- AsMutable(model->mobile_node()),
- &max_id,
- value);
- model->set_next_node_id(max_id);
- AsMutable(model->root_node())->SetMetaInfoMap(codec->model_meta_info_map());
- AsMutable(model->root_node())
- ->set_sync_transaction_version(codec->model_sync_transaction_version());
-
- return result;
- }
-
- BookmarkModel* DecodeHelper(const base::Value& value,
- const std::string& expected_stored_checksum,
- std::string* computed_checksum,
- bool expected_changes) {
- BookmarkCodec decoder;
- // Computed and stored checksums should be empty.
- EXPECT_EQ("", decoder.computed_checksum());
- EXPECT_EQ("", decoder.stored_checksum());
-
- scoped_ptr<BookmarkModel> model(client_.CreateModel(false));
- EXPECT_TRUE(Decode(&decoder, model.get(), value));
-
- *computed_checksum = decoder.computed_checksum();
- const std::string& stored_checksum = decoder.stored_checksum();
-
- // Computed and stored checksums should not be empty.
- EXPECT_FALSE(computed_checksum->empty());
- EXPECT_FALSE(stored_checksum.empty());
-
- // Stored checksum should be as expected.
- EXPECT_EQ(expected_stored_checksum, stored_checksum);
-
- // The two checksums should be equal if expected_changes is true; otherwise
- // they should be different.
- if (expected_changes)
- EXPECT_NE(*computed_checksum, stored_checksum);
- else
- EXPECT_EQ(*computed_checksum, stored_checksum);
-
- return model.release();
- }
-
- void CheckIDs(const BookmarkNode* node, std::set<int64>* assigned_ids) {
- DCHECK(node);
- int64 node_id = node->id();
- EXPECT_TRUE(assigned_ids->find(node_id) == assigned_ids->end());
- assigned_ids->insert(node_id);
- for (int i = 0; i < node->child_count(); ++i)
- CheckIDs(node->GetChild(i), assigned_ids);
- }
-
- void ExpectIDsUnique(BookmarkModel* model) {
- std::set<int64> assigned_ids;
- CheckIDs(model->bookmark_bar_node(), &assigned_ids);
- CheckIDs(model->other_node(), &assigned_ids);
- CheckIDs(model->mobile_node(), &assigned_ids);
- }
-
- test::TestBookmarkClient client_;
-};
-
-TEST_F(BookmarkCodecTest, ChecksumEncodeDecodeTest) {
- scoped_ptr<BookmarkModel> model_to_encode(CreateTestModel1());
- std::string enc_checksum;
- scoped_ptr<base::Value> value(
- EncodeHelper(model_to_encode.get(), &enc_checksum));
-
- EXPECT_TRUE(value.get() != NULL);
-
- std::string dec_checksum;
- scoped_ptr<BookmarkModel> decoded_model(
- DecodeHelper(*value.get(), enc_checksum, &dec_checksum, false));
-}
-
-TEST_F(BookmarkCodecTest, ChecksumEncodeIdenticalModelsTest) {
- // Encode two identical models and make sure the check-sums are same as long
- // as the data is the same.
- scoped_ptr<BookmarkModel> model1(CreateTestModel1());
- std::string enc_checksum1;
- scoped_ptr<base::Value> value1(EncodeHelper(model1.get(), &enc_checksum1));
- EXPECT_TRUE(value1.get() != NULL);
-
- scoped_ptr<BookmarkModel> model2(CreateTestModel1());
- std::string enc_checksum2;
- scoped_ptr<base::Value> value2(EncodeHelper(model2.get(), &enc_checksum2));
- EXPECT_TRUE(value2.get() != NULL);
-
- ASSERT_EQ(enc_checksum1, enc_checksum2);
-}
-
-TEST_F(BookmarkCodecTest, ChecksumManualEditTest) {
- scoped_ptr<BookmarkModel> model_to_encode(CreateTestModel1());
- std::string enc_checksum;
- scoped_ptr<base::Value> value(
- EncodeHelper(model_to_encode.get(), &enc_checksum));
-
- EXPECT_TRUE(value.get() != NULL);
-
- // Change something in the encoded value before decoding it.
- base::DictionaryValue* child1_value;
- GetBookmarksBarChildValue(value.get(), 0, &child1_value);
- std::string title;
- ASSERT_TRUE(child1_value->GetString(BookmarkCodec::kNameKey, &title));
- child1_value->SetString(BookmarkCodec::kNameKey, title + "1");
-
- std::string dec_checksum;
- scoped_ptr<BookmarkModel> decoded_model1(
- DecodeHelper(*value.get(), enc_checksum, &dec_checksum, true));
-
- // Undo the change and make sure the checksum is same as original.
- child1_value->SetString(BookmarkCodec::kNameKey, title);
- scoped_ptr<BookmarkModel> decoded_model2(
- DecodeHelper(*value.get(), enc_checksum, &dec_checksum, false));
-}
-
-TEST_F(BookmarkCodecTest, ChecksumManualEditIDsTest) {
- scoped_ptr<BookmarkModel> model_to_encode(CreateTestModel3());
-
- // The test depends on existence of multiple children under bookmark bar, so
- // make sure that's the case.
- int bb_child_count = model_to_encode->bookmark_bar_node()->child_count();
- ASSERT_GT(bb_child_count, 1);
-
- std::string enc_checksum;
- scoped_ptr<base::Value> value(
- EncodeHelper(model_to_encode.get(), &enc_checksum));
-
- EXPECT_TRUE(value.get() != NULL);
-
- // Change IDs for all children of bookmark bar to be 1.
- base::DictionaryValue* child_value;
- for (int i = 0; i < bb_child_count; ++i) {
- GetBookmarksBarChildValue(value.get(), i, &child_value);
- std::string id;
- ASSERT_TRUE(child_value->GetString(BookmarkCodec::kIdKey, &id));
- child_value->SetString(BookmarkCodec::kIdKey, "1");
- }
-
- std::string dec_checksum;
- scoped_ptr<BookmarkModel> decoded_model(
- DecodeHelper(*value.get(), enc_checksum, &dec_checksum, true));
-
- ExpectIDsUnique(decoded_model.get());
-
- // add a few extra nodes to bookmark model and make sure IDs are still uniuqe.
- const BookmarkNode* bb_node = decoded_model->bookmark_bar_node();
- decoded_model->AddURL(
- bb_node, 0, ASCIIToUTF16("new url1"), GURL("http://newurl1.com"));
- decoded_model->AddURL(
- bb_node, 0, ASCIIToUTF16("new url2"), GURL("http://newurl2.com"));
-
- ExpectIDsUnique(decoded_model.get());
-}
-
-TEST_F(BookmarkCodecTest, PersistIDsTest) {
- scoped_ptr<BookmarkModel> model_to_encode(CreateTestModel3());
- BookmarkCodec encoder;
- scoped_ptr<base::Value> model_value(encoder.Encode(model_to_encode.get()));
-
- scoped_ptr<BookmarkModel> decoded_model(client_.CreateModel(false));
- BookmarkCodec decoder;
- ASSERT_TRUE(Decode(&decoder, decoded_model.get(), *model_value.get()));
- ASSERT_NO_FATAL_FAILURE(
- AssertModelsEqual(model_to_encode.get(), decoded_model.get()));
-
- // Add a couple of more items to the decoded bookmark model and make sure
- // ID persistence is working properly.
- const BookmarkNode* bookmark_bar = decoded_model->bookmark_bar_node();
- decoded_model->AddURL(bookmark_bar,
- bookmark_bar->child_count(),
- ASCIIToUTF16(kUrl3Title),
- GURL(kUrl3Url));
- const BookmarkNode* folder2_node = decoded_model->AddFolder(
- bookmark_bar, bookmark_bar->child_count(), ASCIIToUTF16(kFolder2Title));
- decoded_model->AddURL(
- folder2_node, 0, ASCIIToUTF16(kUrl4Title), GURL(kUrl4Url));
-
- BookmarkCodec encoder2;
- scoped_ptr<base::Value> model_value2(encoder2.Encode(decoded_model.get()));
-
- scoped_ptr<BookmarkModel> decoded_model2(client_.CreateModel(false));
- BookmarkCodec decoder2;
- ASSERT_TRUE(Decode(&decoder2, decoded_model2.get(), *model_value2.get()));
- ASSERT_NO_FATAL_FAILURE(
- AssertModelsEqual(decoded_model.get(), decoded_model2.get()));
-}
-
-TEST_F(BookmarkCodecTest, CanDecodeModelWithoutMobileBookmarks) {
- base::FilePath test_data_directory;
- base::FilePath test_file =
- GetTestDataDir().AppendASCII("bookmarks/model_without_sync.json");
- ASSERT_TRUE(base::PathExists(test_file));
-
- JSONFileValueSerializer serializer(test_file);
- scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL));
-
- scoped_ptr<BookmarkModel> decoded_model(client_.CreateModel(false));
- BookmarkCodec decoder;
- ASSERT_TRUE(Decode(&decoder, decoded_model.get(), *root.get()));
- ExpectIDsUnique(decoded_model.get());
-
- const BookmarkNode* bbn = decoded_model->bookmark_bar_node();
- ASSERT_EQ(1, bbn->child_count());
-
- const BookmarkNode* child = bbn->GetChild(0);
- EXPECT_EQ(BookmarkNode::FOLDER, child->type());
- EXPECT_EQ(ASCIIToUTF16("Folder A"), child->GetTitle());
- ASSERT_EQ(1, child->child_count());
-
- child = child->GetChild(0);
- EXPECT_EQ(BookmarkNode::URL, child->type());
- EXPECT_EQ(ASCIIToUTF16("Bookmark Manager"), child->GetTitle());
-
- const BookmarkNode* other = decoded_model->other_node();
- ASSERT_EQ(1, other->child_count());
-
- child = other->GetChild(0);
- EXPECT_EQ(BookmarkNode::FOLDER, child->type());
- EXPECT_EQ(ASCIIToUTF16("Folder B"), child->GetTitle());
- ASSERT_EQ(1, child->child_count());
-
- child = child->GetChild(0);
- EXPECT_EQ(BookmarkNode::URL, child->type());
- EXPECT_EQ(ASCIIToUTF16("Get started with Google Chrome"), child->GetTitle());
-
- ASSERT_TRUE(decoded_model->mobile_node() != NULL);
-}
-
-TEST_F(BookmarkCodecTest, EncodeAndDecodeMetaInfo) {
- // Add meta info and encode.
- scoped_ptr<BookmarkModel> model(CreateTestModel1());
- model->SetNodeMetaInfo(model->root_node(), "model_info", "value1");
- model->SetNodeMetaInfo(
- model->bookmark_bar_node()->GetChild(0), "node_info", "value2");
- std::string checksum;
- scoped_ptr<base::Value> value(EncodeHelper(model.get(), &checksum));
- ASSERT_TRUE(value.get() != NULL);
-
- // Decode and check for meta info.
- model.reset(DecodeHelper(*value, checksum, &checksum, false));
- std::string meta_value;
- EXPECT_TRUE(model->root_node()->GetMetaInfo("model_info", &meta_value));
- EXPECT_EQ("value1", meta_value);
- EXPECT_FALSE(model->root_node()->GetMetaInfo("other_key", &meta_value));
- const BookmarkNode* bbn = model->bookmark_bar_node();
- ASSERT_EQ(1, bbn->child_count());
- const BookmarkNode* child = bbn->GetChild(0);
- EXPECT_TRUE(child->GetMetaInfo("node_info", &meta_value));
- EXPECT_EQ("value2", meta_value);
- EXPECT_FALSE(child->GetMetaInfo("other_key", &meta_value));
-}
-
-TEST_F(BookmarkCodecTest, EncodeAndDecodeSyncTransactionVersion) {
- // Add sync transaction version and encode.
- scoped_ptr<BookmarkModel> model(CreateTestModel2());
- model->SetNodeSyncTransactionVersion(model->root_node(), 1);
- const BookmarkNode* bbn = model->bookmark_bar_node();
- model->SetNodeSyncTransactionVersion(bbn->GetChild(1), 42);
-
- std::string checksum;
- scoped_ptr<base::Value> value(EncodeHelper(model.get(), &checksum));
- ASSERT_TRUE(value.get() != NULL);
-
- // Decode and verify.
- model.reset(DecodeHelper(*value, checksum, &checksum, false));
- EXPECT_EQ(1, model->root_node()->sync_transaction_version());
- bbn = model->bookmark_bar_node();
- EXPECT_EQ(42, bbn->GetChild(1)->sync_transaction_version());
- EXPECT_EQ(BookmarkNode::kInvalidSyncTransactionVersion,
- bbn->GetChild(0)->sync_transaction_version());
-}
-
-// Verifies that we can still decode the old codec format after changing the
-// way meta info is stored.
-TEST_F(BookmarkCodecTest, CanDecodeMetaInfoAsString) {
- base::FilePath test_data_directory;
- base::FilePath test_file =
- GetTestDataDir().AppendASCII("bookmarks/meta_info_as_string.json");
- ASSERT_TRUE(base::PathExists(test_file));
-
- JSONFileValueSerializer serializer(test_file);
- scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL));
-
- scoped_ptr<BookmarkModel> model(client_.CreateModel(false));
- BookmarkCodec decoder;
- ASSERT_TRUE(Decode(&decoder, model.get(), *root.get()));
-
- EXPECT_EQ(1, model->root_node()->sync_transaction_version());
- const BookmarkNode* bbn = model->bookmark_bar_node();
- EXPECT_EQ(BookmarkNode::kInvalidSyncTransactionVersion,
- bbn->GetChild(0)->sync_transaction_version());
- EXPECT_EQ(42, bbn->GetChild(1)->sync_transaction_version());
-
- const char kSyncTransactionVersionKey[] = "sync.transaction_version";
- const char kNormalKey[] = "key";
- const char kNestedKey[] = "nested.key";
- std::string meta_value;
- EXPECT_FALSE(
- model->root_node()->GetMetaInfo(kSyncTransactionVersionKey, &meta_value));
- EXPECT_FALSE(
- bbn->GetChild(1)->GetMetaInfo(kSyncTransactionVersionKey, &meta_value));
- EXPECT_TRUE(bbn->GetChild(0)->GetMetaInfo(kNormalKey, &meta_value));
- EXPECT_EQ("value", meta_value);
- EXPECT_TRUE(bbn->GetChild(1)->GetMetaInfo(kNormalKey, &meta_value));
- EXPECT_EQ("value2", meta_value);
- EXPECT_TRUE(bbn->GetChild(0)->GetMetaInfo(kNestedKey, &meta_value));
- EXPECT_EQ("value3", meta_value);
-}

Powered by Google App Engine
This is Rietveld 408576698