Stop notifications from being clipped on resize.

ui/message_center/views/message_center_view_unittest.cc

 // Copyright 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.
 
 #include "ui/message_center/views/message_center_view.h"
 
 #include <map>
 #include <memory>
 #include <utility>
 
@@ skipping 97 matching lines @@
   void RemoveAllNotifications(bool by_user, RemoveType type) override {
     if (type == RemoveType::NON_PINNED)
       remove_all_closable_notification_called_ = true;
   }
   bool IsLockedState() const override { return locked_; }
   bool remove_all_closable_notification_called_ = false;
   NotificationList::Notifications visible_notifications_;
   bool locked_ = false;
 };
 
+// This is the class we are testing, but we need to override some functions
+// in it, hence MockMessageCenterView.
+class MockMessageCenterView : public MessageCenterView {
+ public:
+  MockMessageCenterView(MessageCenter* message_center,
+                        MessageCenterTray* tray,
+                        int max_height,
+                        bool initially_settings_visible);
+
+  bool SetRepositionTarget() override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockMessageCenterView);
+};
+
+MockMessageCenterView::MockMessageCenterView(MessageCenter* message_center,
+                                             MessageCenterTray* tray,
+                                             int max_height,
+                                             bool initially_settings_visible)
+    : MessageCenterView(message_center,
+                        tray,
+                        max_height,
+                        initially_settings_visible) {}
+
+// Always say that the current reposition session is still active, by
+// returning true. Normally the reposition session is set based on where the
+// mouse is hovering.
+bool MockMessageCenterView::SetRepositionTarget() {
+  return true;
+}
+
 /* Test fixture ***************************************************************/
 
 class MessageCenterViewTest : public views::ViewsTestBase,
                               public MockNotificationView::Test,
                               public MessageCenterController {
  public:
   // Expose the private enum class MessageCenter::Mode for this test.
   using Mode = MessageCenterView::Mode;
 
   MessageCenterViewTest();
@@ skipping 40 matching lines @@
   MessageCenterButtonBar* GetButtonBar() const;
 
   void RemoveDefaultNotifications();
 
  private:
   views::View* MakeParent(views::View* child1, views::View* child2);
 
   // The ownership map of notifications; the key is the id.
   std::map<std::string, std::unique_ptr<Notification>> notifications_;
   std::unique_ptr<views::Widget> widget_;
-  std::unique_ptr<MessageCenterView> message_center_view_;
+  std::unique_ptr<MockMessageCenterView> message_center_view_;
   std::unique_ptr<FakeMessageCenterImpl> message_center_;
   std::map<CallType,int> callCounts_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageCenterViewTest);
 };
 
 MessageCenterViewTest::MessageCenterViewTest() {
 }
 
 MessageCenterViewTest::~MessageCenterViewTest() {
@@ skipping 18 matching lines @@
       base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
       message_center::RichNotificationData(), nullptr);
 
   // ...and a list for it.
   notifications_[std::string(kNotificationId1)] = std::move(notification1);
   notifications_[std::string(kNotificationId2)] = std::move(notification2);
   NotificationList::Notifications notifications = Notifications();
   message_center_->SetVisibleNotifications(notifications);
 
-  // Then create a new MessageCenterView with that single notification.
-  message_center_view_.reset(new MessageCenterView(
-      message_center_.get(), NULL, 100, false));
+  // Then create a new MockMessageCenterView with that single notification.
+  message_center_view_.reset(
+      new MockMessageCenterView(message_center_.get(), NULL, 100, false));
   GetMessageListView()->quit_message_loop_after_animation_for_test_ = true;
   GetMessageCenterView()->SetBounds(0, 0, 380, 600);
   message_center_view_->SetNotifications(notifications);
   message_center_view_->set_owned_by_client();
 
   widget_.reset(new views::Widget());
   views::Widget::InitParams params =
       CreateParams(views::Widget::InitParams::TYPE_POPUP);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(50, 50, 650, 650);
@@ skipping 227 matching lines @@
   EXPECT_NE(previous_height, GetMessageListView()->height());
 
   EXPECT_EQ(
       GetMessageListView()->height(),
       GetNotificationView(kNotificationId1)->GetHeightForWidth(width) +
           (kMarginBetweenItems - MessageView::GetShadowInsets().bottom()) +
           GetNotificationView(kNotificationId2)->GetHeightForWidth(width) +
           GetMessageListView()->GetInsets().height());
 }
 
