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

Author: Andrii Boichuk

inc/webdriver_route_patterns.h

@@ -104,6 +104,7 @@ class CommandRoutes {
     static const char kVisualizerShowPoint[];
     static const char kTouchPinchZoom[];
     static const char kTouchPinchRotate[];
+    static const char kShutdown[];
 
 private:
     static std::set<std::string> standardCommandRoutes;

src/Test/main.cc

@@ -54,6 +54,7 @@ std::string tests::testDataFolder;
 #include "versioninfo.h"
 #include "webdriver_route_table.h"
 #include "shutdown_command.h"
+#include "webdriver_route_patterns.h"
 
 #ifndef OS_IOS
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
@@ -259,6 +260,7 @@ int main(int argc, char *argv[])
     webdriver::RouteTable *routeTableWithShutdownCommand = new webdriver::RouteTable(wd_server->GetRouteTable());
     const char shutdownCommandRoute[] = "/-cisco-shutdown";
     routeTableWithShutdownCommand->Add<webdriver::ShutdownCommand>(shutdownCommandRoute);
+    routeTableWithShutdownCommand->Add<webdriver::ShutdownCommand>(webdriver::CommandRoutes::kShutdown);
     wd_server->SetRouteTable(routeTableWithShutdownCommand);
 
     InitVNCClient();

src/webdriver/extension_qt/qml_view_executor.cc

@@ -450,11 +450,12 @@ void QQmlViewCmdExecutor::GetAttribute(const ElementId& element, const std::stri
         case QVariant::Double:
             val = Value::CreateDoubleValue(propertyValue.toDouble());
             break;
-        case QVariant::String:
-            val = Value::CreateStringValue(propertyValue.toString().toStdString());
-            break;
         default:
-            session_->logger().Log(kWarningLogLevel, "cant handle proprty type.");
+            if (propertyValue.canConvert<QString>()) {
+                val = Value::CreateStringValue(propertyValue.toString().toStdString());    
+            } else {
+                session_->logger().Log(kWarningLogLevel, "cant handle proprty type.");
+            }
         }
     } else {
         session_->logger().Log(kWarningLogLevel, "property not found.");

src/webdriver/extension_qt/quick2_view_executor.cc

@@ -462,11 +462,12 @@ void Quick2ViewCmdExecutor::GetAttribute(const ElementId& element, const std::st
         case QVariant::Double:
             val = Value::CreateDoubleValue(propertyValue.toDouble());
             break;
-        case QVariant::String:
-            val = Value::CreateStringValue(propertyValue.toString().toStdString());
-            break;
         default:
-            session_->logger().Log(kWarningLogLevel, "cant handle proprty type.");
+            if (propertyValue.canConvert<QString>()) {
+                val = Value::CreateStringValue(propertyValue.toString().toStdString());    
+            } else {
+                session_->logger().Log(kWarningLogLevel, "cant handle proprty type.");
+            }
         }
     } else {
         session_->logger().Log(kWarningLogLevel, "property not found.");

src/webdriver/extension_qt/widget_view_executor.cc

@@ -461,11 +461,12 @@ void QWidgetViewCmdExecutor::GetAttribute(const ElementId& element, const std::s
         case QVariant::Double:
             val = Value::CreateDoubleValue(propertyValue.toDouble());
             break;
-        case QVariant::String:
-            val = Value::CreateStringValue(propertyValue.toString().toStdString());
-            break;
         default:
-            session_->logger().Log(kWarningLogLevel, "cant handle proprty type.");
+            if (propertyValue.canConvert<QString>()) {
+                val = Value::CreateStringValue(propertyValue.toString().toStdString());    
+            } else {
+                session_->logger().Log(kWarningLogLevel, "cant handle proprty type.");
+            }
         }
     } else {
         session_->logger().Log(kWarningLogLevel, "property not found.");

src/webdriver/webdriver_route_patterns.cc

@@ -89,6 +89,7 @@ bool CommandRoutes::IsStandardRoute(const std::string& pattern) {
         standardCommandRoutes.insert(kCiscoPlayerState);
         standardCommandRoutes.insert(kCiscoPlayerVolume);
         standardCommandRoutes.insert(kCiscoPlayingPosition);
+        standardCommandRoutes.insert(kShutdown);
 	}
 
 	// check if paatern is presence in set
@@ -183,5 +184,6 @@ const char CommandRoutes::kVisualizerSource[]           = "/session/*/-cisco-vis
 const char CommandRoutes::kVisualizerShowPoint[]        = "/session/*/-cisco-visualizer_show_point";
 const char CommandRoutes::kTouchPinchZoom[]             = "/session/*/touch/-cisco-pinch-zoom";
 const char CommandRoutes::kTouchPinchRotate[]           = "/session/*/touch/-cisco-pinch-rotate";
+const char CommandRoutes::kShutdown[]                   = "/shutdown";
 
 } // namespace webdriver

src/webdriver/webdriver_route_table.cc

@@ -120,7 +120,7 @@ CommandCreatorPtr RouteTable::GetRouteForURL(const std::string& url, std::string
 bool RouteTable::AddRoute(const std::string& uri_pattern,
                           const CommandCreatorPtr& creator) {
     // custom command check
-    if (false){//!CommandRoutes::IsStandardRoute(uri_pattern)) {
+    if (!CommandRoutes::IsStandardRoute(uri_pattern)) {
         std::vector<std::string> url_segments;
         base::SplitString(uri_pattern, '/', &url_segments);
 
@@ -129,17 +129,16 @@ bool RouteTable::AddRoute(const std::string& uri_pattern,
             GlobalLogger::Log(kWarningLogLevel, "Custom commands too short");
             return false;
         }
-        if (url_segments.size() >= 2
-                && url_segments[0].empty() && url_segments[1] != "session") {
-            if (!CheckCustomPrefix(url_segments[1]))
-                return false;
-        } else  if (url_segments.size() < 4 || !url_segments[0].empty()
-                    || url_segments[1] != "session" || url_segments[2] != "*") {
-            GlobalLogger::Log(kWarningLogLevel, "Invalid custom commands");
+        bool hasCustomPrefix = false;
+        for (size_t i = 0; i < url_segments.size(); ++i)
+        {
+            hasCustomPrefix = CheckCustomPrefix(url_segments[i]);
+            if (hasCustomPrefix)
+                break;
+        }
+        if (!hasCustomPrefix) {
+            GlobalLogger::Log(kWarningLogLevel, "Comand " + uri_pattern +" has no valid custom prefix");
             return false;
-        } else {
-            if (!CheckCustomPrefix(url_segments[3]))
-                return false;
         }
     }
     std::vector<webdriver::internal::RouteDetails>::iterator route;
@@ -175,8 +174,6 @@ bool RouteTable::CheckCustomPrefix(const std::string& prefix) {
     if (prefix_segments.size() < 3 || !prefix_segments[0].empty() || prefix_segments[2].empty()
             || prefix_segments[1].empty() || !std::isalpha(prefix_segments[1].at(0))) {
 #endif //OS_WIN
-
-        GlobalLogger::Log(kWarningLogLevel, "Custom prefix invalid");
         return false;
     }
     return true;