bookmark STAR bubble: Disambiguate folders with the same name...

chrome/browser/cocoa/bookmark_bubble_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/basictypes.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/bookmark_bubble_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
@@ skipping 61 matching lines @@
   }
 
   virtual void TearDown() {
     [controller_ close];
     CocoaTest::TearDown();
   }
 
   // Returns a controller but ownership not transferred.
   // Only one of these will be valid at a time.
   BookmarkBubbleController* ControllerForNode(const BookmarkNode* node) {
-    DCHECK(controller_ == nil);
+    if (controller_)
+      [controller_ close];
     controller_ = [[BookmarkBubbleController alloc]
                        initWithDelegate:delegate_.get()
                        parentWindow:test_window()
                        topLeftForBubble:[delegate_ topLeftForBubble]
                        model:helper_.profile()->GetBookmarkModel()
                        node:node
                        alreadyBookmarked:YES];
     EXPECT_TRUE([controller_ window]);
     [delegate_ setWindowController:controller_];
     return controller_;
@@ skipping 96 matching lines @@
 
   // simulate a user edit
   [controller setTitle:@"oops" parentFolder:@"grandma"];
   [controller edit:controller];
 
   // Make sure bookmark has changed
   EXPECT_EQ(node->GetTitle(), L"oops");
   EXPECT_EQ(node->GetParent()->GetTitle(), L"grandma");
 }
 
+// Confirm happiness with parent nodes that have the same name.
+TEST_F(BookmarkBubbleControllerTest, TestNewParentSameName) {
+  for (int i=0; i<2; i++) {
+    BookmarkModel* model = GetBookmarkModel();
+    const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
+                                             0,
+                                             L"short-title",
+                                             GURL("http://www.google.com"));
+    model->AddGroup(model->GetBookmarkBarNode(), 0, L"NAME");
+    model->AddGroup(model->GetBookmarkBarNode(), 0, L"NAME");
+    model->AddGroup(model->GetBookmarkBarNode(), 0, L"NAME");
+    BookmarkBubbleController* controller = ControllerForNode(node);
+    EXPECT_TRUE(controller);
+
+    // simulate a user edit
+    [controller setParentFolderSelection:
+                  model->GetBookmarkBarNode()->GetChild(i)];
+    [controller edit:controller];
+
+    // Make sure bookmark has changed, and that the parent is what we
+    // expect.  This proves nobody did searching based on name.
+    EXPECT_EQ(node->GetParent(), model->GetBookmarkBarNode()->GetChild(i));
+  }
+}
+
 // Click the "remove" button
 TEST_F(BookmarkBubbleControllerTest, TestRemove) {
   BookmarkModel* model = GetBookmarkModel();
   GURL gurl("http://www.google.com");
   const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
                                            0,
                                            L"Bookie markie title",
                                            gurl);
   BookmarkBubbleController* controller = ControllerForNode(node);
   EXPECT_TRUE(controller);
@@ skipping 55 matching lines @@
                                            L"Bookie markie title",
                                            gurl);
   BookmarkBubbleController* controller = ControllerForNode(node);
   EXPECT_TRUE(controller);
 
   [(id)controller cancel:nil];
   EXPECT_TRUE(model->IsBookmarked(gurl));
 }
 
 }  // namespace