Sprinkle some defensiveness into the UI tests so that they don't explode if t...

chrome/test/automated_ui_tests/automated_ui_test_test.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
@@ skipping 59 matching lines @@
   ASSERT_EQ(1, tab_count);
   RestoreTab();
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(2, tab_count);
 }
 
 TEST_F(AutomatedUITestBase, MAYBE_CloseTab) {
   int num_browser_windows;
   int tab_count;
   NewTab();
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(2, tab_count);
 
   ASSERT_TRUE(OpenAndActivateNewBrowserWindow(NULL));
   NewTab();
   NewTab();
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(3, tab_count);
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(2, num_browser_windows);
 
   ASSERT_TRUE(CloseActiveTab());
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(2, tab_count);
   ASSERT_TRUE(CloseActiveTab());
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
   num_browser_windows = 0;
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(2, num_browser_windows);
 
   // The browser window is closed by closing this tab.
   ASSERT_TRUE(CloseActiveTab());
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
   // Active_browser_ is now the first created window.
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(2, tab_count);
   ASSERT_TRUE(CloseActiveTab());
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
 
   // The last tab should not be closed.
   ASSERT_FALSE(CloseActiveTab());
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
 }
 
 TEST_F(AutomatedUITestBase, OpenBrowserWindow) {
   int num_browser_windows;
   int tab_count;
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
 
   scoped_refptr<BrowserProxy> browser_1;
   ASSERT_TRUE(OpenAndActivateNewBrowserWindow(&browser_1));
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(2, num_browser_windows);
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
   NewTab();
   browser_1->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(2, tab_count);
 
   scoped_refptr<BrowserProxy> browser_2;
   ASSERT_TRUE(OpenAndActivateNewBrowserWindow(&browser_2));
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(3, num_browser_windows);
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
   NewTab();
   NewTab();
   browser_1->GetTabCount(&tab_count);
   ASSERT_EQ(1, tab_count);
   browser_2->GetTabCount(&tab_count);
   ASSERT_EQ(2, tab_count);
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(3, tab_count);
 
   bool application_closed;
   CloseBrowser(browser_1.get(), &application_closed);
   ASSERT_FALSE(application_closed);
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(2, num_browser_windows);
   CloseBrowser(browser_2.get(), &application_closed);
   ASSERT_FALSE(application_closed);
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
 }
 
 TEST_F(AutomatedUITestBase, MAYBE_CloseBrowserWindow) {
   int tab_count;
   NewTab();
   active_browser()->GetTabCount(&tab_count);
   ASSERT_EQ(2, tab_count);
 
   ASSERT_TRUE(OpenAndActivateNewBrowserWindow(NULL));
@@ skipping 22 matching lines @@
     active_browser()->GetTabCount(&tab_count);
     ASSERT_EQ(2, tab_count);
   }
 
   ASSERT_FALSE(CloseActiveWindow());
 }
 
 TEST_F(AutomatedUITestBase, MAYBE_IncognitoWindow) {
   int num_browser_windows;
   int num_normal_browser_windows;
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
   automation()->GetNormalBrowserWindowCount(&num_normal_browser_windows);
   ASSERT_EQ(1, num_normal_browser_windows);
 
   ASSERT_TRUE(GoOffTheRecord());
   ASSERT_TRUE(GoOffTheRecord());
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(3, num_browser_windows);
   automation()->GetNormalBrowserWindowCount(&num_normal_browser_windows);
   ASSERT_EQ(1, num_normal_browser_windows);
 
   // There is only one normal window so it will not be closed.
   ASSERT_FALSE(CloseActiveWindow());
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(3, num_browser_windows);
   automation()->GetNormalBrowserWindowCount(&num_normal_browser_windows);
   ASSERT_EQ(1, num_normal_browser_windows);
 
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
 }
 
 TEST_F(AutomatedUITestBase, MAYBE_OpenCloseBrowserWindowWithAccelerator) {
   // Note: we don't use RunCommand(IDC_OPEN/CLOSE_WINDOW) to open/close
   // browser window in automated ui tests. Instead we use
   // OpenAndActivateNewBrowserWindow and CloseActiveWindow.
   // There are other parts of UI test that use the accelerators. This is
   // a unit test for those usage.
   ASSERT_TRUE(RunCommand(IDC_NEW_WINDOW));
   int num_browser_windows;
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(2, num_browser_windows);
   ASSERT_TRUE(RunCommand(IDC_NEW_WINDOW));
   ASSERT_TRUE(RunCommand(IDC_NEW_WINDOW));
   ASSERT_TRUE(RunCommand(IDC_NEW_WINDOW));
   ASSERT_TRUE(RunCommand(IDC_NEW_WINDOW));
   ASSERT_TRUE(RunCommand(IDC_NEW_WINDOW));
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(7, num_browser_windows);
 
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(6, num_browser_windows);
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
-  automation()->GetBrowserWindowCount(&num_browser_windows);
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
 }
 
 TEST_F(AutomatedUITestBase, Navigate) {
   FilePath path_prefix(test_data_directory_.AppendASCII("session_history"));
   GURL url1(net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html")));
   GURL url2(net::FilePathToFileURL(path_prefix.AppendASCII("bot2.html")));
   GURL url3(net::FilePathToFileURL(path_prefix.AppendASCII("bot3.html")));
   GURL url;
   ASSERT_TRUE(Navigate(url1));
@@ skipping 11 matching lines @@
   ASSERT_TRUE(BackButton());
   ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
   ASSERT_EQ(url1, url);
   ASSERT_TRUE(ForwardButton());
   ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
   ASSERT_EQ(url2, url);
   ASSERT_TRUE(ReloadPage());
   ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
   ASSERT_EQ(url2, url);
 }