[Mac] Redesign the new avatar button.

chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm

 // Copyright 2014 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 "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
 
 #include "base/command_line.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/common/profile_management_switches.h"
+#include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 
 class AvatarButtonControllerTest : public CocoaProfileTest {
  public:
   virtual void SetUp() OVERRIDE {
     switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
     DCHECK(profiles::IsMultipleProfilesEnabled());
 
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
     controller_.reset(
         [[AvatarButtonController alloc] initWithBrowser:browser()]);
   }
 
   virtual void TearDown() OVERRIDE {
     browser()->window()->Close();
     CocoaProfileTest::TearDown();
   }
 
   NSButton* button() { return [controller_ buttonView]; }
 
   NSView* view() { return [controller_ view]; }
 
   AvatarButtonController* controller() { return controller_.get(); }
 
  private:
   base::scoped_nsobject<AvatarButtonController> controller_;
 };
 
-TEST_F(AvatarButtonControllerTest, ButtonShown) {
+TEST_F(AvatarButtonControllerTest, GenericButtonShown) {
   EXPECT_FALSE([view() isHidden]);
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_SINGLE_PROFILE_DISPLAY_NAME),
+  // We only have one local profile, which means we are displaying the

[groby-ooo-7-16, 2014/09/29 17:55:43]

Nit: un-"we", if possible?

[noms (inactive), 2014/09/29 19:21:57]

Done.

+  // generic avatar button.
+  EXPECT_EQ(base::string16(), base::SysNSStringToUTF16([button() title]));

[groby-ooo-7-16, 2014/09/29 17:55:43]

EXPECT_NSEQ(@"", [button() title]); 

[noms (inactive), 2014/09/29 19:21:57]

Oh, cool! Done.
On 2014/09/29 17:55:43, groby wrote:

+}
+
+TEST_F(AvatarButtonControllerTest, ProfileButtonShown) {
+  // Create a second profile, to force the button to display the profile name.
+  testing_profile_manager()->CreateTestingProfile("batman");
+
+  EXPECT_FALSE([view() isHidden]);

[groby-ooo-7-16, 2014/09/29 17:55:43]

Why is that an expect? Should that be ASSERT_FALSE? (I.e. it's not part of
what's tested, it's part of the precondition for hte test, right?) Here and
elsewhere, if that assumption is correct.

[noms (inactive), 2014/09/29 19:21:57]

Done.

+  EXPECT_EQ(base::ASCIIToUTF16("Person 1"),

[groby-ooo-7-16, 2014/09/29 17:55:43]

EXPECT_NSEQ - here and elsewhere

[noms (inactive), 2014/09/29 19:21:57]

Done.

             base::SysNSStringToUTF16([button() title]));
 }
 
+TEST_F(AvatarButtonControllerTest, ProfileButtonWithErrorShown) {
+  // Create a second profile, to force the button to display the profile name.
+  testing_profile_manager()->CreateTestingProfile("batman");
+
+  EXPECT_EQ(0, [button() image].size.width);
+  [controller() updateErrorStatus:true];
+
+  EXPECT_FALSE([view() isHidden]);
+  EXPECT_EQ(base::ASCIIToUTF16("Person 1"),
+            base::SysNSStringToUTF16([button() title]));
+
+  // If the button has an authentication error, it should display an error icon.
+  int errorWidth = ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+      IDR_ICON_PROFILES_AVATAR_BUTTON_ERROR).Width();
+  EXPECT_LT(0, [button() image].size.width);

[groby-ooo-7-16, 2014/09/29 17:55:43]

Isn't that encapsulated in the EXPECT_EQ?

[noms (inactive), 2014/09/29 19:21:57]

I was really paranoid that maybe IDR_ICON.. would be of 0 size. But that's
insane. Removed.
On 2014/09/29 17:55:43, groby wrote:

+  EXPECT_EQ(errorWidth, [button() image].size.width);
+}
+
 TEST_F(AvatarButtonControllerTest, DoubleOpen) {
   EXPECT_FALSE([controller() menuController]);
 
   [button() performClick:button()];
 
   BaseBubbleController* menu = [controller() menuController];
   EXPECT_TRUE(menu);
   EXPECT_TRUE([menu isKindOfClass:[ProfileChooserController class]]);
 
   [button() performClick:button()];
   EXPECT_EQ(menu, [controller() menuController]);
 
   // Do not animate out because that is hard to test around.
   static_cast<InfoBubbleWindow*>(menu.window).allowedAnimations =
       info_bubble::kAnimateNone;
   [menu close];
   EXPECT_FALSE([controller() menuController]);
 }