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

Author: AndriyP

src/Test/main.cc

@@ -36,6 +36,8 @@
 #include "webdriver_server.h"
 #include "webdriver_view_transitions.h"
 #include "versioninfo.h"
+#include "webdriver_route_table.h"
+#include "shutdown_command.h"
 
 #if (WD_TEST_ENABLE_WEB_VIEW == 1)
 #include "extension_qt/web_view_creator.h"
@@ -140,6 +142,12 @@ int main(int argc, char *argv[])
     if (0 != wd_server->Configure(cmd_line)) {
         return 1;
     }
+
+    webdriver::RouteTable *routeTableWithShutdownCommand = new webdriver::RouteTable(wd_server->GetRouteTable());
+    const char shutdownCommandRoute[] = "/-CISCO-shutdown";
+    routeTableWithShutdownCommand->Add<webdriver::ShutdownCommand>(shutdownCommandRoute);
+    wd_server->SetRouteTable(routeTableWithShutdownCommand);
+
 
 	setQtSettings();
     wd_server->Start();

src/Test/shutdown_command.cc

@@ -0,0 +1,33 @@
+#include "shutdown_command.h"
+#include <iostream>
+#include "webdriver_server.h"
+
+#include <QtCore/qglobal.h>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    #include <QtConcurrent/QtConcurrentRun>
+    #include <QtWidgets/QApplication>
+#else
+    #include <QtGui/QApplication>
+#endif
+
+namespace webdriver {
+
+ShutdownCommand::ShutdownCommand(const std::vector<std::string> &path_segments,
+                                 const base::DictionaryValue * const parameters)
+                                : Command(path_segments, parameters) {}
+
+ShutdownCommand::~ShutdownCommand() { }
+
+void ShutdownCommand::ExecutePost(Response * const response)
+{
+    Server *wd_server = Server::GetInstance();
+    QApplication::quit();
+    wd_server->Stop(true);
+}
+
+bool ShutdownCommand::DoesPost() const
+{
+    return true;
+}
+
+}

src/Test/shutdown_command.h

@@ -0,0 +1,26 @@
+#ifndef SHUTDOWN_COMMAND_H
+#define SHUTDOWN_COMMAND_H
+
+#include "commands/command.h"
+#include "commands/response.h"
+
+namespace webdriver {
+
+class ShutdownCommand : public Command
+{
+public:
+    ShutdownCommand(const std::vector<std::string>& path_segments,
+                    const base::DictionaryValue* const parameters);
+    virtual ~ShutdownCommand();
+
+    virtual bool DoesPost() const OVERRIDE;
+
+    virtual void ExecutePost(Response* const response) OVERRIDE;
+
+private:
+    DISALLOW_COPY_AND_ASSIGN(ShutdownCommand);
+};
+
+}
+
+#endif // SHUTDOWN_COMMAND_H

src/webdriver/webdriver_route_table.cc

@@ -115,7 +115,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 (!CommandRoutes::IsStandardRoute(uri_pattern)) {
+    if (false){//!CommandRoutes::IsStandardRoute(uri_pattern)) {
         std::vector<std::string> url_segments;
         base::SplitString(uri_pattern, '/', &url_segments);
 

src/webdriver/webdriver_session.cc

@@ -406,11 +406,14 @@ void Session::RemoveView(const ViewId& viewId) {
 
 void Session::UpdateViews(const std::set<ViewId>& views) {
     ViewsMap::iterator it;
+    ViewId vi;
 
     for (it = views_.begin(); it != views_.end(); ++it) {
-        if (0 == views.count(ViewId(it->first))) {
+        vi = ViewId(it->first);
+		
+        if (vi.is_valid() && 0 == views.count(vi)) {
             // invalidate handle
-            RemoveView(ViewId(it->first));
+            RemoveView(vi);
         }
     }
 }

src/webdriver/webdriver_view_enumerator.cc

@@ -19,7 +19,7 @@ void ViewEnumerator::EnumerateViews(Session* session, std::vector<ViewId>* views
 	std::copy(views_set.begin(), views_set.end(), std::back_inserter(*views));
 
 	// update session to remove dangling sessionIds
-	session->logger().Log(kFineLogLevel, base::StringPrintf("EnumerateViews found %d views.", views_set.size()));
+	session->logger().Log(kFineLogLevel, base::StringPrintf("EnumerateViews found %d views.", (int)views_set.size()));
 	session->UpdateViews(views_set);
 }
 

wd_build_options.gypi

@@ -77,9 +77,13 @@
         'action':      ['mkdir', '-p', '<(INTERMEDIATE_DIR)'],                                                                                                  
        } ],
 
-       'defines': [
+      'defines': [ 
          'OS_POSIX',
-       ],
-     } ],
+      ],
+
+      'xcode_settings': {	
+        'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
+      },
+    } ],
   ],
 }

wd_test.gyp

@@ -201,6 +201,7 @@
 
       'sources': [
         'src/Test/main.cc',
+        'src/Test/shutdown_command.cc',
       ],
 
       'conditions': [
@@ -256,6 +257,7 @@
 
       'sources': [
         'src/Test/main.cc',
+        'src/Test/shutdown_command.cc',
       ],
 
       'conditions': [