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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc

Issue 11567003: Adding a new folder/url to the BMB via right-click insert it at the location clicked (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: update unit test Created 8 years 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 | « chrome/browser/bookmarks/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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 5 #include <string>
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 ASSERT_EQ(ASCIIToUTF16("a"), mf2->GetChild(1)->GetTitle()); 259 ASSERT_EQ(ASCIIToUTF16("a"), mf2->GetChild(1)->GetTitle());
260 260
261 // F21 should have one child, F211. 261 // F21 should have one child, F211.
262 const BookmarkNode* mf21 = mf2->GetChild(0); 262 const BookmarkNode* mf21 = mf2->GetChild(0);
263 ASSERT_EQ(1, mf21->child_count()); 263 ASSERT_EQ(1, mf21->child_count());
264 ASSERT_EQ(ASCIIToUTF16("F211"), mf21->GetChild(0)->GetTitle()); 264 ASSERT_EQ(ASCIIToUTF16("F211"), mf21->GetChild(0)->GetTitle());
265 } 265 }
266 266
267 // Brings up the editor, creating a new URL on the bookmark bar. 267 // Brings up the editor, creating a new URL on the bookmark bar.
268 TEST_F(BookmarkEditorViewTest, NewURL) { 268 TEST_F(BookmarkEditorViewTest, NewURL) {
269 CreateEditor(profile_.get(), NULL, 269 const BookmarkNode* bb_node =
270 BookmarkModelFactory::GetForProfile(profile_.get())->bookmark_bar_node();
271
272 CreateEditor(profile_.get(), bb_node,
270 BookmarkEditor::EditDetails::AddNodeInFolder( 273 BookmarkEditor::EditDetails::AddNodeInFolder(
271 NULL, -1, GURL(), string16()), 274 bb_node, 1, GURL(), string16()),
272 BookmarkEditorView::SHOW_TREE); 275 BookmarkEditorView::SHOW_TREE);
273 276
274 SetURLText(UTF8ToWide(GURL(base_path() + "a").spec())); 277 SetURLText(UTF8ToWide(GURL(base_path() + "a").spec()));
275 SetTitleText(L"new_a"); 278 SetTitleText(L"new_a");
276 279
277 ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0)); 280 ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
278 281
279 const BookmarkNode* bb_node =
280 BookmarkModelFactory::GetForProfile(profile_.get())->bookmark_bar_node();
281 ASSERT_EQ(4, bb_node->child_count()); 282 ASSERT_EQ(4, bb_node->child_count());
282 283
283 const BookmarkNode* new_node = bb_node->GetChild(3); 284 const BookmarkNode* new_node = bb_node->GetChild(1);
284 285
285 EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitle()); 286 EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitle());
286 EXPECT_TRUE(GURL(base_path() + "a") == new_node->url()); 287 EXPECT_TRUE(GURL(base_path() + "a") == new_node->url());
287 } 288 }
288 289
289 // Brings up the editor with no tree and modifies the url. 290 // Brings up the editor with no tree and modifies the url.
290 TEST_F(BookmarkEditorViewTest, ChangeURLNoTree) { 291 TEST_F(BookmarkEditorViewTest, ChangeURLNoTree) {
291 CreateEditor(profile_.get(), NULL, 292 CreateEditor(profile_.get(), NULL,
292 BookmarkEditor::EditDetails::EditNode( 293 BookmarkEditor::EditDetails::EditNode(
293 model_->other_node()->GetChild(0)), 294 model_->other_node()->GetChild(0)),
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 326
326 const BookmarkNode* new_node = other_node->GetChild(0); 327 const BookmarkNode* new_node = other_node->GetChild(0);
327 328
328 EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitle()); 329 EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitle());
329 } 330 }
330 331
331 // Creates a new folder. 332 // Creates a new folder.
332 TEST_F(BookmarkEditorViewTest, NewFolder) { 333 TEST_F(BookmarkEditorViewTest, NewFolder) {
333 const BookmarkNode* bb_node = model_->bookmark_bar_node(); 334 const BookmarkNode* bb_node = model_->bookmark_bar_node();
334 BookmarkEditor::EditDetails details = 335 BookmarkEditor::EditDetails details =
335 BookmarkEditor::EditDetails::AddFolder(bb_node, -1); 336 BookmarkEditor::EditDetails::AddFolder(bb_node, 1);
336 details.urls.push_back(std::make_pair(GURL(base_path() + "x"), 337 details.urls.push_back(std::make_pair(GURL(base_path() + "x"),
337 ASCIIToUTF16("z"))); 338 ASCIIToUTF16("z")));
338 CreateEditor(profile_.get(), bb_node, details, BookmarkEditorView::SHOW_TREE); 339 CreateEditor(profile_.get(), bb_node, details, BookmarkEditorView::SHOW_TREE);
339 340
340 // The url field shouldn't be visible. 341 // The url field shouldn't be visible.
341 EXPECT_FALSE(URLTFHasParent()); 342 EXPECT_FALSE(URLTFHasParent());
342 SetTitleText(L"new_F"); 343 SetTitleText(L"new_F");
343 344
344 ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0)); 345 ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
345 346
346 // Make sure the folder was created. 347 // Make sure the folder was created.
347 ASSERT_EQ(4, bb_node->child_count()); 348 ASSERT_EQ(4, bb_node->child_count());
348 const BookmarkNode* new_node = bb_node->GetChild(3); 349 const BookmarkNode* new_node = bb_node->GetChild(1);
349 EXPECT_EQ(BookmarkNode::FOLDER, new_node->type()); 350 EXPECT_EQ(BookmarkNode::FOLDER, new_node->type());
350 EXPECT_EQ(ASCIIToUTF16("new_F"), new_node->GetTitle()); 351 EXPECT_EQ(ASCIIToUTF16("new_F"), new_node->GetTitle());
351 // The node should have one child. 352 // The node should have one child.
352 ASSERT_EQ(1, new_node->child_count()); 353 ASSERT_EQ(1, new_node->child_count());
353 const BookmarkNode* new_child = new_node->GetChild(0); 354 const BookmarkNode* new_child = new_node->GetChild(0);
354 // Make sure the child url/title match. 355 // Make sure the child url/title match.
355 EXPECT_EQ(BookmarkNode::URL, new_child->type()); 356 EXPECT_EQ(BookmarkNode::URL, new_child->type());
356 EXPECT_EQ(details.urls[0].second, new_child->GetTitle()); 357 EXPECT_EQ(details.urls[0].second, new_child->GetTitle());
357 EXPECT_EQ(details.urls[0].first, new_child->url()); 358 EXPECT_EQ(details.urls[0].first, new_child->url());
358 } 359 }
(...skipping 19 matching lines...) Expand all
378 EXPECT_EQ(BookmarkNode::FOLDER, new_node->type()); 379 EXPECT_EQ(BookmarkNode::FOLDER, new_node->type());
379 EXPECT_EQ(ASCIIToUTF16("new_F"), new_node->GetTitle()); 380 EXPECT_EQ(ASCIIToUTF16("new_F"), new_node->GetTitle());
380 // The node should have one child. 381 // The node should have one child.
381 ASSERT_EQ(1, new_node->child_count()); 382 ASSERT_EQ(1, new_node->child_count());
382 const BookmarkNode* new_child = new_node->GetChild(0); 383 const BookmarkNode* new_child = new_node->GetChild(0);
383 // Make sure the child url/title match. 384 // Make sure the child url/title match.
384 EXPECT_EQ(BookmarkNode::URL, new_child->type()); 385 EXPECT_EQ(BookmarkNode::URL, new_child->type());
385 EXPECT_EQ(details.urls[0].second, new_child->GetTitle()); 386 EXPECT_EQ(details.urls[0].second, new_child->GetTitle());
386 EXPECT_EQ(details.urls[0].first, new_child->url()); 387 EXPECT_EQ(details.urls[0].first, new_child->url());
387 } 388 }
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698