added GetViewTypeName() method

nataliakoval · nataliakoval · commit f1ca2c5cdc2b · 2013-10-22T18:11:48.000+03:00
diff --git a/inc/extension_qt/graphics_web_view_executor.h b/inc/extension_qt/graphics_web_view_executor.h
@@ -26,6 +26,8 @@ class GraphicsWebViewCmdExecutorCreator : public ViewCmdExecutorCreator  {
 
     virtual ViewCmdExecutor* CreateExecutor(Session* session, ViewId viewId) const;
     virtual bool CanHandleView(Session* session, ViewId viewId, ViewType* viewType = NULL) const;
+    virtual std::string GetViewTypeName() const;
+
 private:
 
     DISALLOW_COPY_AND_ASSIGN(GraphicsWebViewCmdExecutorCreator);
diff --git a/inc/extension_qt/qml_view_executor.h b/inc/extension_qt/qml_view_executor.h
@@ -19,6 +19,8 @@ class QQmlViewCmdExecutorCreator : public ViewCmdExecutorCreator  {
 
     virtual ViewCmdExecutor* CreateExecutor(Session* session, ViewId viewId) const;
     virtual bool CanHandleView(Session* session, ViewId viewId, ViewType* viewType = NULL) const;
+    virtual std::string GetViewTypeName() const;
+
 private:
 
     DISALLOW_COPY_AND_ASSIGN(QQmlViewCmdExecutorCreator);
diff --git a/inc/extension_qt/qml_web_view_executor.h b/inc/extension_qt/qml_web_view_executor.h
@@ -27,6 +27,8 @@ class QmlWebViewCmdExecutorCreator : public ViewCmdExecutorCreator  {
 
     virtual ViewCmdExecutor* CreateExecutor(Session* session, ViewId viewId) const;
     virtual bool CanHandleView(Session* session, ViewId viewId, ViewType* viewType = NULL) const;
+    virtual std::string GetViewTypeName() const;
+
 private:
 
     DISALLOW_COPY_AND_ASSIGN(QmlWebViewCmdExecutorCreator);
diff --git a/inc/extension_qt/quick2_view_executor.h b/inc/extension_qt/quick2_view_executor.h
@@ -19,6 +19,8 @@ class Quick2ViewCmdExecutorCreator : public ViewCmdExecutorCreator  {
 
     virtual ViewCmdExecutor* CreateExecutor(Session* session, ViewId viewId) const;
     virtual bool CanHandleView(Session* session, ViewId viewId, ViewType* viewType = NULL) const;
+    virtual std::string GetViewTypeName() const;
+
 private:
 
     DISALLOW_COPY_AND_ASSIGN(Quick2ViewCmdExecutorCreator);
diff --git a/inc/extension_qt/web_view_executor.h b/inc/extension_qt/web_view_executor.h
@@ -28,6 +28,8 @@ class QWebViewCmdExecutorCreator : public ViewCmdExecutorCreator  {
 
     virtual ViewCmdExecutor* CreateExecutor(Session* session, ViewId viewId) const;
     virtual bool CanHandleView(Session* session, ViewId viewId, ViewType* viewType = NULL) const;
+    virtual std::string GetViewTypeName() const;
+
 private:
 
     DISALLOW_COPY_AND_ASSIGN(QWebViewCmdExecutorCreator);
diff --git a/inc/extension_qt/widget_view_executor.h b/inc/extension_qt/widget_view_executor.h
@@ -66,6 +66,8 @@ class QWidgetViewCmdExecutorCreator : public ViewCmdExecutorCreator  {
 
     virtual ViewCmdExecutor* CreateExecutor(Session* session, ViewId viewId) const;
     virtual bool CanHandleView(Session* session, ViewId viewId, ViewType* viewType = NULL) const;
+    virtual std::string GetViewTypeName() const;
+
 private:
 
     DISALLOW_COPY_AND_ASSIGN(QWidgetViewCmdExecutorCreator);
diff --git a/inc/webdriver_view_executor.h b/inc/webdriver_view_executor.h
@@ -198,6 +198,10 @@ class ViewCmdExecutorCreator {
     /// @param[out] viewType returned type of view
     /// @return true - if there is executor for such view
     virtual bool CanHandleView(Session* session, ViewId viewId, ViewType* viewType = NULL) const = 0;
+
+    /// @return supported view type for current executor
+    virtual std::string GetViewTypeName() const = 0;
+
 private:
 
     DISALLOW_COPY_AND_ASSIGN(ViewCmdExecutorCreator);
diff --git a/src/webdriver/extension_qt/graphics_web_view_executor.cc b/src/webdriver/extension_qt/graphics_web_view_executor.cc
@@ -70,7 +70,11 @@ bool GraphicsWebViewCmdExecutorCreator::CanHandleView(Session* session, ViewId v
     }
 
     return false;
-}    
+}
+
+std::string GraphicsWebViewCmdExecutorCreator::GetViewTypeName() const {
+    return "graphicsWebView";
+}
 
 GraphicsWebViewCmdExecutor::GraphicsWebViewCmdExecutor(Session* session, ViewId viewId)
     : ViewCmdExecutor(session, viewId) {
diff --git a/src/webdriver/extension_qt/qml_view_executor.cc b/src/webdriver/extension_qt/qml_view_executor.cc
@@ -61,6 +61,10 @@ bool QQmlViewCmdExecutorCreator::CanHandleView(Session* session, ViewId viewId,
     return false;
 }
 
+std::string QQmlViewCmdExecutorCreator::GetViewTypeName() const {
+    return "qml";
+}
+
 QQmlViewCmdExecutor::QQmlViewCmdExecutor(Session* session, ViewId viewId)
 	: QViewCmdExecutor(session, viewId) {
 }
diff --git a/src/webdriver/extension_qt/qml_web_view_executor.cc b/src/webdriver/extension_qt/qml_web_view_executor.cc
@@ -78,6 +78,10 @@ bool QmlWebViewCmdExecutorCreator::CanHandleView(Session* session, ViewId viewId
     return false;
 }    
 
+std::string QmlWebViewCmdExecutorCreator::GetViewTypeName() const {
+    return "qmlweb";
+}
+
 QmlWebViewCmdExecutor::QmlWebViewCmdExecutor(Session* session, ViewId viewId)
     : ViewCmdExecutor(session, viewId) {
 
diff --git a/src/webdriver/extension_qt/quick2_view_executor.cc b/src/webdriver/extension_qt/quick2_view_executor.cc
@@ -65,6 +65,10 @@ bool Quick2ViewCmdExecutorCreator::CanHandleView(Session* session, ViewId viewId
     return false;
 }
 
+std::string Quick2ViewCmdExecutorCreator::GetViewTypeName() const {
+    return "qml2";
+}
+
 Quick2ViewCmdExecutor::Quick2ViewCmdExecutor(Session* session, ViewId viewId)
 	: QWindowViewCmdExecutor(session, viewId) {
 }
diff --git a/src/webdriver/extension_qt/web_view_executor.cc b/src/webdriver/extension_qt/web_view_executor.cc
@@ -69,6 +69,10 @@ bool QWebViewCmdExecutorCreator::CanHandleView(Session* session, ViewId viewId,
     return false;
 }
 
+std::string QWebViewCmdExecutorCreator::GetViewTypeName() const {
+    return "html";
+}
+
 QWebViewCmdExecutor::QWebViewCmdExecutor(Session* session, ViewId viewId)
     : QViewCmdExecutor(session, viewId) {
 
diff --git a/src/webdriver/extension_qt/widget_view_executor.cc b/src/webdriver/extension_qt/widget_view_executor.cc
@@ -160,6 +160,10 @@ bool QWidgetViewCmdExecutorCreator::CanHandleView(Session* session, ViewId viewI
     return false;
 }
 
+std::string QWidgetViewCmdExecutorCreator::GetViewTypeName() const {
+    return "widget";
+}
+
 QWidgetViewCmdExecutor::QWidgetViewCmdExecutor(Session* session, ViewId viewId)
 	: QViewCmdExecutor(session, viewId) {
 }

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,10 @@ bool QQmlViewCmdExecutorCreator::CanHandleView(Session* session, ViewId viewId,`
`61`	`61`	`return false;`
`62`	`62`	`}`
`63`	`63`
	`64`	`+std::string QQmlViewCmdExecutorCreator::GetViewTypeName() const {`
	`65`	`+ return "qml";`
	`66`	`+}`
	`67`	`+`
`64`	`68`	`QQmlViewCmdExecutor::QQmlViewCmdExecutor(Session* session, ViewId viewId)`
`65`	`69`	`: QViewCmdExecutor(session, viewId) {`
`66`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,10 @@ bool QmlWebViewCmdExecutorCreator::CanHandleView(Session* session, ViewId viewId`
`78`	`78`	`return false;`
`79`	`79`	`}`
`80`	`80`
	`81`	`+std::string QmlWebViewCmdExecutorCreator::GetViewTypeName() const {`
	`82`	`+ return "qmlweb";`
	`83`	`+}`
	`84`	`+`
`81`	`85`	`QmlWebViewCmdExecutor::QmlWebViewCmdExecutor(Session* session, ViewId viewId)`
`82`	`86`	`: ViewCmdExecutor(session, viewId) {`
`83`	`87`