A BookmarkBarFolderButtonCell should have the favicon aligned left when no title is provided

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm
index dff15be173ce60828d156f29294734e2d42f26ab..f2f400ee47fee4a690f3ba32c47f953c9dc766f4 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm
@@ -5,6 +5,7 @@
 #include "base/memory/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "ui/gfx/mac/nsimage_cache.h"
 
 namespace {
 
@@ -21,4 +22,66 @@ TEST_F(BookmarkBarFolderButtonCellTest, Create) {
   EXPECT_TRUE(cell);
 }
 
+TEST_F(BookmarkBarFolderButtonCellTest, FaviconPositioning) {
+  NSRect frame = NSMakeRect(0, 0, 50, 30);
+  scoped_nsobject<NSButton> view([[NSButton alloc] initWithFrame:frame]);
+  scoped_nsobject<NSButton> folder_view(
+      [[NSButton alloc] initWithFrame:frame]);
+
+  EXPECT_TRUE(view.get());
+  EXPECT_TRUE(folder_view.get());
+
+  scoped_nsobject<NSImage> image(
+      [gfx::GetCachedImageWithName(@"nav.pdf") retain]);
+  EXPECT_TRUE(image.get());
+
+  scoped_nsobject<BookmarkButtonCell> cell(
+      [[BookmarkButtonCell alloc] initTextCell:@"Testing"]);
+  scoped_nsobject<BookmarkBarFolderButtonCell> folder_cell(
+      [[BookmarkBarFolderButtonCell buttonCellForNode:nil
+                                          contextMenu:nil
+                                             cellText:@"Testing"
+                                            cellImage:image] retain]);
+
+  EXPECT_TRUE(cell.get());
+  EXPECT_TRUE(folder_cell.get());
+
+  [view setCell:cell.get()];
+  [folder_view setCell:folder_cell.get()];
+
+  [[test_window() contentView] addSubview:view];
+  [[test_window() contentView] addSubview:folder_view];
+
+  NSRect rect = NSMakeRect(50, 50, 50, 50);
+
+  [cell setBookmarkCellText:@"" image:image];
+  float cell_x_without_title = ([cell imageRectForBounds:rect]).origin.x;
+  float cell_width_without_title =
+      ([cell imageRectForBounds:rect]).size.width;
+  EXPECT_EQ(NSImageOnly, [cell imagePosition]);

[Ilya Sherman, 2011/12/14 21:38:07]

nit: Please remove these statements, as they are now primarily testing an
implementation detail that the other EXPECT_* statements are testing at a more
abstract level.

+
+  [cell setBookmarkCellText:@"test" image:image];
+  float cell_x_with_title = ([cell imageRectForBounds:rect]).origin.x;
+  float cell_width_with_title = ([cell imageRectForBounds:rect]).size.width;
+  EXPECT_EQ(NSImageLeft, [cell imagePosition]);
+
+  EXPECT_NE(cell_x_without_title, cell_x_with_title);

[Ilya Sherman, 2011/12/14 21:38:07]

nit: EXPECT_LT rather than EXPECT_NE

+  EXPECT_EQ(cell_width_without_title, cell_width_with_title);

[Ilya Sherman, 2011/12/14 21:38:07]

This currently tests that the bookmark icons within the cells are sized
identically.  I was instead suggesting that we test the *cell* widths, including
both the image and the title (if any).  The cell widths should be different --
we should be able to write EXPECT_LT(cell_width_without_title,
cell_width_with_title).

[KushalP, 2011/12/14 22:10:05]

I've just looked through the NSCell and NSButton Apple docs and neither of them
provide an obvious way to get the width of the cell.

Do you mean adding the widths provided for the text and image rects and then
adding them?

+
+  [folder_cell setBookmarkCellText:@"" image:image];
+  float folder_cell_x_without_title = ([cell imageRectForBounds:rect]).origin.x;
+  float folder_cell_width_without_title =
+      ([cell imageRectForBounds:rect]).size.width;
+  EXPECT_EQ(NSImageLeft, [cell imagePosition]);
+
+  [folder_cell setBookmarkCellText:@"test" image:image];
+  float folder_cell_x_with_title = ([cell imageRectForBounds:rect]).origin.x;
+  float folder_cell_width_with_title =
+      ([cell imageRectForBounds:rect]).size.width;
+  EXPECT_EQ(NSImageLeft, [cell imagePosition]);
+
+  EXPECT_EQ(folder_cell_x_without_title, folder_cell_x_with_title);
+  EXPECT_EQ(folder_cell_width_without_title, folder_cell_width_with_title);
+}
+
 } // namespace