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

Author: Andrii Boichuk

inc/extension_qt/declarative_item_view_handle.h

@@ -6,6 +6,7 @@
 #include "webdriver_view_id.h"
 
 #include <QtDeclarative/QDeclarativeItem>
+#include <QtDeclarative/QDeclarativeView>
 #include <QtCore/QPointer>
 #include <QtCore/QtGlobal>
 
@@ -14,14 +15,16 @@ namespace webdriver {
 class QDeclarativeItemViewHandle : public ViewHandle {
 public:
     QDeclarativeItemViewHandle();
-    QDeclarativeItemViewHandle(QDeclarativeItem* view);
+    QDeclarativeItemViewHandle(QDeclarativeItem* view, QDeclarativeView* container);
 
     virtual bool is_valid() const { return !view_.isNull(); };
     virtual bool equals(const ViewHandle* other) const;
     QDeclarativeItem* get() { return view_.data(); };
+    QDeclarativeView* getContainer() { return container_.data(); };
 
 protected:
     QPointer<QDeclarativeItem> view_;
+    QPointer<QDeclarativeView> container_;
 //private:
 	virtual ~QDeclarativeItemViewHandle() {};
 };

inc/extension_qt/qml_web_view_executor.h

@@ -5,14 +5,19 @@
 #include <vector>
 #include <map>
 
+#include "base/memory/scoped_ptr.h"
 #include "webdriver_view_executor.h"
 #include "webdriver_error.h"
 #include "extension_qt/qdeclarativewebview.h"
 
 #include <QtCore/QDebug>
 
+class QDeclarativeView;
+
 namespace webdriver {
 
+class QWebkitProxy;    
+
 class QmlWebViewCmdExecutorCreator : public ViewCmdExecutorCreator  {
 public:
     static const ViewType QML_WEB_VIEW_TYPE; 
@@ -132,6 +137,10 @@ class QmlWebViewCmdExecutor : public ViewCmdExecutor {
 #endif
 
 private:
+    scoped_ptr<QWebkitProxy> webkitProxy_;
+    QDeclarativeWebView* view_;
+    QDeclarativeView* container_;
+
     DISALLOW_COPY_AND_ASSIGN(QmlWebViewCmdExecutor);
 };
 

inc/extension_qt/web_view_executor.h

@@ -124,7 +124,7 @@ class QWebViewCmdExecutor : public QViewCmdExecutor {
 	QWebView* getView(const ViewId& viewId, Error** error);
 
 private:
-    QWebkitProxy* webkitProxy_;
+    scoped_ptr<QWebkitProxy> webkitProxy_;
     QWebView* view_;
 
     DISALLOW_COPY_AND_ASSIGN(QWebViewCmdExecutor);

src/Test/WindowWithDeclarativeViewTest.cc

@@ -0,0 +1,70 @@
+#include "WindowWithDeclarativeViewTest.h"
+
+WindowWithDeclarativeViewTestWidget::WindowWithDeclarativeViewTestWidget(QWidget *parent) :
+    QWidget(parent)
+{
+    setWindowTitle("Test Window");
+    pLineEdit = new QLineEdit();
+    pLineEdit->setObjectName("inputURL");
+    connect(pLineEdit, SIGNAL(returnPressed()), this, SLOT(loadQML()));
+
+    pButton = new QPushButton("Go!");
+    pButton->setObjectName("loadButton");
+    connect(pButton, SIGNAL(clicked()), this, SLOT(loadQML()));
+
+    pLabel = new QLabel("Status");
+    pLabel->setObjectName("labelStatus");
+    pLabel->setVisible(true);
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    pView = new QQuickView();
+#else
+    pView = new QDeclarativeView();
+#endif
+
+    pView->setObjectName("declarativeView");
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    connect(pView, SIGNAL(statusChanged(QQuickView::Status)), this, SLOT(displayStatus()));
+#else
+    connect(pView, SIGNAL(statusChanged(QDeclarativeView::Status)), this, SLOT(displayStatus()));
+#endif
+
+    QHBoxLayout* hbl = new QHBoxLayout();
+    hbl->addWidget(pLineEdit);
+    hbl->addWidget(pButton);
+
+    QVBoxLayout *vbl = new QVBoxLayout(this);
+    vbl->addLayout(hbl);
+    vbl->addWidget(pLabel);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    QWidget *container = QWidget::createWindowContainer(pView);
+    vbl->addWidget(container);
+#else
+    vbl->addWidget(pView);
+#endif
+    this->setLayout(vbl);
+}
+
+WindowWithDeclarativeViewTestWidget::~WindowWithDeclarativeViewTestWidget() { }
+
+void WindowWithDeclarativeViewTestWidget::loadQML() {
+    pView->setSource(QUrl(pLineEdit->text()));
+    pView->show();
+}
+
+void WindowWithDeclarativeViewTestWidget::displayStatus() {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    if (pView->status() == QQuickView::Ready)
+#else
+    if (pView->status() == QDeclarativeView::Ready)
+#endif
+        pLabel->setText("Loading successfully");
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    if (pView->status() == QQuickView::Error)
+#else
+    if (pView->status() == QDeclarativeView::Error)
+#endif
+        pLabel->setText("Error");
+}

src/Test/WindowWithDeclarativeViewTest.h

@@ -0,0 +1,37 @@
+#ifndef WINDOWWITHDECLARATIVEVIEWTEST_H
+#define WINDOWWITHDECLARATIVEVIEWTEST_H
+
+#include "CommonQtTestHeaders.h"
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtQuick/QQuickView>
+#else
+#include <QtDeclarative/QDeclarativeView>
+#endif
+
+
+class WindowWithDeclarativeViewTestWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit WindowWithDeclarativeViewTestWidget(QWidget *parent = 0);
+    ~WindowWithDeclarativeViewTestWidget();
+    
+public slots:
+    void loadQML();
+    void displayStatus();
+
+private:
+    QPushButton* pButton;
+    QLineEdit* pLineEdit;
+    QLabel *pLabel;
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    QQuickView *pView;
+#else
+    QDeclarativeView *pView;
+#endif
+
+};
+
+#endif // WINDOWWITHDECLARATIVEVIEWTEST_H

src/Test/main.cc

@@ -36,6 +36,8 @@ std::string tests::testDataFolder;
 #include "VisibilityTest.h"
 #include "BasicMouseInterfaceTest.h"
 
+#include "WindowWithDeclarativeViewTest.h"
+
 // Commented VideoTest due to error https://bugreports.qt-project.org/browse/QTBUG-32949
 #ifndef OS_IOS
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
@@ -130,6 +132,7 @@ int main(int argc, char *argv[])
     widgetCreator->RegisterViewClass<StaleElementReferenceTestWidget>("StaleElementReferenceTestWidget");
     widgetCreator->RegisterViewClass<VisibilityTestWidget>("VisibilityTestWidget");
     widgetCreator->RegisterViewClass<BasicMouseInterfaceTestWidget>("BasicMouseInterfaceTestWidget");
+    widgetCreator->RegisterViewClass<WindowWithDeclarativeViewTestWidget>("WindowWithDeclarativeViewTestWidget");
 
 #ifndef OS_IOS
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
@@ -245,7 +248,6 @@ int main(int argc, char *argv[])
         return startError;
 
     setQtSettings();
-
     return app.exec();
 }
 

src/webdriver/extension_qt/declarative_item_view_handle.cc

@@ -3,16 +3,16 @@
 namespace webdriver {
 
 QDeclarativeItemViewHandle::QDeclarativeItemViewHandle() 
-	: view_((QDeclarativeItem*)NULL) { }
+	: view_(NULL), container_(NULL) { }
 
-QDeclarativeItemViewHandle::QDeclarativeItemViewHandle(QDeclarativeItem* view) 
-	: view_(view) { }
+QDeclarativeItemViewHandle::QDeclarativeItemViewHandle(QDeclarativeItem* view, QDeclarativeView* container) 
+	: view_(view), container_(container) { }
 
 bool QDeclarativeItemViewHandle::equals(const ViewHandle* other) const {
 	const QDeclarativeItemViewHandle* toCompare = dynamic_cast<const QDeclarativeItemViewHandle*>(other);
 	if (NULL == toCompare) return false;
 
-	return view_ == toCompare->view_;
+	return (view_ == toCompare->view_)&&(container_ == toCompare->container_);
 }
 
 } // namespace webdriver

src/webdriver/extension_qt/qml_web_view_enumerator.cc

@@ -31,7 +31,7 @@ void QmlWebViewEnumeratorImpl::EnumerateViews(Session* session, std::set<ViewId>
             foreach(QDeclarativeItem *child, childs) {
                 if (isWebView(child)) {
                     // found
-                    ViewHandlePtr handle(new QDeclarativeItemViewHandle(child));
+                    ViewHandlePtr handle(new QDeclarativeItemViewHandle(child, pView));
                     ViewId viewId = session->GetViewForHandle(handle);
                     if (!viewId.is_valid()) {
                         if (session->AddNewView(handle, &viewId))  {