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

Author: nataliakoval

inc/extension_qt/web_view_executor.h

@@ -4,8 +4,6 @@
 #include "extension_qt/q_view_executor.h"
 #include "webdriver_logging.h"
 
-#include <QtCore/QtGlobal>
-
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 #include <QtWebKitWidgets/QWebView>
 #include <QtWebKit/QWebHistory>
@@ -19,88 +17,7 @@ namespace webdriver {
 
 class FramePath;
 class ValueParser;
-
-class QPageLoader : public QObject {
-    Q_OBJECT
-public:
-    explicit QPageLoader(QWebView* view) :
-                QObject(NULL) {webView = view; is_loading = false;}
-
-    void loadPage(QUrl url);
-    void reloadPage();
-    bool isLoading() {return is_loading;}
-    
-signals:
-    void loaded();
-    
-public slots:
-    void pageLoadStarted();
-    void pageLoadFinished();
-private:
-    bool is_loading;
-    QWebView* webView;
-    
-};
-
-//Notify automation module about end of execution of async script
-class JSNotifier : public QObject
-{
-    Q_OBJECT
-
-public:
-    JSNotifier();
-    QVariant getResult();
-    bool IsCompleted();
-
-
-public slots:
-    void setResult(QVariant result);
-
-signals:
-    void completed();
-
-private:
-    QVariant res;
-    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 QWebkitProxy;
 
 class QWebViewCmdExecutorCreator : public ViewCmdExecutorCreator  {
 public:
@@ -203,97 +120,11 @@ class QWebViewCmdExecutor : public QViewCmdExecutor {
 
 protected:
 	QWebView* getView(const ViewId& viewId, Error** error);
-	QWebFrame* FindFrameByPath(QWebFrame* parent, const FramePath &frame_path);
-	QWebFrame* GetFrame(QWebView* view, const FramePath& frame_path);
-	Error* ExecuteScriptAndParse(QWebFrame* frame,
-                                const std::string& anonymous_func_script,
-                                const std::string& script_name,
-                                const base::ListValue* args,
-                                const ValueParser* parser);
-	Error* ExecuteAsyncScript(QWebFrame* frame,
-                            const std::string& script,
-                            const base::ListValue* const args,
-                            base::Value** value);
-	Error* ExecuteScript(QWebFrame* frame,
-                        const std::string& script,
-                        const base::ListValue* const args,
-                        base::Value** value);
-	Error* ExecuteScriptAndParseValue(QWebFrame* frame,
-                                    const std::string& script,
-                                    base::Value** script_result, bool isAsync);
-	Error* ExecuteScriptImpl(QWebFrame* frame,
-                               const std::string &script,
-                               std::string *result,
-                               bool isAsync);
-
-	Error* FindElementsHelper(QWebFrame* frame,
-                            const ElementId& root_element,
-                            const std::string& locator,
-                            const std::string& query,
-                            bool find_one,
-                            std::vector<ElementId>* elements);
-
-	Error* ExecuteFindElementScriptAndParse(
-    			QWebFrame* frame,
-    			const ElementId& root_element,
-    			const std::string& locator,
-    			const std::string& query,
-    			bool find_one,
-    			std::vector<ElementId>* elements);
-
-	Error* GetElementRegionInViewHelper(
-		    	QWebFrame* frame,
-		    	const ElementId& element,
-		    	const Rect& region,
-		    	bool center,
-		    	bool verify_clickable_at_middle,
-		    	Point* location);
-
-	Error* GetElementRegionInView(
-				QWebView* view,
-		    	const ElementId& element,
-		    	const Rect& region,
-		    	bool center,
-		    	bool verify_clickable_at_middle,
-		    	Point* location);
-
-	Error* VerifyElementIsClickable(
-			    QWebFrame* frame,
-			    const ElementId& element,
-			    const Point& location);
-
-	Error* GetElementBorder(QWebFrame* frame,
-                                const ElementId& element,
-                                int* border_left,
-                                int* border_top);
-
-	Error* GetElementEffectiveStyle(
-		    	QWebFrame* frame,
-		    	const ElementId& element,
-		    	const std::string& prop,
-		    	std::string* value);
-
-	QWebFrame* FindFrameByMeta(QWebFrame* parent, const FramePath &frame_path);
-
-	void AddIdToCurrentFrame(QWebView* view, const FramePath &frame_path);
-
-	Error* SwitchToFrameWithJavaScriptLocatedFrame(
-								QWebView* view,
-								QWebFrame* frame,
-    							const std::string& script,
-    							base::ListValue* args);
-
-	Error* GetElementFirstClientRect(QWebFrame* frame,
-                                    const ElementId& element,
-                                    Rect* rect);
-
-	Error* GetClickableLocation(QWebView* view, const ElementId& element, Point* location);
-
-	Error* ToggleOptionElement(const ElementId& element);
-
-    void AddBrowserLoggerToView(QWebView* view);
 
 private:
+    QWebkitProxy* webkitProxy_;
+    QWebView* view_;
+
     DISALLOW_COPY_AND_ASSIGN(QWebViewCmdExecutor);
     friend class QWebViewVisualizerSourceCommand;
     friend class QWebViewVisualizerShowPointCommand;

inc/webdriver_basic_types.h

@@ -20,6 +20,19 @@ enum MouseButton {
     kRightButton = 2
 };    
 
+/// @enum StorageType storage types
+enum StorageType {
+    kLocalStorageType = 0,
+    kSessionStorageType
+};
+
+///@enum PlayerState possible states
+enum PlayerState{
+    Stopped = 0,
+    Playing = 1,
+    Paused = 2
+};
+
 class Point {
 public:
     Point();

inc/webdriver_view_executor.h

@@ -59,20 +59,6 @@ class Rect;
 class Point;
 class Size;
 
-/// @enum StorageType storage types
-enum StorageType {
-    kLocalStorageType = 0,
-    kSessionStorageType
-};
-
-///@enum PlayerState possible states
-enum PlayerState{
-    Stopped = 0,
-    Playing = 1,
-    Paused = 2
-};
-
-
 /// base class for custom view's executors
 class ViewCmdExecutor{
 public:

src/Test/TestVariables.h

@@ -0,0 +1,10 @@
+#ifndef TESTVARIABLES_H
+#define TESTVARIABLES_H
+
+#include <string>
+
+namespace tests {
+    extern std::string testDataFolder;
+}
+
+#endif // TESTVARIABLES_H

src/Test/VideoTest.cc

@@ -7,10 +7,10 @@ VideoTestWidget::VideoTestWidget(QWidget *parent) :
     this->setMinimumSize(400, 400);
     this->setMaximumSize(800, 800);
     mediaPlayer = new QMediaPlayer(NULL, QMediaPlayer::VideoSurface);
-    videoWidget = new QVideoWidget;
+    videoWidget = new QVideoWidget();
     videoWidget->setObjectName("videoPlayer");
 
-    playButton = new QPushButton;
+    playButton = new QPushButton();
     playButton->setIcon(style()->standardIcon(QStyle::SP_MediaPlay));
     playButton->setEnabled(false);
     connect(playButton, SIGNAL(clicked()), this, SLOT(play()));
@@ -32,27 +32,33 @@ VideoTestWidget::VideoTestWidget(QWidget *parent) :
 
     QWidget *centralWidget = new QWidget();
     this->setCentralWidget(centralWidget);
-    QVBoxLayout *centralWidgetLayout = new QVBoxLayout;
+    QVBoxLayout *centralWidgetLayout = new QVBoxLayout();
     centralWidget->setLayout(centralWidgetLayout);
 
     centralWidgetLayout->addWidget(videoWidget);
-    QHBoxLayout *controlsLayout = new QHBoxLayout;
+    QHBoxLayout *controlsLayout = new QHBoxLayout();
     centralWidgetLayout->addLayout(controlsLayout);
     controlsLayout->addWidget(playButton);
     controlsLayout->addWidget(positionSlider);
     controlsLayout->addWidget(volumeSlider);
 
-    QString fileName = QDir::currentPath() + "/TestData/TestVideo.ogv";
+    QString videoPath(tests::testDataFolder.c_str());
+    if(!videoPath.isEmpty()){
+        if(!videoPath.endsWith("/"))
+            videoPath.append("/");
+        videoPath += "TestVideo.ogv";
+    }
 
-    if (!fileName.isEmpty()) {
-        mediaPlayer->setMedia(QUrl::fromLocalFile(fileName));
+    QUrl videoUrl = QUrl::fromLocalFile(videoPath);
+    if (!videoUrl.isEmpty() && videoUrl.isValid()) {
+        mediaPlayer->setMedia(videoUrl);
         durationChanged(mediaPlayer->duration());
         positionChanged(mediaPlayer->position());
         volumeChanged(mediaPlayer->volume());
         playButton->setEnabled(true);
+        QSize resolution = mediaPlayer->media().canonicalResource().resolution();
+        this->setGeometry(0,0, resolution.width(), resolution.height());
     }
-    QSize resolution = mediaPlayer->media().canonicalResource().resolution();
-    this->setGeometry(0,0, resolution.width(), resolution.height());
 
     mediaPlayer->setVideoOutput(this->videoWidget);
 }

src/Test/VideoTest.h

@@ -6,6 +6,8 @@
 #include <QtMultimedia/QMediaPlayer>
 #include <QtNetwork/QNetworkRequest>
 
+#include "TestVariables.h"
+
 class VideoTestWidget;
 class QAbstractButton;
 class QMediaPlayer;

src/Test/main.cc

@@ -16,6 +16,10 @@
 
 #include <iostream>
 
+#include "TestVariables.h"
+std::string tests::testDataFolder;
+
+
 #include "WindowTest.h"
 #include "ClickTest.h"
 #include "ElementAttributeTest.h"
@@ -206,8 +210,20 @@ int main(int argc, char *argv[])
       return 0;
     }
 
+    // check if --test_data_folder CL argument is present
+    std::string testDataFolderSwitch = "test_data_folder";
+    if (cmd_line.HasSwitch(testDataFolderSwitch)) {
+        std::cout << "HasSwitch"<<std::endl;
+      tests::testDataFolder = cmd_line.GetSwitchValueASCII(testDataFolderSwitch);
+      std::cout << "HasSwitch "<< tests::testDataFolder << std::endl;
+    } else {
+        std::cout << "Hasn'tSwitch"<<std::endl;
+        tests::testDataFolder = "./";
+        std::cout << "Hasn'tSwitch"<<std::endl;
+    }
+
 #if defined(OS_WIN)
-#if (QT_VERSION == QT_VERSION_CHECK(5, 1, 0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
     system("qtenv2.bat vsvars");
 #else  //QT_VERSION
     system("qtvars.bat vsvars");