Merge 37444 - Mac bookmark mgr: Restore previously selected group when search...

chrome/browser/cocoa/bookmark_manager_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 24 matching lines @@
   }
 
   NSSet* AddFixtureItems() {
     return [NSSet setWithObjects:
         AddToBar(@"Google", @"http://google.com"),
         AddToBar(@"GMail", @"http://gmail.com"),
         AddToBar(@"Google Sites", @"http://sites.google.com"),
         nil];
   }
 
+  bool SearchResultsVisible() {
+    NSOutlineView* outline = [[controller_ groupsController] outline];
+    return [outline rowForItem:[controller_ searchGroup]] >= 0;
+  }
+
   BrowserTestHelper browser_test_helper_;
   BookmarkManagerController* controller_;
 };
 
 TEST_F(BookmarkManagerControllerTest, IsThisThingTurnedOn) {
   NSWindow* w = [controller_ window];
   ASSERT_TRUE(w);
   EXPECT_TRUE([w isVisible]);
 
   ASSERT_TRUE([controller_ groupsController]);
@@ skipping 58 matching lines @@
   [controller_ setSearchString:@"google"];
   shown = [search children];
   EXPECT_EQ(2U, [shown count]);
 
   // Search for 'fnord':
   [controller_ setSearchString:@"fnord"];
   shown = [search children];
   EXPECT_EQ(0U, [shown count]);
 }
 
+TEST_F(BookmarkManagerControllerTest, SearchSelection) {
+  BookmarkTreeController* groupsController = [controller_ groupsController];
+  AddFixtureItems();
+  BookmarkItem* originalSelection = [controller_ bookmarkBarItem];
+  EXPECT_FALSE(SearchResultsVisible());
+  EXPECT_EQ(originalSelection, [groupsController selectedItem]);
+
+  // Start a search and verify the search results group is selected.
+  [controller_ setSearchString:@"g"];
+  EXPECT_TRUE(SearchResultsVisible());
+  EXPECT_EQ([controller_ searchGroup], [groupsController selectedItem]);
+
+  // Type some more, see if updating the search string works.
+  [controller_ setSearchString:@"gmail"];
+  EXPECT_TRUE(SearchResultsVisible());
+  EXPECT_EQ([controller_ searchGroup], [groupsController selectedItem]);
+
+  // Clear search, verify search results are hidden and original sel restored.
+  [controller_ setSearchString:@""];
+  EXPECT_FALSE(SearchResultsVisible());
+  EXPECT_EQ(originalSelection, [groupsController selectedItem]);
+
+  // Now search, then change the selection, then clear search:
+  [controller_ setSearchString:@"gmail"];
+  EXPECT_TRUE(SearchResultsVisible());
+  EXPECT_EQ([controller_ searchGroup], [groupsController selectedItem]);
+  BookmarkItem* newerSelection = [controller_ otherBookmarksItem];
+  [controller_ showGroup:newerSelection];
+  [controller_ setSearchString:@""];
+  EXPECT_FALSE(SearchResultsVisible());
+  EXPECT_EQ(newerSelection, [groupsController selectedItem]);
+}
+
 }  // namespace