diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 21:02:36 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 21:02:36 +0000 |
| commit | 34f8fee20dd1c07adcb4960310dd1f387d7b7bf3 (patch) | |
| tree | 4d69c8742f0bc52889f19dd8fc7f14dbe86947b1 /chrome/browser/cocoa/status_bubble_mac_unittest.mm | |
| parent | 9ab71d1832cb2651d60769aa263f5fc086a0b6be (diff) | |
| download | chromium_src-34f8fee20dd1c07adcb4960310dd1f387d7b7bf3.zip chromium_src-34f8fee20dd1c07adcb4960310dd1f387d7b7bf3.tar.gz chromium_src-34f8fee20dd1c07adcb4960310dd1f387d7b7bf3.tar.bz2 | |
Mac: Resize status bubble when window is resized.
BUG=22956
TEST=Load a (slow-loading) web site so that a status bubble will appear and be visible for a while. While the status bubble is visible, resize the window. The status bubble should move and/or resize appropriately.
Review URL: http://codereview.chromium.org/266018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/status_bubble_mac_unittest.mm')
| -rw-r--r-- | chrome/browser/cocoa/status_bubble_mac_unittest.mm | 47 |
1 files changed, 46 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/cocoa/status_bubble_mac_unittest.mm index 2482d96..d462f0d 100644 --- a/chrome/browser/cocoa/status_bubble_mac_unittest.mm +++ b/chrome/browser/cocoa/status_bubble_mac_unittest.mm @@ -17,7 +17,6 @@ @end @implementation StatusBubbleMacTestWindowDelegate - (GTMTheme *)gtm_themeForWindow:(NSWindow *)window { - NSLog(@"gettheme"); return [[[GTMTheme alloc] init] autorelease]; } @end @@ -119,3 +118,49 @@ TEST_F(StatusBubbleMacTest, Delete) { bubble->SetStatus(L"showing"); delete bubble; } + +TEST_F(StatusBubbleMacTest, UpdateSizeAndPosition) { + // Test |UpdateSizeAndPosition()| when status bubble does not exist (shouldn't + // crash; shouldn't create window). + EXPECT_FALSE(GetWindow()); + bubble_->UpdateSizeAndPosition(); + EXPECT_FALSE(GetWindow()); + + // Create a status bubble (with contents) and call resize (without actually + // resizing); the frame size shouldn't change. + bubble_->SetStatus(L"UpdateSizeAndPosition test"); + ASSERT_TRUE(GetWindow()); + NSRect rect_before = [GetWindow() frame]; + bubble_->UpdateSizeAndPosition(); + NSRect rect_after = [GetWindow() frame]; + EXPECT_TRUE(NSEqualRects(rect_before, rect_after)); + + // Move the window and call resize; only the origin should change. + NSWindow* window = cocoa_helper_.window(); + ASSERT_TRUE(window); + NSRect frame = [window frame]; + rect_before = [GetWindow() frame]; + frame.origin.x += 10.0; // (fairly arbitrary nonzero value) + frame.origin.y += 10.0; // (fairly arbitrary nonzero value) + [window setFrame:frame display:YES]; + bubble_->UpdateSizeAndPosition(); + rect_after = [GetWindow() frame]; + EXPECT_NE(rect_before.origin.x, rect_after.origin.x); + EXPECT_NE(rect_before.origin.y, rect_after.origin.y); + EXPECT_EQ(rect_before.size.width, rect_after.size.width); + EXPECT_EQ(rect_before.size.height, rect_after.size.height); + + // Resize the window (without moving). The origin shouldn't change. The width + // should change (in the current implementation), but not the height. + frame = [window frame]; + rect_before = [GetWindow() frame]; + frame.size.width += 50.0; // (fairly arbitrary nonzero value) + frame.size.height += 50.0; // (fairly arbitrary nonzero value) + [window setFrame:frame display:YES]; + bubble_->UpdateSizeAndPosition(); + rect_after = [GetWindow() frame]; + EXPECT_EQ(rect_before.origin.x, rect_after.origin.x); + EXPECT_EQ(rect_before.origin.y, rect_after.origin.y); + EXPECT_NE(rect_before.size.width, rect_after.size.width); + EXPECT_EQ(rect_before.size.height, rect_after.size.height); +} |