added hybrid capabilities supported view types

Author: nataliakoval

inc/webdriver_capabilities_parser.h

@@ -61,6 +61,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

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(

inc/webdriver_view_executor.h

@@ -241,10 +241,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(){}

src/webdriver/webdriver_capabilities_parser.cc

@@ -42,6 +42,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 {
 

src/webdriver/webdriver_session.cc

@@ -29,6 +29,7 @@
 #include "webdriver_session_manager.h"
 #include "webdriver_view_runner.h"
 #include "webdriver_util.h"
+#include "webdriver_view_executor.h"
 
 #if !defined(OS_WIN)
 #include <sys/types.h>
@@ -85,6 +86,14 @@ bool Session::InitActualCapabilities() {
     capabilities_.caps->SetBoolean(Capabilities::kAcceptSslCerts, false);
     capabilities_.caps->SetBoolean(Capabilities::kNativeEvents, true);
 
+    ViewCmdExecutorFactory* executorFactory = ViewCmdExecutorFactory::GetInstance();
+    const ViewCmdExecutorFactory::SupportedViewTypesList typesList = executorFactory->getSupportedViewTypesList();
+    base::DictionaryValue *hybrid = new base::DictionaryValue;
+    ViewCmdExecutorFactory::SupportedViewTypesList::const_iterator iter = typesList.begin();
+    for (; iter != typesList.end(); iter++) {
+        hybrid->SetBoolean(*iter, true);
+    }
+    capabilities_.caps->Set(Capabilities::kHybrid, hybrid);
     return true;
 }
 
@@ -95,6 +104,9 @@ bool Session::CheckRequiredCapabilities(const base::DictionaryValue* capabilitie
     if (!CheckRequiredBrowser(capabilities_dict))
         return false;
 
+    if(!CheckRequiredViewType(capabilities_dict))
+        return false;
+
     if (!CheckRequiredCapabilityBoolean(capabilities_dict, Capabilities::kJavascriptEnabled))
         return false;
 
@@ -168,6 +180,35 @@ bool Session::CheckRequiredPlatform(const base::DictionaryValue* capabilities_di
     return true;
 }
 
+bool Session::CheckRequiredViewType(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 (!capabilities_.caps->GetDictionary(Capabilities::kHybrid, &actual_hybrid_caps)) {
+            return false;
+        }
+        base::DictionaryValue::key_iterator key_iter = required_hybrid_caps->begin_keys();
+        for (; key_iter != required_hybrid_caps->end_keys(); ++key_iter) {
+            bool actual_value;
+            bool required_value;
+            if (required_hybrid_caps->GetBoolean(*key_iter, &required_value)) {
+                if (!actual_hybrid_caps->GetBoolean(*key_iter, &actual_value)) {
+                    logger_.Log(kWarningLogLevel, "check failed - view type doesn't set as bool..");
+                    return false;
+                }
+                if (required_value != actual_value) {
+                    logger_.Log(kWarningLogLevel, "check failed - view type doesn't match...");
+                    return false;
+                }
+            }
+        }
+    }
+
+    return true;
+}
+
 bool Session::CheckRequiredCapabilityBoolean(const base::DictionaryValue* capabilities_dict, const std::string& cap_name) {
     bool actual_value; 
     bool required_value;

src/webdriver/webdriver_view_executor.cc

@@ -1,7 +1,6 @@
 #include "webdriver_view_executor.h"
 
 #include "webdriver_session.h"
-
 namespace webdriver {
 
 ViewCmdExecutor::ViewCmdExecutor(Session* session, ViewId viewId)
@@ -26,9 +25,14 @@ ViewCmdExecutorFactory* ViewCmdExecutorFactory::GetInstance() {
 void ViewCmdExecutorFactory::AddViewCmdExecutorCreator(ViewCmdExecutorCreator* creator) {
 	if (NULL != creator) {
 		creators_.push_back(creator);
+        typeslist_.push_back(creator->GetViewTypeName());
 	}
 }
 
+const ViewCmdExecutorFactory::SupportedViewTypesList& ViewCmdExecutorFactory::getSupportedViewTypesList() const {
+    return typeslist_;
+}
+
 ViewCmdExecutor* ViewCmdExecutorFactory::CreateExecutor(Session* session) const {
 	return CreateExecutor(session, session->current_view());
 }