diff options
| author | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 01:13:23 +0000 |
|---|---|---|
| committer | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 01:13:23 +0000 |
| commit | 3b7a703bcfa46f7407aa846e667ee237cc78e55b (patch) | |
| tree | 828316199b61edc81ae8a8289460ddfddcc83fd7 | |
| parent | ade36f2d15e01b39308c7b8f592ea0d189297745 (diff) | |
| download | chromium_src-3b7a703bcfa46f7407aa846e667ee237cc78e55b.zip chromium_src-3b7a703bcfa46f7407aa846e667ee237cc78e55b.tar.gz chromium_src-3b7a703bcfa46f7407aa846e667ee237cc78e55b.tar.bz2 | |
App List tests now assume the existence of the menu bar.
Without the menu bar allows you to make assumptions that pass tests but
fail in the real world (e.g., assuming that the work area is only inset
on a single screen edge).
BUG=317944
Review URL: https://codereview.chromium.org/87323003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237463 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/app_list/app_list_service_mac_unittest.mm | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm b/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm index 863ddfe..6799b78 100644 --- a/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm +++ b/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm @@ -18,6 +18,8 @@ const int kScreenHeight = 600; const int kWindowWidth = 100; const int kWindowHeight = 200; +// Size of the menu bar along the top of the screen. +const int kMenuBarSize = 22; // Size of the normal (non-hidden) dock. const int kDockSize = 30; // Size of the hidden dock. @@ -61,7 +63,8 @@ class AppListServiceMacUnitTest : public testing::Test { public: virtual void SetUp() OVERRIDE { display_.set_bounds(gfx::Rect(0, 0, kScreenWidth, kScreenHeight)); - display_.set_work_area(gfx::Rect(0, 0, kScreenWidth, kScreenHeight)); + display_.set_work_area( + gfx::Rect(0, kMenuBarSize, kScreenWidth, kScreenHeight - kMenuBarSize)); window_size_ = gfx::Size(kWindowWidth, kWindowHeight); cursor_is_visible_ = true; cursor_ = gfx::Point(); @@ -73,15 +76,22 @@ class AppListServiceMacUnitTest : public testing::Test { switch (location) { case DOCK_LOCATION_BOTTOM: display_.set_work_area( - gfx::Rect(0, 0, kScreenWidth, kScreenHeight - dock_size)); + gfx::Rect(0, + kMenuBarSize, + kScreenWidth, + kScreenHeight - kMenuBarSize - dock_size)); break; case DOCK_LOCATION_LEFT: - display_.set_work_area( - gfx::Rect(dock_size, 0, kScreenWidth - dock_size, kScreenHeight)); + display_.set_work_area(gfx::Rect(dock_size, + kMenuBarSize, + kScreenWidth - dock_size, + kScreenHeight - kMenuBarSize)); break; case DOCK_LOCATION_RIGHT: - display_.set_work_area( - gfx::Rect(0, 0, kScreenWidth - dock_size, kScreenHeight)); + display_.set_work_area(gfx::Rect(0, + kMenuBarSize, + kScreenWidth - dock_size, + kScreenHeight - kMenuBarSize)); break; } } |