Skip to content

Commit

Permalink
[ChromeDriver] Delete unimplemented commands
Browse files Browse the repository at this point in the history
Bug: chromedriver:2079
Change-Id: I5395a899686cb8b5f4d2a48f8ea6d7cfa9939e51
Reviewed-on: https://chromium-review.googlesource.com/1256109
Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: Tatiana Buldina <buldina@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595648}
  • Loading branch information
Tatiana Buldina authored and Commit Bot committed Oct 1, 2018
1 parent 06d9324 commit 5394817
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 54 deletions.
16 changes: 1 addition & 15 deletions chrome/test/chromedriver/log_replay/client_replay.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ class Method(object):
# this data throughout chromedriver code (see e.g. http_handler.cc)
_COMMANDS = {
"AcceptAlert": (Method.POST, "/session/:sessionId/alert/accept"),
"Activate": (Method.POST, "/session/:sessionId/ime/activate"),
"Activated": (Method.GET, "/session/:sessionId/ime/activated"),
"AddCookie": (Method.POST, "/session/:sessionId/cookie"),
"ClearElement": (Method.POST, "/session/:sessionId/element/:id/clear"),
"ClearLocalStorage": (Method.DELETE, "/session/:sessionId/local_storage"),
Expand All @@ -80,7 +78,6 @@ class Method(object):
"Click": (Method.POST, "/session/:sessionId/click"),
"ClickElement": (Method.POST, "/session/:sessionId/element/:id/click"),
"CloseWindow": (Method.DELETE, "/session/:sessionId/window"),
"Deactivate": (Method.POST, "/session/:sessionId/ime/deactivate"),
"DeleteActions": (Method.DELETE, "/session/:sessionId/actions"),
"DeleteAllCookies": (Method.DELETE, "/session/:sessionId/cookie"),
"DeleteCookie": (Method.DELETE, "/session/:sessionId/cookie/:name"),
Expand All @@ -90,13 +87,11 @@ class Method(object):
(Method.DELETE, "/session/:sessionId/orientation"),
"DismissAlert": (Method.POST, "/session/:sessionId/dismiss_alert"),
"DoubleClick": (Method.POST, "/session/:sessionId/doubleclick"),
"Drag": (Method.POST, "/session/:sessionId/element/:id/drag"),
"ElementScreenshot":
(Method.GET, "/session/:sessionId/element/:id/screenshot"),
"ExecuteAsyncScript": (Method.POST, "/session/:sessionId/execute_async"),
"ExecuteCDP": (Method.POST, "/session/:sessionId/goog/cdp/execute"),
"ExecuteScript": (Method.POST, "/session/:sessionId/execute/sync"),
"ExecuteSql": (Method.POST, "/session/:sessionId/execute_sql"),
"FindChildElement":
(Method.POST, "/session/:sessionId/element/:id/element"),
"FindChildElements":
Expand All @@ -106,12 +101,7 @@ class Method(object):
"Freeze": (Method.POST, "/session/:sessionId/goog/page/freeze"),
"FullscreenWindow": (Method.POST, "/session/:sessionId/window/fullscreen"),
"GetActiveElement": (Method.POST, "/session/:sessionId/element/active"),
"GetActiveEngine": (Method.GET, "/session/:sessionId/ime/active_engine"),
"GetAlertMessage": (Method.GET, "/session/:sessionId/alert_text"),
"GetAvailableEngines":
(Method.GET, "/session/:sessionId/ime/available_engines"),
"GetBrowserConnection":
(Method.GET, "/session/:sessionId/browser_connection"),
"GetCookies": (Method.GET, "/session/:sessionId/cookie"),
"GetElementAttribute":
(Method.GET, "/session/:sessionId/element/:id/attribute/:name"),
Expand Down Expand Up @@ -180,7 +170,6 @@ class Method(object):
(Method.GET, "/session/:sessionId/element/:id/selected"),
"IsLoading": (Method.GET, "/session/:sessionId/is_loading"),
"LaunchApp": (Method.POST, "/session/:sessionId/chromium/launch_app"),
"Logs": (Method.POST, "Logs"),
"MaximizeWindow": (Method.POST, "/session/:sessionId/window/maximize"),
"MinimizeWindow": (Method.POST, "/session/:sessionId/window/minimize"),
"MouseDown": (Method.POST, "/session/:sessionId/buttondown"),
Expand All @@ -201,8 +190,6 @@ class Method(object):
(Method.POST, "/session/:sessionId/chromium/send_command_and_get_result"),
"SetAlertPrompt": (Method.POST, "/session/:sessionId/alert_text"),
"SetAutoReporting": (Method.POST, "/session/:sessionId/autoreport"),
"SetBrowserConnection":
(Method.POST, "/session/:sessionId/browser_connection"),
"SetGeolocation": (Method.POST, "/session/:sessionId/location"),
"SetImplicitWait":
(Method.POST, "/session/:sessionId/timeouts/implicit_wait"),
Expand Down Expand Up @@ -237,8 +224,7 @@ class Method(object):
"TouchUp": (Method.POST, "/session/:sessionId/touch/up"),
"Type": (Method.POST, "/session/:sessionId/keys"),
"TypeElement": (Method.POST, "/session/:sessionId/element/:id/value"),
"UploadFile": (Method.POST, "/session/:sessionId/file"),
"Visible": (Method.POST, "/session/:sessionId/visible")
"UploadFile": (Method.POST, "/session/:sessionId/file")
}

