Fixes after rebase

mked-luxoft · mked-luxoft · commit 81b45157b6b8 · 2019-05-27T08:45:30.000+03:00
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h
@@ -605,7 +605,7 @@ class ApplicationManagerImpl
       const uint32_t connection_key,
       hmi_apis::Common_ServiceType::eType service_type,
       hmi_apis::Common_ServiceEvent::eType service_event,
-      utils::Optional<hmi_apis::Common_ServiceUpdateReason::eType>
+      utils::Optional<hmi_apis::Common_ServiceStatusUpdateReason::eType>
           service_update_reason) FINAL;
 
   bool OnPTUFailed() FINAL;
diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
@@ -110,7 +110,8 @@ class MessageHelper {
    public:
     typedef hmi_apis::Common_ServiceType::eType ServiceType;
     typedef hmi_apis::Common_ServiceEvent::eType ServiceEvent;
-    typedef hmi_apis::Common_ServiceUpdateReason::eType ServiceUpdateReason;
+    typedef hmi_apis::Common_ServiceStatusUpdateReason::eType
+        ServiceStatusUpdateReason;
 
     /**
      * @brief CreateBuilder creates builder instance
@@ -134,7 +135,7 @@ class MessageHelper {
      * @returns ref to builder instance
      */
     ServiceStatusUpdateNotificationBuilder& AddServiceUpdateReason(
-        const ServiceUpdateReason service_update_reason);
+        const ServiceStatusUpdateReason service_update_reason);
 
     /**
      * @brief notification gets notification SO
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -447,8 +447,12 @@ class PolicyHandler : public PolicyHandlerInterface,
                              std::string& cloud_transport_type,
                              std::string& hybrid_app_preference) const OVERRIDE;
 
+  void OnAuthTokenUpdated(const std::string& policy_app_id,
+                          const std::string& auth_token) OVERRIDE;
+
   /**
-   * @brief Callback for when a SetCloudAppProperties message is received from a
+   * @brief Callback for when a SetCloudAppProperties message is received
+   * from a
    * mobile app
    * @param message The SetCloudAppProperties message
    */
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
@@ -2006,7 +2006,7 @@ void ApplicationManagerImpl::ProcessServiceStatusUpdate(
     const uint32_t connection_key,
     hmi_apis::Common_ServiceType::eType service_type,
     hmi_apis::Common_ServiceEvent::eType service_event,
-    utils::Optional<hmi_apis::Common_ServiceUpdateReason::eType>
+    utils::Optional<hmi_apis::Common_ServiceStatusUpdateReason::eType>
         service_update_reason) {
   LOG4CXX_AUTO_TRACE(logger_);
 
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -2129,7 +2129,7 @@ MessageHelper::ServiceStatusUpdateNotificationBuilder::AddAppID(
 
 MessageHelper::ServiceStatusUpdateNotificationBuilder&
 MessageHelper::ServiceStatusUpdateNotificationBuilder::AddServiceUpdateReason(
-    const ServiceUpdateReason service_update_reason) {
+    const ServiceStatusUpdateReason service_update_reason) {
   (*notification_)[strings::msg_params][hmi_notification::reason] =
       service_update_reason;
 
diff --git a/src/components/application_manager/test/application_manager_impl_test.cc b/src/components/application_manager/test/application_manager_impl_test.cc
@@ -105,10 +105,11 @@ const std::string kAppName = "appName";
 
 typedef MockMessageHelper::MockServiceStatusUpdateNotificationBuilder*
     MockServiceStatusUpdatePtr;
-typedef hmi_apis::Common_ServiceUpdateReason::eType ServiceUpdateReason;
+typedef hmi_apis::Common_ServiceStatusUpdateReason::eType
+    ServiceStatusUpdateReason;
 typedef hmi_apis::Common_ServiceType::eType ServiceType;
 typedef hmi_apis::Common_ServiceEvent::eType ServiceEvent;
-typedef utils::Optional<ServiceUpdateReason> UpdateReasonOptional;
+typedef utils::Optional<ServiceStatusUpdateReason> UpdateReasonOptional;
 
 #if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT)
 // Cloud application params
@@ -173,11 +174,7 @@ class ApplicationManagerImplTest
         .WillByDefault(DoAll(SetArgPointee<3u>(kDeviceId), Return(0)));
     ON_CALL(mock_connection_handler_, get_session_observer())
         .WillByDefault(ReturnRef(mock_session_observer_));
-    std::unique_ptr<rpc_service::RPCService> unique_rpc_service(
-        new MockRPCService);
-    app_manager_impl_->SetRPCService(unique_rpc_service);
-    mock_rpc_service_ =
-        static_cast<MockRPCService*>(&(app_manager_impl_->GetRPCService()));
+
     app_manager_impl_->SetMockRPCService(mock_rpc_service_);
     app_manager_impl_->resume_controller().set_resumption_storage(
         mock_storage_);
@@ -320,8 +317,9 @@ INSTANTIATE_TEST_CASE_P(
 
 TEST_P(ApplicationManagerImplTest,
        ProcessServiceStatusUpdate_SendMessageToHMI) {
-  smart_objects::SmartObjectSPtr notification_(
-      new smart_objects::SmartObject(smart_objects::SmartType_Map));
+  smart_objects::SmartObjectSPtr notification_ =
+      std::make_shared<smart_objects::SmartObject>(
+          smart_objects::SmartType_Map);
   (*notification_)[strings::msg_params][hmi_notification::service_type] =
       GetParam().service_type_;
   (*notification_)[strings::msg_params][hmi_notification::service_event] =
@@ -341,7 +339,7 @@ TEST_P(ApplicationManagerImplTest,
   ON_CALL(*mock_service_status_update_, notification())
       .WillByDefault(Return(notification_));
 
-  EXPECT_CALL(*mock_rpc_service_, ManageHMICommand(notification_))
+  EXPECT_CALL(*mock_rpc_service_, ManageHMICommand(notification_, _))
       .WillOnce(Return(true));
 
   app_manager_impl_->ProcessServiceStatusUpdate(kConnectionKey,
diff --git a/src/components/application_manager/test/help_prompt_manager_test.cc b/src/components/application_manager/test/help_prompt_manager_test.cc
@@ -1,4 +1,4 @@
-﻿/*
+/*
  * Copyright (c) 2018, Ford Motor Company
  * All rights reserved.
  *
diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
@@ -331,7 +331,7 @@ class MockMessageHelper {
                    const uint32_t app_id,
                    const hmi_apis::Common_ServiceType::eType service_type,
                    const hmi_apis::Common_ServiceEvent::eType service_event,
-                   const hmi_apis::Common_ServiceUpdateReason::eType
+                   const hmi_apis::Common_ServiceStatusUpdateReason::eType
                        service_update_reason));
 
   class MockServiceStatusUpdateNotificationBuilder
@@ -351,7 +351,7 @@ class MockMessageHelper {
 
     MOCK_METHOD1(AddServiceUpdateReason,
                  MessageHelper::ServiceStatusUpdateNotificationBuilder&(
-                     const hmi_apis::Common_ServiceUpdateReason::eType));
+                     const hmi_apis::Common_ServiceStatusUpdateReason::eType));
 
     MOCK_CONST_METHOD0(notification, smart_objects::SmartObjectSPtr());
   };
diff --git a/src/components/application_manager/test/message_helper/message_helper_test.cc b/src/components/application_manager/test/message_helper/message_helper_test.cc
@@ -74,7 +74,7 @@ typedef MessageHelper::ServiceStatusUpdateNotificationBuilder::ServiceType
 typedef MessageHelper::ServiceStatusUpdateNotificationBuilder::ServiceEvent
     ServiceEvent;
 typedef MessageHelper::ServiceStatusUpdateNotificationBuilder::
-    ServiceUpdateReason UpdateReason;
+    ServiceStatusUpdateReason UpdateReason;
 typedef MessageHelper::ServiceStatusUpdateNotificationBuilder
     ServiceStatusUpdateBuilder;
 
diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc
@@ -602,7 +602,8 @@ MessageHelper::ServiceStatusUpdateNotificationBuilder::AddAppID(
 
 MessageHelper::ServiceStatusUpdateNotificationBuilder&
 MessageHelper::ServiceStatusUpdateNotificationBuilder::AddServiceUpdateReason(
-    const hmi_apis::Common_ServiceUpdateReason::eType service_update_reason) {
+    const hmi_apis::Common_ServiceStatusUpdateReason::eType
+        service_update_reason) {
   return MockMessageHelper::on_service_update_builder_mock()
       ->AddServiceUpdateReason(service_update_reason);
 }
diff --git a/src/components/application_manager/test/policy_event_observer_test.cc b/src/components/application_manager/test/policy_event_observer_test.cc
@@ -38,10 +38,6 @@
 #include "smart_objects/smart_object.h"
 #include "application_manager/mock_event_dispatcher.h"
 
-#ifdef EXTERNAL_PROPRIETARY_MODE
-#include "policy/ptu_retry_handler.h"
-#endif
-
 namespace test {
 namespace components {
 namespace policy_test {
diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h
@@ -49,13 +49,14 @@
 #include "policy/policy_types.h"
 #include "policy/policy_table/types.h"
 #include "policy/cache_manager_interface.h"
+#ifdef EXTERNAL_PROPRIETARY_MODE
+#include "policy/ptu_retry_handler.h"
+#endif  // EXTERNAL_PROPRIETARY_MODE
 
 using namespace ::rpc::policy_table_interface_base;
 namespace policy {
 typedef std::shared_ptr<utils::Callable> StatusNotifier;
 
-class PTURetryHandler;
-
 class PolicyHandlerInterface {
  public:
   virtual ~PolicyHandlerInterface() {}
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
@@ -359,7 +359,7 @@
   <element name="STOP">
     <description>Indicates that a button press of the Play/Pause button would stop the current playback.</description>
   </element>
-</enum> 
+</enum>
 
 <enum name="SystemContext">
   <description>Enumeration that describes possible contexts the application might be in on HU.</description>
@@ -3361,10 +3361,10 @@
       <description>The position of the haptic rectangle to be highlighted. The center of this rectangle will be "touched" when a press occurs.</description>
     </param>
   </struct>
-    
+
   <struct name="SyncMsgVersion">
         <description>Specifies the version number of the SmartDeviceLink protocol that is supported by the mobile application or app service</description>
-        
+
         <param name="majorVersion" type="Integer" minvalue="1" maxvalue="10" mandatory="true">
             <description>The major version indicates versions that is not-compatible to previous versions.</description>
         </param>
@@ -3385,7 +3385,7 @@
     </element>
     <element name="RPC" >
       <description>Refers to the RPC service.</description>
-    </element>	  
+    </element>
   </enum>
 
   <enum name="ServiceEvent">
@@ -3394,23 +3394,23 @@
     </element>
     <element name="REQUEST_ACCEPTED" >
       <description>When a request for a Service is Accepted.</description>
-    </element>			
+    </element>
     <element name="REQUEST_REJECTED" >
       <description>When a request for a Service is Rejected.</description>
-    </element>			
-  </enum>	
+    </element>
+  </enum>
 
-  <enum name="ServiceUpdateReason">
+  <enum name="ServiceStatusUpdateReason">
     <element name="PTU_FAILED" >
       <description>When a Service is rejected because the system was unable to get a required Policy Table Update.</description>
     </element>
     <element name="INVALID_CERT" >
       <description>When a Service is rejected because the security certificate is invalid/expired.</description>
-    </element>			
+    </element>
     <element name="INVALID_TIME" >
       <description>When a Service is rejected because the system was unable to get a valid SystemTime from HMI, which is required for certificate authentication.</description>
-    </element>			
-  </enum>	
+    </element>
+  </enum>
 
     <!-- App Services -->
 
@@ -3546,7 +3546,7 @@
         <param name="apparentTemperature" type="Common.Temperature" mandatory="false"/>
         <param name="apparentTemperatureHigh" type="Common.Temperature" mandatory="false"/>
         <param name="apparentTemperatureLow" type="Common.Temperature" mandatory="false"/>
-    
+
         <param name="weatherSummary" type="String" mandatory="false"/>
         <param name="time" type="Common.DateTime" mandatory="false"/>
         <param name="humidity" type="Float" minvalue="0" maxvalue="1" mandatory="false">
@@ -3617,7 +3617,7 @@
             <description> Using this action plus a supplied direction can give the type of turn. </description>
         </element>
         <element name="EXIT"/>
-        <element name="STAY"/>    
+        <element name="STAY"/>
         <element name="MERGE"/>
         <element name="FERRY"/>
         <element name="CAR_SHUTTLE_TRAIN"/>
@@ -3839,7 +3839,7 @@
         </param>
         <param name="appServicesCapabilities" type="Common.AppServicesCapabilities" mandatory="false">
             <description>An array of currently available services. If this is an update to the capability the affected services will include an update reason in that item</description>
-        </param>      
+        </param>
     </struct>
 
 </interface>
@@ -3940,14 +3940,14 @@
   <param name="serviceEvent" type="Common.ServiceEvent" mandatory="false">
     <description>Specifies service update event.</description>
   </param>
-  <param name="reason" type="Common.ServiceUpdateReason" mandatory="false">
+  <param name="reason" type="Common.ServiceStatusUpdateReason" mandatory="false">
     <description>
       The reason for a service event. Certain events may not have a reason, such as when a service is ACCEPTED (which is the normal expected behavior).
     </description>
   </param>
    <param name="appID" type="Integer" mandatory="false">
        <description>ID of the application which triggered the update.</description>
-   </param>	
+   </param>
 </function>
     <function name="GetSystemTime" messagetype="request">
       <description>Request from SDL to HMI to obtain current UTC time.</description>
@@ -4272,7 +4272,7 @@
       <description>Selected file type.</description>
     </param>
   </function>
-  
+
 <!-- Policies -->
   <function name="GetSystemInfo" messagetype="request">
     <description>Request from SDL to HMI to obtain information about head unit system.</description>
@@ -4319,7 +4319,7 @@
     <param name="systemCapability" type="Common.SystemCapability" mandatory="true">
       <description>The system capability that has been updated</description>
     </param>
-  </function> 
+  </function>
 </interface>
 
 <interface name="VR" version="1.1.0" date="2017-04-27">
@@ -6397,34 +6397,34 @@
 
     <function name="GetAppServiceData" messagetype="request">
         <description> This request asks the module for current data related to the specific service. It also includes an option to subscribe to that service for future updates</description>
-        
+
         <param name="serviceType" type="String" mandatory="true">
             <description>The type of service that is to be offered by this app. See AppServiceType for known enum equivalent types. Parameter is a string to allow for new service types to be used by apps on older versions of SDL Core.</description>
         </param>
-        
+
         <param name="subscribe" type="Boolean" mandatory="false">
             <description> If true, the consumer is requesting to subscribe to all future updates from the service publisher. If false, the consumer doesn't wish to subscribe and should be unsubscribed if it was previously subscribed.</description>
-        </param>      
+        </param>
     </function>
 
     <function name="GetAppServiceData" messagetype="response">
-        <description> This response includes the data that was requested from the specific service</description>    
+        <description> This response includes the data that was requested from the specific service</description>
         <param name="serviceData" type="Common.AppServiceData" mandatory="false"/>
     </function>
 
     <function name="PerformAppServiceInteraction" messagetype="request">
         <param name="serviceUri" type="String"  mandatory="true">
             <description>Fully qualified URI based on a predetermined scheme provided by the app service. SDL makes no guarantee that this URI is correct.</description>
         </param>
-        
+
         <param name="serviceID" type="String" mandatory="true">
             <description>The service ID that the app consumer wishes to send this URI.</description>
         </param>
-        
+
         <param name="originApp" type="String" mandatory="false">
             <description>This string is the appID of the app requesting the app service provider take the specific action. This will automatically be set by SDL Core in requests originating from the HMI</description>
         </param>
-        
+
         <param name="requestServiceActive" type="Boolean" mandatory="false">
             <description>This flag signals the requesting consumer would like this service to become the active primary service of the destination's type.</description>
         </param>
@@ -6469,7 +6469,7 @@
         </param>
         <param name="setAsDefault" type="Boolean" mandatory="false">
             <description>True if the service was set to the default service of this type. False if the app was not to be the default</description>
-        </param> 
+        </param>
     </function>
 
     <function name="GetActiveServiceConsent" messagetype="request">
@@ -6480,7 +6480,7 @@
             <description>The ID of the service to be activated</description>
         </param>
     </function>
-    
+
     <function name="GetActiveServiceConsent" messagetype="response">
         <param name="activate" type="Boolean" mandatory="true">
             <description>
diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -52,7 +52,6 @@
 
 #include "policy/access_remote.h"
 #include "policy/access_remote_impl.h"
-#include "policy/ptu_retry_handler.h"
 #include "utils/timer_task_impl.h"
 
 policy::PolicyManager* CreateManager() {
diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
@@ -461,6 +461,8 @@ class ProtocolHandlerImpl
   }
 #endif
 
+  void OnAuthTokenUpdated(const std::string&, const std::string&) OVERRIDE;
+
  private:
   void SendEndServicePrivate(int32_t primary_connection_id,
                              int32_t connection_id,
@@ -538,6 +540,10 @@ class ProtocolHandlerImpl
       const transport_manager::ConnectionUID connection_id,
       const transport_manager::CommunicationError& error) OVERRIDE;
 
+  void OnConnectionPending(
+      const transport_manager::DeviceInfo& device_info,
+      const transport_manager::ConnectionUID connection_id) OVERRIDE;
+
   /**
    * @brief Notifies that configuration of a transport has been updated.
    *
diff --git a/src/components/protocol_handler/include/protocol_handler/service_status_update_handler_listener.h b/src/components/protocol_handler/include/protocol_handler/service_status_update_handler_listener.h
@@ -68,7 +68,7 @@ class ServiceStatusUpdateHandlerListener {
       const uint32_t connection_key,
       hmi_apis::Common_ServiceType::eType service_type,
       hmi_apis::Common_ServiceEvent::eType service_event,
-      utils::Optional<hmi_apis::Common_ServiceUpdateReason::eType>
+      utils::Optional<hmi_apis::Common_ServiceStatusUpdateReason::eType>
           service_update_reason) = 0;
 };
 
diff --git a/src/components/protocol_handler/src/service_status_update_handler.cc b/src/components/protocol_handler/src/service_status_update_handler.cc
diff --git a/src/components/protocol_handler/test/include/protocol_handler/mock_service_status_update_handler_listener.h b/src/components/protocol_handler/test/include/protocol_handler/mock_service_status_update_handler_listener.h
diff --git a/src/components/protocol_handler/test/service_status_update_handler_test.cc b/src/components/protocol_handler/test/service_status_update_handler_test.cc

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*`
	`1`	`+/*`
`2`	`2`	`* Copyright (c) 2018, Ford Motor Company`
`3`	`3`	`* All rights reserved.`
`4`	`4`	`*`
Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,8 @@ MessageHelper::ServiceStatusUpdateNotificationBuilder::AddAppID(`
`602`	`602`
`603`	`603`	`MessageHelper::ServiceStatusUpdateNotificationBuilder&`
`604`	`604`	`MessageHelper::ServiceStatusUpdateNotificationBuilder::AddServiceUpdateReason(`
`605`		`- const hmi_apis::Common_ServiceUpdateReason::eType service_update_reason) {`
	`605`	`+ const hmi_apis::Common_ServiceStatusUpdateReason::eType`
	`606`	`+ service_update_reason) {`
`606`	`607`	`return MockMessageHelper::on_service_update_builder_mock()`
`607`	`608`	`->AddServiceUpdateReason(service_update_reason);`
`608`	`609`	`}`