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

Author: Mykola Tryshnivskyy

inc/extension_qt/q_view_executor.h

@@ -38,6 +38,7 @@ class QViewCmdExecutor : public ViewCmdExecutor {
     virtual void SendKeys(const string16& keys, Error** error);
     virtual void Close(Error** error);
     virtual void SwitchTo(Error** error);
+    virtual void FindElement(const ElementId& root_element, const std::string& locator, const std::string& query, ElementId* element, Error** error);
     virtual void GetAlertMessage(std::string* text, Error** error);
     virtual void SetAlertPromptText(const std::string& alert_prompt_text, Error** error);
     virtual void AcceptOrDismissAlert(bool accept, Error** error);

inc/extension_qt/wd_event_dispatcher.h

@@ -15,6 +15,7 @@ class WDEventDispatcher
     static WDEventDispatcher *getInstance();
     void add(EventDispatcher *dispatcher);
     QVector<EventDispatcher*>& getDispatchers();
+    bool dispatch(QEvent *event);
 
 private:
     static WDEventDispatcher *_instance;

inc/extension_qt/widget_view_executor.h

@@ -60,7 +60,6 @@ class QWidgetViewCmdExecutor : public QViewCmdExecutor {
     virtual void ElementSubmit(const ElementId& element, Error** error) NOT_SUPPORTED_IMPL;
     virtual void GetElementText(const ElementId& element, std::string* element_text, Error** error);
     virtual void GetElementCssProperty(const ElementId& element, const std::string& property, base::Value** value, Error** error) NOT_SUPPORTED_IMPL;
-    virtual void FindElement(const ElementId& root_element, const std::string& locator, const std::string& query, ElementId* element, Error** error);
     virtual void FindElements(const ElementId& root_element, const std::string& locator, const std::string& query, std::vector<ElementId>* elements, Error** error);
     virtual void ActiveElement(ElementId* element, Error** error);
     virtual void SwitchToFrameWithNameOrId(const std::string& name_or_id, Error** error) NOT_SUPPORTED_IMPL;

inc/webdriver_route_table.h

@@ -138,6 +138,11 @@ class RouteTable {
     bool AddRoute(const std::string& uri_pattern,
                   const CommandCreatorPtr& creator);
 
+    // check custom prefix, should be of the form:
+    // '-' + vendor prefix + '-' + command name
+    // return true if prefix correct
+    bool CheckCustomPrefix(const std::string& prefix);
+
     // return true if pattern1 is bestmatch then pattern2
     bool CompareBestMatch(const std::string& uri_pattern1, const std::string& uri_pattern2);
 

inc/webdriver_switches.h

@@ -67,6 +67,11 @@ class Switches {
     /// Web inspector listening port (by default - 9222)
     static const char kWIPort[];
 
+    /// \page page_webdriver_switches WD Server switches
+    /// - <b>vnc</b><br>
+    /// Enabling VNC support (by default - false)
+    static const char kVNCEnabled[];
+
 };
 
 }  // namespace webdriver

src/Test/main.cc

@@ -53,6 +53,7 @@
 #include "extension_qt/vnc_event_dispatcher.h"
 
 #include "vnc/vncclient.h"
+#include "webdriver_switches.h"
 
 void setQtSettings();
 void PrintVersion();
@@ -143,7 +144,13 @@ int main(int argc, char *argv[])
     VNCClient *client = new VNCClient();
     client->Init("http://127.0.0.1", 5900);
 
-    WDEventDispatcher::getInstance()->add(new VNCEventDispatcher(client));
+
+    CommandLine cmdLine = webdriver::Server::GetInstance()->GetCommandLine();
+
+    if (cmdLine.HasSwitch(webdriver::Switches::kVNCEnabled))
+    {
+        WDEventDispatcher::getInstance()->add(new VNCEventDispatcher(client));
+    }
 
 	setQtSettings();
     wd_server->Start();

src/vnc/vncclient.cc

@@ -3,7 +3,6 @@
 #include <iostream>
 #include <QtNetwork/QHostAddress>
 #include <QtCore/QMap>
-#include <X11/keysymdef.h>
 
 #define MAJOR_INDEX 6
 #define MINOR_INDEX 10

src/webdriver/extension_qt/q_view_executor.cc

@@ -75,6 +75,11 @@ void QViewCmdExecutor::SetBounds(const Rect& bounds, Error** error) {
     if (NULL == view)
         return;
 
+    if (!view->isTopLevel()) {
+        *error = new Error(kUnknownError, "Cant set bounds to non top level view.");
+        return;
+    }
+
     view->setGeometry(ConvertRectToQRect(bounds));
 }
 
@@ -185,6 +190,15 @@ void QViewCmdExecutor::SwitchTo(Error** error) {
     session_->logger().Log(kInfoLogLevel, "SwitchTo - set current view ("+view_id_.id()+")");
 }
 
+void QViewCmdExecutor::FindElement(const ElementId& root_element, const std::string& locator, const std::string& query, ElementId* element, Error** error) {
+    std::vector<ElementId> elements;
+    FindElements(root_element, locator, query, &elements, error);
+    if (*error == NULL && !elements.empty())
+        *element = elements[0];
+    else if(*error == NULL)
+        *error = new Error(kNoSuchElement);
+}
+
 void QViewCmdExecutor::GetAlertMessage(std::string* text, Error** error) {
     QWidget* view = getView(view_id_, error);
     if (NULL == view)

src/webdriver/extension_qt/wd_event_dispatcher.cc

@@ -30,3 +30,15 @@ QVector<EventDispatcher*>& WDEventDispatcher::getDispatchers()
 {
     return _dispatchers;
 }
+
+bool WDEventDispatcher::dispatch(QEvent *event)
+{
+    bool consumed = false;
+    QVector<EventDispatcher*> dispatchers = WDEventDispatcher::getInstance()->getDispatchers();
+    foreach (EventDispatcher* item, dispatchers)
+    {
+        consumed |= item->dispatch(event, consumed);
+    }
+
+    return consumed;
+}

src/webdriver/extension_qt/web_view_executor.cc

@@ -330,14 +330,8 @@ void QWebViewCmdExecutor::SendKeys(const ElementId& element, const string16& key
     std::vector<QKeyEvent>::iterator it = key_events.begin();
     while (it != key_events.end()) {
 
-        //////////////////////
-        bool consumed = false;
-        QVector<EventDispatcher*> dispatchers = WDEventDispatcher::getInstance()->getDispatchers();
-        foreach (EventDispatcher* item, dispatchers)
-        {
-            consumed |= item->dispatch(&(*it), consumed);
-        }
-        //////////////////////
+        bool consumed = WDEventDispatcher::getInstance()->dispatch(&(*it));
+
         if (!consumed)
             qApp->sendEvent(view, &(*it));
         ++it;