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

Mykola Tryshnivskyy · Mykola Tryshnivskyy · commit 965d23607b80 · 2013-10-22T18:11:02.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/q_session_lifecycle_actions.h b/inc/extension_qt/q_session_lifecycle_actions.h
@@ -27,6 +27,9 @@ class QSessionLifeCycleActions : public SessionLifeCycleActions {
 
     Error* ParseAndApplyProxySettings(const base::DictionaryValue* proxy_dict);
 
+    bool AddActualQtVersion();
+    Error* CheckRequiredQtVersion(const base::DictionaryValue *capabilities_dict);
+
     DISALLOW_COPY_AND_ASSIGN(QSessionLifeCycleActions);
 };
 
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
@@ -14,6 +14,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_capabilities_parser.h b/inc/webdriver_capabilities_parser.h
@@ -62,6 +62,7 @@ struct Capabilities {
     static const char kLoadAsync[];
     static const char kBrowserStartWindow[];
     static const char kBrowserClass[];
+    static const char kHybrid[];
     /// desired size, as a string (e.g. - "600, 600") for start window
     static const char kWindowSize[];
     /// desired position, as a string (e.g. - "80, 60") for start window
diff --git a/inc/webdriver_session.h b/inc/webdriver_session.h
@@ -52,6 +52,7 @@ session's create or session's terminate.
 #include "base/scoped_temp_dir.h"
 #include "base/string16.h"
 #include "base/threading/thread.h"
+#include "base/values.h"
 #include "frame_path.h"
 #include "webdriver_basic_types.h"
 #include "webdriver_view_id.h"
@@ -217,6 +218,7 @@ class Session {
     bool CheckRequiredCapabilities(const base::DictionaryValue* capabilities_dict);
     bool CheckRequiredBrowser(const base::DictionaryValue* capabilities_dict);
     bool CheckRequiredPlatform(const base::DictionaryValue* capabilities_dict);
+    bool CheckRequiredViewType(const base::DictionaryValue* capabilities_dict);
     bool CheckRequiredCapabilityBoolean(const base::DictionaryValue* capabilities_dict, const std::string& cap_name);
 
     void RunClosureOnSessionThread(
diff --git a/inc/webdriver_view_executor.h b/inc/webdriver_view_executor.h
@@ -202,6 +202,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);
@@ -241,10 +245,15 @@ class ViewCmdExecutorFactory
     /// @param creator pointer to custom creator. No need to delete object
     void AddViewCmdExecutorCreator(ViewCmdExecutorCreator* creator);
 
+    typedef std::vector<std::string> SupportedViewTypesList;
+    /// @return pointer to vector supported view types
+    const SupportedViewTypesList& getSupportedViewTypesList() const;
+
 private:
     typedef ViewCmdExecutorCreator* ViewCmdExecutorCreatorPtr;
     typedef std::vector<ViewCmdExecutorCreatorPtr> CreatorsList;
     CreatorsList creators_;
+    SupportedViewTypesList typeslist_;
 
     ViewCmdExecutorFactory();
     ~ViewCmdExecutorFactory(){}
diff --git a/src/webdriver/extension_qt/common_util.cc b/src/webdriver/extension_qt/common_util.cc
@@ -38,5 +38,8 @@ Qt::MouseButton QCommonUtil::ConvertMouseButtonToQtMouseButton(MouseButton butto
     return result;
 }
 
+std::string QCommonUtil::GetQtVersion() {
+    return QT_VERSION_STR;
+}
 
 } // namespace webdriver
diff --git a/src/webdriver/extension_qt/common_util.h b/src/webdriver/extension_qt/common_util.h
@@ -28,6 +28,7 @@ class QCommonUtil {
     static QRect ConvertRectToQRect(const Rect &rect);
     static QPoint ConvertPointToQPoint(const Point &p);
     static Qt::MouseButton ConvertMouseButtonToQtMouseButton(MouseButton button);
+    static std::string GetQtVersion();
 
 private:
     QCommonUtil() {}
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/q_session_lifecycle_actions.cc b/src/webdriver/extension_qt/q_session_lifecycle_actions.cc
@@ -3,8 +3,12 @@
 #include "extension_qt/vnc_event_dispatcher.h"
 #include "webdriver_switches.h"
 #include "webdriver_server.h"
+#include "webdriver_view_executor.h"
+#include "webdriver_error.h"
 
 #include "q_proxy_parser.h"
+#include "common_util.h"
+#include "base/string_util.h"
 
 namespace webdriver {
 
@@ -33,6 +37,14 @@ Error* QSessionLifeCycleActions::PostInit(const base::DictionaryValue* desired_c
 		session_->logger().Log(kInfoLogLevel, "no proxy settings requsted.");
 	}
 
+    AddActualQtVersion();
+    if (required_capabilities_dict)
+        error = CheckRequiredQtVersion(required_capabilities_dict);
+    if (error) {
+        session_->logger().Log(kWarningLogLevel, "qt version doesn't match...");
+        return error;
+    }
+
 	return error;
 }
 
@@ -62,4 +74,37 @@ Error* QSessionLifeCycleActions::ParseAndApplyProxySettings(const base::Dictiona
     return NULL;
 }
 
+bool QSessionLifeCycleActions::AddActualQtVersion() {
+    base::DictionaryValue *hybrid;
+    session_->capabilities().caps->GetDictionary(Capabilities::kHybrid, &hybrid);
+    hybrid->SetString("qtVersion", QCommonUtil::GetQtVersion());
+
+    return true;
+}
+
+Error* QSessionLifeCycleActions::CheckRequiredQtVersion(const base::DictionaryValue *capabilities_dict) {
+    const base::DictionaryValue *required_hybrid_caps;
+    base::DictionaryValue *actual_hybrid_caps;
+
+    if (capabilities_dict->GetDictionary(Capabilities::kHybrid, &required_hybrid_caps)) {
+        if (!session_->capabilities().caps->GetDictionary(Capabilities::kHybrid, &actual_hybrid_caps)) {
+            return new Error(kUnknownError);
+        }
+        std::string required_qtVersion;
+        std::string actual_qtVersion;
+        if (required_hybrid_caps->GetString("qtVersion", &required_qtVersion)) {
+            if (!actual_hybrid_caps->GetString("qtVersion", &actual_qtVersion)) {
+                return new Error(kUnknownError);
+            }
+            if (StringToUpperASCII(required_qtVersion).compare("ANY")
+                    && required_qtVersion.compare("") && required_qtVersion.compare("*")) {
+                if(required_qtVersion.at(0) != actual_qtVersion.at(0))
+                    return new Error(kUnknownError);
+            }
+        }
+    }
+
+    return NULL;
+}
+
 } // namespace webdriver
diff --git a/src/webdriver/extension_qt/qml_view_executor.cc b/src/webdriver/extension_qt/qml_view_executor.cc
@@ -52,6 +52,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
@@ -57,6 +57,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/qwebkit_proxy.cc b/src/webdriver/extension_qt/qwebkit_proxy.cc
@@ -23,6 +23,7 @@
 #include "webdriver_util.h"
 #include "frame_path.h"
 #include "value_conversion_util.h"
+#include "webdriver_logging.h"
 
 #include "third_party/webdriver/atoms.h"
 
@@ -1076,15 +1077,16 @@ Error* QWebkitProxy::GetMute(const ElementId& element, bool* mute) {
 Error* QWebkitProxy::SetOnline(bool online) {
 #ifndef QT_NO_BEARERMANAGEMENT
     QNetworkAccessManager *manager = page_->networkAccessManager();
-
     if (online){
         manager->setNetworkAccessible(QNetworkAccessManager::Accessible);
     } else {
         manager->setNetworkAccessible(QNetworkAccessManager::NotAccessible);
     }
-#endif //QT_NO_BEARERMANAGEMENT
-
     return NULL;
+#else
+    session_->logger().Log(kWarningLogLevel, "In QWebkitProxy::SetOnline() defined QT_NO_BEARERMANAGEMENT");
+    return new Error(kCommandNotSupported, "Can't change online mode");
+#endif //QT_NO_BEARERMANAGEMENT
 }
 
 Error* QWebkitProxy::IsOnline(bool* online) {
@@ -1095,9 +1097,11 @@ Error* QWebkitProxy::IsOnline(bool* online) {
     } else {
         *online = true;
     }
-#endif //QT_NO_BEARERMANAGEMENT
-
     return NULL;
+#else
+    session_->logger().Log(kWarningLogLevel, "In QWebkitProxy::IsOnline() defined QT_NO_BEARERMANAGEMENT");
+    return new Error(kCommandNotSupported, "Can't check online mode");
+#endif //QT_NO_BEARERMANAGEMENT
 }
 
 QWebFrame* QWebkitProxy::GetFrame(QWebPage* page, const FramePath& frame_path) {
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
@@ -85,6 +85,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) {
 }
diff --git a/src/webdriver/webdriver_capabilities_parser.cc b/src/webdriver/webdriver_capabilities_parser.cc
@@ -43,6 +43,7 @@ const char Capabilities::kBrowserClass[]                = "browserClass";
 const char Capabilities::kWindowSize[]                  = "windowsize";
 const char Capabilities::kWindowPosition[]              = "windowposition";
 const char Capabilities::kMaximize[]                    = "maximize";
+const char Capabilities::kHybrid[]                      = "hybrid";
 
 namespace {
 
diff --git a/src/webdriver/webdriver_session.cc b/src/webdriver/webdriver_session.cc
diff --git a/src/webdriver/webdriver_view_executor.cc b/src/webdriver/webdriver_view_executor.cc
diff --git a/wd_common.gypi b/wd_common.gypi
