Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(606)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/bubble/border_contents_unittest.cc

Issue 8870003: Merge BorderContentsView into BubbleFrameView; simplify. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and merge. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/page_info_bubble_view.cc ('k') | ui/views/bubble/border_contents_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/bubble/border_contents_unittest.cc
diff --git a/ui/views/bubble/border_contents_unittest.cc b/ui/views/bubble/border_contents_unittest.cc
deleted file mode 100644
index cba8bc78bb4be283d6d9bd53e81f4339cfa2e673..0000000000000000000000000000000000000000
--- a/ui/views/bubble/border_contents_unittest.cc
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright (c) 2011 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/views/bubble/border_contents_view.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-typedef testing::Test BorderContentsTest;
-
-class TestBorderContentsView : public views::BorderContentsView {
- public:
- TestBorderContentsView() {}
-
- void set_monitor_bounds(const gfx::Rect& bounds) {
- monitor_bounds_ = bounds;
- }
-
- views::BubbleBorder* bubble_border() const {
- return BorderContentsView::bubble_border();
- }
-
- protected:
- virtual gfx::Rect GetMonitorBounds(const gfx::Rect& rect) {
- return monitor_bounds_;
- }
-
- private:
- gfx::Rect monitor_bounds_;
-
- DISALLOW_COPY_AND_ASSIGN(TestBorderContentsView);
-};
-
-// Tests that the arrow is moved appropriately when the info-bubble does not fit
-// the screen.
-TEST_F(BorderContentsTest, BorderContentsSizeAndGetBounds) {
- TestBorderContentsView border_contents;
- border_contents.Init();
-
- gfx::Insets insets;
- border_contents.bubble_border()->GetInsets(&insets);
- int xposition = 95 - insets.width();
-
- // Test that the info bubble displays normally when it fits.
- gfx::Rect contents_bounds;
- gfx::Rect window_bounds;
- border_contents.set_monitor_bounds(gfx::Rect(0, 0, 1000, 1000));
- border_contents.SizeAndGetBounds(
- gfx::Rect(100, 100, 50, 50), // |position_relative_to|
- views::BubbleBorder::TOP_LEFT,
- false, // |allow_bubble_offscreen|
- gfx::Size(500, 500), // |contents_size|
- &contents_bounds, &window_bounds);
- // The arrow shouldn't have changed from TOP_LEFT.
- views::BubbleBorder::ArrowLocation arrow_location =
- border_contents.bubble_border()->arrow_location();
- EXPECT_TRUE(views::BubbleBorder::has_arrow(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_top(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_left(arrow_location));
- EXPECT_GT(window_bounds.x(), xposition);
- EXPECT_GT(window_bounds.y(), 100 + 50 - 10); // -10 to roughly compensate for
- // arrow overlap.
-
- // Test bubble not fitting on left.
- border_contents.SizeAndGetBounds(
- gfx::Rect(100, 100, 50, 50), // |position_relative_to|
- views::BubbleBorder::TOP_RIGHT,
- false, // |allow_bubble_offscreen|
- gfx::Size(500, 500), // |contents_size|
- &contents_bounds, &window_bounds);
- arrow_location = border_contents.bubble_border()->arrow_location();
- // The arrow should have changed to TOP_LEFT.
- EXPECT_TRUE(views::BubbleBorder::has_arrow(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_top(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_left(arrow_location));
- EXPECT_GT(window_bounds.x(), xposition);
- EXPECT_GT(window_bounds.y(), 100 + 50 - 10); // -10 to roughly compensate for
- // arrow overlap.
-
- // Test bubble not fitting on left or top.
- border_contents.SizeAndGetBounds(
- gfx::Rect(100, 100, 50, 50), // |position_relative_to|
- views::BubbleBorder::BOTTOM_RIGHT,
- false, // |allow_bubble_offscreen|
- gfx::Size(500, 500), // |contents_size|
- &contents_bounds, &window_bounds);
- arrow_location = border_contents.bubble_border()->arrow_location();
- // The arrow should have changed to TOP_LEFT.
- EXPECT_TRUE(views::BubbleBorder::has_arrow(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_top(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_left(arrow_location));
- EXPECT_GT(window_bounds.x(), xposition);
- EXPECT_GT(window_bounds.y(), 100 + 50 - 10); // -10 to roughly compensate for
- // arrow overlap.
-
- // Test bubble not fitting on top.
- border_contents.SizeAndGetBounds(
- gfx::Rect(100, 100, 50, 50), // |position_relative_to|
- views::BubbleBorder::BOTTOM_LEFT,
- false, // |allow_bubble_offscreen|
- gfx::Size(500, 500), // |contents_size|
- &contents_bounds, &window_bounds);
- arrow_location = border_contents.bubble_border()->arrow_location();
- // The arrow should have changed to TOP_LEFT.
- EXPECT_TRUE(views::BubbleBorder::has_arrow(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_top(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_left(arrow_location));
- EXPECT_GT(window_bounds.x(), xposition);
- EXPECT_GT(window_bounds.y(), 100 + 50 - 10); // -10 to roughly compensate for
- // arrow overlap.
-
- // Test bubble not fitting on top and right.
- border_contents.SizeAndGetBounds(
- gfx::Rect(900, 100, 50, 50), // |position_relative_to|
- views::BubbleBorder::BOTTOM_LEFT,
- false, // |allow_bubble_offscreen|
- gfx::Size(500, 500), // |contents_size|
- &contents_bounds, &window_bounds);
- arrow_location = border_contents.bubble_border()->arrow_location();
- // The arrow should have changed to TOP_RIGHT.
- EXPECT_TRUE(views::BubbleBorder::has_arrow(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_top(arrow_location));
- EXPECT_FALSE(views::BubbleBorder::is_arrow_on_left(arrow_location));
- EXPECT_LT(window_bounds.x(), 900 + 50 - 500);
- EXPECT_GT(window_bounds.y(), 100 + 50 - 10); // -10 to roughly compensate for
- // arrow overlap.
-
- // Test bubble not fitting on right.
- border_contents.SizeAndGetBounds(
- gfx::Rect(900, 100, 50, 50), // |position_relative_to|
- views::BubbleBorder::TOP_LEFT,
- false, // |allow_bubble_offscreen|
- gfx::Size(500, 500), // |contents_size|
- &contents_bounds, &window_bounds);
- arrow_location = border_contents.bubble_border()->arrow_location();
- // The arrow should have changed to TOP_RIGHT.
- EXPECT_TRUE(views::BubbleBorder::has_arrow(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_top(arrow_location));
- EXPECT_FALSE(views::BubbleBorder::is_arrow_on_left(arrow_location));
- EXPECT_LT(window_bounds.x(), 900 + 50 - 500);
- EXPECT_GT(window_bounds.y(), 100 + 50 - 10); // -10 to roughly compensate for
- // arrow overlap.
-
- // Test bubble not fitting on bottom and right.
- border_contents.SizeAndGetBounds(
- gfx::Rect(900, 900, 50, 50), // |position_relative_to|
- views::BubbleBorder::TOP_LEFT,
- false, // |allow_bubble_offscreen|
- gfx::Size(500, 500), // |contents_size|
- &contents_bounds, &window_bounds);
- arrow_location = border_contents.bubble_border()->arrow_location();
- // The arrow should have changed to BOTTOM_RIGHT.
- EXPECT_TRUE(views::BubbleBorder::has_arrow(arrow_location));
- EXPECT_FALSE(views::BubbleBorder::is_arrow_on_top(arrow_location));
- EXPECT_FALSE(views::BubbleBorder::is_arrow_on_left(arrow_location));
- EXPECT_LT(window_bounds.x(), 900 + 50 - 500);
- EXPECT_LT(window_bounds.y(), 900 - 500 - 15); // -15 to roughly compensate
- // for arrow height.
-
- // Test bubble not fitting at the bottom.
- border_contents.SizeAndGetBounds(
- gfx::Rect(100, 900, 50, 50), // |position_relative_to|
- views::BubbleBorder::TOP_LEFT,
- false, // |allow_bubble_offscreen|
- gfx::Size(500, 500), // |contents_size|
- &contents_bounds, &window_bounds);
- arrow_location = border_contents.bubble_border()->arrow_location();
- // The arrow should have changed to BOTTOM_LEFT.
- EXPECT_TRUE(views::BubbleBorder::has_arrow(arrow_location));
- EXPECT_FALSE(views::BubbleBorder::is_arrow_on_top(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_left(arrow_location));
- // The window should be right aligned with the position_relative_to.
- EXPECT_LT(window_bounds.x(), 900 + 50 - 500);
- EXPECT_LT(window_bounds.y(), 900 - 500 - 15); // -15 to roughly compensate
- // for arrow height.
-
- // Test bubble not fitting at the bottom and left.
- border_contents.SizeAndGetBounds(
- gfx::Rect(100, 900, 50, 50), // |position_relative_to|
- views::BubbleBorder::TOP_RIGHT,
- false, // |allow_bubble_offscreen|
- gfx::Size(500, 500), // |contents_size|
- &contents_bounds, &window_bounds);
- arrow_location = border_contents.bubble_border()->arrow_location();
- // The arrow should have changed to BOTTOM_LEFT.
- EXPECT_TRUE(views::BubbleBorder::has_arrow(arrow_location));
- EXPECT_FALSE(views::BubbleBorder::is_arrow_on_top(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_left(arrow_location));
- // The window should be right aligned with the position_relative_to.
- EXPECT_LT(window_bounds.x(), 900 + 50 - 500);
- EXPECT_LT(window_bounds.y(), 900 - 500 - 15); // -15 to roughly compensate
- // for arrow height.
-}
-
-// Tests that the arrow is not moved when the info-bubble does not fit the
-// screen but moving it would make matter worse.
-TEST_F(BorderContentsTest, BorderContentsSizeAndGetBoundsDontMoveArrow) {
- TestBorderContentsView border_contents;
- border_contents.Init();
- gfx::Rect contents_bounds;
- gfx::Rect window_bounds;
- border_contents.set_monitor_bounds(gfx::Rect(0, 0, 1000, 1000));
- border_contents.SizeAndGetBounds(
- gfx::Rect(400, 100, 50, 50), // |position_relative_to|
- views::BubbleBorder::TOP_LEFT,
- false, // |allow_bubble_offscreen|
- gfx::Size(500, 700), // |contents_size|
- &contents_bounds, &window_bounds);
-
- // The arrow should not have changed, as it would make it the bubble even more
- // offscreen.
- views::BubbleBorder::ArrowLocation arrow_location =
- border_contents.bubble_border()->arrow_location();
- EXPECT_TRUE(views::BubbleBorder::has_arrow(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_top(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_left(arrow_location));
-}
-
-// Test that the 'allow offscreen' prevents the bubble from moving.
-TEST_F(BorderContentsTest, BorderContentsSizeAndGetBoundsAllowOffscreen) {
- TestBorderContentsView border_contents;
- border_contents.Init();
- gfx::Rect contents_bounds;
- gfx::Rect window_bounds;
- border_contents.set_monitor_bounds(gfx::Rect(0, 0, 1000, 1000));
- border_contents.SizeAndGetBounds(
- gfx::Rect(100, 900, 50, 50), // |position_relative_to|
- views::BubbleBorder::TOP_RIGHT,
- true, // |allow_bubble_offscreen|
- gfx::Size(500, 500), // |contents_size|
- &contents_bounds, &window_bounds);
-
- // The arrow should not have changed (eventhough the bubble does not fit).
- views::BubbleBorder::ArrowLocation arrow_location =
- border_contents.bubble_border()->arrow_location();
- EXPECT_TRUE(views::BubbleBorder::has_arrow(arrow_location));
- EXPECT_TRUE(views::BubbleBorder::is_arrow_on_top(arrow_location));
- EXPECT_FALSE(views::BubbleBorder::is_arrow_on_left(arrow_location));
- // The coordinates should be pointing to 'positive relative to' from
- // TOP_RIGHT.
- EXPECT_LT(window_bounds.x(), 100 + 50 - 500);
- EXPECT_GT(window_bounds.y(), 900 + 50 - 10); // -10 to roughly compensate for
- // arrow overlap.
-}
« no previous file with comments | « chrome/browser/ui/views/page_info_bubble_view.cc ('k') | ui/views/bubble/border_contents_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698