Address comments, fix unit test failures

14 files changed, 65 insertions, 18 deletions

diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h
index 4ddf1e1388..963f93ce5c 100644
--- a/src/components/application_manager/include/application_manager/application.h
+++ b/src/components/application_manager/include/application_manager/application.h
@@ -950,35 +950,35 @@ class Application : public virtual InitialApplicationData,
    * @brief Get cloud app endpoint for websocket connection
    * @return cloud app endpoint
    */
-  const virtual std::string cloud_app_endpoint() = 0;
+  virtual const std::string& cloud_app_endpoint() const = 0;
 
   /**
    * @brief Get cloud app authtoken to be used in connection handshake after
    * websocket open.
    * @return cloud app authtoken
    */
-  const virtual std::string cloud_app_authtoken() = 0;
+  virtual const std::string& cloud_app_authtoken() const = 0;
 
   /**
    * @brief Get cloud app tranpsport type. Defines the type of websocket
    * connection used.
    * @return cloud app transport type
    */
-  const virtual std::string cloud_app_transport_type() = 0;
+  virtual const std::string& cloud_app_transport_type() const = 0;
 
   /**
    * @brief Get hybrid app preference. Defines behaviour for when a similar
    * mobile and cloud app are connected simultaneously.
    * @return hybrid app preference
    */
-  const virtual mobile_apis::HybridAppPreference::eType
-  hybrid_app_preference() = 0;
+  virtual const mobile_apis::HybridAppPreference::eType& hybrid_app_preference()
+      const = 0;
 
   /**
    * @brief Get cloud app certificate. Used for secured websocket connections.
    * @return cloud app certificate.
    */
-  const virtual std::string cloud_app_certificate() = 0;
+  virtual const std::string& cloud_app_certificate() const = 0;
 
   /**
    * @brief Set cloud app endpoint
diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h
index 26d8cd6159..8fa1553811 100644
--- a/src/components/application_manager/include/application_manager/application_impl.h
+++ b/src/components/application_manager/include/application_manager/application_impl.h
@@ -413,35 +413,35 @@ class ApplicationImpl : public virtual Application,
    * @brief Get cloud app endpoint for websocket connection
    * @return cloud app endpoint
    */
-  const std::string cloud_app_endpoint() OVERRIDE;
+  const std::string& cloud_app_endpoint() const OVERRIDE;
 
   /**
    * @brief Get cloud app authtoken to be used in connection handshake after
    * websocket open.
    * @return cloud app authtoken
    */
-  const std::string cloud_app_authtoken() OVERRIDE;
+  const std::string& cloud_app_authtoken() const OVERRIDE;
 
   /**
    * @brief Get cloud app tranpsport type. Defines the type of websocket
    * connection used.
    * @return cloud app transport type
    */
-  const std::string cloud_app_transport_type() OVERRIDE;
+  const std::string& cloud_app_transport_type() const OVERRIDE;
 
   /**
    * @brief Get hybrid app preference. Defines behaviour for when a similar
    * mobile and cloud app are connected simultaneously.
    * @return hybrid app preference
    */
-  const mobile_apis::HybridAppPreference::eType hybrid_app_preference()
-      OVERRIDE;
+  const mobile_apis::HybridAppPreference::eType& hybrid_app_preference()
+      const OVERRIDE;
 
   /**
    * @brief Get cloud app certificate. Used for secured websocket connections.
    * @return cloud app certificate.
    */
