Fix "open all" on a folder node to open only 'marks in that folder,...

chrome/browser/cocoa/bookmark_bar_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"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/bookmark_bar_constants.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 #import "chrome/browser/cocoa/bookmark_bar_view.h"
+#import "chrome/browser/cocoa/bookmark_menu.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/cocoa/test_event_utils.h"
 #import "chrome/browser/cocoa/view_resizer_pong.h"
 #include "chrome/common/pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 // Just like a BookmarkBarController but openURL: is stubbed out.
 @interface BookmarkBarControllerNoOpen : BookmarkBarController {
@@ skipping 70 matching lines @@
     bar_.reset(
       [[BookmarkBarControllerNoOpen alloc]
           initWithBrowser:helper_.browser()
              initialWidth:NSWidth(parent_frame)
                  delegate:nil
            resizeDelegate:resizeDelegate_.get()]);
 
     InstallAndToggleBar(bar_.get());
 
     // Create a menu/item to act like a sender
-    menu_.reset([[NSMenu alloc] initWithTitle:@"I_dont_care"]);
+    menu_.reset([[BookmarkMenu alloc] initWithTitle:@"I_dont_care"]);
     menu_item_.reset([[NSMenuItem alloc]
                        initWithTitle:@"still_dont_care"
                               action:NULL
                        keyEquivalent:@""]);
     cell_.reset([[NSButtonCell alloc] init]);
     [menu_item_ setMenu:menu_.get()];
     [menu_ setDelegate:cell_.get()];
   }
 
   void InstallAndToggleBar(BookmarkBarController* bar) {
@@ skipping 14 matching lines @@
   // Update the state of the bookmark bar.
   void UpdateBookmarkBar() {
     [bar_ updateAndShowNormalBar:[bar_ isShownAsToolbar]
                  showDetachedBar:[bar_ isShownAsDetachedBar]
                    withAnimation:NO];
   }
 
   // Return a menu item that points to the right URL.
   NSMenuItem* ItemForBookmarkBarMenu(GURL& gurl) {
     node_.reset(new BookmarkNode(gurl));
-    [cell_ setRepresentedObject:[NSValue valueWithPointer:node_.get()]];
+    [menu_ setRepresentedObject:[NSValue valueWithPointer:node_.get()]];
     return menu_item_;
   }
 
   // Does NOT take ownership of node.
   NSMenuItem* ItemForBookmarkBarMenu(const BookmarkNode* node) {
-    [cell_ setRepresentedObject:[NSValue valueWithPointer:node]];
+    [menu_ setRepresentedObject:[NSValue valueWithPointer:node]];
     return menu_item_;
   }
 
   CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
   scoped_nsobject<NSView> parent_view_;
   BrowserTestHelper helper_;
   scoped_nsobject<ViewResizerPong> resizeDelegate_;
   scoped_nsobject<BookmarkBarControllerNoOpen> bar_;
-  scoped_nsobject<NSMenu> menu_;
+  scoped_nsobject<BookmarkMenu> menu_;
   scoped_nsobject<NSMenuItem> menu_item_;
   scoped_nsobject<NSButtonCell> cell_;
   scoped_ptr<BookmarkNode> node_;
 };
 
 TEST_F(BookmarkBarControllerTest, ShowWhenShowBookmarkBarTrue) {
   [bar_ updateAndShowNormalBar:YES
                showDetachedBar:NO
                  withAnimation:NO];
   EXPECT_TRUE([bar_ isShownAsToolbar]);
@@ skipping 349 matching lines @@
                 L"title", GURL("http://one.com"));
   const BookmarkNode* folder = model->AddGroup(parent,
                                                parent->GetChildCount(),
                                                L"group");
   model->AddURL(folder, folder->GetChildCount(),
                 L"title", GURL("http://two-one.com"));
   model->AddURL(folder, folder->GetChildCount(),
                 L"title", GURL("http://two-two.com"));
   model->AddURL(parent, parent->GetChildCount(),
                 L"title", GURL("https://three.com"));
-  [bar_ openAllBookmarks:nil];
 
