Merge 37521 - Mac bookmark manager: Crash after deleting folder in left pane...

chrome/browser/cocoa/bookmark_tree_controller_unittest.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/bookmark_item.h"
 #import "chrome/browser/cocoa/bookmark_manager_controller.h"
 #import "chrome/browser/cocoa/bookmark_tree_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
@@ skipping 87 matching lines @@
 
 TEST_F(BookmarkTreeControllerTest, NewFolder) {
   // Select Bookmark Bar in tree and create a new folder:
   BookmarkItem* bar = SelectBar();
   EXPECT_EQ(0U, [bar numberOfChildren]);
   BookmarkItem* parent = nil;
   NSUInteger index = 0;
   EXPECT_TRUE([groupsController_ getInsertionParent:&parent index:&index]);
   EXPECT_EQ(bar, parent);
   EXPECT_EQ(0U, index);
-  [groupsController_ newFolder:nil];
+  BookmarkItem* newFolder = [groupsController_ newFolderWithTitle:@""];
 
   // Verify the new folder exists and is selected:
   ASSERT_EQ(1U, [bar numberOfChildren]);
-  BookmarkItem *newFolder = [bar childAtIndex:0];
+  EXPECT_EQ(newFolder, [bar childAtIndex:0]);
   EXPECT_EQ(newFolder, [groupsController_ selectedItem]);
 
   // Do New Folder again:
   EXPECT_TRUE([groupsController_ getInsertionParent:&parent index:&index]);
   EXPECT_EQ(bar, parent);
   EXPECT_EQ(0U, index);
   EXPECT_TRUE([listController_ getInsertionParent:&parent index:&index]);
   EXPECT_EQ(newFolder, parent);
   EXPECT_EQ(0U, index);
-  [groupsController_ newFolder:nil];
+  newFolder = [groupsController_ newFolderWithTitle:@""];
 
   // Verify the new folder exists and is selected:
   ASSERT_EQ(2U, [bar numberOfChildren]);
-  newFolder = [bar childAtIndex:0];
+  EXPECT_EQ(newFolder, [bar childAtIndex:0]);
   EXPECT_EQ(newFolder, [groupsController_ selectedItem]);
 
   // Verify it's possible to add to Other Bookmarks:
   [groupsController_ setSelectedItem:[manager_ otherBookmarksItem]];
   EXPECT_TRUE([groupsController_ canInsert]);
   EXPECT_TRUE([listController_ canInsert]);
 
   // Verify it's not possible to add to Recents:
   [groupsController_ setSelectedItem:[manager_ recentGroup]];
   EXPECT_FALSE([groupsController_ canInsert]);
   EXPECT_FALSE([listController_ canInsert]);
 }
 
+TEST_F(BookmarkTreeControllerTest, Deletion) {
+  // Create a new folder in the bookmarks bar:
+  SelectBar();
+  BookmarkItem* newFolder = [groupsController_ newFolderWithTitle:@""];
+  ASSERT_TRUE(newFolder);
+  ASSERT_EQ(newFolder, [groupsController_ selectedItem]);
+
+  // Now delete the folder and make sure it's not still selected/shown:
+  [groupsController_ delete:nil];
+  ASSERT_EQ(0U, [[manager_ bookmarkBarItem] numberOfChildren]);
+  BookmarkItem* newSel = [groupsController_ selectedItem];
+  EXPECT_NE(newFolder, newSel);
+  EXPECT_EQ(newSel, [listController_ group]);
+}
+
 TEST_F(BookmarkTreeControllerTest, MoveItems) {
   NSOutlineView* outline = [groupsController_ outline];
   ASSERT_TRUE(outline);
 
   // Add three folders and another one we'll drop some into:
   BookmarkItem* bookmarkBar = SelectBar();
   BookmarkItem* test1 = AddFolderToBar(@"Test 1");
   BookmarkItem* test2 = AddFolderToBar(@"Test 2");
   BookmarkItem* folder = AddFolderToBar(@"Folder");
   BookmarkItem* test3 = AddFolderToBar(@"Test 3");
@@ skipping 186 matching lines @@
 
   BookmarkItem* item = [sel objectAtIndex:0];
   EXPECT_TRUE([@"http://google.com/" isEqual:[item URLString]]);
   EXPECT_TRUE([@"Gooooogle" isEqual:[item title]]);
   item = [sel objectAtIndex:1];
   EXPECT_TRUE([@"http://chromium.org/" isEqual:[item URLString]]);
   EXPECT_TRUE([@"Chrooooomium" isEqual:[item title]]);
 }
 
 }  // namespace