-  const std::string cloud_app_certificate() OVERRIDE;
+  const std::string& cloud_app_certificate() const OVERRIDE;
 
   /**
    * @brief Set cloud app endpoint
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc
index 31df4e821b..732e5bc804 100644
--- a/src/components/application_manager/src/application_impl.cc
+++ b/src/components/application_manager/src/application_impl.cc
@@ -1163,24 +1163,24 @@ const std::list<AppExtensionPtr>& ApplicationImpl::Extensions() const {
   return extensions_;
 }
 
-const std::string ApplicationImpl::cloud_app_endpoint() {
+const std::string& ApplicationImpl::cloud_app_endpoint() const {
   return endpoint_;
 }
 
-const std::string ApplicationImpl::cloud_app_authtoken() {
+const std::string& ApplicationImpl::cloud_app_authtoken() const {
   return auth_token_;
 }
 
-const std::string ApplicationImpl::cloud_app_transport_type() {
+const std::string& ApplicationImpl::cloud_app_transport_type() const {
   return cloud_transport_type_;
 }
 
-const mobile_apis::HybridAppPreference::eType
-ApplicationImpl::hybrid_app_preference() {
+const mobile_apis::HybridAppPreference::eType&
+ApplicationImpl::hybrid_app_preference() const {
   return hybrid_app_preference_;
 }
 
-const std::string ApplicationImpl::cloud_app_certificate() {
+const std::string& ApplicationImpl::cloud_app_certificate() const {
   return certificate_;
 }
 
diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h
index fe16e8ce6e..486871b5de 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application.h
+++ b/src/components/application_manager/test/include/application_manager/mock_application.h
@@ -342,6 +342,20 @@ class MockApplication : public ::application_manager::Application {
                      const std::list<application_manager::AppExtensionPtr>&());
   MOCK_CONST_METHOD0(is_remote_control_supported, bool());
   MOCK_METHOD1(set_remote_control_supported, void(const bool allow));
+  MOCK_CONST_METHOD0(cloud_app_endpoint, const std::string&());
+  MOCK_CONST_METHOD0(cloud_app_authtoken, const std::string&());
+  MOCK_CONST_METHOD0(cloud_app_transport_type, const std::string&());
+  MOCK_CONST_METHOD0(hybrid_app_preference,
+                     const mobile_apis::HybridAppPreference::eType&());
+  MOCK_CONST_METHOD0(cloud_app_certificate, const std::string&());
+  MOCK_METHOD1(set_cloud_app_endpoint, void(const std::string& endpoint));
+  MOCK_METHOD1(set_cloud_app_auth_token, void(const std::string& auth_token));
+  MOCK_METHOD1(set_cloud_app_transport_type,
+               void(const std::string& transport_type));
+  MOCK_METHOD1(set_hybrid_app_preference,
+               void(const mobile_apis::HybridAppPreference::eType&
+                        hybrid_app_preference));
+  MOCK_METHOD1(set_cloud_app_certificate, void(const std::string& certificate));
 };
 
 }  // namespace application_manager_test
diff --git a/src/components/include/test/connection_handler/mock_connection_handler.h b/src/components/include/test/connection_handler/mock_connection_handler.h
index 2de3a0f9a7..bdc0469844 100644
--- a/src/components/include/test/connection_handler/mock_connection_handler.h
+++ b/src/components/include/test/connection_handler/mock_connection_handler.h
@@ -63,6 +63,10 @@ class MockConnectionHandler : public connection_handler::ConnectionHandler {
   MOCK_CONST_METHOD2(RunAppOnDevice,
                      void(const std::string&, const std::string&));
   MOCK_METHOD0(ConnectToAllDevices, void());
+  MOCK_METHOD3(AddCloudAppDevice,
+               void(const std::string& policy_app_id,
+                    const std::string& endpoint,
+                    const std::string& cloud_transport_type));
   MOCK_METHOD1(CloseRevokedConnection, void(uint32_t connection_key));
   MOCK_METHOD1(CloseConnection, void(ConnectionHandle connection_handle));
   MOCK_METHOD1(GetConnectionSessionsCount, uint32_t(uint32_t connection_key));
diff --git a/src/components/include/test/connection_handler/mock_connection_handler_observer.h b/src/components/include/test/connection_handler/mock_connection_handler_observer.h
index a9e4349bec..2984b2e471 100644
--- a/src/components/include/test/connection_handler/mock_connection_handler_observer.h
+++ b/src/components/include/test/connection_handler/mock_connection_handler_observer.h
@@ -74,6 +74,10 @@ class MockConnectionHandlerObserver
                     const int32_t session_key));
   MOCK_METHOD1(OnSecondaryTransportEndedCallback,
                void(const int32_t session_key));
+  MOCK_METHOD3(CreatePendingApplication,
+               void(const transport_manager::ConnectionUID connection_id,
+                    const transport_manager::DeviceInfo& device_info,
+                    connection_handler::DeviceHandle device_id));
 };
 
 }  // namespace connection_handler_test
diff --git a/src/components/include/test/transport_manager/mock_transport_manager.h b/src/components/include/test/transport_manager/mock_transport_manager.h
index cc8bd5ab85..e3f01fccb5 100644
--- a/src/components/include/test/transport_manager/mock_transport_manager.h
+++ b/src/components/include/test/transport_manager/mock_transport_manager.h
@@ -59,6 +59,9 @@ class MockTransportManager : public ::transport_manager::TransportManager,
   MOCK_METHOD1(Init, int(resumption::LastState& last_state));
   MOCK_METHOD0(Reinit, int());
   MOCK_METHOD0(SearchDevices, int());
+  MOCK_METHOD2(AddCloudDevice,
+               void(const std::string& endpoint,
+                    const std::string& cloud_transport_type));
   MOCK_METHOD1(ConnectDevice, int(const DeviceHandle));
   MOCK_METHOD1(DisconnectDevice, int(const DeviceHandle));
   MOCK_METHOD1(Disconnect, int(const ConnectionUID));
diff --git a/src/components/include/test/transport_manager/mock_transport_manager_listener.h b/src/components/include/test/transport_manager/mock_transport_manager_listener.h
index 133dabe732..734651f455 100644
--- a/src/components/include/test/transport_manager/mock_transport_manager_listener.h
+++ b/src/components/include/test/transport_manager/mock_transport_manager_listener.h
@@ -55,6 +55,9 @@ class MockTransportManagerListener : public TransportManagerListener {
   MOCK_METHOD1(OnDeviceRemoved, void(const DeviceInfo& device_info));
   MOCK_METHOD0(OnScanDevicesFinished, void());
   MOCK_METHOD1(OnScanDevicesFailed, void(const SearchDeviceError& error));
+  MOCK_METHOD2(OnConnectionPending,
+               void(const DeviceInfo& device_info,
+                    const ConnectionUID connection_id));
   MOCK_METHOD2(OnConnectionEstablished,
                void(const DeviceInfo& device_info,
                     const ConnectionUID connection_id));
diff --git a/src/components/include/test/transport_manager/mock_transport_manager_settings.h b/src/components/include/test/transport_manager/mock_transport_manager_settings.h
index 3e7c8f36f7..bed0d5e6e6 100644
--- a/src/components/include/test/transport_manager/mock_transport_manager_settings.h
+++ b/src/components/include/test/transport_manager/mock_transport_manager_settings.h
@@ -63,6 +63,8 @@ class MockTransportManagerSettings
   MOCK_CONST_METHOD0(app_transport_change_timer_addition, uint32_t());
   MOCK_CONST_METHOD0(transport_manager_tcp_adapter_network_interface,
                      std::string&());
+  MOCK_CONST_METHOD0(cloud_app_retry_timeout, uint32_t());
+  MOCK_CONST_METHOD0(cloud_app_max_retry_attempts, uint16_t());
 };
 
 }  // namespace transport_manager_test
diff --git a/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h b/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h
index eff0abdcd3..0be4da1063 100644
--- a/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h
+++ b/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h
@@ -105,6 +105,8 @@ class MockTransportAdapter
                      transport_manager::SwitchableDevices());
   MOCK_CONST_METHOD0(GetTransportConfiguration,
                      transport_manager::transport_adapter::TransportConfig());
+  MOCK_METHOD1(CreateDevice, void(const std::string& uid));
+
 #ifdef TELEMETRY_MONITOR
   MOCK_METHOD0(GetTelemetryObserver,
                ::transport_manager::TMTelemetryObserver*());
diff --git a/src/components/transport_manager/test/CMakeLists.txt b/src/components/transport_manager/test/CMakeLists.txt
index 240784436b..5288d8c697 100644
--- a/src/components/transport_manager/test/CMakeLists.txt
+++ b/src/components/transport_manager/test/CMakeLists.txt
@@ -75,6 +75,11 @@ if (BUILD_BT_SUPPORT)
  endif()
 endif()
 
+if(BUILD_CLOUD_APP_SUPPORT)
+  GET_PROPERTY(BOOST_LIBS_DIRECTORY GLOBAL PROPERTY GLOBAL_BOOST_LIBS)
+  list(APPEND LIBRARIES boost_system boost_regex crypto ssl -L${BOOST_LIBS_DIRECTORY})
+endif()
+
 create_test("transport_manager_test" "${SOURCES}" "${LIBRARIES}")
 
 file(COPY smartDeviceLink_test.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h
index 58e143342a..4eaf34d041 100644
--- a/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h
+++ b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h
@@ -56,6 +56,9 @@ class MockTransportManagerListener : public TransportManagerListener {
   MOCK_METHOD1(OnDeviceRemoved, void(const DeviceInfo& device_info));
   MOCK_METHOD0(OnScanDevicesFinished, void());
   MOCK_METHOD1(OnScanDevicesFailed, void(const SearchDeviceError& error));
+  MOCK_METHOD2(OnConnectionPending,
+               void(const DeviceInfo& device_info,
+                    const ConnectionUID connection_id));
   MOCK_METHOD2(OnConnectionEstablished,
                void(const DeviceInfo& device_info,
                     const ConnectionUID connection_id));
diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h
index dce23189c8..81e133ec2b 100644
--- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h
@@ -59,6 +59,10 @@ class MockTransportAdapterListener : public TransportAdapterListener {
                     const SearchDeviceError& error));
   MOCK_METHOD1(OnFindNewApplicationsRequest,
                void(const TransportAdapter* adapter));
+  MOCK_METHOD3(OnConnectPending,
+               void(const TransportAdapter* adapter,
+                    const DeviceUID& device_handle,
+                    const ApplicationHandle& app_id));
   MOCK_METHOD1(OnDeviceListUpdated,
                void(const TransportAdapter* transport_adapter));
   MOCK_METHOD3(OnConnectDone,
diff --git a/src/components/transport_manager/test/tcp_client_listener_test.cc b/src/components/transport_manager/test/tcp_client_listener_test.cc
index 5205d6ae3c..f44f8785aa 100644
--- a/src/components/transport_manager/test/tcp_client_listener_test.cc
+++ b/src/components/transport_manager/test/tcp_client_listener_test.cc
@@ -73,6 +73,9 @@ class MockTransportAdapterController : public TransportAdapterController {
                void(ConnectionSPtr connection,
                     const DeviceUID& device_handle,
                     const ApplicationHandle& app_handle));
+  MOCK_METHOD2(ConnectPending,
+               void(const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle));
   MOCK_METHOD2(ConnectDone,
                void(const DeviceUID& device_handle,
                     const ApplicationHandle& app_handle));