diff options
author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 19:20:43 +0000 |
---|---|---|
committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 19:20:43 +0000 |
commit | 9aa215f7a8b478ce84b30c0c5fcd31455059bfd6 (patch) | |
tree | 29a9660f5df87441c36f61509025686d34a344eb /chrome/test | |
parent | 3935b9cfebbfa7ce16cbabe7d93e9e1aedd05efc (diff) | |
download | chromium_src-9aa215f7a8b478ce84b30c0c5fcd31455059bfd6.zip chromium_src-9aa215f7a8b478ce84b30c0c5fcd31455059bfd6.tar.gz chromium_src-9aa215f7a8b478ce84b30c0c5fcd31455059bfd6.tar.bz2 |
[chromedriver] Remove unused command_executor files.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/19743003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/chromedriver/command_executor_impl.cc | 306 | ||||
-rw-r--r-- | chrome/test/chromedriver/command_executor_impl_unittest.cc | 139 |
2 files changed, 0 insertions, 445 deletions
diff --git a/chrome/test/chromedriver/command_executor_impl.cc b/chrome/test/chromedriver/command_executor_impl.cc deleted file mode 100644 index 359bfed..0000000 --- a/chrome/test/chromedriver/command_executor_impl.cc +++ /dev/null @@ -1,306 +0,0 @@ -// Copyright (c) 2012 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/test/chromedriver/command_executor_impl.h" - -#include "base/bind.h" -#include "base/callback.h" -#include "base/message_loop/message_loop.h" -#include "base/message_loop/message_loop_proxy.h" -#include "base/strings/stringprintf.h" -#include "base/sys_info.h" -#include "base/values.h" -#include "chrome/test/chromedriver/alert_commands.h" -#include "chrome/test/chromedriver/chrome/adb_impl.h" -#include "chrome/test/chromedriver/chrome/device_manager.h" -#include "chrome/test/chromedriver/chrome/status.h" -#include "chrome/test/chromedriver/chrome/version.h" -#include "chrome/test/chromedriver/chrome_launcher.h" -#include "chrome/test/chromedriver/command_names.h" -#include "chrome/test/chromedriver/commands.h" -#include "chrome/test/chromedriver/element_commands.h" -#include "chrome/test/chromedriver/net/url_request_context_getter.h" -#include "chrome/test/chromedriver/session.h" -#include "chrome/test/chromedriver/session_commands.h" -#include "chrome/test/chromedriver/session_map.h" -#include "chrome/test/chromedriver/window_commands.h" - -#if defined(OS_MACOSX) -#include "base/mac/scoped_nsautorelease_pool.h" -#endif - -namespace { - -const char kLocalStorage[] = "localStorage"; -const char kSessionStorage[] = "sessionStorage"; - -} // namespace - -CommandExecutorImpl::CommandExecutorImpl(Log* log) - : log_(log), io_thread_("ChromeDriver IO") {} - -CommandExecutorImpl::~CommandExecutorImpl() {} - -void CommandExecutorImpl::Init() { -#if defined(OS_MACOSX) - base::mac::ScopedNSAutoreleasePool autorelease_pool; -#endif - base::Thread::Options options(base::MessageLoop::TYPE_IO, 0); - CHECK(io_thread_.StartWithOptions(options)); - context_getter_ = new URLRequestContextGetter( - io_thread_.message_loop_proxy()); - socket_factory_ = CreateSyncWebSocketFactory(context_getter_.get()); - adb_.reset(new AdbImpl(io_thread_.message_loop_proxy(), log_)); - device_manager_.reset(new DeviceManager(adb_.get())); - - // Commands which require an element id. - typedef std::map<std::string, ElementCommand> ElementCommandMap; - ElementCommandMap element_command_map; - element_command_map[CommandNames::kFindChildElement] = - base::Bind(&ExecuteFindChildElement, 50); - element_command_map[CommandNames::kFindChildElements] = - base::Bind(&ExecuteFindChildElements, 50); - element_command_map[CommandNames::kHoverOverElement] = - base::Bind(&ExecuteHoverOverElement); - element_command_map[CommandNames::kClickElement] = - base::Bind(&ExecuteClickElement); - element_command_map[CommandNames::kClearElement] = - base::Bind(&ExecuteClearElement); - element_command_map[CommandNames::kSendKeysToElement] = - base::Bind(&ExecuteSendKeysToElement); - element_command_map[CommandNames::kSubmitElement] = - base::Bind(&ExecuteSubmitElement); - element_command_map[CommandNames::kTouchSingleTap] = - base::Bind(&ExecuteTouchSingleTap); - element_command_map[CommandNames::kGetElementText] = - base::Bind(&ExecuteGetElementText); - element_command_map[CommandNames::kGetElementValue] = - base::Bind(&ExecuteGetElementValue); - element_command_map[CommandNames::kGetElementTagName] = - base::Bind(&ExecuteGetElementTagName); - element_command_map[CommandNames::kIsElementSelected] = - base::Bind(&ExecuteIsElementSelected); - element_command_map[CommandNames::kIsElementEnabled] = - base::Bind(&ExecuteIsElementEnabled); - element_command_map[CommandNames::kIsElementDisplayed] = - base::Bind(&ExecuteIsElementDisplayed); - element_command_map[CommandNames::kGetElementLocation] = - base::Bind(&ExecuteGetElementLocation); - element_command_map[CommandNames::kGetElementLocationOnceScrolledIntoView] = - base::Bind(&ExecuteGetElementLocationOnceScrolledIntoView); - element_command_map[CommandNames::kGetElementSize] = - base::Bind(&ExecuteGetElementSize); - element_command_map[CommandNames::kGetElementAttribute] = - base::Bind(&ExecuteGetElementAttribute); - element_command_map[CommandNames::kGetElementValueOfCssProperty] = - base::Bind(&ExecuteGetElementValueOfCSSProperty); - element_command_map[CommandNames::kElementEquals] = - base::Bind(&ExecuteElementEquals); - - // Commands which require a window. - typedef std::map<std::string, WindowCommand> WindowCommandMap; - WindowCommandMap window_command_map; - // Wrap ElementCommand into WindowCommand. - for (ElementCommandMap::const_iterator it = element_command_map.begin(); - it != element_command_map.end(); ++it) { - window_command_map[it->first] = - base::Bind(&ExecuteElementCommand, it->second); - } - window_command_map[CommandNames::kGet] = base::Bind(&ExecuteGet); - window_command_map[CommandNames::kExecuteScript] = - base::Bind(&ExecuteExecuteScript); - window_command_map[CommandNames::kExecuteAsyncScript] = - base::Bind(&ExecuteExecuteAsyncScript); - window_command_map[CommandNames::kSwitchToFrame] = - base::Bind(&ExecuteSwitchToFrame); - window_command_map[CommandNames::kGetTitle] = - base::Bind(&ExecuteGetTitle); - window_command_map[CommandNames::kGetPageSource] = - base::Bind(&ExecuteGetPageSource); - window_command_map[CommandNames::kFindElement] = - base::Bind(&ExecuteFindElement, 50); - window_command_map[CommandNames::kFindElements] = - base::Bind(&ExecuteFindElements, 50); - window_command_map[CommandNames::kGetCurrentUrl] = - base::Bind(&ExecuteGetCurrentUrl); - window_command_map[CommandNames::kGoBack] = - base::Bind(&ExecuteGoBack); - window_command_map[CommandNames::kGoForward] = - base::Bind(&ExecuteGoForward); - window_command_map[CommandNames::kRefresh] = - base::Bind(&ExecuteRefresh); - window_command_map[CommandNames::kMouseMoveTo] = - base::Bind(&ExecuteMouseMoveTo); - window_command_map[CommandNames::kMouseClick] = - base::Bind(&ExecuteMouseClick); - window_command_map[CommandNames::kMouseButtonDown] = - base::Bind(&ExecuteMouseButtonDown); - window_command_map[CommandNames::kMouseButtonUp] = - base::Bind(&ExecuteMouseButtonUp); - window_command_map[CommandNames::kMouseDoubleClick] = - base::Bind(&ExecuteMouseDoubleClick); - window_command_map[CommandNames::kGetActiveElement] = - base::Bind(&ExecuteGetActiveElement); - window_command_map[CommandNames::kSendKeysToActiveElement] = - base::Bind(&ExecuteSendKeysToActiveElement); - window_command_map[CommandNames::kGetStatus] = - base::Bind(&ExecuteGetAppCacheStatus); - window_command_map[CommandNames::kIsBrowserOnline] = - base::Bind(&ExecuteIsBrowserOnline); - window_command_map[CommandNames::kGetLocalStorageItem] = - base::Bind(&ExecuteGetStorageItem, kLocalStorage); - window_command_map[CommandNames::kGetLocalStorageKeys] = - base::Bind(&ExecuteGetStorageKeys, kLocalStorage); - window_command_map[CommandNames::kSetLocalStorageItem] = - base::Bind(&ExecuteSetStorageItem, kLocalStorage); - window_command_map[CommandNames::kRemoveLocalStorageItem] = - base::Bind(&ExecuteRemoveStorageItem, kLocalStorage); - window_command_map[CommandNames::kClearLocalStorage] = - base::Bind(&ExecuteClearStorage, kLocalStorage); - window_command_map[CommandNames::kGetLocalStorageSize] = - base::Bind(&ExecuteGetStorageSize, kLocalStorage); - window_command_map[CommandNames::kGetSessionStorageItem] = - base::Bind(&ExecuteGetStorageItem, kSessionStorage); - window_command_map[CommandNames::kGetSessionStorageKey] = - base::Bind(&ExecuteGetStorageKeys, kSessionStorage); - window_command_map[CommandNames::kSetSessionStorageItem] = - base::Bind(&ExecuteSetStorageItem, kSessionStorage); - window_command_map[CommandNames::kRemoveSessionStorageItem] = - base::Bind(&ExecuteRemoveStorageItem, kSessionStorage); - window_command_map[CommandNames::kClearSessionStorage] = - base::Bind(&ExecuteClearStorage, kSessionStorage); - window_command_map[CommandNames::kGetSessionStorageSize] = - base::Bind(&ExecuteGetStorageSize, kSessionStorage); - window_command_map[CommandNames::kScreenshot] = - base::Bind(&ExecuteScreenshot); - window_command_map[CommandNames::kGetCookies] = - base::Bind(&ExecuteGetCookies); - window_command_map[CommandNames::kAddCookie] = - base::Bind(&ExecuteAddCookie); - window_command_map[CommandNames::kDeleteCookie] = - base::Bind(&ExecuteDeleteCookie); - window_command_map[CommandNames::kDeleteAllCookies] = - base::Bind(&ExecuteDeleteAllCookies); - window_command_map[CommandNames::kSetLocation] = - base::Bind(&ExecuteSetLocation); - - // Commands which require a session. - typedef std::map<std::string, SessionCommand> SessionCommandMap; - SessionCommandMap session_command_map; - // Wrap WindowCommand into SessionCommand. - for (WindowCommandMap::const_iterator it = window_command_map.begin(); - it != window_command_map.end(); ++it) { - session_command_map[it->first] = - base::Bind(&ExecuteWindowCommand, it->second); - } - session_command_map[CommandNames::kGetSessionCapabilities] = - base::Bind(&ExecuteGetSessionCapabilities, &session_map_); - session_command_map[CommandNames::kGetCurrentWindowHandle] = - base::Bind(&ExecuteGetCurrentWindowHandle); - session_command_map[CommandNames::kClose] = - base::Bind(&ExecuteClose, &session_map_); - session_command_map[CommandNames::kGetWindowHandles] = - base::Bind(&ExecuteGetWindowHandles); - session_command_map[CommandNames::kSwitchToWindow] = - base::Bind(&ExecuteSwitchToWindow); - session_command_map[CommandNames::kSetTimeout] = - base::Bind(&ExecuteSetTimeout); - session_command_map[CommandNames::kSetScriptTimeout] = - base::Bind(&ExecuteSetScriptTimeout); - session_command_map[CommandNames::kImplicitlyWait] = - base::Bind(&ExecuteImplicitlyWait); - session_command_map[CommandNames::kGetAlert] = - base::Bind(&ExecuteAlertCommand, base::Bind(&ExecuteGetAlert)); - session_command_map[CommandNames::kGetAlertText] = - base::Bind(&ExecuteAlertCommand, base::Bind(&ExecuteGetAlertText)); - session_command_map[CommandNames::kSetAlertValue] = - base::Bind(&ExecuteAlertCommand, base::Bind(&ExecuteSetAlertValue)); - session_command_map[CommandNames::kAcceptAlert] = - base::Bind(&ExecuteAlertCommand, base::Bind(&ExecuteAcceptAlert)); - session_command_map[CommandNames::kDismissAlert] = - base::Bind(&ExecuteAlertCommand, base::Bind(&ExecuteDismissAlert)); - session_command_map[CommandNames::kIsLoading] = - base::Bind(&ExecuteIsLoading); - session_command_map[CommandNames::kGetLocation] = - base::Bind(&ExecuteGetLocation); - session_command_map[CommandNames::kGetWindowPosition] = - base::Bind(&ExecuteGetWindowPosition); - session_command_map[CommandNames::kSetWindowPosition] = - base::Bind(&ExecuteSetWindowPosition); - session_command_map[CommandNames::kGetWindowSize] = - base::Bind(&ExecuteGetWindowSize); - session_command_map[CommandNames::kSetWindowSize] = - base::Bind(&ExecuteSetWindowSize); - session_command_map[CommandNames::kMaximizeWindow] = - base::Bind(&ExecuteMaximizeWindow); - session_command_map[CommandNames::kGetAvailableLogTypes] = - base::Bind(&ExecuteGetAvailableLogTypes); - session_command_map[CommandNames::kGetLog] = - base::Bind(&ExecuteGetLog); - session_command_map[CommandNames::kUploadFile] = - base::Bind(&ExecuteUploadFile); - - // Wrap SessionCommand into non-session Command. - base::Callback<Status( - const SessionCommand&, - const base::DictionaryValue&, - const std::string&, - scoped_ptr<base::Value>*, - std::string*)> execute_session_command = base::Bind( - &ExecuteSessionCommand, - &session_map_); - for (SessionCommandMap::const_iterator it = session_command_map.begin(); - it != session_command_map.end(); ++it) { - command_map_.Set(it->first, - base::Bind(execute_session_command, it->second)); - } - command_map_.Set(CommandNames::kStatus, base::Bind(&ExecuteGetStatus)); - command_map_.Set( - CommandNames::kNewSession, - base::Bind(&ExecuteNewSession, - NewSessionParams( - log_, &session_map_, context_getter_, socket_factory_, - device_manager_.get()))); - command_map_.Set(CommandNames::kQuit, - base::Bind(&ExecuteQuit, false, &session_map_)); - command_map_.Set( - CommandNames::kQuitAll, - base::Bind(&ExecuteQuitAll, - base::Bind(&ExecuteQuit, true, &session_map_), - &session_map_)); -} - -void CommandExecutorImpl::ExecuteCommand( - const std::string& name, - const base::DictionaryValue& params, - const std::string& session_id, - StatusCode* status_code, - scoped_ptr<base::Value>* value, - std::string* out_session_id) { -#if defined(OS_MACOSX) - base::mac::ScopedNSAutoreleasePool autorelease_pool; -#endif - Command cmd; - Status status(kOk); - if (command_map_.Get(name, &cmd)) { - status = cmd.Run(params, session_id, value, out_session_id); - } else { - status = Status(kUnknownCommand, name); - *out_session_id = session_id; - } - *status_code = status.code(); - if (status.IsError()) { - status.AddDetails(base::StringPrintf( - "Driver info: chromedriver=%s,platform=%s %s %s", - kChromeDriverVersion, - base::SysInfo::OperatingSystemName().c_str(), - base::SysInfo::OperatingSystemVersion().c_str(), - base::SysInfo::OperatingSystemArchitecture().c_str())); - scoped_ptr<base::DictionaryValue> error(new base::DictionaryValue()); - error->SetString("message", status.message()); - value->reset(error.release()); - } - if (!*value) - value->reset(base::Value::CreateNullValue()); -} diff --git a/chrome/test/chromedriver/command_executor_impl_unittest.cc b/chrome/test/chromedriver/command_executor_impl_unittest.cc deleted file mode 100644 index 68f81e0..0000000 --- a/chrome/test/chromedriver/command_executor_impl_unittest.cc +++ /dev/null @@ -1,139 +0,0 @@ -// Copyright (c) 2012 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 <string> - -#include "base/bind.h" -#include "base/callback.h" -#include "base/memory/scoped_ptr.h" -#include "base/values.h" -#include "chrome/test/chromedriver/chrome/log.h" -#include "chrome/test/chromedriver/chrome/status.h" -#include "chrome/test/chromedriver/command_executor_impl.h" -#include "testing/gtest/include/gtest/gtest.h" - -TEST(CommandExecutorImplTest, UnknownCommand) { - Logger log; - CommandExecutorImpl executor(&log); - base::DictionaryValue empty_dict; - StatusCode status; - scoped_ptr<base::Value> value; - std::string session_id; - executor.ExecuteCommand("noSuchCommand", empty_dict, "session", - &status, &value, &session_id); - ASSERT_EQ(kUnknownCommand, status); - base::DictionaryValue* error; - ASSERT_TRUE(value->GetAsDictionary(&error)); - std::string error_msg; - ASSERT_TRUE(error->GetString("message", &error_msg)); - ASSERT_NE(std::string::npos, error_msg.find("noSuchCommand")); - ASSERT_STREQ("session", session_id.c_str()); -} - -namespace { - -Status ExecuteSimpleCommand( - const base::DictionaryValue* expected_params, - const std::string& expected_session_id, - const base::DictionaryValue& params, - const std::string& session_id, - scoped_ptr<base::Value>* value, - std::string* out_session_id) { - EXPECT_EQ(expected_params, ¶ms); - EXPECT_STREQ(expected_session_id.c_str(), session_id.c_str()); - value->reset(new base::StringValue("hi")); - *out_session_id = "out session id"; - return Status(kOk); -} - -} // namespace - -TEST(CommandExecutorImplTest, SimpleCommand) { - Logger log; - CommandExecutorImpl executor(&log); - base::DictionaryValue params; - std::string session_id("some id"); - executor.command_map_.Set("simpleCommand", - base::Bind(&ExecuteSimpleCommand, ¶ms, session_id)); - - StatusCode status_code; - scoped_ptr<base::Value> value; - std::string out_session_id; - executor.ExecuteCommand("simpleCommand", params, session_id, - &status_code, &value, - &out_session_id); - ASSERT_EQ(kOk, status_code); - ASSERT_TRUE(value); - base::StringValue hi("hi"); - ASSERT_TRUE(value->Equals(&hi)); - ASSERT_STREQ("out session id", out_session_id.c_str()); -} - -namespace { - -Status ExecuteSimpleCommand2( - const base::DictionaryValue& params, - const std::string& session_id, - scoped_ptr<base::Value>* out_value, - std::string* out_session_id) { - return Status(kOk); -} - -} // namespace - -TEST(CommandExecutorImplTest, CommandThatDoesntSetValueOrSessionId) { - Logger log; - CommandExecutorImpl executor(&log); - executor.command_map_.Set( - "simpleCommand", - base::Bind(&ExecuteSimpleCommand2)); - - base::DictionaryValue params; - StatusCode status_code; - scoped_ptr<base::Value> value; - std::string session_id; - executor.ExecuteCommand("simpleCommand", params, "session", - &status_code, &value, &session_id); - - ASSERT_TRUE(value->IsType(base::Value::TYPE_NULL)); - ASSERT_STREQ("", session_id.c_str()); -} - -namespace { - -Status ExecuteSimpleCommand3( - const base::DictionaryValue& params, - const std::string& session_id, - scoped_ptr<base::Value>* value, - std::string* out_session_id) { - value->reset(new base::StringValue("hi")); - return Status(kUnknownError); -} - -} // namespace - -TEST(CommandExecutorImplTest, CommandThatReturnsError) { - Logger log; - CommandExecutorImpl executor(&log); - executor.command_map_.Set("simpleCommand", - base::Bind(&ExecuteSimpleCommand3)); - - base::DictionaryValue params; - StatusCode status_code; - scoped_ptr<base::Value> value; - std::string out_session_id; - executor.ExecuteCommand("simpleCommand", - params, - std::string(), - &status_code, - &value, - &out_session_id); - ASSERT_EQ(kUnknownError, status_code); - ASSERT_TRUE(value); - base::DictionaryValue* error; - ASSERT_TRUE(value->GetAsDictionary(&error)); - std::string message; - ASSERT_TRUE(error->GetString("message", &message)); - ASSERT_NE(std::string::npos, message.find("unknown error")); -} |