Separate the logic of popup alignment and workarea handling as delegate.

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 <list>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/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 message_center {
 namespace test {
 
 class MessagePopupCollectionTest : public views::ViewsTestBase {
  public:
   virtual void SetUp() OVERRIDE {
     views::ViewsTestBase::SetUp();
     MessageCenter::Initialize();
     MessageCenter::Get()->DisableTimersForTest();
+    alignment_delegate_.reset(new DesktopPopupAlignmentDelegate);
     collection_.reset(new MessagePopupCollection(
-        GetContext(), MessageCenter::Get(), NULL, false));
+        GetContext(), MessageCenter::Get(), NULL, alignment_delegate_.get()));
     // This size fits test machines resolution and also can keep a few toasts
     // w/o ill effects of hitting the screen overflow. This allows us to assume
     // and verify normal layout of the toast stack.
-    collection_->SetDisplayInfo(gfx::Rect(0, 0, 600, 390),
-                                gfx::Rect(0, 0, 600, 400));  // Simulate a
-                                                             // taskbar at the
-                                                             // bottom.
+    SetDisplayInfo(gfx::Rect(0, 0, 600, 390),  // taskbar at the bottom.
+                   gfx::Rect(0, 0, 600, 400));
     id_ = 0;
     PrepareForWait();
   }
 
   virtual void TearDown() OVERRIDE {
     collection_.reset();
     MessageCenter::Shutdown();
     views::ViewsTestBase::TearDown();
   }
 
@@ skipping 10 matching lines @@
 
   bool IsToastShown(const std::string& id) {
     views::Widget* widget = collection_->GetWidgetForTest(id);
     return widget && widget->IsVisible();
   }
 
   views::Widget* GetWidget(const std::string& id) {
     return collection_->GetWidgetForTest(id);
   }
 
+  void SetDisplayInfo(const gfx::Rect& work_area,
+                      const gfx::Rect& display_bounds) {
+    gfx::Display dummy_display;
+    dummy_display.set_bounds(display_bounds);
+    dummy_display.set_work_area(work_area);
+    alignment_delegate_->RecomputeAlignment(dummy_display);
+    PrepareForWait();
+  }
+
   gfx::Rect GetWorkArea() {
-    return collection_->work_area_;
+    return alignment_delegate_->work_area_;
   }
 
   ToastContentsView* GetToast(const std::string& id) {
     for (MessagePopupCollection::Toasts::iterator iter =
              collection_->toasts_.begin();
          iter != collection_->toasts_.end(); ++iter) {
       if ((*iter)->id() == id)
         return *iter;
     }
     return NULL;
@@ skipping 28 matching lines @@
     EXPECT_TRUE(GetToastCounts() > 0);
     MessageCenter::Get()->RemoveAllNotifications(false);
   }
 
   gfx::Rect GetToastRectAt(size_t index) {
     return collection_->GetToastRectAt(index);
   }
 
  private:
   scoped_ptr<MessagePopupCollection> collection_;
+  scoped_ptr<DesktopPopupAlignmentDelegate> alignment_delegate_;
   int id_;
 };
 
 TEST_F(MessagePopupCollectionTest, DismissOnClick) {
 
   std::string id1 = AddNotification();
   std::string id2 = AddNotification();
   WaitForTransitionsDone();
 
   EXPECT_EQ(2u, GetToastCounts());
@@ skipping 63 matching lines @@
   EXPECT_EQ(0, r3.height());
 
   CloseAllToasts();
   EXPECT_EQ(0u, GetToastCounts());
 }
 
 TEST_F(MessagePopupCollectionTest, DefaultPositioningWithRightTaskbar) {
   // If taskbar is on the right we show the toasts bottom to top as usual.
 
   // Simulate a taskbar at the right.
-  collection()->SetDisplayInfo(gfx::Rect(0, 0, 590, 400),   // Work-area.
-                               gfx::Rect(0, 0, 600, 400));  // Display-bounds.
+  SetDisplayInfo(gfx::Rect(0, 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());
 
   CloseAllToasts();
   EXPECT_EQ(0u, GetToastCounts());
 
   // Restore simulated taskbar position to bottom.
-  collection()->SetDisplayInfo(gfx::Rect(0, 0, 600, 390),  // Work-area.
-                               gfx::Rect(0, 0, 600, 400)); // Display-bounds.
+  SetDisplayInfo(gfx::Rect(0, 0, 600, 390),  // Work-area.
+                 gfx::Rect(0, 0, 600, 400)); // Display-bounds.
 }
 
 TEST_F(MessagePopupCollectionTest, TopDownPositioningWithTopTaskbar) {
   // Simulate a taskbar at the top.
-  collection()->SetDisplayInfo(gfx::Rect(0, 10, 600, 390),  // Work-area.
-                               gfx::Rect(0, 0, 600, 400));  // Display-bounds.
+  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());
 
   // Restore simulated taskbar position to bottom.
-  collection()->SetDisplayInfo(gfx::Rect(0, 0, 600, 390),   // Work-area.
-                               gfx::Rect(0, 0, 600, 400));  // Display-bounds.
+  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.
-  collection()->SetDisplayInfo(gfx::Rect(10, 10, 590, 390),  // Work-area.
-                               gfx::Rect(0, 0, 600, 400));   // Display-bounds.
+  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());
 
   // Restore simulated taskbar position to bottom.
-  collection()->SetDisplayInfo(gfx::Rect(0, 0, 600, 390),   // Work-area.
-                               gfx::Rect(0, 0, 600, 400));  // Display-bounds.
+  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.
-  collection()->SetDisplayInfo(gfx::Rect(0, 10, 580, 400),  // Work-area.
-                               gfx::Rect(0, 0, 600, 400));  // Display-bounds.
+  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());
 
   // Restore simulated taskbar position to bottom.
-  collection()->SetDisplayInfo(gfx::Rect(0, 0, 600, 390),   // Work-area.
-                               gfx::Rect(0, 0, 600, 400));  // Display-bounds.
+  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.
-  collection()->SetDisplayInfo(gfx::Rect(10, 0, 590, 400),  // Work-area.
-                               gfx::Rect(0, 0, 600, 400));  // Display-bounds.
+  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());
 
   // Restore simulated taskbar position to bottom.
-  collection()->SetDisplayInfo(gfx::Rect(0, 0, 600, 390),   // Work-area.
-                               gfx::Rect(0, 0, 600, 400));  // Display-bounds.
+  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 43 matching lines @@
   std::string id2 = AddNotification();
 
   WaitForTransitionsDone();
   views::WidgetDelegateView* toast2 = GetToast(id2);
   EXPECT_TRUE(toast2 != NULL);
 }
 
 
 }  // namespace test
 }  // namespace message_center