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

Unified Diff: components/bookmarks/browser/bookmark_utils_unittest.cc

Issue 428183004: Fix BookmarkNode MetaInfoMap copypasting for Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: In one line Created 6 years, 5 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
« no previous file with comments | « components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/bookmarks/browser/bookmark_utils_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc
index 644537345f1ea91ed1efa5d716a3b56df78c796e..a5009d7c993c19b6e01c82f1f35496c436155494 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -285,6 +285,43 @@ TEST_F(BookmarkUtilsTest, CopyPaste) {
EXPECT_FALSE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node()));
}
+TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) {
+ test::TestBookmarkClient client;
+ scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+ const BookmarkNode* node = model->AddURL(model->other_node(),
+ 0,
+ ASCIIToUTF16("foo bar"),
+ GURL("http://www.google.com"));
+ model->SetNodeMetaInfo(node, "somekey", "somevalue");
+ model->SetNodeMetaInfo(node, "someotherkey", "someothervalue");
+
+ // Copy a node to the clipboard.
+ std::vector<const BookmarkNode*> nodes;
+ nodes.push_back(node);
+ CopyToClipboard(model.get(), nodes, false);
+
+ // Paste node to a different folder.
+ const BookmarkNode* folder =
+ model->AddFolder(model->bookmark_bar_node(), 0, ASCIIToUTF16("Folder"));
+ EXPECT_EQ(0, folder->child_count());
+
+ // And make sure we can paste a bookmark from the clipboard.
+ EXPECT_TRUE(CanPasteFromClipboard(model.get(), folder));
+
+ PasteFromClipboard(model.get(), folder, 0);
+ ASSERT_EQ(1, folder->child_count());
+
+ // Verify that the pasted node contains the same meta info.
+ const BookmarkNode* pasted = folder->GetChild(0);
+ ASSERT_TRUE(pasted->GetMetaInfoMap());
+ EXPECT_EQ(2u, pasted->GetMetaInfoMap()->size());
+ std::string value;
+ EXPECT_TRUE(pasted->GetMetaInfo("somekey", &value));
+ EXPECT_EQ("somevalue", value);
+ EXPECT_TRUE(pasted->GetMetaInfo("someotherkey", &value));
+ EXPECT_EQ("someothervalue", value);
+}
+
TEST_F(BookmarkUtilsTest, CutToClipboard) {
test::TestBookmarkClient client;
scoped_ptr<BookmarkModel> model(client.CreateModel(false));
« no previous file with comments | « components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698