Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 266 GURL("http://www.google.com")); | 266 GURL("http://www.google.com")); |
| 267 | 267 |
| 268 // Copy a node to the clipboard. | 268 // Copy a node to the clipboard. |
| 269 std::vector<const BookmarkNode*> nodes; | 269 std::vector<const BookmarkNode*> nodes; |
| 270 nodes.push_back(node); | 270 nodes.push_back(node); |
| 271 CopyToClipboard(model.get(), nodes, false); | 271 CopyToClipboard(model.get(), nodes, false); |
| 272 | 272 |
| 273 // And make sure we can paste a bookmark from the clipboard. | 273 // And make sure we can paste a bookmark from the clipboard. |
| 274 EXPECT_TRUE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node())); | 274 EXPECT_TRUE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node())); |
| 275 | 275 |
| 276 // Write some valid url to the clipboard. | |
|
sky
2014/09/08 16:26:18
Move your new assertions into their own test. Putt
| |
| 277 ui::ScopedClipboardWriter clipboard_writer( | |
| 278 ui::Clipboard::GetForCurrentThread(), ui::CLIPBOARD_TYPE_COPY_PASTE); | |
| 279 clipboard_writer.WriteText(ASCIIToUTF16("http://www.google.com")); | |
| 280 | |
| 281 // Now we should be able to paste from the clipboard. | |
| 282 EXPECT_TRUE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node())); | |
| 283 | |
| 284 // Write blank text to clipboard. | |
| 285 { | |
| 286 ui::ScopedClipboardWriter clipboard_writer( | |
| 287 ui::Clipboard::GetForCurrentThread(), | |
| 288 ui::CLIPBOARD_TYPE_COPY_PASTE); | |
| 289 clipboard_writer.WriteText(ASCIIToUTF16("")); | |
| 290 } | |
| 291 | |
| 292 // Now we shouldn't be able to paste from the clipboard. | |
| 293 EXPECT_FALSE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node())); | |
| 294 | |
| 276 // Write some text to the clipboard. | 295 // Write some text to the clipboard. |
| 277 { | 296 { |
| 278 ui::ScopedClipboardWriter clipboard_writer( | 297 ui::ScopedClipboardWriter clipboard_writer( |
| 279 ui::Clipboard::GetForCurrentThread(), | 298 ui::Clipboard::GetForCurrentThread(), |
| 280 ui::CLIPBOARD_TYPE_COPY_PASTE); | 299 ui::CLIPBOARD_TYPE_COPY_PASTE); |
| 281 clipboard_writer.WriteText(ASCIIToUTF16("foo")); | 300 clipboard_writer.WriteText(ASCIIToUTF16("foo")); |
| 282 } | 301 } |
| 283 | 302 |
| 284 // Now we shouldn't be able to paste from the clipboard. | 303 // Now we shouldn't be able to paste from the clipboard. |
| 285 EXPECT_FALSE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node())); | 304 EXPECT_FALSE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node())); |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 304 const BookmarkNode* folder = | 323 const BookmarkNode* folder = |
| 305 model->AddFolder(model->bookmark_bar_node(), 0, ASCIIToUTF16("Folder")); | 324 model->AddFolder(model->bookmark_bar_node(), 0, ASCIIToUTF16("Folder")); |
| 306 EXPECT_EQ(0, folder->child_count()); | 325 EXPECT_EQ(0, folder->child_count()); |
| 307 | 326 |
| 308 // And make sure we can paste a bookmark from the clipboard. | 327 // And make sure we can paste a bookmark from the clipboard. |
| 309 EXPECT_TRUE(CanPasteFromClipboard(model.get(), folder)); | 328 EXPECT_TRUE(CanPasteFromClipboard(model.get(), folder)); |
| 310 | 329 |
| 311 PasteFromClipboard(model.get(), folder, 0); | 330 PasteFromClipboard(model.get(), folder, 0); |
| 312 ASSERT_EQ(1, folder->child_count()); | 331 ASSERT_EQ(1, folder->child_count()); |
| 313 | 332 |
| 333 // Write some valid url to clipboard | |
|
sky
2014/09/08 16:26:18
end with '.'
| |
| 334 base::string16 url_text = ASCIIToUTF16("http://www.google.com/"); | |
|
sky
2014/09/08 16:26:18
you've got two spaces here. And make url_text a co
| |
| 335 ui::ScopedClipboardWriter clipboard_writer( | |
| 336 ui::Clipboard::GetForCurrentThread(), ui::CLIPBOARD_TYPE_COPY_PASTE); | |
| 337 clipboard_writer.WriteText(url_text); | |
| 338 | |
| 339 // We should be able to paste from clipboard. | |
| 340 EXPECT_TRUE(CanPasteFromClipboard(model.get(), folder)); | |
| 341 | |
| 342 PasteFromClipboard(model.get(), folder, 1); | |
| 343 ASSERT_EQ(2, folder->child_count()); | |
| 344 | |
| 345 // Url for added node should be same as url_text. | |
| 346 EXPECT_EQ(url_text,ASCIIToUTF16(folder->GetChild(1)->url().spec())); | |
|
sky
2014/09/08 16:26:18
nit: space after ','
| |
| 347 | |
| 314 // Verify that the pasted node contains the same meta info. | 348 // Verify that the pasted node contains the same meta info. |
| 315 const BookmarkNode* pasted = folder->GetChild(0); | 349 const BookmarkNode* pasted = folder->GetChild(0); |
| 316 ASSERT_TRUE(pasted->GetMetaInfoMap()); | 350 ASSERT_TRUE(pasted->GetMetaInfoMap()); |
| 317 EXPECT_EQ(2u, pasted->GetMetaInfoMap()->size()); | 351 EXPECT_EQ(2u, pasted->GetMetaInfoMap()->size()); |
| 318 std::string value; | 352 std::string value; |
| 319 EXPECT_TRUE(pasted->GetMetaInfo("somekey", &value)); | 353 EXPECT_TRUE(pasted->GetMetaInfo("somekey", &value)); |
| 320 EXPECT_EQ("somevalue", value); | 354 EXPECT_EQ("somevalue", value); |
| 321 EXPECT_TRUE(pasted->GetMetaInfo("someotherkey", &value)); | 355 EXPECT_TRUE(pasted->GetMetaInfo("someotherkey", &value)); |
| 322 EXPECT_EQ("someothervalue", value); | 356 EXPECT_EQ("someothervalue", value); |
| 323 } | 357 } |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 488 model->GetNodesByURL(url, &nodes); | 522 model->GetNodesByURL(url, &nodes); |
| 489 ASSERT_EQ(1u, nodes.size()); | 523 ASSERT_EQ(1u, nodes.size()); |
| 490 EXPECT_TRUE(model->bookmark_bar_node()->empty()); | 524 EXPECT_TRUE(model->bookmark_bar_node()->empty()); |
| 491 EXPECT_TRUE(model->other_node()->empty()); | 525 EXPECT_TRUE(model->other_node()->empty()); |
| 492 EXPECT_TRUE(model->mobile_node()->empty()); | 526 EXPECT_TRUE(model->mobile_node()->empty()); |
| 493 EXPECT_EQ(1, extra_node->child_count()); | 527 EXPECT_EQ(1, extra_node->child_count()); |
| 494 } | 528 } |
| 495 | 529 |
| 496 } // namespace | 530 } // namespace |
| 497 } // namespace bookmarks | 531 } // namespace bookmarks |
| OLD | NEW |