Restoring r29827....

chrome/browser/cocoa/autocomplete_text_field_cell_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"
 #import "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 // Width of the field so that we don't have to ask |field_| for it all
 // the time.
 const CGFloat kWidth(300.0);
 
 // A narrow width for tests which test things that don't fit.
 const CGFloat kNarrowWidth(5.0);
 
 class AutocompleteTextFieldCellTest : public PlatformTest {
  public:
-  AutocompleteTextFieldCellTest() {
+  AutocompleteTextFieldCellTest() : security_image_view_(NULL, NULL) {
     // Make sure this is wide enough to play games with the cell
     // decorations.
     const NSRect frame = NSMakeRect(0, 0, kWidth, 30);
     view_.reset([[NSTextField alloc] initWithFrame:frame]);
     scoped_nsobject<AutocompleteTextFieldCell> cell(
         [[AutocompleteTextFieldCell alloc] initTextCell:@"Testing"]);
     [cell setEditable:YES];
     [cell setBordered:YES];
     [view_ setCell:cell.get()];
+    [cell setSecurityImageView:&security_image_view_];
     [cocoa_helper_.contentView() addSubview:view_.get()];
   }
 
   CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
   scoped_nsobject<NSTextField> view_;
+  LocationBarViewMac::SecurityImageView security_image_view_;
 };
 
 // Test adding/removing from the view hierarchy, mostly to ensure nothing
 // leaks or crashes.
 TEST_F(AutocompleteTextFieldCellTest, AddRemove) {
   EXPECT_EQ(cocoa_helper_.contentView(), [view_ superview]);
   [view_.get() removeFromSuperview];
   EXPECT_FALSE([view_ superview]);
 }
 
@@ skipping 117 matching lines @@
 
   // Text frame should take everything over again on reset.
   [cell clearKeywordAndHint];
   textFrame = [cell textFrameForFrame:bounds];
   EXPECT_FALSE(NSIsEmptyRect(textFrame));
   EXPECT_TRUE(NSContainsRect(bounds, textFrame));
   EXPECT_EQ(NSMinX(bounds), NSMinX(textFrame));
   EXPECT_EQ(NSMaxX(bounds), NSMaxX(textFrame));
   EXPECT_TRUE(NSContainsRect(cursorFrame, textFrame));
 
-  // Hint icon takes up space on the right
-  [cell setHintIcon:[NSImage imageNamed:@"NSComputer"] label:nil color:nil];
+  // Security icon takes up space on the right
+  security_image_view_.SetImageShown(
+      LocationBarViewMac::SecurityImageView::LOCK);
+  security_image_view_.SetVisible(true);
+
   textFrame = [cell textFrameForFrame:bounds];
   EXPECT_FALSE(NSIsEmptyRect(textFrame));
   EXPECT_TRUE(NSContainsRect(bounds, textFrame));
   EXPECT_LT(NSMaxX(textFrame), NSMaxX(bounds));
   EXPECT_TRUE(NSContainsRect(cursorFrame, textFrame));
 
   // Search hint text takes precedence over the hint icon; the text frame
   // should be smaller in order to accomodate the text that is wider than
   // the icon.
   [cell setSearchHintString:@"Search hint" availableWidth:kWidth];
@@ skipping 41 matching lines @@
   EXPECT_FALSE(NSIsEmptyRect(drawingRect));
   EXPECT_TRUE(NSContainsRect(NSInsetRect(textFrame, 1, 1), drawingRect));
 
   [cell clearKeywordAndHint];
   textFrame = [cell textFrameForFrame:bounds];
   drawingRect = [cell drawingRectForBounds:bounds];
   EXPECT_FALSE(NSIsEmptyRect(drawingRect));
   EXPECT_TRUE(NSContainsRect(NSInsetRect(textFrame, 1, 1), drawingRect));
   EXPECT_TRUE(NSEqualRects(drawingRect, originalDrawingRect));
 
-  [cell setHintIcon:[NSImage imageNamed:@"NSComputer"] label:nil color:nil];
+  security_image_view_.SetImageShown(
+      LocationBarViewMac::SecurityImageView::LOCK);
+  security_image_view_.SetVisible(true);
+
   textFrame = [cell textFrameForFrame:bounds];
   drawingRect = [cell drawingRectForBounds:bounds];
   EXPECT_FALSE(NSIsEmptyRect(drawingRect));
   EXPECT_TRUE(NSContainsRect(NSInsetRect(textFrame, 1, 1), drawingRect));
 }
 
 // Test that the security icon is at the right side of the cell.
 TEST_F(AutocompleteTextFieldCellTest, HintImageFrame) {
   AutocompleteTextFieldCell* cell =
       static_cast<AutocompleteTextFieldCell*>([view_ cell]);
   const NSRect bounds([view_ bounds]);
-  scoped_nsobject<NSImage> hintIcon(
-      [[NSImage alloc] initWithSize:NSMakeSize(20, 20)]);
+  security_image_view_.SetImageShown(
+      LocationBarViewMac::SecurityImageView::LOCK);
 
-  NSRect iconRect = [cell hintImageFrameForFrame:bounds];
+  security_image_view_.SetVisible(false);
+  NSRect iconRect = [cell securityImageFrameForFrame:bounds];
   EXPECT_TRUE(NSIsEmptyRect(iconRect));
 
   // Save the starting frame for after clear.
   const NSRect originalIconRect(iconRect);
 
-  [cell setHintIcon:hintIcon label:nil color:nil];
-  iconRect = [cell hintImageFrameForFrame:bounds];
+  security_image_view_.SetVisible(true);
+  iconRect = [cell securityImageFrameForFrame:bounds];
+
   EXPECT_FALSE(NSIsEmptyRect(iconRect));
   EXPECT_TRUE(NSContainsRect(bounds, iconRect));
 
   // Make sure we are right of the |drawingRect|.
   NSRect drawingRect = [cell drawingRectForBounds:bounds];
   EXPECT_LE(NSMaxX(drawingRect), NSMinX(iconRect));
 
   // Make sure we're right of the |textFrame|.
   NSRect textFrame = [cell textFrameForFrame:bounds];
   EXPECT_LE(NSMaxX(textFrame), NSMinX(iconRect));
 
+  // Now add a label.
+  NSFont* font = [NSFont controlContentFontOfSize:12.0];
+  NSColor* color = [NSColor blackColor];
+  security_image_view_.SetLabel(@"Label", font, color);
+  iconRect = [cell securityImageFrameForFrame:bounds];
+
+  EXPECT_FALSE(NSIsEmptyRect(iconRect));
+  EXPECT_TRUE(NSContainsRect(bounds, iconRect));
+
+  // Make sure we are right of the |drawingRect|.
+  drawingRect = [cell drawingRectForBounds:bounds];
+  EXPECT_LE(NSMaxX(drawingRect), NSMinX(iconRect));
+
+  // Make sure we're right of the |textFrame|.
+  textFrame = [cell textFrameForFrame:bounds];
+  EXPECT_LE(NSMaxX(textFrame), NSMinX(iconRect));
+
   // Make sure we clear correctly.
-  [cell setHintIcon:nil label:nil color:nil];
-  iconRect = [cell hintImageFrameForFrame:bounds];
+  security_image_view_.SetVisible(false);
+  iconRect = [cell securityImageFrameForFrame:bounds];
   EXPECT_TRUE(NSEqualRects(iconRect, originalIconRect));
   EXPECT_TRUE(NSIsEmptyRect(iconRect));
 }
 
 // Test that the cell correctly chooses the partial keyword if there's
 // no enough room.
 TEST_F(AutocompleteTextFieldCellTest, UsesPartialKeywordIfNarrow) {
   AutocompleteTextFieldCell* cell =
       static_cast<AutocompleteTextFieldCell*>([view_ cell]);
 
@@ skipping 58 matching lines @@
   EXPECT_TRUE([[[cell hintString] string] hasPrefix:kHintPrefix]);
   EXPECT_TRUE([[[cell hintString] string] hasSuffix:kHintSuffix]);
 
   // Narrow width suppresses everything but the image.
   [cell setKeywordHintPrefix:kHintPrefix image:image suffix:kHintSuffix
               availableWidth:kNarrowWidth];
   EXPECT_EQ([[cell hintString] length], 1U);
 }
 
 }  // namespace