From 8c899745075cbd3a3abead137ca0b151529898a2 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Thu, 11 Mar 2010 14:26:31 +0000 Subject: [GTTF] Add more NULL-checks to UI tests that were lacking them to avoid crashiness. TEST=none BUG=none Review URL: http://codereview.chromium.org/841002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41273 0039d316-1c4b-4281-b951-d872f2087c98 --- .../renderer_host/resource_dispatcher_host_uitest.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'chrome/browser/renderer_host') diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc index 3c22b13..5b3bc5b 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc @@ -61,6 +61,7 @@ TEST_F(ResourceDispatcherTest, SniffNoContentTypeNoData) { // Make sure the download shelf is not showing. scoped_refptr browser(automation()->GetBrowserWindow(0)); + ASSERT_TRUE(browser.get()); bool visible = false; ASSERT_TRUE(browser->IsShelfVisible(&visible)); EXPECT_FALSE(visible); @@ -82,7 +83,7 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest) { ASSERT_TRUE(NULL != server.get()); scoped_refptr browser_proxy(automation()->GetBrowserWindow(0)); - EXPECT_TRUE(browser_proxy.get()); + ASSERT_TRUE(browser_proxy.get()); scoped_refptr tab(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab.get()); tab->NavigateToURL(server->TestServerPageW( @@ -103,7 +104,7 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest_Disallowed) { ASSERT_TRUE(NULL != server.get()); scoped_refptr browser_proxy(automation()->GetBrowserWindow(0)); - EXPECT_TRUE(browser_proxy.get()); + ASSERT_TRUE(browser_proxy.get()); scoped_refptr tab(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab.get()); tab->NavigateToURL(server->TestServerPageW( @@ -127,7 +128,7 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest_DuringUnload) { ASSERT_TRUE(NULL != server.get()); scoped_refptr browser_proxy(automation()->GetBrowserWindow(0)); - EXPECT_TRUE(browser_proxy.get()); + ASSERT_TRUE(browser_proxy.get()); scoped_refptr tab(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab.get()); @@ -149,6 +150,7 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest_DuringUnload) { bool shelf_is_visible = false; scoped_refptr browser(automation()->GetBrowserWindow(0)); + ASSERT_TRUE(browser.get()); EXPECT_TRUE(browser->IsShelfVisible(&shelf_is_visible)); EXPECT_FALSE(shelf_is_visible); } @@ -161,7 +163,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteOnunloadCookie) { ASSERT_TRUE(NULL != server.get()); scoped_refptr browser_proxy(automation()->GetBrowserWindow(0)); - EXPECT_TRUE(browser_proxy.get()); + ASSERT_TRUE(browser_proxy.get()); scoped_refptr tab(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab.get()); @@ -204,7 +206,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteAfterCrash) { return; scoped_refptr browser_proxy(automation()->GetBrowserWindow(0)); - EXPECT_TRUE(browser_proxy.get()); + ASSERT_TRUE(browser_proxy.get()); scoped_refptr tab(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab.get()); @@ -229,7 +231,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteAfterCrash) { // the BufferedEventHandler (e.g., non-http{s} URLs). (Bug 1225872) TEST_F(ResourceDispatcherTest, CrossSiteNavigationNonBuffered) { scoped_refptr browser_proxy(automation()->GetBrowserWindow(0)); - EXPECT_TRUE(browser_proxy.get()); + ASSERT_TRUE(browser_proxy.get()); scoped_refptr tab(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab.get()); @@ -255,7 +257,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteNavigationErrorPage) { ASSERT_TRUE(NULL != server.get()); scoped_refptr browser_proxy(automation()->GetBrowserWindow(0)); - EXPECT_TRUE(browser_proxy.get()); + ASSERT_TRUE(browser_proxy.get()); scoped_refptr tab(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab.get()); -- cgit v1.1