Merge branch 'WD_1.X_dev' of https://portal-ua.globallogic.com/git/wd into WD_1.X_dev

AndriyP · AndriyP · commit 3dcce8876de0 · 2013-11-28T16:46:44.000+02:00
diff --git a/generate_wdversion.py b/generate_wdversion.py
@@ -8,7 +8,7 @@
 versionfile = open (filename, 'w')
 versionfile.write("namespace webdriver {\n")
 versionfile.write("extern const char kProductName[] = \"WebDriver-cisco-cmt\";\n")
-versionfile.write("extern const char kVersionNumber[] = \"1.3.0\";\n")
+versionfile.write("extern const char kVersionNumber[] = \"1.2.1\";\n")
 versionfile.write("extern const char kBuildTime[] = __TIME__;\n")
 versionfile.write("extern const char kBuildDate[] = __DATE__;\n")
 versionfile.write("extern const char kLastChanges[] = \"" + data.strip() + "\";\n")
diff --git a/inc/extension_qt/web_view_executor.h b/inc/extension_qt/web_view_executor.h
@@ -1,6 +1,7 @@
 #ifndef WEBDRIVER_QT_WEB_VIEW_EXECUTOR_H_
 #define WEBDRIVER_QT_WEB_VIEW_EXECUTOR_H_
 
+#include "base/yasper.h"
 #include "extension_qt/q_view_executor.h"
 #include "webdriver_logging.h"
 
@@ -133,7 +134,7 @@ class QWebViewCmdExecutor : public QViewCmdExecutor {
 	QWebView* getView(const ViewId& viewId, Error** error);
 
 private:
-    scoped_ptr<QWebkitProxy> webkitProxy_;
+    yasper::ptr<QWebkitProxy> webkitProxy_;
     QWebView* view_;
 
     DISALLOW_COPY_AND_ASSIGN(QWebViewCmdExecutor);
diff --git a/inc/webdriver_server.h b/inc/webdriver_server.h
@@ -183,6 +183,8 @@ class Server {
 
     int ParseConfigToOptions();
 
+    int ParseMongooseConfig();
+
     DISALLOW_COPY_AND_ASSIGN(Server);
 };
 
diff --git a/inc/webdriver_switches.h b/inc/webdriver_switches.h
@@ -88,6 +88,16 @@ class Switches {
 
     static const char kWhiteList[];
 
+    /// \page page_webdriver_switches WD Server switches
+    /// - <b>webserver-cfg</b><br>
+    /// The path to mongoose config file (e.g. config.json) in
+    /// JSON format with specified mongoose start option
+    /// (extra-mime-types, listening_ports, etc.)
+    /// Option from webserver config file will have more priority than
+    /// commandline param that specify the same option.
+
+    static const char kWebServerCfg[];
+
 };
 
 }  // namespace webdriver
