add browser log support

Author: dteteruk

inc/commands/log_command.h

@@ -18,7 +18,7 @@ namespace webdriver {
 
 class Response;
 
-class LogCommand : public WebDriverCommand {
+class LogCommand : public ViewCommand {
 public:
   	LogCommand(const std::vector<std::string>& path_segments,
              const base::DictionaryValue* parameters);

inc/extension_qt/web_view_executor.h

@@ -2,6 +2,7 @@
 #define WEBDRIVER_QT_WEB_VIEW_EXECUTOR_H_
 
 #include "extension_qt/q_view_executor.h"
+#include "webdriver_logging.h"
 
 #include <QtCore/QtGlobal>
 
@@ -61,6 +62,44 @@ public slots:
     bool isCompleted;
 };
 
+class JSLogger : public QObject
+{
+    Q_OBJECT
+
+public:
+    JSLogger();
+    base::ListValue* getLog();
+    void SetMinLogLevel(LogLevel level);
+
+public slots:
+    void log(QVariant message);
+    void warn(QVariant message);
+    void error(QVariant message);
+
+private:
+    InMemoryLog browserLog;
+    Logger browserLogger;
+};
+
+class BrowserLogHandler : public QObject
+{
+    Q_OBJECT
+
+public:
+    BrowserLogHandler(QObject* parent);
+    base::ListValue* getLog();
+    void SetMinLogLevel(LogLevel level);
+    void loadConsoleJS(const QWebView* view);
+    void loadJSLogObject(QWebFrame *frame);
+
+public slots:
+    void loadJSLogObject();
+    void loadConsoleJS();
+
+private:
+    JSLogger jslogger;
+};
+
 class QWebViewCmdExecutorCreator : public ViewCmdExecutorCreator  {
 public:
     static const ViewType WEB_VIEW_TYPE; 
@@ -147,6 +186,7 @@ class QWebViewCmdExecutor : public QViewCmdExecutor {
     virtual void TouchScroll(const ElementId &element, const int &xoffset, const int &yoffset, Error **error);
     virtual void TouchFlick(const int &xSpeed, const int &ySpeed, Error **error);
     virtual void TouchFlick(const ElementId &element, const int &xoffset, const int &yoffset, const int &speed, Error **error);
+    virtual void GetBrowserLog(base::ListValue** browserLog, Error **error);
 
 
 protected:
@@ -239,6 +279,8 @@ class QWebViewCmdExecutor : public QViewCmdExecutor {
 
 	Error* ToggleOptionElement(const ElementId& element);
 
+    void AddBrowserLoggerToView(QWebView* view);
+
 
 
 

inc/webdriver_logging.h

@@ -41,6 +41,7 @@ class LogType {
     enum Type {
         kInvalid = -1,  /// invalid type
         kDriver,        /// driver
+        kBrowser,       /// browser (console.log)
         kNum            /// number of sources
     };
 

inc/webdriver_view_executor.h

@@ -164,6 +164,7 @@ class ViewCmdExecutor {
     virtual void TouchScroll(const ElementId &element, const int &xoffset, const int &yoffset, Error **error) = 0;
     virtual void TouchFlick(const int &xSpeed, const int &ySpeed, Error **error) = 0;
     virtual void TouchFlick(const ElementId &element, const int &xoffset, const int &yoffset, const int &speed, Error **error) = 0;
+    virtual void GetBrowserLog(base::ListValue** browserLog, Error **error) {}
 
 protected:
     Session* session_;

src/webdriver/commands/log_command.cc

@@ -6,16 +6,18 @@
 
 #include "base/string_util.h"
 #include "base/values.h"
+#include "base/bind.h"
 #include "commands/response.h"
 #include "webdriver_error.h"
 #include "webdriver_session.h"
+#include "webdriver_view_executor.h"
 
 namespace webdriver {
 
 LogCommand::LogCommand(
     const std::vector<std::string>& path_segments,
     const DictionaryValue* parameters)
-    : WebDriverCommand(path_segments, parameters) {
+    : ViewCommand(path_segments, parameters) {
 }
 
 LogCommand::~LogCommand() {
@@ -40,7 +42,31 @@ void LogCommand::ExecutePost(Response* const response) {
 
     if (log_type.type() == LogType::kDriver) {
         response->SetValue(session_->GetLog());
-    } else {
+    }
+    else if (log_type.type() == LogType::kBrowser) {
+        Error* error = NULL;
+        base::ListValue* browserLog = NULL;
+
+        session_->RunSessionTask(base::Bind(
+                    &ViewCmdExecutor::GetBrowserLog,
+                    base::Unretained(executor_.get()),
+                    &browserLog,
+                    &error));
+
+        if (error)
+            response->SetError(error);
+        else if (browserLog == NULL)
+        {
+            browserLog = new base::ListValue();
+            response->SetValue(browserLog);
+        }
+        else
+        {
+            response->SetValue(browserLog);
+        }
+    }
+    else
+    {
         response->SetError(new Error(kUnknownError, "Unrecognized type: " + type));
         return;
     }
@@ -62,7 +88,7 @@ bool LogTypesCommand::DoesGet() const {
 void LogTypesCommand::ExecuteGet(Response* const response) {
     base::ListValue* logTypes_list = new base::ListValue();
     logTypes_list->Append(Value::CreateStringValue(LogType(LogType::kDriver).ToString()));
-
+    logTypes_list->Append(Value::CreateStringValue(LogType(LogType::kBrowser).ToString()));
     response->SetValue(logTypes_list);
 }
 

src/webdriver/extension_qt/web_view_executor.cc

@@ -77,6 +77,96 @@ void JSNotifier::setResult(QVariant result)
     emit completed();
 }
 
+BrowserLogHandler::BrowserLogHandler(QObject *parent): QObject(parent), jslogger()
+{
+}
+
+base::ListValue* BrowserLogHandler::getLog()
+{
+    return jslogger.getLog();
+}
+
+void BrowserLogHandler::SetMinLogLevel(LogLevel level)
+{
+    jslogger.SetMinLogLevel(level);
+}
+
+void BrowserLogHandler::loadJSLogObject()
+{
+    QWebFrame *mainFrame = qobject_cast<QWebFrame*>(sender());
+    if (mainFrame)
+        loadJSLogObject(mainFrame);
+}
+
+void BrowserLogHandler::loadJSLogObject(QWebFrame *frame)
+{
+    frame->addToJavaScriptWindowObject("wdconsole", &jslogger);
+}
+
+void BrowserLogHandler::loadConsoleJS()
+{
+    QWebView* view = qobject_cast<QWebView*>(sender());
+    if (view)
+        loadConsoleJS(view);
+}
+
+void BrowserLogHandler::loadConsoleJS(const QWebView *view)
+{
+    QString jscript ("if ( _log == null ){"
+                    "var _log = console.log,"
+                        "_warn = console.warn,"
+                        "_error = console.error;"
+                    "};"
+
+                    "console.log = function() {"
+                        "wdconsole.log(arguments[0]);"
+                        "return _log.apply(console, arguments);"
+                    "};"
+
+                     "console.warn = function() {"
+                        "wdconsole.warn(arguments[0]);"
+                        "return _warn.apply(console, arguments);"
+                     "};"
+
+                     "console.error = function() {"
+                        "wdconsole.error(arguments[0]);"
+                        "return _error.apply(console, arguments);"
+                     "};");
+    view->page()->mainFrame()->evaluateJavaScript(jscript);
+}
+
+JSLogger::JSLogger()
+{
+    browserLogger.AddHandler(&browserLog);
+}
+
+base::ListValue* JSLogger::getLog()
+{
+    base::ListValue* retVal = browserLog.entries_list()->DeepCopy();
+    browserLog.clear_entries_list();
+    return retVal;
+}
+
+void  JSLogger::SetMinLogLevel(LogLevel level)
+{
+    browserLogger.set_min_log_level(level);
+}
+
+void JSLogger::log(QVariant message)
+{
+    browserLogger.Log(kInfoLogLevel, message.toString().toStdString());
+}
+
+void JSLogger::warn(QVariant message)
+{
+    browserLogger.Log(kWarningLogLevel, message.toString().toStdString());
+}
+
+void JSLogger::error(QVariant message)
+{
+    browserLogger.Log(kSevereLogLevel, message.toString().toStdString());
+}
+
 const ViewType QWebViewCmdExecutorCreator::WEB_VIEW_TYPE = 0x13f0;
 
 QWebViewCmdExecutorCreator::QWebViewCmdExecutorCreator()
@@ -771,6 +861,8 @@ void QWebViewCmdExecutor::SwitchTo(Error** error) {
 
     session_->logger().Log(kInfoLogLevel, "SwitchTo - set current view ("+view_id_.id()+")");
 
+    AddBrowserLoggerToView(view);
+
     // reset frame path
     session_->frame_elements_.clear();
     session_->set_current_frame(FramePath());
@@ -1464,6 +1556,19 @@ void QWebViewCmdExecutor::TouchFlick(const ElementId &element, const int &xoffse
     view->page()->mainFrame()->scroll(-xoffset*(speed+1), -yoffset*(speed+1));
 }
 
+void QWebViewCmdExecutor::GetBrowserLog(base::ListValue** browserLog, Error **error)
+{
+    QWebView* view = getView(view_id_, error);
+    if (NULL == view)
+        return;
+
+    BrowserLogHandler* logHandler = view->findChild<BrowserLogHandler*>();
+    if (NULL == logHandler)
+        return;
+
+    *browserLog = logHandler->getLog();
+}
+
 QWebFrame* QWebViewCmdExecutor::FindFrameByPath(QWebFrame* parent, const FramePath &frame_path) {
     if (frame_path.value().empty())
         return NULL;
@@ -1984,7 +2089,7 @@ Error* QWebViewCmdExecutor::SwitchToFrameWithJavaScriptLocatedFrame(
     std::string frame_id = GenerateRandomID();
     error = ExecuteScriptAndParse(
                 frame,
-                "function(elem, id) { var meta; elem.setAttribute('wd_frame_id_', id); var doc = elem.contentDocument? elem.contentDocument: elem.contentWindow.document; meta=doc.createElement('meta'); meta.name = 'wd_frame_id_'; meta.content = id; var child = doc.body.appendChild(meta);  console.log(meta); console.log(child);}",
+                "function(elem, id) { var meta; elem.setAttribute('wd_frame_id_', id); var doc = elem.contentDocument? elem.contentDocument: elem.contentWindow.document; meta=doc.createElement('meta'); meta.name = 'wd_frame_id_'; meta.content = id; var child = doc.body.appendChild(meta);}",
                 "setFrameId",
                 CreateListValueFrom(new_frame_element, frame_id),
                 CreateDirectValueParser(kSkipParsing));
@@ -2107,5 +2212,20 @@ Error* QWebViewCmdExecutor::ToggleOptionElement(const ElementId& element) {
     return error;
 }
 
+void QWebViewCmdExecutor::AddBrowserLoggerToView(QWebView* view)
+{
+    BrowserLogHandler* logHandler = view->findChild<BrowserLogHandler*>();
+    if (NULL == logHandler)
+    {
+        logHandler = new BrowserLogHandler(view);
+        logHandler->SetMinLogLevel(session_->capabilities().log_levels[LogType::kBrowser]);
+    }
+
+    QObject::connect(view->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), logHandler, SLOT(loadJSLogObject()));
+    QObject::connect(view, SIGNAL(loadFinished(bool)),logHandler, SLOT(loadConsoleJS()), Qt::QueuedConnection);
+    logHandler->loadJSLogObject(view->page()->mainFrame());
+    logHandler->loadConsoleJS(view);
+}
+
 
 } //namespace webdriver 

src/webdriver/webdriver_capabilities_parser.cc

@@ -62,6 +62,7 @@ Capabilities::Capabilities()
       load_async(false),
       caps(new DictionaryValue()) {
     log_levels[LogType::kDriver] = kAllLogLevel;
+    log_levels[LogType::kBrowser] = kAllLogLevel;
 }
 
 Capabilities::~Capabilities() { }

src/webdriver/webdriver_logging.cc

@@ -69,7 +69,9 @@ std::string LogLevelToString(LogLevel level) {
 bool LogType::FromString(const std::string& name, LogType* log_type) {
     if (name == "driver") {
         *log_type = LogType(kDriver);
-    } else {
+    } else if (name == "browser") {
+        *log_type = LogType(kBrowser);
+    } else{
         return false;
     }
     return true;
@@ -85,6 +87,8 @@ std::string LogType::ToString() const {
     switch (type_) {
         case kDriver:
             return "driver";
+        case kBrowser:
+            return "browser";
         default:
             return "unknown";
     };