Supporting shrinking/enlarging for notifications

ui/message_center/views/message_popup_collection_unittest.cc

 // 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.
 
 #include "ui/message_center/views/message_popup_collection.h"
 
 #include <stddef.h>
 
 #include <list>
 #include <utility>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/message_center/fake_message_center.h"
 #include "ui/message_center/views/desktop_popup_alignment_delegate.h"
 #include "ui/message_center/views/toast_contents_view.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
+namespace {
+
+std::unique_ptr<message_center::Notification> CreateTestNotification(
+    std::string id,
+    std::string text) {
+  return base::WrapUnique(new message_center::Notification(
+      message_center::NOTIFICATION_TYPE_BASE_FORMAT, id,
+      base::UTF8ToUTF16("test title"), base::ASCIIToUTF16(text), gfx::Image(),
+      base::string16() /* display_source */, GURL(),
+      message_center::NotifierId(message_center::NotifierId::APPLICATION, id),
+      message_center::RichNotificationData(),
+      new message_center::NotificationDelegate()));
+}
+
+}  // namespace
+
 namespace message_center {
 namespace test {
 
 class MessagePopupCollectionTest : public views::ViewsTestBase {
  public:
   void SetUp() override {
     views::ViewsTestBase::SetUp();
     MessageCenter::Initialize();
     MessageCenter::Get()->DisableTimersForTest();
     alignment_delegate_.reset(new DesktopPopupAlignmentDelegate);
@@ skipping 220 matching lines @@
   EXPECT_TRUE(IsToastShown(id0));
   EXPECT_TRUE(IsToastShown(id1));
 
   EXPECT_EQ(r0.width(), r1.width());
   EXPECT_EQ(r0.height(), r1.height());
   EXPECT_GT(r0.y(), r1.y());
   EXPECT_EQ(r0.x(), r1.x());
 
   CloseAllToasts();
   EXPECT_EQ(0u, GetToastCounts());
-
-  // Restore simulated taskbar position to bottom.
-  SetDisplayInfo(gfx::Rect(0, 0, 600, 390),  // Work-area.
-                 gfx::Rect(0, 0, 600, 400)); // Display-bounds.
-
   WaitForTransitionsDone();
 }
 
 TEST_F(MessagePopupCollectionTest, TopDownPositioningWithTopTaskbar) {
   // Simulate a taskbar at the top.
   SetDisplayInfo(gfx::Rect(0, 10, 600, 390),  // Work-area.
                  gfx::Rect(0, 0, 600, 400));  // Display-bounds.
   std::string id0 = AddNotification();
   std::string id1 = AddNotification();
   WaitForTransitionsDone();
 
   gfx::Rect r0 = GetToastRectAt(0);
   gfx::Rect r1 = GetToastRectAt(1);
 
   // 2 toasts are shown, equal size, vertical stack.
   EXPECT_TRUE(IsToastShown(id0));
   EXPECT_TRUE(IsToastShown(id1));
 
   EXPECT_EQ(r0.width(), r1.width());
   EXPECT_EQ(r0.height(), r1.height());
   EXPECT_LT(r0.y(), r1.y());
   EXPECT_EQ(r0.x(), r1.x());
 
   CloseAllToasts();
   EXPECT_EQ(0u, GetToastCounts());
   WaitForTransitionsDone();
-
-  // Restore simulated taskbar position to bottom.
-  SetDisplayInfo(gfx::Rect(0, 0, 600, 390),   // Work-area.
-                 gfx::Rect(0, 0, 600, 400));  // Display-bounds.
 }
 
 TEST_F(MessagePopupCollectionTest, TopDownPositioningWithLeftAndTopTaskbar) {
   // If there "seems" to be a taskbar on left and top (like in Unity), it is
   // assumed that the actual taskbar is the top one.
 
   // Simulate a taskbar at the top and left.
   SetDisplayInfo(gfx::Rect(10, 10, 590, 390),  // Work-area.
                  gfx::Rect(0, 0, 600, 400));   // Display-bounds.
   std::string id0 = AddNotification();
   std::string id1 = AddNotification();
   WaitForTransitionsDone();
 
   gfx::Rect r0 = GetToastRectAt(0);
   gfx::Rect r1 = GetToastRectAt(1);
 
   // 2 toasts are shown, equal size, vertical stack.
   EXPECT_TRUE(IsToastShown(id0));
   EXPECT_TRUE(IsToastShown(id1));
 
   EXPECT_EQ(r0.width(), r1.width());
   EXPECT_EQ(r0.height(), r1.height());
   EXPECT_LT(r0.y(), r1.y());
   EXPECT_EQ(r0.x(), r1.x());
 
   CloseAllToasts();
   EXPECT_EQ(0u, GetToastCounts());
   WaitForTransitionsDone();
-
-  // Restore simulated taskbar position to bottom.
-  SetDisplayInfo(gfx::Rect(0, 0, 600, 390),   // Work-area.
-                 gfx::Rect(0, 0, 600, 400));  // Display-bounds.
 }
 
 TEST_F(MessagePopupCollectionTest, TopDownPositioningWithBottomAndTopTaskbar) {
   // If there "seems" to be a taskbar on bottom and top (like in Gnome), it is
   // assumed that the actual taskbar is the top one.
 
   // Simulate a taskbar at the top and bottom.
   SetDisplayInfo(gfx::Rect(0, 10, 580, 400),  // Work-area.
                  gfx::Rect(0, 0, 600, 400));  // Display-bounds.
   std::string id0 = AddNotification();
   std::string id1 = AddNotification();
   WaitForTransitionsDone();
 
   gfx::Rect r0 = GetToastRectAt(0);
   gfx::Rect r1 = GetToastRectAt(1);
 
   // 2 toasts are shown, equal size, vertical stack.
   EXPECT_TRUE(IsToastShown(id0));
   EXPECT_TRUE(IsToastShown(id1));
 
   EXPECT_EQ(r0.width(), r1.width());
   EXPECT_EQ(r0.height(), r1.height());
   EXPECT_LT(r0.y(), r1.y());
   EXPECT_EQ(r0.x(), r1.x());
 
   CloseAllToasts();
   EXPECT_EQ(0u, GetToastCounts());
   WaitForTransitionsDone();
-
-  // Restore simulated taskbar position to bottom.
-  SetDisplayInfo(gfx::Rect(0, 0, 600, 390),   // Work-area.
-                 gfx::Rect(0, 0, 600, 400));  // Display-bounds.
 }
 
 TEST_F(MessagePopupCollectionTest, LeftPositioningWithLeftTaskbar) {
   // Simulate a taskbar at the left.
   SetDisplayInfo(gfx::Rect(10, 0, 590, 400),  // Work-area.
                  gfx::Rect(0, 0, 600, 400));  // Display-bounds.
   std::string id0 = AddNotification();
   std::string id1 = AddNotification();
   WaitForTransitionsDone();
 
   gfx::Rect r0 = GetToastRectAt(0);
   gfx::Rect r1 = GetToastRectAt(1);
 
   // 2 toasts are shown, equal size, vertical stack.
   EXPECT_TRUE(IsToastShown(id0));
   EXPECT_TRUE(IsToastShown(id1));
 
   EXPECT_EQ(r0.width(), r1.width());
   EXPECT_EQ(r0.height(), r1.height());
   EXPECT_GT(r0.y(), r1.y());
   EXPECT_EQ(r0.x(), r1.x());
 
   // Ensure that toasts are on the left.
   EXPECT_LT(r1.x(), GetWorkArea().CenterPoint().x());
 
   CloseAllToasts();
   EXPECT_EQ(0u, GetToastCounts());
   WaitForTransitionsDone();
-
-  // Restore simulated taskbar position to bottom.
-  SetDisplayInfo(gfx::Rect(0, 0, 600, 390),   // Work-area.
-                 gfx::Rect(0, 0, 600, 400));  // Display-bounds.
 }
 
 TEST_F(MessagePopupCollectionTest, DetectMouseHover) {
   std::string id0 = AddNotification();
   std::string id1 = AddNotification();
   WaitForTransitionsDone();
 
   views::WidgetDelegateView* toast0 = GetToast(id0);
   EXPECT_TRUE(toast0 != NULL);
   views::WidgetDelegateView* toast1 = GetToast(id1);
@@ skipping 103 matching lines @@
   WaitForTransitionsDone();
 
   // Confirms that there is no toast.
   EXPECT_EQ(0u, GetToastCounts());
   // But the notification still exists.
   EXPECT_EQ(1u, MessageCenter::Get()->NotificationCount());
 }
 
 #endif  // defined(OS_CHROMEOS)
 
+// When notifications were displayed on top, change of notification
+// size didn't affect corresponding widget.
+TEST_F(MessagePopupCollectionTest, ChangingNotificationSize) {
+  // Simulate a taskbar at the top.
+  SetDisplayInfo(gfx::Rect(0, 10, 600, 390),  // Work-area.
+                 gfx::Rect(0, 0, 600, 400));  // Display-bounds.
+
+  struct {
+    std::string name;
+    std::string text;
+  } updates[] = {
+      {"shrinking", ""},
+      {"enlarging", "abc\ndef\nghk\n"},
+      {"restoring", "abc\n"},
+  };
+
+  std::vector<std::string> notification_ids;
+  // adding notifications
+  {
+    constexpr int max_visible_popup_notifications = 3;
+    notification_ids.reserve(max_visible_popup_notifications);
+    std::generate_n(std::back_inserter(notification_ids),
+                    max_visible_popup_notifications,
+                    [this] { return AddNotification(); });
+  }
+
+  // helper to check, that notifications borders have the same size
+  // as their widgets at any time
+  auto check_notifications = [this, &notification_ids](const std::string& msg) {
+    for (const std::string& id : notification_ids) {
+      auto* toast = GetToast(id);
+      ASSERT_TRUE(toast) << "no toast for: " << id << "\ntest case: " << msg;
+      auto* widget = GetWidget(id);
+      ASSERT_TRUE(widget) << "no widget for: " << id << "\ntest case: " << msg;
+      EXPECT_TRUE(toast->bounds().height() ==
+                      widget->GetWindowBoundsInScreen().height() &&
+                  toast->bounds().width() ==
+                      widget->GetWindowBoundsInScreen().width())

[Jun Mukai, 2016/05/05 18:01:51]

nit: EXPECT_EQ(toast->bounds().size(), widget->GetWindowBoundsInScreen().size())
?

+          << "size of toast contents doesn't match widget's size"
+          << "\nfor id: " << id << "\ntest case: " << msg
+          << "\ntoast width: " << toast->bounds().width()
+          << "\nwidget width: " << widget->GetWindowBoundsInScreen().width()
+          << "\ntoast height: " << toast->bounds().height()
+          << "\nwidget height: " << widget->GetWindowBoundsInScreen().height();

[Jun Mukai, 2016/05/05 18:01:51]

In case you have to keep EXPECT_TRUE, you may want to consider
toast->bounds().size().ToString() for logging.

+    }
+  };
+
+  // checks not updated notifications
+  {
+    WaitForTransitionsDone();
+    ASSERT_NO_FATAL_FAILURE(
+        check_notifications("before updating, animation is done"));
+  }
+
+  // updating notifications one by one
+  for (const std::string& id : notification_ids) {
+    for (const auto& update : updates) {
+      MessageCenter::Get()->UpdateNotification(
+          id, CreateTestNotification(id, update.text));
+      ASSERT_NO_FATAL_FAILURE(check_notifications(id + " " + update.name +
+                                                  " animation in progress"));
+      WaitForTransitionsDone();
+      ASSERT_NO_FATAL_FAILURE(
+          check_notifications(id + " " + update.name + " animation is done"));
+    }
+  }
+
+  CloseAllToasts();
+  WaitForTransitionsDone();
+}
+
 }  // namespace test
 }  // namespace message_center