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

Author: AndriyP

inc/extension_qt/event_dispatcher.h

@@ -0,0 +1,12 @@
+#ifndef EVENTDISPATCHER_H
+#define EVENTDISPATCHER_H
+
+#include <QtCore/QEvent>
+
+class EventDispatcher
+{
+public:
+    virtual bool dispatch(QEvent *event, bool consumed)=0;
+};
+
+#endif // EVENTDISPATCHER_H

inc/extension_qt/q_view_executor.h

@@ -19,7 +19,7 @@
 
 namespace webdriver {
 
-#define NOT_SUPPORTED_IMPL      {*error = new Error(kUnknownError, "Current view doesnt support this command.");}    
+#define NOT_SUPPORTED_IMPL      {*error = new Error(kCommandNotSupported, "Current view doesnt support this command.");}
 //#define NOT_IMPLEMENTED_IMPL    {*error = new Error(kUnknownError, "Command not implemented.");}
 //#define RET_IF_ERROR(e)         {if(e) {*error = e; return;}}
 

inc/extension_qt/vnc_event_dispatcher.h

@@ -0,0 +1,19 @@
+#ifndef VNCEVENTDISPATCHER_H
+#define VNCEVENTDISPATCHER_H
+
+#include "event_dispatcher.h"
+#include "vnc/vncclient.h"
+
+class VNCEventDispatcher : public EventDispatcher
+{
+public:
+    VNCEventDispatcher(VNCClient *client);
+    virtual ~VNCEventDispatcher();
+
+    bool dispatch(QEvent *event, bool consumed);
+
+private:
+    VNCClient *_vncClient;
+};
+
+#endif // VNCEVENTDISPATCHER_H

inc/extension_qt/wd_event_dispatcher.h

@@ -0,0 +1,24 @@
+#ifndef WDEVENTDISPATCHER_H
+#define WDEVENTDISPATCHER_H
+
+#include <QtCore/QVector>
+
+#include "event_dispatcher.h"
+
+class WDEventDispatcher
+{
+private:
+    WDEventDispatcher();
+    virtual ~WDEventDispatcher();
+
+public:
+    static WDEventDispatcher *getInstance();
+    void add(EventDispatcher *dispatcher);
+    QVector<EventDispatcher*>& getDispatchers();
+
+private:
+    static WDEventDispatcher *_instance;
+    QVector<EventDispatcher*> _dispatchers;
+};
+
+#endif // WDEVENTDISPATCHER_H

inc/webdriver_error.h

@@ -30,6 +30,7 @@ enum ErrorCode {
     kUnexpectedAlertOpen = 26,
     kNoAlertOpenError = 27,
     kMoveTargetOutOfBounds = 34,
+    kCommandNotSupported = 50,
 
     // HTTP status codes.
     kSeeOther = 303,

src/Test/main.cc

@@ -49,6 +49,10 @@
 #include "extension_qt/widget_view_creator.h"
 #include "extension_qt/widget_view_enumerator.h"
 #include "extension_qt/widget_view_executor.h"
+#include "extension_qt/wd_event_dispatcher.h"
+#include "extension_qt/vnc_event_dispatcher.h"
+
+#include "vnc/vncclient.h"
 
 void setQtSettings();
 void PrintVersion();
@@ -122,12 +126,26 @@ int main(int argc, char *argv[])
       PrintVersion();
       return 0;
     }
+
+#if defined(OS_WIN)
+#if (QT_VERSION == QT_VERSION_CHECK(5, 1, 0))
+    system("qtenv2.bat vsvars");
+#else  //QT_VERSION
+    system("qtvars.bat vsvars");
+#endif //QT_VERSION
+#endif //OS_WIN
+
     webdriver::Server* wd_server = webdriver::Server::GetInstance();
     if (0 != wd_server->Configure(cmd_line)) {
         return 1;
     }
 
-    setQtSettings();
+    VNCClient *client = new VNCClient();
+    client->Init("http://127.0.0.1", 5900);
+
+    WDEventDispatcher::getInstance()->add(new VNCEventDispatcher(client));
+	
+	setQtSettings();
     wd_server->Start();
 
     return app.exec();