First part of automated_ui_tests improvements....

chrome/test/automated_ui_tests/automated_ui_tests.cc

 // Copyright (c) 2006-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 <fstream>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 407 matching lines @@
     did_complete_action = ViewSource();
   } else if (LowerCaseEqualsASCII(action, "zoomplus")) {
     did_complete_action = ZoomPlus();
   } else if (LowerCaseEqualsASCII(action, "zoomminus")) {
     did_complete_action = ZoomMinus();
   } else {
     NOTREACHED() << "Unknown command passed into DoAction: "
                  << action.c_str();
   }
 
+  EXPECT_TRUE(did_complete_action) << action;
+
   if (!did_complete_action)
     xml_writer_.AddAttribute("failed_to_complete", "yes");
   xml_writer_.EndElement();
 
   if (post_action_delay_)
     PlatformThread::Sleep(1000 * post_action_delay_);
 
   return did_complete_action;
 }
 
@@ skipping 10 matching lines @@
   // The vector will contain mostly IDC values for encoding commands plus a few
   // menu separators (0 values). If we hit a separator we just retry.
   int index = base::RandInt(0, len);
   while ((*encodings)[index].encoding_id == 0) {
     index = base::RandInt(0, len);
   }
 
   return RunCommandAsync((*encodings)[index].encoding_id);
 }
 
-bool AutomatedUITest::FindInPage() {
-  return RunCommandAsync(IDC_FIND);
-}
-
-bool AutomatedUITest::Home() {
-  return RunCommandAsync(IDC_HOME);
-}
-
 bool AutomatedUITest::JavaScriptConsole() {
   return RunCommandAsync(IDC_DEV_TOOLS);
 }
 
 bool AutomatedUITest::OpenAboutDialog() {
   return RunCommandAsync(IDC_ABOUT);
 }
 
 bool AutomatedUITest::OpenClearBrowsingDataDialog() {
   return RunCommandAsync(IDC_CLEAR_BROWSING_DATA);
@@ skipping 44 matching lines @@
 }
 
 bool AutomatedUITest::PressTabKey() {
   return SimulateKeyPressInActiveWindow(base::VKEY_TAB, 0);
 }
 
 bool AutomatedUITest::PressUpArrow() {
   return SimulateKeyPressInActiveWindow(base::VKEY_UP, 0);
 }
 
-bool AutomatedUITest::SelectNextTab() {
-  return RunCommandAsync(IDC_SELECT_NEXT_TAB);
-}
-
-bool AutomatedUITest::SelectPreviousTab() {
-  return RunCommandAsync(IDC_SELECT_PREVIOUS_TAB);
-}
-
-bool AutomatedUITest::ShowBookmarkBar() {
-  return RunCommandAsync(IDC_SHOW_BOOKMARK_BAR);
-}
-
-bool AutomatedUITest::ShowDownloads() {
-  return RunCommandAsync(IDC_SHOW_DOWNLOADS);
-}
-
-bool AutomatedUITest::ShowHistory() {
-  return RunCommandAsync(IDC_SHOW_HISTORY);
-}
-
 bool AutomatedUITest::StarPage() {
   return RunCommandAsync(IDC_STAR);
 }
 
 bool AutomatedUITest::ViewSource() {
   return RunCommandAsync(IDC_VIEW_SOURCE);
 }
 
 bool AutomatedUITest::ZoomMinus() {
   return RunCommandAsync(IDC_ZOOM_MINUS);
@@ skipping 219 matching lines @@
   }
 }
 
 TEST_F(AutomatedUITest, TheOneAndOnlyTest) {
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (parsed_command_line.HasSwitch(kReproSwitch))
     RunReproduction();
   else
     RunAutomatedUITest();
 }