+TEST_F(MessageCenterViewTest, SizeAfterUpdateBelowWithRepositionTarget) {
+  EXPECT_EQ(2, GetMessageListView()->child_count());
+  // Make sure that notification 2 is placed above notification 1.
+  EXPECT_LT(GetNotificationView(kNotificationId2)->bounds().y(),
+            GetNotificationView(kNotificationId1)->bounds().y());
+
+  GetMessageListView()->SetRepositionTargetForTest(
+      GetNotificationView(kNotificationId1)->bounds());
+
+  std::unique_ptr<Notification> notification = base::MakeUnique<Notification>(
+      NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId2),
+      base::UTF8ToUTF16("title2"),
+      base::UTF8ToUTF16("message\nwhich\nis\nvertically\nlong\n."),
+      gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
+      NotifierId(NotifierId::APPLICATION, "extension_id"),
+      message_center::RichNotificationData(), nullptr);
+  UpdateNotification(kNotificationId2, std::move(notification));
+
+  // Wait until the animation finishes if available.
+  if (GetAnimator()->IsAnimating())
+    base::RunLoop().Run();
+
+  int width =
+      GetMessageListView()->width() - GetMessageListView()->GetInsets().width();
+  EXPECT_EQ(
+      GetMessageListView()->height(),
+      GetNotificationView(kNotificationId1)->GetHeightForWidth(width) +
+          (kMarginBetweenItems - MessageView::GetShadowInsets().bottom()) +
+          GetNotificationView(kNotificationId2)->GetHeightForWidth(width) +
+          GetMessageListView()->GetInsets().height());
+}
+
+TEST_F(MessageCenterViewTest, SizeAfterUpdateOfRepositionTarget) {
+  EXPECT_EQ(2, GetMessageListView()->child_count());
+  // Make sure that notification 2 is placed above notification 1.
+  EXPECT_LT(GetNotificationView(kNotificationId2)->bounds().y(),
+            GetNotificationView(kNotificationId1)->bounds().y());
+
+  GetMessageListView()->SetRepositionTargetForTest(
+      GetNotificationView(kNotificationId1)->bounds());
+
+  std::unique_ptr<Notification> notification = base::MakeUnique<Notification>(
+      NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId1),
+      base::UTF8ToUTF16("title2"),
+      base::UTF8ToUTF16("message\nwhich\nis\nvertically\nlong\n."),
+      gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
+      NotifierId(NotifierId::APPLICATION, "extension_id"),
+      message_center::RichNotificationData(), nullptr);
+  UpdateNotification(kNotificationId1, std::move(notification));
+
+  // Wait until the animation finishes if available.
+  if (GetAnimator()->IsAnimating())
+    base::RunLoop().Run();
+
+  int width =
+      GetMessageListView()->width() - GetMessageListView()->GetInsets().width();
+  EXPECT_EQ(
+      GetMessageListView()->height(),
+      GetNotificationView(kNotificationId1)->GetHeightForWidth(width) +
+          (kMarginBetweenItems - MessageView::GetShadowInsets().bottom()) +
+          GetNotificationView(kNotificationId2)->GetHeightForWidth(width) +
+          GetMessageListView()->GetInsets().height());
+}
+
 TEST_F(MessageCenterViewTest, SizeAfterRemove) {
   EXPECT_EQ(2, GetMessageListView()->child_count());
   RemoveNotification(kNotificationId1, false);
 
   // Wait until the animation finishes if available.
   if (GetAnimator()->IsAnimating())
     base::RunLoop().Run();
 
   EXPECT_EQ(1, GetMessageListView()->child_count());
 
@@ skipping 373 matching lines @@
       base::UTF8ToUTF16("title1"), base::UTF8ToUTF16("message"), gfx::Image(),
       base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
       message_center::RichNotificationData(), nullptr));
 
   GetMessageCenterView()->SizeToPreferredSize();
   EXPECT_NE(kEmptyMessageCenterViewHeight, GetMessageCenterView()->height());
 }
 
 }  // namespace message_center