Add named testing interface

chrome/test/automation/proxy_launcher.cc

Index: chrome/test/automation/proxy_launcher.cc
===================================================================
--- chrome/test/automation/proxy_launcher.cc	(revision 0)
+++ chrome/test/automation/proxy_launcher.cc	(revision 0)
@@ -0,0 +1,63 @@
+// Copyright (c) 2010 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/automation/proxy_launcher.h"
+
+#include "chrome/common/automation_constants.h"
+#include "chrome/common/logging_chrome.h"
+#include "chrome/test/automation/automation_proxy.h"
+#include "chrome/test/ui/ui_test.h"
+
+// Default path of named testing interface.
+static const char kInterfacePath[] = "/var/tmp/ChromeTestingInterface";
+
+// NamedProxyLauncher functions
+
+NamedProxyLauncher::NamedProxyLauncher(bool disconnect_on_failure)
+    : disconnect_on_failure_(disconnect_on_failure) {
+  channel_id_ = kInterfacePath;
+}
+
+AutomationProxy* NamedProxyLauncher::CreateAutomationProxy(
+    int execution_timeout) const {
+  AutomationProxy* proxy = new AutomationProxy(execution_timeout,
+                                               disconnect_on_failure_);
+  proxy->InitializeChannel(channel_id_, false);
+  return proxy;
+}
+
+void NamedProxyLauncher::InitializeConnection(UITestBase* ui_test_base) const {
+  ui_test_base->ConnectToRunningBrowser();

[Paweł Hajdan Jr., 2010/11/10 11:15:44]

We need to go further. Now it adds another level of indirection with little
gain. Could you move the implementation of ConnectToRunningBrowser (and also
LaunchBrowserAndServer) here?

It may make sense to merge CreateAutomationProxy and InitializeConnection into
one method, that would return an already connected AutomationProxy, after
waiting for the full launch of the application.

[dtu, 2010/11/11 00:10:54]

Those functions (and their helper functions LaunchBrowser(),
WaitForBrowserLaunch(), LaunchBrowserHelper()) have a TON of dependences in
UITestBase. It would uproot half of UITestBase to move these things. This is a
large enough refactoring change to warrant its own changelist.

[Nirnimesh, 2010/11/11 11:20:46]

No, I disagree. We do NOT want this class to start looking like a mini
UITestBase.
I like that this class does one thing and one thing only -- do what's needed to
initialize the automation channel. Maybe these needs to be renamed to
ChannelInitializer instead of ProxyLauncher, but I don't want it be launch the
browser, and things like that (also that'd involve it manipulating the launch
command arguments and so on.. and very soon it starts fighting for
responsibility with UITestBase).

+}
+
+std::string NamedProxyLauncher::PrefixedChannelID() const {
+  std::string channel_id;
+  channel_id.append(automation::kNamedInterfacePrefix).append(channel_id_);
+  return channel_id;
+}
+
+// AnonymousProxyLauncher functions
+
+AnonymousProxyLauncher::AnonymousProxyLauncher(bool disconnect_on_failure)
+    : disconnect_on_failure_(disconnect_on_failure) {
+  channel_id_ = AutomationProxy::GenerateChannelID();
+}
+
+AutomationProxy* AnonymousProxyLauncher::CreateAutomationProxy(
+    int execution_timeout) const {
+  AutomationProxy* proxy = new AutomationProxy(execution_timeout,
+                                               disconnect_on_failure_);
+  proxy->InitializeChannel(channel_id_, true);
+  return proxy;
+}
+
+void AnonymousProxyLauncher::InitializeConnection(
+    UITestBase* ui_test_base) const {
+  ui_test_base->LaunchBrowserAndServer();
+}
+
+std::string AnonymousProxyLauncher::PrefixedChannelID() const {
+  return channel_id_;
+}
+
Property changes on: chrome/test/automation/proxy_launcher.cc
___________________________________________________________________
Added: svn:eol-style
   + LF