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

Author: Mykola Tryshnivskyy

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"
@@ -203,6 +207,18 @@ 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, 0, 0))
     system("qtenv2.bat vsvars");