Fix a bug that old height is set in DoUpdateIfPossible().

ui/message_center/views/message_list_view_unittest.cc

 // Copyright 2016 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 <map>
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/fake_message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/views/message_center_controller.h"
 #include "ui/message_center/views/message_list_view.h"
 #include "ui/message_center/views/notification_view.h"
 #include "ui/views/test/views_test_base.h"
 
 using ::testing::ElementsAre;
 
 namespace message_center {
 
 static const char* kNotificationId1 = "notification id 1";
+static const char* kNotificationId2 = "notification id 2";
 
 namespace {
 
 /* Types **********************************************************************/
 
 enum CallType { GET_PREFERRED_SIZE, GET_HEIGHT_FOR_WIDTH, LAYOUT };
 
 /* Instrumented/Mock NotificationView subclass ********************************/
 
 class MockNotificationView : public NotificationView {
@@ skipping 87 matching lines @@
 
  protected:
   MessageListView* message_list_view() const {
     return message_list_view_.get();
   }
 
   int& reposition_top() { return message_list_view_->reposition_top_; }
 
   int& fixed_height() { return message_list_view_->fixed_height_; }
 
+  views::BoundsAnimator& animator() { return message_list_view_->animator_; }
+
   std::vector<int> ComputeRepositionOffsets(const std::vector<int>& heights,
                                             const std::vector<bool>& deleting,
                                             int target_index,
                                             int padding) {
     return message_list_view_->ComputeRepositionOffsets(heights, deleting,
                                                         target_index, padding);
   }
 
   MockNotificationView* CreateNotificationView(
       const Notification& notification) {
     return new MockNotificationView(this, notification, this);
   }
 
+  void RunPendingAnimations() {
+    while (animator().IsAnimating())
+      RunPendingMessages();
+  }
+
  private:
   // MockNotificationView::Test override
   void RegisterCall(CallType type) override {}
 
   // MessageListView::Observer override
   void OnAllNotificationsCleared() override {}
 
   // MessageCenterController override:
   void ClickOnNotification(const std::string& notification_id) override {}
   void RemoveNotification(const std::string& notification_id,
@@ skipping 211 matching lines @@
   reposition_top() = 5 + top;
   positions =
       ComputeRepositionOffsets({5, 3, 3, 3}, {false, false, false, false},
                                1 /* target_index */, 2 /* padding */);
   EXPECT_THAT(positions,
               ElementsAre(top, top + 7, top + 7 + 5, top + 7 + 5 + 5));
   EXPECT_EQ(20 + insets.height() + 2, fixed_height());
   EXPECT_EQ(5 + top + 2, reposition_top());
 }
 
+TEST_F(MessageListViewTest, RemoveNotification) {
+  message_list_view()->SetBounds(0, 0, 800, 600);
+
+  // Create dummy notifications.
+  auto* notification_view = CreateNotificationView(
+      Notification(NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId1),
+                   base::UTF8ToUTF16("title"), base::UTF8ToUTF16("message1"),
+                   gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
+                   NotifierId(NotifierId::APPLICATION, "extension_id"),
+                   message_center::RichNotificationData(), nullptr));
+
+  message_list_view()->AddNotificationAt(notification_view, 0);
+  EXPECT_EQ(1, message_list_view()->child_count());
+  EXPECT_TRUE(message_list_view()->Contains(notification_view));
+
+  RunPendingAnimations();
+
+  message_list_view()->RemoveNotification(notification_view);
+
+  RunPendingAnimations();
+
+  EXPECT_EQ(0, message_list_view()->child_count());
+}
+
+TEST_F(MessageListViewTest, ClearAllClosableNotifications) {
+  message_list_view()->SetBounds(0, 0, 800, 600);
+
+  // Create dummy notifications.
+  auto* notification_view1 = CreateNotificationView(
+      Notification(NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId1),
+                   base::UTF8ToUTF16("title"), base::UTF8ToUTF16("message1"),
+                   gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
+                   NotifierId(NotifierId::APPLICATION, "extension_id"),
+                   message_center::RichNotificationData(), nullptr));
+  auto* notification_view2 = CreateNotificationView(
+      Notification(NOTIFICATION_TYPE_SIMPLE, std::string(kNotificationId2),
+                   base::UTF8ToUTF16("title 2"), base::UTF8ToUTF16("message2"),
+                   gfx::Image(), base::UTF8ToUTF16("display source"), GURL(),
+                   NotifierId(NotifierId::APPLICATION, "extension_id"),
+                   message_center::RichNotificationData(), nullptr));
+
+  message_list_view()->AddNotificationAt(notification_view1, 0);
+  EXPECT_EQ(1, message_list_view()->child_count());
+  EXPECT_TRUE(notification_view1->visible());
+
+  RunPendingAnimations();
+
+  message_list_view()->AddNotificationAt(notification_view2, 1);
+  EXPECT_EQ(2, message_list_view()->child_count());
+  EXPECT_TRUE(notification_view2->visible());
+
+  RunPendingAnimations();
+
+  message_list_view()->ClearAllClosableNotifications(
+      message_list_view()->bounds());
+
+  RunPendingAnimations();
+
+  // TODO(yhanada): notification_view1 and notification_view2 should be deleted
+  //                here. Uncomment the below test.
+  EXPECT_TRUE(gfx::IntersectRects(notification_view1->bounds(),
+                                  message_list_view()->bounds())
+                  .IsEmpty());
+  EXPECT_TRUE(gfx::IntersectRects(notification_view2->bounds(),
+                                  message_list_view()->bounds())
+                  .IsEmpty());
+  // EXPECT_EQ(0, message_list_view()->child_count());
+}
+
 }  // namespace