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

Side by Side Diff: components/bookmarks/browser/bookmark_utils_unittest.cc

Issue 437423005: Show paste option on right click of bookmark bar if some URL is copied from outside browser or from… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created new test assertion Created 6 years, 3 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_utils.cc ('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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 fields[i]->reset(new base::string16(ASCIIToUTF16("fjdkslafjkldsa"))); 250 fields[i]->reset(new base::string16(ASCIIToUTF16("fjdkslafjkldsa")));
251 GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes); 251 GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
252 ASSERT_EQ(0U, nodes.size()); 252 ASSERT_EQ(0U, nodes.size());
253 nodes.clear(); 253 nodes.clear();
254 fields[i]->reset(original_value.release()); 254 fields[i]->reset(original_value.release());
255 } 255 }
256 } 256 }
257 257
258 // Copy and paste is not yet supported on iOS. http://crbug.com/228147 258 // Copy and paste is not yet supported on iOS. http://crbug.com/228147
259 #if !defined(OS_IOS) 259 #if !defined(OS_IOS)
260 TEST_F(BookmarkUtilsTest, PasteBookmarkFromURL) {
261 test::TestBookmarkClient client;
262 scoped_ptr<BookmarkModel> model(client.CreateModel());
263 const base::string16 url_text = ASCIIToUTF16("http://www.google.com/");
264 const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
265
266 // Write some valid url to the clipboard.
267 ui::ScopedClipboardWriter clipboard_writer(
268 ui::Clipboard::GetForCurrentThread(), ui::CLIPBOARD_TYPE_COPY_PASTE);
269 clipboard_writer.WriteText(url_text);
270
271 // Now we should be able to paste from the clipboard.
272 EXPECT_TRUE(CanPasteFromClipboard(model.get(), bookmark_bar));
273
274 PasteFromClipboard(model.get(), bookmark_bar, 0);
275 ASSERT_EQ(1, bookmark_bar->child_count());
276
277 // Url for added node should be same as url_text.
278 EXPECT_EQ(url_text, ASCIIToUTF16(bookmark_bar->GetChild(0)->url().spec()));
279
280 // Write blank text to clipboard.
281 {
282 ui::ScopedClipboardWriter clipboard_writer(
283 ui::Clipboard::GetForCurrentThread(), ui::CLIPBOARD_TYPE_COPY_PASTE);
284 clipboard_writer.WriteText(ASCIIToUTF16(""));
sky 2014/09/09 15:52:29 ASCIIToUTF16("")->base::string16()
ankit 2014/09/10 13:18:47 Done.
285 }
286 // Now we shouldn't be able to paste from the clipboard.
287 EXPECT_FALSE(CanPasteFromClipboard(model.get(), bookmark_bar));
288 }
289
260 TEST_F(BookmarkUtilsTest, CopyPaste) { 290 TEST_F(BookmarkUtilsTest, CopyPaste) {
261 test::TestBookmarkClient client; 291 test::TestBookmarkClient client;
262 scoped_ptr<BookmarkModel> model(client.CreateModel()); 292 scoped_ptr<BookmarkModel> model(client.CreateModel());
263 const BookmarkNode* node = model->AddURL(model->other_node(), 293 const BookmarkNode* node = model->AddURL(model->other_node(),
264 0, 294 0,
265 ASCIIToUTF16("foo bar"), 295 ASCIIToUTF16("foo bar"),
266 GURL("http://www.google.com")); 296 GURL("http://www.google.com"));
267 297
268 // Copy a node to the clipboard. 298 // Copy a node to the clipboard.
269 std::vector<const BookmarkNode*> nodes; 299 std::vector<const BookmarkNode*> nodes;
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 model->GetNodesByURL(url, &nodes); 518 model->GetNodesByURL(url, &nodes);
489 ASSERT_EQ(1u, nodes.size()); 519 ASSERT_EQ(1u, nodes.size());
490 EXPECT_TRUE(model->bookmark_bar_node()->empty()); 520 EXPECT_TRUE(model->bookmark_bar_node()->empty());
491 EXPECT_TRUE(model->other_node()->empty()); 521 EXPECT_TRUE(model->other_node()->empty());
492 EXPECT_TRUE(model->mobile_node()->empty()); 522 EXPECT_TRUE(model->mobile_node()->empty());
493 EXPECT_EQ(1, extra_node->child_count()); 523 EXPECT_EQ(1, extra_node->child_count());
494 } 524 }
495 525
496 } // namespace 526 } // namespace
497 } // namespace bookmarks 527 } // namespace bookmarks
OLDNEW
« no previous file with comments | « components/bookmarks/browser/bookmark_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698