diff --git a/src/webdriver/extension_qt/qwebkit_proxy.cc b/src/webdriver/extension_qt/qwebkit_proxy.cc
diff --git a/src/webdriver/extension_qt/qwebkit_proxy.h b/src/webdriver/extension_qt/qwebkit_proxy.h
@@ -185,7 +185,7 @@ class QWebkitProxy {
     Session* session_;
     QWebPage* page_;
 
-    QWebFrame* GetFrame(QWebPage* page, const FramePath& frame_path);
+    QWebFrame* GetFrame(const FramePath& frame_path);
     QWebFrame* FindFrameByMeta(QWebFrame* parent, const FramePath &frame_path);
     QWebFrame* FindFrameByPath(QWebFrame* parent, const FramePath &frame_path);
 
@@ -246,7 +246,6 @@ class QWebkitProxy {
                 Point* location);
 
     Error* GetElementRegionInView(
-                QWebPage* page,
                 const ElementId& element,
                 const Rect& region,
                 bool center,
diff --git a/src/webdriver/extension_qt/web_view_executor.cc b/src/webdriver/extension_qt/web_view_executor.cc
@@ -42,7 +42,7 @@ namespace webdriver {
         *error = new Error(kNoSuchWindow); \
         return; \
     } \
-    webkitProxy_.reset(new QWebkitProxy(session_, (view_)?view_->page():NULL));
+    webkitProxy_ = yasper::ptr<QWebkitProxy>(new QWebkitProxy(session_, (view_)?view_->page():NULL));
 
 const ViewType QWebViewCmdExecutorCreator::WEB_VIEW_TYPE = 0x13f0;
 
@@ -977,14 +977,14 @@ void QWebViewCmdExecutor::GetMute(const ElementId &element, bool *mute, Error **
 void QWebViewCmdExecutor::VisualizerSource(std::string* source, Error** error) {
     CHECK_VIEW_EXISTANCE
 
-    QWebViewVisualizerSourceCommand command(this, session_, view_);
+    QWebViewVisualizerSourceCommand command(webkitProxy_, session_, view_);
     command.Execute(source, error);
 }
 
 void QWebViewCmdExecutor::VisualizerShowPoint(Error** error) {
     CHECK_VIEW_EXISTANCE
 
-    QWebViewVisualizerShowPointCommand command(this, session_, view_);
+    QWebViewVisualizerShowPointCommand command(webkitProxy_, session_, view_);
     command.Execute(error);
 }
 
diff --git a/src/webdriver/extension_qt/web_view_visualizer.cc b/src/webdriver/extension_qt/web_view_visualizer.cc
@@ -14,8 +14,8 @@
 
 namespace webdriver {
 
-QWebViewVisualizerSourceCommand::QWebViewVisualizerSourceCommand(QWebViewCmdExecutor* executor, Session* session, QWebView* view)
-    : executor_(executor), session_(session), view_(view)
+QWebViewVisualizerSourceCommand::QWebViewVisualizerSourceCommand(yasper::ptr<QWebkitProxy> webkitProxy, Session* session, QWebView* view)
+    : webkitProxy_(webkitProxy), session_(session), view_(view)
 {}
 
 void QWebViewVisualizerSourceCommand::Execute(std::string* source, Error** error) {
@@ -36,11 +36,10 @@ void QWebViewVisualizerSourceCommand::Execute(std::string* source, Error** error
         "return new XMLSerializer().serializeToString(root);";
 
     Value* unscoped_value = NULL;
-    executor_->ExecuteScript(
+    *error = webkitProxy_->ExecuteScript(
                 kSource,
                 new ListValue(),
-                &unscoped_value,
-                error);
+                &unscoped_value);
     if (*error) {
         (*error)->AddDetails("getSource execution failed");
         return;
@@ -230,15 +229,27 @@ void QWebViewVisualizerSourceCommand::AssembleImg(pugi::xml_node element) const
 
 void QWebViewVisualizerSourceCommand::AssembleStyle(pugi::xml_node element) const {
     pugi::xml_attribute type = element.attribute("type");
-    if (type.empty() != 0 &&
+    if (!type.empty() &&
         std::string(type.value()) != "text/css") {
         return;
     }
 
-    QString value = QString::fromUtf8(element.text().as_string());
-    value = AssembleStyle(value);
-    clearChildren(element);
-    element.append_child(pugi::node_pcdata).set_value(value.toStdString().c_str());
+    if (len(element.children()) == 1 &&
+        element.first_child().type() == pugi::node_cdata) {
+        pugi::xml_node cdata = element.first_child();
+        element.remove_child(cdata);
+        QString value = QString::fromUtf8(cdata.value());
+        value = AssembleStyle(value);
+        element.append_child(pugi::node_pcdata).set_value(value.toStdString().c_str());
+    } else {
+        for (pugi::xml_node_iterator childIt = element.begin(); childIt != element.end(); childIt++) {
+            if (childIt->type() == pugi::node_pcdata) {
+                QString value = QString::fromUtf8(childIt->value());
+                value = AssembleStyle(value);
+                childIt->set_value(value.toStdString().c_str());
+            }
+        }
+    }
 }
 
 void QWebViewVisualizerSourceCommand::AssembleStyle(pugi::xml_attribute attribute) const {
@@ -353,6 +364,10 @@ bool QWebViewVisualizerSourceCommand::isEmpty(const pugi::xml_object_range<pugi:
     return range.begin() == range.end();
 }
 
+int QWebViewVisualizerSourceCommand::len(const pugi::xml_object_range<pugi::xml_node_iterator>& range) {
+    return std::distance(range.begin(), range.end());
+}
+
 void QWebViewVisualizerSourceCommand::clearChildren(pugi::xml_node element) {
     std::vector<pugi::xml_node> children;
     for (pugi::xml_node_iterator it = element.children().begin(); it != element.children().end(); it++) {
@@ -390,8 +405,8 @@ class QCursorMark : public QWidget
     static const int RADIUS = 5;
 };
 
-QWebViewVisualizerShowPointCommand::QWebViewVisualizerShowPointCommand(QWebViewCmdExecutor* executor, Session* session, QWebView* view)
-    : executor_(executor), session_(session), view_(view)
+QWebViewVisualizerShowPointCommand::QWebViewVisualizerShowPointCommand(yasper::ptr<QWebkitProxy> webkitProxy, Session* session, QWebView* view)
+    : webkitProxy_(webkitProxy), session_(session), view_(view)
 {}
 
 void QWebViewVisualizerShowPointCommand::Execute(Error** error) {
diff --git a/src/webdriver/extension_qt/web_view_visualizer.h b/src/webdriver/extension_qt/web_view_visualizer.h
@@ -9,19 +9,20 @@
 #include <QtWebKit/QtWebKit>
 #endif
 
+#include "base/yasper.h"
+#include "qwebkit_proxy.h"
 #include "third_party/pugixml/pugixml.hpp"
 
 namespace webdriver {
 
-class QWebViewCmdExecutor;
 class Error;
 class Session;
 
 class QWebViewVisualizerSourceCommand : public QObject {
     Q_OBJECT
 
 public:
-    QWebViewVisualizerSourceCommand(QWebViewCmdExecutor* executor, Session* session, QWebView* view);
+    QWebViewVisualizerSourceCommand(yasper::ptr<QWebkitProxy> webkitProxy, Session* session, QWebView* view);
 
     void Execute(std::string* source, Error** error);
 
@@ -47,22 +48,23 @@ private Q_SLOTS:
 
 private:
     static bool isEmpty(const pugi::xml_object_range<pugi::xml_node_iterator>& range);
+    static int len(const pugi::xml_object_range<pugi::xml_node_iterator>& range);
     static void clearChildren(pugi::xml_node element);
     static const char DATA_PROTOCOL[];
 
-    QWebViewCmdExecutor* executor_;
+    yasper::ptr<QWebkitProxy> webkitProxy_;
     Session* session_;
     QWebView* view_;
 };
 
 class QWebViewVisualizerShowPointCommand {
 public:
-    QWebViewVisualizerShowPointCommand(QWebViewCmdExecutor* executor, Session* session, QWebView* view);
+    QWebViewVisualizerShowPointCommand(yasper::ptr<QWebkitProxy> webkitProxy, Session* session, QWebView* view);
 
     void Execute(Error** error);
 
 private:
-    QWebViewCmdExecutor* executor_;
+    yasper::ptr<QWebkitProxy> webkitProxy_;
     Session* session_;
     QWebView* view_;
 };
diff --git a/src/webdriver/webdriver_server.cc b/src/webdriver/webdriver_server.cc
@@ -607,7 +607,9 @@ int Server::InitMongooseOptions() {
         }
     }
     mg_options_.push_back("extra_mime_types");
-    mg_options_.push_back(".xhtml=application/xhtml+xml");
+    mg_options_.push_back(".xhtml=application/xhtml+xml,.qml=text/x-qml");
+
+    ParseMongooseConfig();
 
     return 0;
 }
@@ -674,7 +676,7 @@ int Server::ParseConfigToOptions() {
 
             if (value->GetType() != Value::TYPE_DICTIONARY)
             {
-                std::cerr << "Execute script returned non-dict: " + JsonStringify(value.get()) << std::endl;
+                std::cerr << "Config file: result of parsing json is not a dictionary " + JsonStringify(value.get()) << std::endl;
                 return 2;
             }
 
@@ -700,7 +702,52 @@ int Server::ParseConfigToOptions() {
         }
         else
         {
-            std::cerr << "can't read file" << std::endl;
+            std::cerr << "can't read config file" << std::endl;
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+int Server::ParseMongooseConfig() {
+    if (options_->HasSwitch(webdriver::Switches::kWebServerCfg))
+    {
+        //parse json config file and set value
+        std::string mongoose_cfg;
+        FilePath configPath(options_->GetSwitchValueNative(webdriver::Switches::kWebServerCfg));
+
+        if (file_util::ReadFileToString(configPath, &mongoose_cfg))
+        {
+            scoped_ptr<Value> value(base::JSONReader::ReadAndReturnError(
+                mongoose_cfg, base::JSON_ALLOW_TRAILING_COMMAS, NULL, NULL));
+            if (!value.get())
+            {
+                std::cout << "Failed to parse webserver config file" << std::endl;
+                return 1;
+            }
+
+            if (value->GetType() != Value::TYPE_DICTIONARY)
+            {
+                std::cerr << "Webserver config: result of parsing json is not a dictionary " + JsonStringify(value.get()) << std::endl;
+                return 2;
+            }
+
+            DictionaryValue* result_dict = static_cast<DictionaryValue*>(value.get());
+
+            DictionaryValue::key_iterator key_iter = result_dict->begin_keys();
+            for (; key_iter != result_dict->end_keys(); ++key_iter) {
+                std::string value;
+                result_dict->GetStringWithoutPathExpansion(*key_iter, &value);
+                mg_options_.push_back(*key_iter);
+                mg_options_.push_back(value.c_str());
+            }
+
+            return 0;
+        }
+        else
+        {
+            std::cerr << "can't read webserver confifg file" << std::endl;
             return 1;
         }
     }
diff --git a/src/webdriver/webdriver_switches.cc b/src/webdriver/webdriver_switches.cc
@@ -28,4 +28,6 @@ const char Switches::kUserInputDevice[] = "uinput";
 
 const char Switches::kWhiteList[] = "white-list";
 
+const char Switches::kWebServerCfg[] = "webserver-cfg";
+
 }  // namespace webdriver
