Fix style after develop merge

11 files changed, 34 insertions, 41 deletions

diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_send_haptic_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_send_haptic_data_request.h
index a7c491f6bd..b697176a36 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_send_haptic_data_request.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_send_haptic_data_request.h
@@ -51,7 +51,7 @@ class UISendHapticDataRequest : public RequestToHMI {
    * @param application_manager Reference of application manager
    **/
   UISendHapticDataRequest(const MessageSharedPtr& message,
-                                  ApplicationManager& application_manager);
+                          ApplicationManager& application_manager);
 
   /**
    * @brief UISendHapticDataRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_send_haptic_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_send_haptic_data_response.h
index 3c5714ef89..96abe4665d 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/ui_send_haptic_data_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_send_haptic_data_response.h
@@ -51,7 +51,7 @@ class UISendHapticDataResponse : public ResponseFromHMI {
    * @param application_manager Reference of application manager
    **/
   UISendHapticDataResponse(const MessageSharedPtr& message,
-                                   ApplicationManager& application_manager);
+                           ApplicationManager& application_manager);
 
   /**
    * @brief UISendHapticDataResponse class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/send_haptic_data_request.h b/src/components/application_manager/include/application_manager/commands/mobile/send_haptic_data_request.h
index 18703e84c7..13ed06cce6 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/send_haptic_data_request.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/send_haptic_data_request.h
@@ -33,7 +33,6 @@
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_HAPTIC_DATA_REQUEST_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_HAPTIC_DATA_REQUEST_H_
 
-
 #include <string>
 #include "application_manager/commands/command_request_impl.h"
 #include "application_manager/application_manager.h"
@@ -56,7 +55,7 @@ class SendHapticDataRequest : public CommandRequestImpl {
    * @param application_manager Reference of application manager
    **/
   SendHapticDataRequest(const MessageSharedPtr& message,
-                ApplicationManager& application_manager);
+                        ApplicationManager& application_manager);
 
   /**
    * @brief SendHapticDataRequest class destructor
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/send_haptic_data_response.h b/src/components/application_manager/include/application_manager/commands/mobile/send_haptic_data_response.h
index d7bb76f669..2a60746c61 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/send_haptic_data_response.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/send_haptic_data_response.h
@@ -33,7 +33,6 @@
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_HAPTIC_DATA_RESPONSE_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_MOBILE_SEND_HAPTIC_DATA_RESPONSE_H_
 
-
 #include "application_manager/commands/command_response_impl.h"
 
 namespace application_manager {
@@ -52,7 +51,7 @@ class SendHapticDataResponse : public CommandResponseImpl {
    * @param application_manager Reference of application manager
    **/
   SendHapticDataResponse(const MessageSharedPtr& message,
-                 ApplicationManager& application_manager);
+                         ApplicationManager& application_manager);
 
   /**
    * @brief SendHapticDataResponse class destructor
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 23d3048c9d..19e255647a 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -1607,8 +1607,8 @@ void ApplicationManagerImpl::SendMessageToMobile(
         msg_to_mobile[strings::params][strings::function_id].asInt());
 #ifdef SDL_REMOTE_CONTROL
     const mobile_apis::FunctionID::eType function_id =
-      static_cast<mobile_apis::FunctionID::eType>(
-          (*message)[strings::params][strings::function_id].asUInt());
+        static_cast<mobile_apis::FunctionID::eType>(
+            (*message)[strings::params][strings::function_id].asUInt());
     if (function_id == mobile_apis::FunctionID::RegisterAppInterfaceID &&
         (*message)[strings::msg_params][strings::success].asBool()) {
       const bool is_for_plugin = plugin_manager_.IsAppForPlugins(app);
diff --git a/src/components/application_manager/src/commands/hmi/ui_send_haptic_data_response.cc b/src/components/application_manager/src/commands/hmi/ui_send_haptic_data_response.cc
index 03a2ce69e2..a8239a40e8 100644
--- a/src/components/application_manager/src/commands/hmi/ui_send_haptic_data_response.cc
+++ b/src/components/application_manager/src/commands/hmi/ui_send_haptic_data_response.cc
@@ -46,8 +46,7 @@ UISendHapticDataResponse::~UISendHapticDataResponse() {}
 
 void UISendHapticDataResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
-  event_engine::Event event(
-      hmi_apis::FunctionID::UI_SendHapticData);
+  event_engine::Event event(hmi_apis::FunctionID::UI_SendHapticData);
   event.set_smart_object(*message_);
   event.raise(application_manager_.event_dispatcher());
 }
diff --git a/src/components/application_manager/src/commands/mobile/send_haptic_data_request.cc b/src/components/application_manager/src/commands/mobile/send_haptic_data_request.cc
index 4f50ff20b0..cabfef15f6 100644
--- a/src/components/application_manager/src/commands/mobile/send_haptic_data_request.cc
+++ b/src/components/application_manager/src/commands/mobile/send_haptic_data_request.cc
@@ -39,8 +39,8 @@ namespace commands {
 
 namespace custom_str = utils::custom_string;
 
-SendHapticDataRequest::SendHapticDataRequest(const MessageSharedPtr& message,
-                             ApplicationManager& application_manager)
+SendHapticDataRequest::SendHapticDataRequest(
+    const MessageSharedPtr& message, ApplicationManager& application_manager)
     : CommandRequestImpl(message, application_manager) {}
 
 SendHapticDataRequest::~SendHapticDataRequest() {}
@@ -49,9 +49,7 @@ void SendHapticDataRequest::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
   smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params];
-  SendHMIRequest(hmi_apis::FunctionID::UI_SendHapticData,
-                 &msg_params,
-                 true);
+  SendHMIRequest(hmi_apis::FunctionID::UI_SendHapticData, &msg_params, true);
 }
 
 void SendHapticDataRequest::on_event(const event_engine::Event& event) {
diff --git a/src/components/application_manager/src/commands/mobile/send_haptic_data_response.cc b/src/components/application_manager/src/commands/mobile/send_haptic_data_response.cc
index cb7cd9f3ec..c8649d34af 100644
--- a/src/components/application_manager/src/commands/mobile/send_haptic_data_response.cc
+++ b/src/components/application_manager/src/commands/mobile/send_haptic_data_response.cc
@@ -36,8 +36,8 @@ namespace application_manager {
 
 namespace commands {
 
-SendHapticDataResponse::SendHapticDataResponse(const MessageSharedPtr& message,
-                               ApplicationManager& application_manager)
+SendHapticDataResponse::SendHapticDataResponse(
+    const MessageSharedPtr& message, ApplicationManager& application_manager)
     : CommandResponseImpl(message, application_manager) {}
 
 SendHapticDataResponse::~SendHapticDataResponse() {}
diff --git a/src/components/application_manager/test/commands/hmi/simple_response_from_hmi_test.cc b/src/components/application_manager/test/commands/hmi/simple_response_from_hmi_test.cc
index f257a41624..f55b2e5835 100644
--- a/src/components/application_manager/test/commands/hmi/simple_response_from_hmi_test.cc
+++ b/src/components/application_manager/test/commands/hmi/simple_response_from_hmi_test.cc
@@ -238,8 +238,7 @@ typedef Types<
     CommandData<commands::UIScrollableMessageResponse,
                 hmi_apis::FunctionID::UI_ScrollableMessage>,
     CommandData<commands::UISendHapticDataResponse,
-                hmi_apis::FunctionID::UI_SendHapticData> >
-    ResponseCommandsList;
+                hmi_apis::FunctionID::UI_SendHapticData> > ResponseCommandsList;
 
 typedef Types<commands::AudioStopStreamResponse,
               commands::NaviStopStreamResponse,
diff --git a/src/components/application_manager/test/commands/mobile/send_haptic_data_test.cc b/src/components/application_manager/test/commands/mobile/send_haptic_data_test.cc
index 1e14f46555..49483209b6 100644
--- a/src/components/application_manager/test/commands/mobile/send_haptic_data_test.cc
+++ b/src/components/application_manager/test/commands/mobile/send_haptic_data_test.cc
@@ -68,13 +68,13 @@ class SendHapticDataRequestTest
     : public CommandRequestTest<CommandsTestMocks::kIsNice> {
  public:
   SendHapticDataRequestTest()
-    : msg_(CreateMessage(::smart_objects::SmartType_Map))
-    , mock_app_(CreateMockApp()) {}
+      : msg_(CreateMessage(::smart_objects::SmartType_Map))
+      , mock_app_(CreateMockApp()) {}
 
   void SetUp() OVERRIDE {
     (*msg_)[am::strings::params][am::strings::connection_key] = kConnectionKey;
     ON_CALL(app_mngr_, application(kConnectionKey))
-      .WillByDefault(Return(mock_app_));
+        .WillByDefault(Return(mock_app_));
   }
 
   MessageSharedPtr msg_;
@@ -82,7 +82,7 @@ class SendHapticDataRequestTest
 };
 
 class SendHapticDataResponseTest
-  : public CommandsTest<CommandsTestMocks::kIsNice> {
+    : public CommandsTest<CommandsTestMocks::kIsNice> {
  public:
   SendHapticDataResponseTest() : message_(CreateMessage()) {}
 
@@ -95,11 +95,10 @@ class SendHapticDataResponseTest
 };
 
 TEST_F(SendHapticDataRequestTest, Run_SUCCESS) {
-  EXPECT_CALL(
-    app_mngr_,
-    ManageHMICommand(HMIResultCodeIs(
-      hmi_apis::FunctionID::UI_SendHapticData)))
-    .WillOnce(Return(true));
+  EXPECT_CALL(app_mngr_,
+              ManageHMICommand(
+                  HMIResultCodeIs(hmi_apis::FunctionID::UI_SendHapticData)))
+      .WillOnce(Return(true));
 
   SendHapticDataRequestPtr command(CreateCommand<SendHapticDataRequest>(msg_));
 
@@ -108,14 +107,14 @@ TEST_F(SendHapticDataRequestTest, Run_SUCCESS) {
 }
 
 TEST_F(SendHapticDataRequestTest, OnEvent_SUCCESS) {
-  EXPECT_CALL(app_mngr_,
-    ManageMobileCommand(
-      MobileResultCodeIs(mobile_apis::Result::SUCCESS),
-      am::commands::Command::ORIGIN_SDL));
+  EXPECT_CALL(
+      app_mngr_,
+      ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS),
+                          am::commands::Command::ORIGIN_SDL));
 
   (*msg_)[am::strings::msg_params] = 0;
   (*msg_)[am::strings::params][am::hmi_response::code] =
-    hmi_apis::Common_Result::eType::SUCCESS;
+      hmi_apis::Common_Result::eType::SUCCESS;
   Event event(hmi_apis::FunctionID::UI_SendHapticData);
   event.set_smart_object(*msg_);
   SendHapticDataRequestPtr command(CreateCommand<SendHapticDataRequest>(msg_));
@@ -127,13 +126,11 @@ TEST_F(SendHapticDataRequestTest, OnEvent_SUCCESS) {
 TEST_F(SendHapticDataResponseTest, Run_Success) {
   ::smart_objects::SmartObject& message_ref = *message_;
   message_ref[am::strings::msg_params][am::strings::result_code] =
-    mobile_apis::Result::SUCCESS;
+      mobile_apis::Result::SUCCESS;
 
   EXPECT_CALL(
-    app_mngr_,
-    SendMessageToMobile(
-      MobileResultCodeIs(mobile_apis::Result::SUCCESS),
-      _));
+      app_mngr_,
+      SendMessageToMobile(MobileResultCodeIs(mobile_apis::Result::SUCCESS), _));
   command_sptr_->Init();
   command_sptr_->Run();
 }
diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc
index 43b757c909..5c3830d5a5 100644
--- a/src/components/application_manager/test/hmi_capabilities_test.cc
+++ b/src/components/application_manager/test/hmi_capabilities_test.cc
@@ -422,9 +422,11 @@ TEST_F(HMICapabilitiesTest, LoadCapabilitiesFromFile) {
   EXPECT_EQ(
       2,
       vs_capability_so[strings::supported_formats][1][strings::codec].asInt());
-  
-  EXPECT_TRUE(vs_capability_so.keyExists(strings::haptic_spatial_data_supported));
-  EXPECT_TRUE(vs_capability_so[strings::haptic_spatial_data_supported].asBool());
+
+  EXPECT_TRUE(
+      vs_capability_so.keyExists(strings::haptic_spatial_data_supported));
+  EXPECT_TRUE(
+      vs_capability_so[strings::haptic_spatial_data_supported].asBool());
 
   // Check remote control capabilites
   const smart_objects::SmartObject rc_capability_so =