[Mac][MC] Implement notification updates and relayouts.

ui/message_center/cocoa/popup_collection_unittest.mm

 // Copyright (c) 2013 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 "ui/message_center/cocoa/popup_collection.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
+#import "ui/message_center/cocoa/notification_controller.h"
 #import "ui/message_center/cocoa/popup_controller.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_constants.h"
 #include "ui/message_center/notification.h"
 
 @implementation MCPopupCollection (TestingAPI)
 - (NSArray*)popups {
   return popups_.get();
 }
 @end
 
+
+@implementation MCNotificationController (TestingInterface)
+- (NSImageView*)iconView {
+  return icon_.get();
+}
+@end
+
 class PopupCollectionTest : public ui::CocoaTest {
  public:
   PopupCollectionTest() {
     message_center::MessageCenter::Initialize();
     center_ = message_center::MessageCenter::Get();
     collection_.reset(
         [[MCPopupCollection alloc] initWithMessageCenter:center_]);
   }
 
   virtual void TearDown() OVERRIDE {
@@ skipping 121 matching lines @@
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:1],
                                   [popups objectAtIndex:2]));
 
   // Remove "1".
   center_->RemoveNotification("2", true);
   EXPECT_EQ(message_center::kMarginBetweenItems,
             kScreenSize - NSMaxY([[[popups objectAtIndex:0] window] frame]));
   EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:0],
                                   [popups objectAtIndex:1]));
 }
+
+TEST_F(PopupCollectionTest, UpdateIconAndBody) {
+  AddThreeNotifications();
+  NSArray* popups = [collection_ popups];
+
+  EXPECT_EQ(3u, [popups count]);
+
+  // Update "2" icon.
+  MCNotificationController* controller =
+      [[popups objectAtIndex:1] notificationController];
+  EXPECT_FALSE([[controller iconView] image]);
+  center_->SetNotificationIcon("2",
+      gfx::Image([[NSImage imageNamed:NSImageNameUser] retain]));
+  EXPECT_TRUE([[controller iconView] image]);
+
+  EXPECT_EQ(3u, [popups count]);
+  EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:0],
+                                  [popups objectAtIndex:1]));
+  EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:1],
+                                  [popups objectAtIndex:2]));
+
+  // Replace "1".
+  controller = [[popups objectAtIndex:0] notificationController];
+  NSRect old_frame = [[controller view] frame];
+  center_->AddNotification(message_center::NOTIFICATION_TYPE_SIMPLE,
+                           "1",
+                           ASCIIToUTF16("One is going to get a much longer "
+                                        "title than it previously had."),
+                           ASCIIToUTF16("This is the first notification to "
+                                        "be displayed, but it will also be "
+                                        "updated to have a significantly "
+                                        "longer body"),
+                           string16(),
+                           std::string(),
+                           NULL);
+  EXPECT_GT(NSHeight([[controller view] frame]), NSHeight(old_frame));
+
+  // Test updated spacing.
+  EXPECT_EQ(3u, [popups count]);
+  EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:0],
+                                  [popups objectAtIndex:1]));
+  EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:1],
+                                  [popups objectAtIndex:2]));
+  EXPECT_EQ("1", [[popups objectAtIndex:0] notificationID]);
+  EXPECT_EQ("2", [[popups objectAtIndex:1] notificationID]);
+  EXPECT_EQ("3", [[popups objectAtIndex:2] notificationID]);
+}