diff options
author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 17:59:27 +0000 |
---|---|---|
committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 17:59:27 +0000 |
commit | 5447be826e379f87ab6f24085e687c4d6628b05c (patch) | |
tree | 20bd7522787c5fde711c9b35f84a445136df290a /chrome/browser/cocoa/tab_controller_unittest.mm | |
parent | d0fe06123dc0d08b75e75d2ca3b67cb0b8d40517 (diff) | |
download | chromium_src-5447be826e379f87ab6f24085e687c4d6628b05c.zip chromium_src-5447be826e379f87ab6f24085e687c4d6628b05c.tar.gz chromium_src-5447be826e379f87ab6f24085e687c4d6628b05c.tar.bz2 |
Given the results of Rohit's investigation, I think that the times that we're
getting out of the pageload tests right now are highly suspect because we're
not actually getting the bits from each page to the screen. As such, I'm
much less inclined to treat the "regression" in these tests as a problem.
BUG=15232
TEST=throbber changes between waiting (gray) and loading (blue) at appropriate
times; animation still disabled
Review URL: http://codereview.chromium.org/147211
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_controller_unittest.mm')
-rw-r--r-- | chrome/browser/cocoa/tab_controller_unittest.mm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/tab_controller_unittest.mm b/chrome/browser/cocoa/tab_controller_unittest.mm index c6526be..0761679 100644 --- a/chrome/browser/cocoa/tab_controller_unittest.mm +++ b/chrome/browser/cocoa/tab_controller_unittest.mm @@ -126,9 +126,13 @@ TEST_F(TabControllerTest, Loading) { scoped_nsobject<TabController> controller([[TabController alloc] init]); [[window contentView] addSubview:[controller view]]; - EXPECT_FALSE([controller loading]); - [controller setLoading:YES]; - EXPECT_TRUE([controller loading]); + EXPECT_EQ(kTabDone, [controller loadingState]); + [controller setLoadingState:kTabWaiting]; + EXPECT_EQ(kTabWaiting, [controller loadingState]); + [controller setLoadingState:kTabLoading]; + EXPECT_EQ(kTabLoading, [controller loadingState]); + [controller setLoadingState:kTabDone]; + EXPECT_EQ(kTabDone, [controller loadingState]); [[controller view] removeFromSuperview]; } |