MULTI_SESSION_COMMANDS = ["GetSessions"]
Expand Down
39 changes: 0 additions & 39 deletions chrome/test/chromedriver/server/http_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -449,21 +449,6 @@ HttpHandler::HttpHandler(
CommandMapping(
kPost, "session/:sessionId/keys",
WrapToCommand("Type", base::Bind(&ExecuteSendKeysToActiveElement))),
CommandMapping(kGet, "session/:sessionId/ime/available_engines",
WrapToCommand("GetAvailableEngines",
base::Bind(&ExecuteUnimplementedCommand))),
CommandMapping(kGet, "session/:sessionId/ime/active_engine",
WrapToCommand("GetActiveEngine",
base::Bind(&ExecuteUnimplementedCommand))),
CommandMapping(
kGet, "session/:sessionId/ime/activated",
WrapToCommand("Activated", base::Bind(&ExecuteUnimplementedCommand))),
CommandMapping(kPost, "session/:sessionId/ime/deactivate",
WrapToCommand("Deactivate",
base::Bind(&ExecuteUnimplementedCommand))),
CommandMapping(
kPost, "session/:sessionId/ime/activate",
WrapToCommand("Activate", base::Bind(&ExecuteUnimplementedCommand))),
CommandMapping(kPost, "session/:sessionId/touch/click",
WrapToCommand("Tap", base::Bind(&ExecuteTouchSingleTap))),
CommandMapping(kPost, "session/:sessionId/touch/down",
Expand Down Expand Up @@ -504,12 +489,6 @@ HttpHandler::HttpHandler(
CommandMapping(
kGet, "session/:sessionId/chromium/heap_snapshot",
WrapToCommand("HeapSnapshot", base::Bind(&ExecuteTakeHeapSnapshot))),
CommandMapping(
kPost, "session/:sessionId/visible",
WrapToCommand("Visible", base::Bind(&ExecuteUnimplementedCommand))),
CommandMapping(
kGet, "session/:sessionId/visible",
WrapToCommand("Visible", base::Bind(&ExecuteUnimplementedCommand))),
CommandMapping(
kPost, "session/:sessionId/file",
WrapToCommand("UploadFile", base::Bind(&ExecuteUploadFile))),
Expand All @@ -519,14 +498,6 @@ HttpHandler::HttpHandler(
CommandMapping(
kPost, "session/:sessionId/element/:id/hover",
WrapToCommand("HoverElement", base::Bind(&ExecuteHoverOverElement))),
CommandMapping(
kPost, "session/:sessionId/element/:id/drag",
WrapToCommand("Drag", base::Bind(&ExecuteUnimplementedCommand))),

CommandMapping(kPost, "session/:sessionId/execute_sql",
WrapToCommand("ExecuteSql",
base::Bind(&ExecuteUnimplementedCommand))),

CommandMapping(kGet, "session/:sessionId/network_connection",
WrapToCommand("GetNetworkConnection",
base::Bind(&ExecuteGetNetworkConnection))),
Expand All @@ -540,20 +511,10 @@ HttpHandler::HttpHandler(
kDelete, "session/:sessionId/chromium/network_conditions",
WrapToCommand("DeleteNetworkConditions",
base::Bind(&ExecuteDeleteNetworkConditions))),

CommandMapping(kGet, "session/:sessionId/browser_connection",
WrapToCommand("GetBrowserConnection",
base::Bind(&ExecuteUnimplementedCommand))),
CommandMapping(kPost, "session/:sessionId/browser_connection",
WrapToCommand("SetBrowserConnection",
base::Bind(&ExecuteUnimplementedCommand))),
CommandMapping(
kDelete, "session/:sessionId/orientation",
WrapToCommand("DeleteScreenOrientation",
base::Bind(&ExecuteDeleteScreenOrientation))),
CommandMapping(
kPost, "Logs",
WrapToCommand("Logs", base::Bind(&ExecuteUnimplementedCommand))),
CommandMapping(
kGet, kShutdownPath,
base::Bind(&ExecuteQuitAll,
Expand Down

0 comments on commit 5394817

Please sign in to comment.