Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5425)

Unified Diff: chrome/test/remoting/remote_desktop_browsertest.cc

Issue 807343002: Adding the first set of remote test cases and associated framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing comments and merge issues. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/remoting/remote_desktop_browsertest.cc
diff --git a/chrome/test/remoting/remote_desktop_browsertest.cc b/chrome/test/remoting/remote_desktop_browsertest.cc
index a18778a990d5598c1717992faba72e710ac70232..1b4fe2fcf702ad4eed49352da6e3fe17202f98d7 100644
--- a/chrome/test/remoting/remote_desktop_browsertest.cc
+++ b/chrome/test/remoting/remote_desktop_browsertest.cc
@@ -29,7 +29,7 @@
namespace remoting {
RemoteDesktopBrowserTest::RemoteDesktopBrowserTest()
- : extension_(NULL) {
+ : remote_test_helper_(nullptr), extension_(nullptr) {
}
RemoteDesktopBrowserTest::~RemoteDesktopBrowserTest() {}
@@ -72,7 +72,7 @@ void RemoteDesktopBrowserTest::OpenClientBrowserPage() {
// Open the client browser page in a new tab
ui_test_utils::NavigateToURLWithDisposition(
browser(),
- GURL(http_server() + "/clientpage.html"),
+ GURL(http_server() + "/client.html"),
NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// Save this web content for later reference
@@ -80,6 +80,9 @@ void RemoteDesktopBrowserTest::OpenClientBrowserPage() {
// Go back to the previous tab that has chromoting opened
browser()->tab_strip_model()->SelectPreviousTab();
+
+ // Create the RemoteTestHelper object to use.
+ remote_test_helper_.reset(new RemoteTestHelper(client_web_content_));
}
bool RemoteDesktopBrowserTest::HtmlElementVisible(const std::string& name) {
@@ -665,42 +668,6 @@ void RemoteDesktopBrowserTest::ExecuteScriptAndWaitForAnyPageLoad(
}
// static
-bool RemoteDesktopBrowserTest::ExecuteScriptAndExtractBool(
- content::WebContents* web_contents, const std::string& script) {
- bool result;
- EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
- web_contents,
- "window.domAutomationController.send(" + script + ");",
- &result));
-
- return result;
-}
-
-// static
-int RemoteDesktopBrowserTest::ExecuteScriptAndExtractInt(
- content::WebContents* web_contents, const std::string& script) {
- int result;
- _ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
- web_contents,
- "window.domAutomationController.send(" + script + ");",
- &result));
-
- return result;
-}
-
-// static
-std::string RemoteDesktopBrowserTest::ExecuteScriptAndExtractString(
- content::WebContents* web_contents, const std::string& script) {
- std::string result;
- _ASSERT_TRUE(content::ExecuteScriptAndExtractString(
- web_contents,
- "window.domAutomationController.send(" + script + ");",
- &result));
-
- return result;
-}
-
-// static
bool RemoteDesktopBrowserTest::LoadScript(
content::WebContents* web_contents,
const base::FilePath::StringType& path) {
@@ -758,8 +725,8 @@ void RemoteDesktopBrowserTest::ClickOnControl(const std::string& name) {
std::string has_disabled_attribute =
"document.getElementById('" + name + "').hasAttribute('disabled')";
- if (ExecuteScriptAndExtractBool(active_web_contents(),
- has_disabled_attribute)) {
+ if (RemoteTestHelper::ExecuteScriptAndExtractBool(active_web_contents(),
+ has_disabled_attribute)) {
// This element has a disabled attribute. Wait for it become enabled.
ConditionalTimeoutWaiter waiter(
base::TimeDelta::FromSeconds(5),
@@ -879,7 +846,7 @@ void RemoteDesktopBrowserTest::SetUserNameAndPassword(
// static
bool RemoteDesktopBrowserTest::IsAuthenticatedInWindow(
content::WebContents* web_contents) {
- return ExecuteScriptAndExtractBool(
+ return RemoteTestHelper::ExecuteScriptAndExtractBool(
web_contents, "remoting.identity.isAuthenticated()");
}
@@ -887,7 +854,7 @@ bool RemoteDesktopBrowserTest::IsAuthenticatedInWindow(
bool RemoteDesktopBrowserTest::IsHostActionComplete(
content::WebContents* client_web_content,
std::string host_action_var) {
- return ExecuteScriptAndExtractBool(
+ return RemoteTestHelper::ExecuteScriptAndExtractBool(
client_web_content,
host_action_var);
}
@@ -896,7 +863,7 @@ bool RemoteDesktopBrowserTest::IsHostActionComplete(
bool RemoteDesktopBrowserTest::IsEnabled(
content::WebContents* client_web_content,
const std::string& element_name) {
- return !ExecuteScriptAndExtractBool(
+ return !RemoteTestHelper::ExecuteScriptAndExtractBool(
client_web_content,
"document.getElementById(\"" + element_name + "\").disabled");
}

Powered by Google App Engine
This is Rietveld 408576698