diff options
author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 01:42:30 +0000 |
---|---|---|
committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 01:42:30 +0000 |
commit | 4c1bdfe25b4088e292e521478fcd06e5e096aab9 (patch) | |
tree | 6b650797a3f0459a71236e9b80e1c44ab8ec83cd /ash/wm/base_layout_manager_unittest.cc | |
parent | c0c09f91d95d1801aabfbef23461ba9a4acd379b (diff) | |
download | chromium_src-4c1bdfe25b4088e292e521478fcd06e5e096aab9.zip chromium_src-4c1bdfe25b4088e292e521478fcd06e5e096aab9.tar.gz chromium_src-4c1bdfe25b4088e292e521478fcd06e5e096aab9.tar.bz2 |
Set minimize property and re-enable tests on Aura
Currently we disable several important tests on Aura because Minimize() is unimplemented.
Most significant is ExtensionApiTest.UpdateWindowResize and ExtensionApiTest.UpdateWindowState, which test a lot of the chrome.windows api.
Setting the minimized property but not doing anything satisfies the tests with minimal change, until we determine what the expected minimize behavior is on Aura, and how this affects the extensions API.
BUG=104571
TEST=Tests pass (esp. browser_tests)
Review URL: http://codereview.chromium.org/9372126
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/base_layout_manager_unittest.cc')
-rw-r--r-- | ash/wm/base_layout_manager_unittest.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ash/wm/base_layout_manager_unittest.cc b/ash/wm/base_layout_manager_unittest.cc index c0cd326..19df383 100644 --- a/ash/wm/base_layout_manager_unittest.cc +++ b/ash/wm/base_layout_manager_unittest.cc @@ -57,6 +57,18 @@ TEST_F(BaseLayoutManagerTest, Maximize) { EXPECT_EQ(bounds, window->bounds()); } +// Tests normal->minimize->normal. +TEST_F(BaseLayoutManagerTest, Minimize) { + gfx::Rect bounds(100, 100, 200, 200); + scoped_ptr<aura::Window> window(CreateTestWindow(bounds)); + window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED); + // Note: Currently minimize doesn't do anything except set the state. + // See crbug.com/104571. + EXPECT_EQ(bounds, window->bounds()); + window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); + EXPECT_EQ(bounds, window->bounds()); +} + // Tests maximized window size during root window resize. TEST_F(BaseLayoutManagerTest, MaximizeRootWindowResize) { gfx::Rect bounds(100, 100, 200, 200); |