| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <set> | 5 #include <set> |
| 6 | 6 |
| 7 #include "app/tree_node_iterator.h" | 7 #include "app/tree_node_iterator.h" |
| 8 #include "app/tree_node_model.h" | 8 #include "app/tree_node_model.h" |
| 9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| (...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 const GURL url("http://foo.com/0"); | 471 const GURL url("http://foo.com/0"); |
| 472 model.AddURL(model.GetBookmarkBarNode(), 0, ASCIIToUTF16("blah"), url); | 472 model.AddURL(model.GetBookmarkBarNode(), 0, ASCIIToUTF16("blah"), url); |
| 473 model.AddURL(model.GetBookmarkBarNode(), 1, ASCIIToUTF16("blah"), url); | 473 model.AddURL(model.GetBookmarkBarNode(), 1, ASCIIToUTF16("blah"), url); |
| 474 | 474 |
| 475 std::vector<GURL> urls; | 475 std::vector<GURL> urls; |
| 476 model.GetBookmarks(&urls); | 476 model.GetBookmarks(&urls); |
| 477 EXPECT_EQ(1U, urls.size()); | 477 EXPECT_EQ(1U, urls.size()); |
| 478 ASSERT_TRUE(urls[0] == url); | 478 ASSERT_TRUE(urls[0] == url); |
| 479 } | 479 } |
| 480 | 480 |
| 481 TEST_F(BookmarkModelTest, HasBookmarks) { |
| 482 const GURL url("http://foo.com/"); |
| 483 model.AddURL(model.GetBookmarkBarNode(), 0, ASCIIToUTF16("bar"), url); |
| 484 |
| 485 EXPECT_TRUE(model.HasBookmarks()); |
| 486 } |
| 487 |
| 481 namespace { | 488 namespace { |
| 482 | 489 |
| 483 // NotificationObserver implementation used in verifying we've received the | 490 // NotificationObserver implementation used in verifying we've received the |
| 484 // NOTIFY_URLS_STARRED method correctly. | 491 // NOTIFY_URLS_STARRED method correctly. |
| 485 class StarredListener : public NotificationObserver { | 492 class StarredListener : public NotificationObserver { |
| 486 public: | 493 public: |
| 487 StarredListener() : notification_count_(0), details_(false) { | 494 StarredListener() : notification_count_(0), details_(false) { |
| 488 registrar_.Add(this, NotificationType::URLS_STARRED, Source<Profile>(NULL)); | 495 registrar_.Add(this, NotificationType::URLS_STARRED, Source<Profile>(NULL)); |
| 489 } | 496 } |
| 490 | 497 |
| (...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 978 // Make sure we were notified. | 985 // Make sure we were notified. |
| 979 AssertObserverCount(0, 0, 0, 0, 1); | 986 AssertObserverCount(0, 0, 0, 0, 1); |
| 980 | 987 |
| 981 // Make sure the order matches (remember, 'a' and 'C' are folders and | 988 // Make sure the order matches (remember, 'a' and 'C' are folders and |
| 982 // come first). | 989 // come first). |
| 983 EXPECT_EQ(parent->GetChild(0)->GetTitleAsString16(), ASCIIToUTF16("a")); | 990 EXPECT_EQ(parent->GetChild(0)->GetTitleAsString16(), ASCIIToUTF16("a")); |
| 984 EXPECT_EQ(parent->GetChild(1)->GetTitleAsString16(), ASCIIToUTF16("C")); | 991 EXPECT_EQ(parent->GetChild(1)->GetTitleAsString16(), ASCIIToUTF16("C")); |
| 985 EXPECT_EQ(parent->GetChild(2)->GetTitleAsString16(), ASCIIToUTF16("B")); | 992 EXPECT_EQ(parent->GetChild(2)->GetTitleAsString16(), ASCIIToUTF16("B")); |
| 986 EXPECT_EQ(parent->GetChild(3)->GetTitleAsString16(), ASCIIToUTF16("d")); | 993 EXPECT_EQ(parent->GetChild(3)->GetTitleAsString16(), ASCIIToUTF16("d")); |
| 987 } | 994 } |
| OLD | NEW |