+  // Our first OpenAll... is from the bar itself.
+  [bar_ openAllBookmarks:ItemForBookmarkBarMenu(parent)];
   EXPECT_EQ(bar_.get()->urls_.size(), 4U);
   EXPECT_EQ(bar_.get()->dispositions_.size(), 4U);
 
   // I can't use EXPECT_EQ() here since the macro can't expand
   // properly (no way to print the value of an iterator).
   std::vector<GURL>::iterator i;
   std::vector<GURL>::iterator begin = bar_.get()->urls_.begin();
   std::vector<GURL>::iterator end = bar_.get()->urls_.end();
   i = find(begin, end, GURL("http://two-one.com"));
   EXPECT_FALSE(i == end);
   i = find(begin, end, GURL("https://three.com"));
   EXPECT_FALSE(i == end);
   i = find(begin, end, GURL("https://will-not-be-found.com"));
   EXPECT_TRUE(i == end);
 
   EXPECT_EQ(bar_.get()->dispositions_[3], NEW_BACKGROUND_TAB);
+
+  // Now try an OpenAll... from a folder node.
+  bar_.get()->urls_.clear();
+  bar_.get()->dispositions_.clear();
+  [bar_ openAllBookmarks:ItemForBookmarkBarMenu(folder)];
+
+  EXPECT_EQ(bar_.get()->urls_.size(), 2U);
+  EXPECT_EQ(bar_.get()->dispositions_.size(), 2U);
 }
 
 // TODO(jrg): write a test to confirm that nodeFavIconLoaded calls
 // checkForBookmarkButtonGrowth:.
 
 TEST_F(BookmarkBarControllerTest, Cell) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   [bar_ loaded:model];
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
@@ skipping 133 matching lines @@
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   [bar_ addURLs:nsurls withTitles:nstitles at:NSZeroPoint];
   EXPECT_EQ(3, parent->GetChildCount());
   for (int i = 0; i < parent->GetChildCount(); ++i) {
     EXPECT_EQ(parent->GetChild(i)->GetURL(), GURL(urls[i]));
     EXPECT_EQ(parent->GetChild(i)->GetTitle(), titles[i]);
   }
 }
 
+TEST_F(BookmarkBarControllerTest, TestButtonOrBar) {
+  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  GURL gurl1("http://www.google.com");
+  std::wstring title1(L"x");
+  model->SetURLStarred(gurl1, title1, true);
+
+  GURL gurl2("http://www.google.com/gurl_power");
+  std::wstring title2(L"gurl power");
+  model->SetURLStarred(gurl2, title2, true);
+
+  NSButton* first = [[bar_ buttons] objectAtIndex:0];
+  NSButton* second = [[bar_ buttons] objectAtIndex:1];
+  EXPECT_TRUE(first && second);
+
+  NSMenuItem* menuItem = [[[first cell] menu] itemAtIndex:0];
+  BookmarkNode* node = [bar_ nodeFromMenuItem:menuItem];
+  EXPECT_TRUE(node);
+  EXPECT_EQ(node, model->GetBookmarkBarNode()->GetChild(0));
+
+  menuItem = [[[second cell] menu] itemAtIndex:0];
+  node = [bar_ nodeFromMenuItem:menuItem];
+  EXPECT_TRUE(node);
+  EXPECT_EQ(node, model->GetBookmarkBarNode()->GetChild(1));
+
+  menuItem = [[[bar_ view] menu] itemAtIndex:0];
+  node = [bar_ nodeFromMenuItem:menuItem];
+  EXPECT_TRUE(node);
+  EXPECT_EQ(node, model->GetBookmarkBarNode());
+}
+
+TEST_F(BookmarkBarControllerTest, TestMenuNodeAndDisable) {
+  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
+  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* folder = model->AddGroup(parent,
+                                               parent->GetChildCount(),
+                                               L"group");
+  NSButton* button = [[bar_ buttons] objectAtIndex:0];
+  EXPECT_TRUE(button);
+
+  // Confirm the menu knows which node it is talking about
+  BookmarkMenu* menu = static_cast<BookmarkMenu*>([[button cell] menu]);
+  EXPECT_TRUE(menu);
+  EXPECT_TRUE([menu isKindOfClass:[BookmarkMenu class]]);
+  EXPECT_EQ(folder, [menu node]);
+
+  // Make sure "Open All" is disabled (nothing to open -- no children!)
+  // (Assumes "Open All" is the 1st item)
+  NSMenuItem* item = [menu itemAtIndex:0];
+  EXPECT_FALSE([bar_ validateUserInterfaceItem:item]);
+
+  // Now add a child and make sure the item would be enabled.
+  model->AddURL(folder, folder->GetChildCount(),
+                L"super duper wide title",
+                GURL("http://superfriends.hall-of-justice.edu"));
+  EXPECT_TRUE([bar_ validateUserInterfaceItem:item]);
+}
+
 }  // namespace