added test widget for graphics web view

Author: AndriyP

inc/extension_qt/graphics_web_view_enumerator.h

@@ -10,7 +10,7 @@
 namespace webdriver {
 
 /// class for QDeclarativeWebView enumerator
-class GraphicsQmlWebViewEnumeratorImpl : public AbstractViewEnumeratorImpl {
+class GraphicsWebViewEnumeratorImpl : public AbstractViewEnumeratorImpl {
 public:
 	virtual void EnumerateViews(Session* session, std::set<ViewId>* views) const;
 };

src/Test/GraphicsWebViewTest.cc

@@ -0,0 +1,21 @@
+#include "GraphicsWebViewTest.h"
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWebKitWidgets/QWebView>
+#else
+#include <QtWebKit/QWebView>
+#endif
+
+GraphicsWebViewTestWindows::GraphicsWebViewTestWindows(QWidget *parent) :
+    QGraphicsView(parent) {
+    this->setWindowTitle("Test Widget");
+
+    QGraphicsScene *pScene = new QGraphicsScene();
+    this->setScene(pScene);
+    this->resize(800, 600);
+    QGraphicsWebView *pWebView = new QGraphicsWebView();
+    this->scene()->addItem(pWebView);
+}
+
+GraphicsWebViewTestWindows::~GraphicsWebViewTestWindows() {}
+

src/Test/GraphicsWebViewTest.h

@@ -0,0 +1,22 @@
+#ifndef GRAPHICS_WEB_VIEW_TEST_H
+#define GRAPHICS_WEB_VIEW_TEST_H
+
+#include "CommonQtTestHeaders.h"
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWebKitWidgets/QGraphicsWebView>
+#include <QtWidgets/QGraphicsView>
+#else
+#include <QtWebKit/QGraphicsWebView>
+#include <QtGui/QGraphicsView>
+#endif
+
+class GraphicsWebViewTestWindows : public QGraphicsView
+{
+    Q_OBJECT
+public:
+    explicit GraphicsWebViewTestWindows(QWidget *parent = 0);
+    ~GraphicsWebViewTestWindows();
+};
+
+#endif // GRAPHICS_WEB_VIEW_TEST_H

src/Test/main.cc

@@ -79,6 +79,9 @@ std::string tests::testDataFolder;
 #include "extension_qt/web_view_executor.h"
 #include "extension_qt/web_view_enumerator.h"
 #include "extension_qt/qwebviewext.h"
+#include "extension_qt/graphics_web_view_executor.h"
+#include "extension_qt/graphics_web_view_enumerator.h"
+#include "GraphicsWebViewTest.h"
 #include "WindowWithEmbeddedViewTest.h"
 #include "WidgetAndWebViewTest.h"
 #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
@@ -155,8 +158,16 @@ int main(int argc, char *argv[])
     webdriver::ViewEnumerator::AddViewEnumeratorImpl(new webdriver::WebViewEnumeratorImpl());
 
     webdriver::ViewCmdExecutorFactory::GetInstance()->AddViewCmdExecutorCreator(new webdriver::QWebViewCmdExecutorCreator());
+
+    webdriver::ViewEnumerator::AddViewEnumeratorImpl(new webdriver::GraphicsWebViewEnumeratorImpl());
+
+    webdriver::ViewCmdExecutorFactory::GetInstance()->AddViewCmdExecutorCreator(new webdriver::GraphicsWebViewCmdExecutorCreator());
+
+    widgetCreator->RegisterViewClass<GraphicsWebViewTestWindows>("GraphicsWebViewTestWindows");
     widgetCreator->RegisterViewClass<WindowWithEmbeddedViewTestWidget>("WindowWithEmbeddedViewTestWidget");
     widgetCreator->RegisterViewClass<WidgetAndWebViewTestWindows>("WidgetAndWebViewTestWindows");
+
+
 #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
     widgetCreator->RegisterViewClass<WindowWithSeparatedDeclarativeAndWebViewsTestWidget>("WindowWithSeparatedDeclarativeAndWebViewsTestWidget");
 #endif

src/webdriver/extension_qt/graphics_web_view_enumerator.cc

@@ -18,7 +18,7 @@
 
 namespace webdriver {
 
-void GraphicsQmlWebViewEnumeratorImpl::EnumerateViews(Session* session, std::set<ViewId>* views) const {
+void GraphicsWebViewEnumeratorImpl::EnumerateViews(Session* session, std::set<ViewId>* views) const {
     session->logger().Log(kInfoLogLevel, ">>>>> QGraphicsWebView enumerate");
 
     foreach(QWidget* pWidget, qApp->allWidgets()) {
@@ -36,7 +36,7 @@ void GraphicsQmlWebViewEnumeratorImpl::EnumerateViews(Session* session, std::set
                     if (!viewId.is_valid()) {
                         if (session->AddNewView(handle, &viewId))  {
                             session->logger().Log(kInfoLogLevel,
-                                "GraphicsQmlWebViewEnumerator found new view("+viewId.id()+")");
+                                "GraphicsWebViewEnumerator found new view("+viewId.id()+")");
                         }
                     }
                     if (viewId.is_valid()) {

wd_ext_qt.gyp

@@ -73,6 +73,9 @@
         'src/webdriver/extension_qt/web_view_util.cc',
         'src/webdriver/extension_qt/qwebkit_proxy.cc',
         'src/webdriver/extension_qt/qwebkit_proxy.h',
+        'src/webdriver/extension_qt/graphics_web_view_handle.cc',
+        'src/webdriver/extension_qt/graphics_web_view_enumerator.cc',
+        'src/webdriver/extension_qt/graphics_web_view_executor.cc',
         'inc/extension_qt/qwebviewext.h',
         '<(INTERMEDIATE_DIR)/moc_web_view_visualizer.cc',
         '<(INTERMEDIATE_DIR)/moc_qwebviewext.cc',

wd_test.gyp

@@ -279,6 +279,9 @@
         'src/Test/WidgetAndWebViewTest.cc',
         'src/Test/WidgetAndWebViewTest.h',
         '<(INTERMEDIATE_DIR)/moc_WidgetAndWebViewTest.cc',
+        'src/Test/GraphicsWebViewTest.cc',
+        'src/Test/GraphicsWebViewTest.h',
+        '<(INTERMEDIATE_DIR)/moc_GraphicsWebViewTest.cc',
       ],
 
       'conditions': [