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

Author: AndriyP

src/Test/WindowWithEmbeddedViewTest.cc

@@ -0,0 +1,49 @@
+#include "WindowWithEmbeddedViewTest.h"
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWebKitWidgets/QWebView>
+#else
+#include <QtWebKit/QtWebKit>
+#endif
+
+
+WindowWithEmbeddedViewTestWidget::WindowWithEmbeddedViewTestWidget(QWidget *parent) :
+    QWidget(parent)
+{
+    setWindowTitle("Test Window");
+    pLineEdit = new QLineEdit();
+    pLineEdit->setObjectName("inputURL");
+    connect(pLineEdit, SIGNAL(returnPressed()), this, SLOT(loadHTML()));
+
+    pButton = new QPushButton("Go!");
+    pButton->setObjectName("loadButton");
+    connect(pButton, SIGNAL(clicked()), this, SLOT(loadHTML()));
+
+    pLabel = new QLabel("Here Will Be HTML Title");
+    pLabel->setObjectName("labelTitle");
+    pLabel->setVisible(true);
+
+    pView = new QWebView();
+    pView->setObjectName("webView");
+    connect(pView, SIGNAL(loadFinished(bool)), this, SLOT(setHTMLTitle()));
+
+    QHBoxLayout* hbl = new QHBoxLayout();
+    hbl->addWidget(pLineEdit);
+    hbl->addWidget(pButton);
+
+    QVBoxLayout *vbl = new QVBoxLayout(this);
+    vbl->addLayout(hbl);
+    vbl->addWidget(pLabel);
+    vbl->addWidget(pView);
+    this->setLayout(vbl);
+}
+
+WindowWithEmbeddedViewTestWidget::~WindowWithEmbeddedViewTestWidget() {}
+
+void WindowWithEmbeddedViewTestWidget::loadHTML() {
+    pView->load(QUrl(pLineEdit->text()));
+}
+
+void WindowWithEmbeddedViewTestWidget::setHTMLTitle() {
+    pLabel->setText(pView->title());
+}

src/Test/WindowWithEmbeddedViewTest.h

@@ -0,0 +1,27 @@
+#ifndef WINDOWWITHEMBEDDEDVIEWTEST_H
+#define WINDOWWITHEMBEDDEDVIEWTEST_H
+
+#include "CommonQtTestHeaders.h"
+
+class QWebView;
+
+class WindowWithEmbeddedViewTestWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit WindowWithEmbeddedViewTestWidget(QWidget *parent = 0);
+    ~WindowWithEmbeddedViewTestWidget();
+    
+public slots:
+    void loadHTML();
+    void setHTMLTitle();
+
+private:
+    QPushButton* pButton;
+    QLineEdit* pLineEdit;
+    QLabel *pLabel;
+    QWebView *pView;
+    
+};
+
+#endif // WINDOWWITHEMBEDDEDVIEWTEST_H

src/Test/main.cc

@@ -31,6 +31,7 @@
 #include "StaleElementReferenceTest.h"
 #include "VisibilityTest.h"
 #include "BasicMouseInterfaceTest.h"
+#include "WindowWithEmbeddedViewTest.h"
 
 #include "base/at_exit.h"
 #include "webdriver_server.h"
@@ -76,17 +77,6 @@ int main(int argc, char *argv[])
 
     webdriver::ViewTransitionManager::SetURLTransitionAction(new webdriver::URLTransitionAction_CloseOldView());
 
-#if (WD_TEST_ENABLE_WEB_VIEW == 1)    
-    webdriver::ViewCreator* webCreator = new webdriver::QWebViewCreator();
-    webCreator->RegisterViewClass<QWebViewExt>("QWebViewExt");
-    webdriver::ViewFactory::GetInstance()->AddViewCreator(webCreator);
-
-    webdriver::ViewEnumerator::AddViewEnumeratorImpl(new webdriver::WebViewEnumeratorImpl());
-
-    webdriver::ViewCmdExecutorFactory::GetInstance()->AddViewCmdExecutorCreator(new webdriver::QWebViewCmdExecutorCreator());
-
-#endif    
-
     webdriver::ViewCreator* widgetCreator = new webdriver::QWidgetViewCreator();
     widgetCreator->RegisterViewClass<QWidget>("QWidget");
     widgetCreator->RegisterViewClass<WindowTestWidget>("WindowTestWidget");
@@ -105,6 +95,18 @@ int main(int argc, char *argv[])
     widgetCreator->RegisterViewClass<VisibilityTestWidget>("VisibilityTestWidget");
     widgetCreator->RegisterViewClass<BasicMouseInterfaceTestWidget>("BasicMouseInterfaceTestWidget");
 
+#if (WD_TEST_ENABLE_WEB_VIEW == 1)
+    webdriver::ViewCreator* webCreator = new webdriver::QWebViewCreator();
+    webCreator->RegisterViewClass<QWebViewExt>("QWebViewExt");
+    webdriver::ViewFactory::GetInstance()->AddViewCreator(webCreator);
+
+    webdriver::ViewEnumerator::AddViewEnumeratorImpl(new webdriver::WebViewEnumeratorImpl());
+
+    webdriver::ViewCmdExecutorFactory::GetInstance()->AddViewCmdExecutorCreator(new webdriver::QWebViewCmdExecutorCreator());
+    widgetCreator->RegisterViewClass<WindowWithEmbeddedViewTestWidget>("WindowWithEmbeddedViewTestWidget");
+
+
+#endif
     webdriver::ViewFactory::GetInstance()->AddViewCreator(widgetCreator);
 
     webdriver::ViewEnumerator::AddViewEnumeratorImpl(new webdriver::WidgetViewEnumeratorImpl());

wd_test.gyp

@@ -44,6 +44,8 @@
               '-licuuc',
               '-licudata',
               '-licui18n',
+#              '-lQt5WebKit',
+              '-lQt5WebKitWidgets',
             ],
           } ],
           ['OS=="win"', {
@@ -95,6 +97,7 @@
               '-lpthread',
               '-lrt',
               '-ldl',
+              '-lQtWebKit',
             ],
           } ],
           [ 'OS=="win"', {
@@ -104,6 +107,7 @@
               '-l<(QT_LIB_PATH)/QtXmlPatterns4',
               '-l<(QT_LIB_PATH)/QtGui4',
               '-l<(QT_LIB_PATH)/QtCore4',
+              '-l<(QT_LIB_PATH)/QtWebKit4',
               '-luser32.lib',
               '-lws2_32.lib',
               '-lshell32.lib',
@@ -180,7 +184,7 @@
         '<(INTERMEDIATE_DIR)/moc_VisibilityTest.cc',
         'src/Test/RestyledLabel.cc',
         'src/Test/DragableWidget.cc',
-        'src/Test/BasicMouseInterfaceTest.cc'
+        'src/Test/BasicMouseInterfaceTest.cc',
       ],
 
     }, {
@@ -202,6 +206,9 @@
       'sources': [
         'src/Test/main.cc',
         'src/Test/shutdown_command.cc',
+        'src/Test/WindowWithEmbeddedViewTest.cc',
+        'src/Test/WindowWithEmbeddedViewTest.h',
+        '<(INTERMEDIATE_DIR)/moc_WindowWithEmbeddedViewTest.cc',
       ],
 
       'conditions': [