Original discussion in CL for 337010. See http://codereview.chromium.org/337...

chrome/browser/cocoa/bookmark_editor_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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/bookmark_editor_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
@@ skipping 237 matching lines @@
 
   child = root.GetChild(3);
   EXPECT_EQ(0, child->GetChildCount());
 }
 
 TEST_F(BookmarkEditorControllerTreeTest, RenameBookmarkInPlace) {
   const BookmarkNode* oldParent = bookmark_bb_3_->GetParent();
   [default_controller_ setDisplayName:@"NEW NAME"];
   [default_controller_ ok:nil];
   const BookmarkNode* newParent = bookmark_bb_3_->GetParent();
-  std::cout << "oldParent: " << oldParent->GetTitle() << "\r";
-  std::cout << "newParent: " << newParent->GetTitle() << "\r";
   ASSERT_EQ(newParent, oldParent);
   int childIndex = newParent->IndexOfChild(bookmark_bb_3_);
   ASSERT_EQ(3, childIndex);
 }
 
 TEST_F(BookmarkEditorControllerTreeTest, ChangeBookmarkURLInPlace) {
   const BookmarkNode* oldParent = bookmark_bb_3_->GetParent();
   [default_controller_ setDisplayURL:@"http://NEWURL.com"];
   [default_controller_ ok:nil];
   const BookmarkNode* newParent = bookmark_bb_3_->GetParent();
@@ skipping 15 matching lines @@
   [default_controller_ setDisplayName:@"NEW NAME"];
   [default_controller_ selectTestNodeInBrowser:group_c_];
   [default_controller_ ok:nil];
   const BookmarkNode* parent = bookmark_bb_3_->GetParent();
   ASSERT_EQ(parent, group_c_);
   int childIndex = parent->IndexOfChild(bookmark_bb_3_);
   ASSERT_EQ(4, childIndex);
   EXPECT_EQ(bookmark_bb_3_->GetTitle(), L"NEW NAME");
 }
 
+TEST_F(BookmarkEditorControllerTreeTest, AddFolderWithGroupSelected) {
+  [default_controller_ newFolder:nil];
+  [default_controller_ cancel:nil];
+  EXPECT_EQ(6, group_bb_->GetChildCount());
+  const BookmarkNode* folderChild = group_bb_->GetChild(5);
+  EXPECT_EQ(folderChild->GetTitle(), L"New folder");
+}
+
 class BookmarkEditorControllerTreeNoNodeTest :
     public BookmarkEditorControllerTreeTest {
  public:
   BookmarkEditorControllerTreeNoNodeTest() {
     // Reset the controller so that we have no |node|.
     default_controller_.reset([[BookmarkEditorController alloc]
                                initWithParentWindow:cocoa_helper_.window()
                                profile:helper_.profile()
                                parent:group_bb_
                                node:nil
                                configuration:BookmarkEditor::SHOW_TREE
                                handler:nil]);
     [default_controller_ window];  // Forces a nib load
   }
 };
 
 TEST_F(BookmarkEditorControllerTreeNoNodeTest, NewBookmarkNoNode) {
   [default_controller_ setDisplayName:@"NEW BOOKMARK"];
   [default_controller_ setDisplayURL:@"http://NEWURL.com"];
   [default_controller_ ok:nil];
   const BookmarkNode* new_node = group_bb_->GetChild(5);
   ASSERT_EQ(0, new_node->GetChildCount());
   EXPECT_EQ(new_node->GetTitle(), L"NEW BOOKMARK");
   EXPECT_EQ(new_node->GetURL(), GURL("http://NEWURL.com"));
 }
 
+class BookmarkEditorControllerTreeNoParentTest :
+    public BookmarkEditorControllerTreeTest {
+ public:
+  BookmarkEditorControllerTreeNoParentTest() {
+    // Reset the controller so that we have no |node|.
+    default_controller_.reset([[BookmarkEditorController alloc]
+                               initWithParentWindow:cocoa_helper_.window()
+                               profile:helper_.profile()
+                               parent:nil
+                               node:nil
+                               configuration:BookmarkEditor::SHOW_TREE
+                               handler:nil]);
+    [default_controller_ window];  // Forces a nib load
+  }
+};
+
+TEST_F(BookmarkEditorControllerTreeNoParentTest, AddFolderWithNoGroupSelected) {
+  [default_controller_ newFolder:nil];
+  [default_controller_ cancel:nil];
+  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  const BookmarkNode* bookmarkBar = model->GetBookmarkBarNode();
+  EXPECT_EQ(5, bookmarkBar->GetChildCount());
+  const BookmarkNode* folderChild = bookmarkBar->GetChild(4);
+  EXPECT_EQ(folderChild->GetTitle(), L"New folder");
+}
+