Commit ae9b9ff0 authored by John Chen's avatar John Chen Committed by Commit Bot

[ChromeDriver] Simplify WebView unit test

Let FakeDevToolsClient inherit from StubDevToolsClient instead of
DevToolsClient, to avoid large amount of boilerplate code.

Change-Id: Ia8c1d98c07838a1d4ccbadc1e4b0224379da10d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2276219Reviewed-by: default avatarWenbin Zhang <wenbinzhang@google.com>
Commit-Queue: John Chen <johnchen@chromium.org>
Auto-Submit: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784177}
parent c72c50b1
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
#include "base/time/time.h" #include "base/time/time.h"
#include "base/values.h" #include "base/values.h"
#include "chrome/test/chromedriver/chrome/browser_info.h" #include "chrome/test/chromedriver/chrome/browser_info.h"
#include "chrome/test/chromedriver/chrome/devtools_client.h"
#include "chrome/test/chromedriver/chrome/devtools_client_impl.h" #include "chrome/test/chromedriver/chrome/devtools_client_impl.h"
#include "chrome/test/chromedriver/chrome/page_load_strategy.h" #include "chrome/test/chromedriver/chrome/page_load_strategy.h"
#include "chrome/test/chromedriver/chrome/status.h" #include "chrome/test/chromedriver/chrome/status.h"
#include "chrome/test/chromedriver/chrome/stub_devtools_client.h"
#include "chrome/test/chromedriver/net/sync_websocket.h" #include "chrome/test/chromedriver/net/sync_websocket.h"
#include "chrome/test/chromedriver/net/sync_websocket_factory.h" #include "chrome/test/chromedriver/net/sync_websocket_factory.h"
#include "chrome/test/chromedriver/net/timeout.h" #include "chrome/test/chromedriver/net/timeout.h"
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
namespace { namespace {
class FakeDevToolsClient : public DevToolsClient { class FakeDevToolsClient : public StubDevToolsClient {
public: public:
FakeDevToolsClient() : id_("fake-id"), status_(kOk) {} FakeDevToolsClient() : status_(kOk) {}
~FakeDevToolsClient() override {} ~FakeDevToolsClient() override = default;
void set_status(const Status& status) { void set_status(const Status& status) {
status_ = status; status_ = status;
...@@ -38,31 +38,6 @@ class FakeDevToolsClient : public DevToolsClient { ...@@ -38,31 +38,6 @@ class FakeDevToolsClient : public DevToolsClient {
} }
// Overridden from DevToolsClient: // Overridden from DevToolsClient:
const std::string& GetId() override { return id_; }
bool WasCrashed() override { return false; }
Status ConnectIfNecessary() override { return Status(kOk); }
Status SetUpDevTools() override { return Status(kOk); }
Status SendCommand(
const std::string& method,
const base::DictionaryValue& params) override {
return SendCommandAndGetResult(method, params, nullptr);
}
Status SendCommandFromWebSocket(const std::string& method,
const base::DictionaryValue& params,
const int client_command_id) override {
return SendCommandAndGetResult(method, params, nullptr);
}
Status SendCommandWithTimeout(
const std::string& method,
const base::DictionaryValue& params,
const Timeout* timeout) override {
return SendCommandAndGetResult(method, params, nullptr);
}
Status SendAsyncCommand(
const std::string& method,
const base::DictionaryValue& params) override {
return SendCommandAndGetResult(method, params, nullptr);
}
Status SendCommandAndGetResult( Status SendCommandAndGetResult(
const std::string& method, const std::string& method,
const base::DictionaryValue& params, const base::DictionaryValue& params,
...@@ -72,29 +47,8 @@ class FakeDevToolsClient : public DevToolsClient { ...@@ -72,29 +47,8 @@ class FakeDevToolsClient : public DevToolsClient {
result->reset(result_.DeepCopy()); result->reset(result_.DeepCopy());
return Status(kOk); return Status(kOk);
} }
Status SendCommandAndGetResultWithTimeout(
const std::string& method,
const base::DictionaryValue& params,
const Timeout* timeout,
std::unique_ptr<base::DictionaryValue>* result) override {
return SendCommandAndGetResult(method, params, result);
}
Status SendCommandAndIgnoreResponse(
const std::string& method,
const base::DictionaryValue& params) override {
return SendCommandAndGetResult(method, params, nullptr);
}
void AddListener(DevToolsEventListener* listener) override {}
Status HandleEventsUntil(const ConditionalFunc& conditional_func,
const Timeout& timeout) override {
return Status(kOk);
}
Status HandleReceivedEvents() override { return Status(kOk); }
void SetDetached() override {}
void SetOwner(WebViewImpl* owner) override {}
private: private:
const std::string id_;
Status status_; Status status_;
base::DictionaryValue result_; base::DictionaryValue result_;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment