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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/bookmarks/managed_bookmark_service_unittest.cc

Issue 1233673002: Fix componentization of chrome/browser/bookmarks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments by tfarina and fix compilation Created 5 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
« chrome/browser/bookmarks/chrome_bookmark_client.cc ('K') | « chrome/browser/bookmarks/managed_bookmark_service_factory.cc ('k') | chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc » ('j') | chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/managed_bookmark_service_unittest.cc
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc b/chrome/browser/bookmarks/managed_bookmark_service_unittest.cc
similarity index 72%
rename from chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
rename to chrome/browser/bookmarks/managed_bookmark_service_unittest.cc
index 6a6dd17a53fe4251313ea78893c6ea46601f7288..f970c0c04b4699f5f89e8b11828569011a6b32f9 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
+++ b/chrome/browser/bookmarks/managed_bookmark_service_unittest.cc
@@ -2,21 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/bookmarks/chrome_bookmark_client.h"
-
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/bookmarks/chrome_bookmark_client.h"
-#include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
+#include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
#include "chrome/test/base/testing_pref_service_syncable.h"
#include "chrome/test/base/testing_profile.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_node.h"
#include "components/bookmarks/browser/bookmark_utils.h"
#include "components/bookmarks/common/bookmark_pref_names.h"
+#include "components/bookmarks/managed/managed_bookmark_service.h"
sky 2015/07/20 15:53:19 nit: this should be the first include (line 5 old)
sdefresne 2015/07/20 17:43:40 Done.
#include "components/bookmarks/test/bookmark_test_helpers.h"
#include "components/bookmarks/test/mock_bookmark_model_observer.h"
#include "content/public/test/test_browser_thread_bundle.h"
@@ -27,13 +26,14 @@
using bookmarks::BookmarkModel;
using bookmarks::BookmarkNode;
+using bookmarks::ManagedBookmarkService;
using testing::Mock;
using testing::_;
-class ChromeBookmarkClientTest : public testing::Test {
+class ManagedBookmarkServiceTest : public testing::Test {
public:
- ChromeBookmarkClientTest() : client_(NULL), model_(NULL) {}
- ~ChromeBookmarkClientTest() override {}
+ ManagedBookmarkServiceTest() : managed_(NULL), model_(NULL) {}
+ ~ManagedBookmarkServiceTest() override {}
void SetUp() override {
prefs_ = profile_.GetTestingPrefService();
@@ -44,9 +44,9 @@ class ChromeBookmarkClientTest : public testing::Test {
ResetModel();
// The managed node always exists.
- ASSERT_TRUE(client_->managed_node());
- ASSERT_TRUE(client_->managed_node()->parent() == model_->root_node());
- EXPECT_NE(-1, model_->root_node()->GetIndexOf(client_->managed_node()));
+ ASSERT_TRUE(managed_->managed_node());
+ ASSERT_TRUE(managed_->managed_node()->parent() == model_->root_node());
+ EXPECT_NE(-1, model_->root_node()->GetIndexOf(managed_->managed_node()));
}
void TearDown() override { model_->RemoveObserver(&observer_); }
@@ -56,8 +56,8 @@ class ChromeBookmarkClientTest : public testing::Test {
model_ = BookmarkModelFactory::GetForProfile(&profile_);
bookmarks::test::WaitForBookmarkModelToLoad(model_);
model_->AddObserver(&observer_);
- client_ = ChromeBookmarkClientFactory::GetForProfile(&profile_);
- DCHECK(client_);
+ managed_ = ManagedBookmarkServiceFactory::GetForProfile(&profile_);
+ DCHECK(managed_);
}
static base::DictionaryValue* CreateBookmark(const std::string& title,
@@ -132,36 +132,36 @@ class ChromeBookmarkClientTest : public testing::Test {
TestingProfile profile_;
TestingPrefServiceSyncable* prefs_;
bookmarks::MockBookmarkModelObserver observer_;
- ChromeBookmarkClient* client_;
+ ManagedBookmarkService* managed_;
BookmarkModel* model_;
- DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClientTest);
+ DISALLOW_COPY_AND_ASSIGN(ManagedBookmarkServiceTest);
};
-TEST_F(ChromeBookmarkClientTest, EmptyManagedNode) {
+TEST_F(ManagedBookmarkServiceTest, EmptyManagedNode) {
// Verifies that the managed node is empty and invisible when the policy is
// not set.
model_->RemoveObserver(&observer_);
prefs_->RemoveManagedPref(bookmarks::prefs::kManagedBookmarks);
ResetModel();
- ASSERT_TRUE(client_->managed_node());
- EXPECT_TRUE(client_->managed_node()->empty());
- EXPECT_FALSE(client_->managed_node()->IsVisible());
+ ASSERT_TRUE(managed_->managed_node());
+ EXPECT_TRUE(managed_->managed_node()->empty());
+ EXPECT_FALSE(managed_->managed_node()->IsVisible());
}
-TEST_F(ChromeBookmarkClientTest, LoadInitial) {
+TEST_F(ManagedBookmarkServiceTest, LoadInitial) {
// Verifies that the initial load picks up the initial policy too.
EXPECT_TRUE(model_->bookmark_bar_node()->empty());
EXPECT_TRUE(model_->other_node()->empty());
- EXPECT_FALSE(client_->managed_node()->empty());
- EXPECT_TRUE(client_->managed_node()->IsVisible());
+ EXPECT_FALSE(managed_->managed_node()->empty());
+ EXPECT_TRUE(managed_->managed_node()->IsVisible());
scoped_ptr<base::DictionaryValue> expected(CreateExpectedTree());
- EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+ EXPECT_TRUE(NodeMatchesValue(managed_->managed_node(), expected.get()));
}
-TEST_F(ChromeBookmarkClientTest, SwapNodes) {
+TEST_F(ManagedBookmarkServiceTest, SwapNodes) {
// Swap the Google bookmark with the Folder.
scoped_ptr<base::ListValue> updated(CreateTestTree());
scoped_ptr<base::Value> removed;
@@ -169,7 +169,7 @@ TEST_F(ChromeBookmarkClientTest, SwapNodes) {
updated->Append(removed.release());
// These two nodes should just be swapped.
- const BookmarkNode* parent = client_->managed_node();
+ const BookmarkNode* parent = managed_->managed_node();
EXPECT_CALL(observer_, BookmarkNodeMoved(model_, parent, 1, parent, 0));
prefs_->SetManagedPref(bookmarks::prefs::kManagedBookmarks,
updated->DeepCopy());
@@ -178,15 +178,15 @@ TEST_F(ChromeBookmarkClientTest, SwapNodes) {
// Verify the final tree.
scoped_ptr<base::DictionaryValue> expected(
CreateFolder(GetManagedFolderTitle(), updated.release()));
- EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+ EXPECT_TRUE(NodeMatchesValue(managed_->managed_node(), expected.get()));
}
-TEST_F(ChromeBookmarkClientTest, RemoveNode) {
+TEST_F(ManagedBookmarkServiceTest, RemoveNode) {
// Remove the Folder.
scoped_ptr<base::ListValue> updated(CreateTestTree());
ASSERT_TRUE(updated->Remove(1, NULL));
- const BookmarkNode* parent = client_->managed_node();
+ const BookmarkNode* parent = managed_->managed_node();
EXPECT_CALL(observer_, BookmarkNodeRemoved(model_, parent, 1, _, _));
prefs_->SetManagedPref(bookmarks::prefs::kManagedBookmarks,
updated->DeepCopy());
@@ -195,10 +195,10 @@ TEST_F(ChromeBookmarkClientTest, RemoveNode) {
// Verify the final tree.
scoped_ptr<base::DictionaryValue> expected(
CreateFolder(GetManagedFolderTitle(), updated.release()));
- EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+ EXPECT_TRUE(NodeMatchesValue(managed_->managed_node(), expected.get()));
}
-TEST_F(ChromeBookmarkClientTest, CreateNewNodes) {
+TEST_F(ManagedBookmarkServiceTest, CreateNewNodes) {
// Put all the nodes inside another folder.
scoped_ptr<base::ListValue> updated(new base::ListValue);
updated->Append(CreateFolder("Container", CreateTestTree()));
@@ -206,7 +206,7 @@ TEST_F(ChromeBookmarkClientTest, CreateNewNodes) {
EXPECT_CALL(observer_, BookmarkNodeAdded(model_, _, _)).Times(5);
// The remaining nodes have been pushed to positions 1 and 2; they'll both be
// removed when at position 1.
- const BookmarkNode* parent = client_->managed_node();
+ const BookmarkNode* parent = managed_->managed_node();
EXPECT_CALL(observer_, BookmarkNodeRemoved(model_, parent, 1, _, _))
.Times(2);
prefs_->SetManagedPref(bookmarks::prefs::kManagedBookmarks,
@@ -216,50 +216,50 @@ TEST_F(ChromeBookmarkClientTest, CreateNewNodes) {
// Verify the final tree.
scoped_ptr<base::DictionaryValue> expected(
CreateFolder(GetManagedFolderTitle(), updated.release()));
- EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+ EXPECT_TRUE(NodeMatchesValue(managed_->managed_node(), expected.get()));
}
-TEST_F(ChromeBookmarkClientTest, RemoveAllUserBookmarks) {
+TEST_F(ManagedBookmarkServiceTest, RemoveAllUserBookmarks) {
// Remove the policy.
- const BookmarkNode* parent = client_->managed_node();
+ const BookmarkNode* parent = managed_->managed_node();
EXPECT_CALL(observer_, BookmarkNodeRemoved(model_, parent, 0, _, _))
.Times(2);
prefs_->RemoveManagedPref(bookmarks::prefs::kManagedBookmarks);
Mock::VerifyAndClearExpectations(&observer_);
- EXPECT_TRUE(client_->managed_node()->empty());
- EXPECT_FALSE(client_->managed_node()->IsVisible());
+ EXPECT_TRUE(managed_->managed_node()->empty());
+ EXPECT_FALSE(managed_->managed_node()->IsVisible());
}
-TEST_F(ChromeBookmarkClientTest, IsDescendantOfManagedNode) {
+TEST_F(ManagedBookmarkServiceTest, IsDescendantOfManagedNode) {
EXPECT_FALSE(bookmarks::IsDescendantOf(model_->root_node(),
- client_->managed_node()));
+ managed_->managed_node()));
EXPECT_FALSE(bookmarks::IsDescendantOf(model_->bookmark_bar_node(),
- client_->managed_node()));
+ managed_->managed_node()));
EXPECT_FALSE(bookmarks::IsDescendantOf(model_->other_node(),
- client_->managed_node()));
+ managed_->managed_node()));
EXPECT_FALSE(bookmarks::IsDescendantOf(model_->mobile_node(),
- client_->managed_node()));
- EXPECT_TRUE(bookmarks::IsDescendantOf(client_->managed_node(),
- client_->managed_node()));
+ managed_->managed_node()));
+ EXPECT_TRUE(bookmarks::IsDescendantOf(managed_->managed_node(),
+ managed_->managed_node()));
- const BookmarkNode* parent = client_->managed_node();
+ const BookmarkNode* parent = managed_->managed_node();
ASSERT_EQ(2, parent->child_count());
EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(0),
- client_->managed_node()));
+ managed_->managed_node()));
EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(1),
- client_->managed_node()));
+ managed_->managed_node()));
parent = parent->GetChild(1);
ASSERT_EQ(2, parent->child_count());
EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(0),
- client_->managed_node()));
+ managed_->managed_node()));
EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(1),
- client_->managed_node()));
+ managed_->managed_node()));
}
-TEST_F(ChromeBookmarkClientTest, RemoveAllDoesntRemoveManaged) {
- EXPECT_EQ(2, client_->managed_node()->child_count());
+TEST_F(ManagedBookmarkServiceTest, RemoveAllDoesntRemoveManaged) {
+ EXPECT_EQ(2, managed_->managed_node()->child_count());
EXPECT_CALL(observer_,
BookmarkNodeAdded(model_, model_->bookmark_bar_node(), 0));
@@ -276,23 +276,23 @@ TEST_F(ChromeBookmarkClientTest, RemoveAllDoesntRemoveManaged) {
EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_, _));
model_->RemoveAllUserBookmarks();
- EXPECT_EQ(2, client_->managed_node()->child_count());
+ EXPECT_EQ(2, managed_->managed_node()->child_count());
EXPECT_EQ(0, model_->bookmark_bar_node()->child_count());
Mock::VerifyAndClearExpectations(&observer_);
}
-TEST_F(ChromeBookmarkClientTest, HasDescendantsOfManagedNode) {
+TEST_F(ManagedBookmarkServiceTest, HasDescendantsOfManagedNode) {
const BookmarkNode* user_node = model_->AddURL(model_->other_node(),
0,
base::ASCIIToUTF16("foo bar"),
GURL("http://www.google.com"));
- const BookmarkNode* managed_node = client_->managed_node()->GetChild(0);
+ const BookmarkNode* managed_node = managed_->managed_node()->GetChild(0);
ASSERT_TRUE(managed_node);
std::vector<const BookmarkNode*> nodes;
- EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, client_->managed_node()));
+ EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, managed_->managed_node()));
nodes.push_back(user_node);
- EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, client_->managed_node()));
+ EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, managed_->managed_node()));
nodes.push_back(managed_node);
- EXPECT_TRUE(bookmarks::HasDescendantsOf(nodes, client_->managed_node()));
+ EXPECT_TRUE(bookmarks::HasDescendantsOf(nodes, managed_->managed_node()));
}
« chrome/browser/bookmarks/chrome_bookmark_client.cc ('K') | « chrome/browser/bookmarks/managed_bookmark_service_factory.cc ('k') | chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc » ('j') | chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698