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

Side by Side 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, 4 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 unified diff | Download patch
« no previous file with comments | « components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "components/bookmarks/browser/bookmark_utils.h" 5 #include "components/bookmarks/browser/bookmark_utils.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 ui::ScopedClipboardWriter clipboard_writer( 278 ui::ScopedClipboardWriter clipboard_writer(
279 ui::Clipboard::GetForCurrentThread(), 279 ui::Clipboard::GetForCurrentThread(),
280 ui::CLIPBOARD_TYPE_COPY_PASTE); 280 ui::CLIPBOARD_TYPE_COPY_PASTE);
281 clipboard_writer.WriteText(ASCIIToUTF16("foo")); 281 clipboard_writer.WriteText(ASCIIToUTF16("foo"));
282 } 282 }
283 283
284 // Now we shouldn't be able to paste from the clipboard. 284 // Now we shouldn't be able to paste from the clipboard.
285 EXPECT_FALSE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node())); 285 EXPECT_FALSE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node()));
286 } 286 }
287 287
288 TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) {
289 test::TestBookmarkClient client;
290 scoped_ptr<BookmarkModel> model(client.CreateModel(false));
291 const BookmarkNode* node = model->AddURL(model->other_node(),
292 0,
293 ASCIIToUTF16("foo bar"),
294 GURL("http://www.google.com"));
295 model->SetNodeMetaInfo(node, "somekey", "somevalue");
296 model->SetNodeMetaInfo(node, "someotherkey", "someothervalue");
297
298 // Copy a node to the clipboard.
299 std::vector<const BookmarkNode*> nodes;
300 nodes.push_back(node);
301 CopyToClipboard(model.get(), nodes, false);
302
303 // Paste node to a different folder.
304 const BookmarkNode* folder =
305 model->AddFolder(model->bookmark_bar_node(), 0, ASCIIToUTF16("Folder"));
306 EXPECT_EQ(0, folder->child_count());
307
308 // And make sure we can paste a bookmark from the clipboard.
309 EXPECT_TRUE(CanPasteFromClipboard(model.get(), folder));
310
311 PasteFromClipboard(model.get(), folder, 0);
312 ASSERT_EQ(1, folder->child_count());
313
314 // Verify that the pasted node contains the same meta info.
315 const BookmarkNode* pasted = folder->GetChild(0);
316 ASSERT_TRUE(pasted->GetMetaInfoMap());
317 EXPECT_EQ(2u, pasted->GetMetaInfoMap()->size());
318 std::string value;
319 EXPECT_TRUE(pasted->GetMetaInfo("somekey", &value));
320 EXPECT_EQ("somevalue", value);
321 EXPECT_TRUE(pasted->GetMetaInfo("someotherkey", &value));
322 EXPECT_EQ("someothervalue", value);
323 }
324
288 TEST_F(BookmarkUtilsTest, CutToClipboard) { 325 TEST_F(BookmarkUtilsTest, CutToClipboard) {
289 test::TestBookmarkClient client; 326 test::TestBookmarkClient client;
290 scoped_ptr<BookmarkModel> model(client.CreateModel(false)); 327 scoped_ptr<BookmarkModel> model(client.CreateModel(false));
291 model->AddObserver(this); 328 model->AddObserver(this);
292 329
293 base::string16 title(ASCIIToUTF16("foo")); 330 base::string16 title(ASCIIToUTF16("foo"));
294 GURL url("http://foo.com"); 331 GURL url("http://foo.com");
295 const BookmarkNode* n1 = model->AddURL(model->other_node(), 0, title, url); 332 const BookmarkNode* n1 = model->AddURL(model->other_node(), 0, title, url);
296 const BookmarkNode* n2 = model->AddURL(model->other_node(), 1, title, url); 333 const BookmarkNode* n2 = model->AddURL(model->other_node(), 1, title, url);
297 334
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 model->GetNodesByURL(url, &nodes); 482 model->GetNodesByURL(url, &nodes);
446 ASSERT_EQ(1u, nodes.size()); 483 ASSERT_EQ(1u, nodes.size());
447 EXPECT_TRUE(model->bookmark_bar_node()->empty()); 484 EXPECT_TRUE(model->bookmark_bar_node()->empty());
448 EXPECT_TRUE(model->other_node()->empty()); 485 EXPECT_TRUE(model->other_node()->empty());
449 EXPECT_TRUE(model->mobile_node()->empty()); 486 EXPECT_TRUE(model->mobile_node()->empty());
450 EXPECT_EQ(1, extra_node->child_count()); 487 EXPECT_EQ(1, extra_node->child_count());
451 } 488 }
452 489
453 } // namespace 490 } // namespace
454 } // namespace bookmarks 491 } // namespace bookmarks
OLDNEW
« 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