1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
|
// Copyright 2013 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/bookmarks/bookmark_editor.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/test/test_bookmark_client.h"
#include "components/signin/public/base/signin_switches.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::ASCIIToUTF16;
using bookmarks::BookmarkModel;
using bookmarks::BookmarkNode;
using testing::ElementsAre;
using testing::Pointer;
namespace {
const BookmarkNode* InitBookmarkBar(BookmarkModel* model) {
const BookmarkNode* bookmarkbar = model->bookmark_bar_node();
model->AddURL(bookmarkbar, 0, u"url0", GURL("chrome://newtab"));
model->AddURL(bookmarkbar, 1, u"url1", GURL("chrome://newtab"));
return bookmarkbar;
}
TEST(BookmarkEditorTest, ApplyEditsWithNoFolderChange) {
std::unique_ptr<BookmarkModel> model(
bookmarks::TestBookmarkClient::CreateModel());
const BookmarkNode* bookmarkbar = InitBookmarkBar(model.get());
{
BookmarkEditor::EditDetails detail(
BookmarkEditor::EditDetails::AddFolder(bookmarkbar, 1));
BookmarkEditor::ApplyEdits(model.get(), bookmarkbar, detail, u"folder0",
GURL(std::string()));
EXPECT_EQ(u"folder0", bookmarkbar->children()[1]->GetTitle());
}
{
BookmarkEditor::EditDetails detail(BookmarkEditor::EditDetails::AddFolder(
bookmarkbar, static_cast<size_t>(-1)));
BookmarkEditor::ApplyEdits(model.get(), bookmarkbar, detail, u"folder1",
GURL(std::string()));
EXPECT_EQ(u"folder1", bookmarkbar->children()[3]->GetTitle());
}
{
BookmarkEditor::EditDetails detail(
BookmarkEditor::EditDetails::AddFolder(bookmarkbar, 10));
BookmarkEditor::ApplyEdits(model.get(), bookmarkbar, detail, u"folder2",
GURL(std::string()));
EXPECT_EQ(u"folder2", bookmarkbar->children()[4]->GetTitle());
}
}
TEST(BookmarkEditorTest, ApplyEditsWithMultipleURLs) {
std::unique_ptr<BookmarkModel> model(
bookmarks::TestBookmarkClient::CreateModel());
const BookmarkNode* bookmarkbar = InitBookmarkBar(model.get());
BookmarkEditor::EditDetails detail(
BookmarkEditor::EditDetails::AddFolder(bookmarkbar, 2));
const std::u16string url_title_0 = u"url_0";
const std::u16string url_title_1 = u"url_1";
BookmarkEditor::EditDetails::BookmarkData url_data_0;
url_data_0.url = std::make_optional(GURL("chrome://newtab"));
url_data_0.title = url_title_0;
BookmarkEditor::EditDetails::BookmarkData url_data_1;
url_data_1.url = std::make_optional(GURL("chrome://newtab"));
url_data_1.title = url_title_1;
detail.bookmark_data.children.push_back(url_data_0);
detail.bookmark_data.children.push_back(url_data_1);
BookmarkEditor::ApplyEdits(model.get(), bookmarkbar, detail, u"folder",
GURL(std::string()));
EXPECT_EQ(u"folder", bookmarkbar->children()[2]->GetTitle());
EXPECT_EQ(url_title_0, bookmarkbar->children()[2]->children()[0]->GetTitle());
EXPECT_EQ(url_title_1, bookmarkbar->children()[2]->children()[1]->GetTitle());
}
TEST(BookmarkEditorTest, ApplyEditsWithNestedFolder) {
std::unique_ptr<BookmarkModel> model(
bookmarks::TestBookmarkClient::CreateModel());
const BookmarkNode* bookmarkbar = InitBookmarkBar(model.get());
BookmarkEditor::EditDetails detail(
BookmarkEditor::EditDetails::AddFolder(bookmarkbar, 2));
const std::u16string nested_folder_title = u"nested_folder";
const std::u16string nested_url_title = u"nested_url";
BookmarkEditor::EditDetails::BookmarkData url_data;
url_data.url = std::make_optional(GURL("chrome://newtab"));
url_data.title = nested_url_title;
BookmarkEditor::EditDetails::BookmarkData folder_data;
folder_data.title = nested_folder_title;
folder_data.children.push_back(url_data);
detail.bookmark_data.children.push_back(folder_data);
BookmarkEditor::ApplyEdits(model.get(), bookmarkbar, detail, u"folder",
GURL(std::string()));
EXPECT_EQ(u"folder", bookmarkbar->children()[2]->GetTitle());
EXPECT_EQ(nested_folder_title,
bookmarkbar->children()[2]->children()[0]->GetTitle());
EXPECT_EQ(
nested_url_title,
bookmarkbar->children()[2]->children()[0]->children()[0]->GetTitle());
}
TEST(BookmarkEditorTest, ApplyEditsWithURLsAndNestedFolders) {
std::unique_ptr<BookmarkModel> model(
bookmarks::TestBookmarkClient::CreateModel());
const BookmarkNode* bookmarkbar = InitBookmarkBar(model.get());
BookmarkEditor::EditDetails detail(
BookmarkEditor::EditDetails::AddFolder(bookmarkbar, 10));
const std::u16string nested_folder_title_0 = u"nested_folder_0";
const std::u16string nested_folder_title_1 = u"nested_folder_1";
const std::u16string nested_folder_title_2 = u"nested_folder_2";
const std::u16string url_title_0 = u"url_0";
const std::u16string url_title_1 = u"url_1";
const std::u16string nested_url_title = u"nested_url";
BookmarkEditor::EditDetails::BookmarkData url_data_0;
url_data_0.url = std::make_optional(GURL("chrome://newtab"));
url_data_0.title = url_title_0;
BookmarkEditor::EditDetails::BookmarkData url_data_1;
url_data_1.url = std::make_optional(GURL("chrome://newtab"));
url_data_1.title = url_title_1;
BookmarkEditor::EditDetails::BookmarkData nested_url_data;
nested_url_data.url = std::make_optional(GURL("chrome://newtab"));
nested_url_data.title = nested_url_title;
BookmarkEditor::EditDetails::BookmarkData folder_data_0;
folder_data_0.title = nested_folder_title_0;
folder_data_0.children.push_back(nested_url_data);
BookmarkEditor::EditDetails::BookmarkData folder_data_1;
folder_data_1.title = nested_folder_title_1;
folder_data_1.children.push_back(nested_url_data);
BookmarkEditor::EditDetails::BookmarkData folder_data_2;
folder_data_2.title = nested_folder_title_2;
folder_data_2.children.push_back(nested_url_data);
detail.bookmark_data.children.push_back(folder_data_0);
detail.bookmark_data.children.push_back(url_data_0);
detail.bookmark_data.children.push_back(folder_data_1);
detail.bookmark_data.children.push_back(folder_data_2);
detail.bookmark_data.children.push_back(url_data_1);
BookmarkEditor::ApplyEdits(model.get(), bookmarkbar, detail, u"folder",
GURL(std::string()));
EXPECT_EQ(u"folder", bookmarkbar->children()[2]->GetTitle());
EXPECT_EQ(nested_folder_title_0,
bookmarkbar->children()[2]->children()[0]->GetTitle());
EXPECT_EQ(url_title_0, bookmarkbar->children()[2]->children()[1]->GetTitle());
EXPECT_EQ(nested_folder_title_1,
bookmarkbar->children()[2]->children()[2]->GetTitle());
EXPECT_EQ(nested_folder_title_2,
bookmarkbar->children()[2]->children()[3]->GetTitle());
EXPECT_EQ(url_title_1, bookmarkbar->children()[2]->children()[4]->GetTitle());
}
TEST(BookmarkEditorTest, ApplyEditsMoveBookmarks) {
base::test::ScopedFeatureList override_features{
switches::kSyncEnableBookmarksInTransportMode};
std::unique_ptr<BookmarkModel> model =
bookmarks::TestBookmarkClient::CreateModel();
model->CreateAccountPermanentFolders();
const BookmarkNode* local_node = model->AddURL(
model->bookmark_bar_node(), 0, u"title", GURL("chrome://newtab"));
const BookmarkNode* account_node = model->AddURL(
model->account_bookmark_bar_node(), 0, u"title", GURL("chrome://newtab"));
ASSERT_THAT(model->bookmark_bar_node()->children(),
ElementsAre(Pointer(local_node)));
ASSERT_THAT(model->account_bookmark_bar_node()->children(),
ElementsAre(Pointer(account_node)));
BookmarkEditor::EditDetails detail(BookmarkEditor::EditDetails::MoveNodes(
model.get(), {local_node, account_node}));
BookmarkEditor::ApplyEdits(model.get(), model->account_other_node(), detail,
std::u16string(), GURL());
EXPECT_TRUE(model->bookmark_bar_node()->children().empty());
EXPECT_TRUE(model->account_bookmark_bar_node()->children().empty());
EXPECT_THAT(model->account_other_node()->children(),
ElementsAre(Pointer(local_node), Pointer(account_node)));
}
TEST(BookmarkEditorTest, ApplyEditsMoveAccountBookmarks) {
base::test::ScopedFeatureList override_features{
switches::kSyncEnableBookmarksInTransportMode};
std::unique_ptr<BookmarkModel> model =
bookmarks::TestBookmarkClient::CreateModel();
model->CreateAccountPermanentFolders();
const BookmarkNode* folder =
model->AddFolder(model->account_bookmark_bar_node(), 0, u"folder");
const BookmarkNode* node = model->AddURL(
model->account_bookmark_bar_node(), 1, u"title", GURL("chrome://newtab"));
ASSERT_THAT(model->account_bookmark_bar_node()->children(),
ElementsAre(Pointer(folder), Pointer(node)));
BookmarkEditor::EditDetails detail(
BookmarkEditor::EditDetails::MoveNodes(model.get(), {folder, node}));
BookmarkEditor::ApplyEdits(model.get(), model->other_node(), detail,
std::u16string(), GURL());
EXPECT_TRUE(model->account_bookmark_bar_node()->children().empty());
EXPECT_THAT(model->other_node()->children(),
ElementsAre(Pointer(folder), Pointer(node)));
}
TEST(BookmarkEditorTest, ApplyEditsMoveLocalBookmarks) {
std::unique_ptr<BookmarkModel> model =
bookmarks::TestBookmarkClient::CreateModel();
const BookmarkNode* folder =
model->AddFolder(model->bookmark_bar_node(), 0, u"folder");
const BookmarkNode* node = model->AddURL(model->bookmark_bar_node(), 1,
u"title", GURL("chrome://newtab"));
ASSERT_THAT(model->bookmark_bar_node()->children(),
ElementsAre(Pointer(folder), Pointer(node)));
BookmarkEditor::EditDetails detail(
BookmarkEditor::EditDetails::MoveNodes(model.get(), {folder, node}));
BookmarkEditor::ApplyEdits(model.get(), model->other_node(), detail,
std::u16string(), GURL());
EXPECT_TRUE(model->bookmark_bar_node()->children().empty());
EXPECT_THAT(model->other_node()->children(),
ElementsAre(Pointer(folder), Pointer(node)));
}
TEST(BookmarkEditorTest, MoveNodesDefaultLocation) {
base::test::ScopedFeatureList features(
switches::kSyncEnableBookmarksInTransportMode);
std::unique_ptr<BookmarkModel> model(
bookmarks::TestBookmarkClient::CreateModel());
model->CreateAccountPermanentFolders();
// Bookmark tree will have the following structure:
// LocalBookmarkBar
// local_folder
// local_nested_node
// local_node
// AccountBookmarkBar
// account_folder
// account_nested_node
// account_node
const BookmarkNode* local_folder =
model->AddFolder(model->bookmark_bar_node(), 0, u"folder");
const BookmarkNode* local_node = model->AddURL(
model->bookmark_bar_node(), 0, u"title", GURL(u"chrome://newtab"));
const BookmarkNode* local_nested_node =
model->AddURL(local_folder, 0, u"title", GURL(u"chrome://newtab"));
const BookmarkNode* account_folder =
model->AddFolder(model->account_bookmark_bar_node(), 0, u"folder");
const BookmarkNode* account_node =
model->AddURL(model->account_bookmark_bar_node(), 0, u"title",
GURL(u"chrome://newtab"));
const BookmarkNode* account_nested_node =
model->AddURL(account_folder, 0, u"title", GURL(u"chrome://newtab"));
// Move nodes with the same local parent.
{
BookmarkEditor::EditDetails detail(BookmarkEditor::EditDetails::MoveNodes(
model.get(), {local_folder, local_node}));
EXPECT_EQ(model->bookmark_bar_node(), detail.parent_node);
}
// Move nodes with the same account parent.
{
BookmarkEditor::EditDetails detail(BookmarkEditor::EditDetails::MoveNodes(
model.get(), {account_folder, account_node}));
EXPECT_EQ(model->account_bookmark_bar_node(), detail.parent_node);
}
// Move only local nodes.
{
BookmarkEditor::EditDetails detail(BookmarkEditor::EditDetails::MoveNodes(
model.get(), {local_node, local_nested_node}));
EXPECT_EQ(model->other_node(), detail.parent_node);
}
// Move only account nodes.
{
BookmarkEditor::EditDetails detail(BookmarkEditor::EditDetails::MoveNodes(
model.get(), {account_node, account_nested_node}));
EXPECT_EQ(model->account_other_node(), detail.parent_node);
}
// Move both local and account nodes.
{
BookmarkEditor::EditDetails detail(BookmarkEditor::EditDetails::MoveNodes(
model.get(), {local_node, account_nested_node}));
EXPECT_EQ(model->account_other_node(), detail.parent_node);
}
}
TEST(BookmarkEditorTest, ApplyEditsPersistOrderAfterMove) {
base::test::ScopedFeatureList override_features{
switches::kSyncEnableBookmarksInTransportMode};
std::unique_ptr<BookmarkModel> model =
bookmarks::TestBookmarkClient::CreateModel();
model->CreateAccountPermanentFolders();
const BookmarkNode* local_node1 = model->AddURL(
model->bookmark_bar_node(), 0, u"title", GURL("chrome://newtab"));
const BookmarkNode* local_node2 = model->AddURL(
model->bookmark_bar_node(), 1, u"title", GURL("chrome://newtab"));
const BookmarkNode* local_node3 = model->AddURL(
model->bookmark_bar_node(), 2, u"title", GURL("chrome://newtab"));
const BookmarkNode* account_node1 = model->AddURL(
model->account_other_node(), 0, u"title", GURL("chrome://newtab"));
const BookmarkNode* account_node2 = model->AddURL(
model->account_other_node(), 1, u"title", GURL("chrome://newtab"));
const BookmarkNode* account_node3 = model->AddURL(
model->account_other_node(), 2, u"title", GURL("chrome://newtab"));
ASSERT_THAT(model->bookmark_bar_node()->children(),
ElementsAre(Pointer(local_node1), Pointer(local_node2),
Pointer(local_node3)));
ASSERT_THAT(model->account_other_node()->children(),
ElementsAre(Pointer(account_node1), Pointer(account_node2),
Pointer(account_node3)));
// Make the selection in a random order. The order after moving should however
// remain the same as in the initial parent node.
BookmarkEditor::EditDetails detail(BookmarkEditor::EditDetails::MoveNodes(
model.get(), {account_node2, local_node1, local_node3, account_node3,
account_node1, local_node2}));
BookmarkEditor::ApplyEdits(model.get(), model->other_node(), detail,
std::u16string(), GURL());
// Since the account nodes were added more recently, they should be rowed
// last.
EXPECT_THAT(model->other_node()->children(),
ElementsAre(Pointer(local_node1), Pointer(local_node2),
Pointer(local_node3), Pointer(account_node1),
Pointer(account_node2), Pointer(account_node3)));
}
} // namespace
|
