Added WindowWithSeparatedDeclarativeAndWebViewsTestWidget to hybrid tests

Author: nataliakoval

src/Test/WindowWithSeparatedDeclarativeAndWebViewsTest.cc

@@ -0,0 +1,50 @@
+#include "WindowWithSeparatedDeclarativeAndWebViewsTest.h"
+
+WindowWithSeparatedDeclarativeAndWebViewsTestWidget::WindowWithSeparatedDeclarativeAndWebViewsTestWidget(QWidget *parent) :
+    QWidget(parent) {
+    this->setWindowTitle("Test Widget");
+    pLineEditForWeb = new QLineEdit();
+    pLineEditForWeb->setObjectName("inputWebURL");
+    connect(pLineEditForWeb, SIGNAL(returnPressed()), this, SLOT(openWebView()));
+
+    pButtonWeb = new QPushButton("Go to Web!");
+    pButtonWeb->setObjectName("openWebViewButton");
+    connect(pButtonWeb, SIGNAL(clicked()), this, SLOT(openWebView()));
+
+    pLineEditForQml = new QLineEdit();
+    pLineEditForQml->setObjectName("inputQmlURL");
+    connect(pLineEditForQml, SIGNAL(returnPressed()), this, SLOT(openQmlView()));
+
+    pButtonQml = new QPushButton("Go to Qml!");
+    pButtonQml->setObjectName("openQmlViewButton");
+    connect(pButtonQml, SIGNAL(clicked()), this, SLOT(openQmlView()));
+
+    QHBoxLayout* hblweb = new QHBoxLayout();
+    hblweb->addWidget(pLineEditForWeb);
+    hblweb->addWidget(pButtonWeb);
+
+    QHBoxLayout* hblqml = new QHBoxLayout();
+    hblqml->addWidget(pLineEditForQml);
+    hblqml->addWidget(pButtonQml);
+
+    QVBoxLayout* vbl = new QVBoxLayout();
+    vbl->addLayout(hblweb);
+    vbl->addLayout(hblqml);
+    this->setLayout(vbl);
+}
+
+WindowWithSeparatedDeclarativeAndWebViewsTestWidget::~WindowWithSeparatedDeclarativeAndWebViewsTestWidget() {}
+
+void WindowWithSeparatedDeclarativeAndWebViewsTestWidget::openWebView() {
+    QWebView *pWebView = new QWebView;
+    pWebView->setAttribute(Qt::WA_DeleteOnClose);
+    pWebView->load(pLineEditForWeb->text());
+    pWebView->show();
+}
+
+void WindowWithSeparatedDeclarativeAndWebViewsTestWidget::openQmlView() {
+    QDeclarativeView *pView = new QDeclarativeView();
+    pView->setAttribute(Qt::WA_DeleteOnClose);
+    pView->setSource(pLineEditForQml->text());
+    pView->show();
+}

src/Test/WindowWithSeparatedDeclarativeAndWebViewsTest.h

@@ -0,0 +1,28 @@
+#ifndef WINDOWWITHSEPARATEDDECLARATIVEANDWEBVIEWSTEST_H
+#define WINDOWWITHSEPARATEDDECLARATIVEANDWEBVIEWSTEST_H
+
+#include "CommonQtTestHeaders.h"
+
+#include <QtWebKit/QWebView>
+#include <QtDeclarative/QDeclarativeView>
+
+class WindowWithSeparatedDeclarativeAndWebViewsTestWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit WindowWithSeparatedDeclarativeAndWebViewsTestWidget(QWidget *parent = 0);
+    ~WindowWithSeparatedDeclarativeAndWebViewsTestWidget();
+    
+public slots:
+    void openWebView();
+    void openQmlView();
+
+private:
+    QPushButton* pButtonWeb;
+    QLineEdit* pLineEditForWeb;
+    QPushButton* pButtonQml;
+    QLineEdit* pLineEditForQml;
+    
+};
+
+#endif // WINDOWWITHSEPARATEDDECLARATIVEANDWEBVIEWSTEST_H

src/Test/main.cc

@@ -37,6 +37,7 @@ std::string tests::testDataFolder;
 #include "BasicMouseInterfaceTest.h"
 
 #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#include "WindowWithSeparatedDeclarativeAndWebViewsTest.h"
 #include "WindowWithDeclarativeViewTest.h"
 #endif
 
@@ -154,6 +155,9 @@ int main(int argc, char *argv[])
     webdriver::ViewCmdExecutorFactory::GetInstance()->AddViewCmdExecutorCreator(new webdriver::QWebViewCmdExecutorCreator());
     widgetCreator->RegisterViewClass<WindowWithEmbeddedViewTestWidget>("WindowWithEmbeddedViewTestWidget");
     widgetCreator->RegisterViewClass<WidgetAndWebViewTestWindows>("WidgetAndWebViewTestWindows");
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+    widgetCreator->RegisterViewClass<WindowWithSeparatedDeclarativeAndWebViewsTestWidget>("WindowWithSeparatedDeclarativeAndWebViewsTestWidget");
+#endif
 #endif
 
 #ifndef OS_IOS 

wd_test.gyp

@@ -241,6 +241,9 @@
         'src/Test/WindowWithDeclarativeViewTest.cc',
         'src/Test/WindowWithDeclarativeViewTest.h',
         '<(INTERMEDIATE_DIR)/moc_WindowWithDeclarativeViewTest.cc',
+        'src/Test/WindowWithSeparatedDeclarativeAndWebViewsTest.cc',
+        'src/Test/WindowWithSeparatedDeclarativeAndWebViewsTest.h',
+        '<(INTERMEDIATE_DIR)/moc_WindowWithSeparatedDeclarativeAndWebViewsTest.cc',
       ],
       'conditions': [
         # IGNORE VideoTest due to error https://bugreports.qt-project.org/browse/QTBUG-32949