Beautifiering hmi_message_adapter_test

2 files changed, 24 insertions, 22 deletions

diff --git a/src/components/hmi_message_handler/src/messagebroker_adapter.cc b/src/components/hmi_message_handler/src/messagebroker_adapter.cc
index c367dd44a5..76e544f3f5 100644
--- a/src/components/hmi_message_handler/src/messagebroker_adapter.cc
+++ b/src/components/hmi_message_handler/src/messagebroker_adapter.cc
@@ -43,19 +43,17 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "HMIMessageHandler")
 typedef NsMessageBroker::CMessageBrokerController MessageBrokerController;
 
 MessageBrokerAdapter::MessageBrokerAdapter(HMIMessageHandler* handler_param,
-    const std::string& server_address,
-    uint16_t port)
-  : HMIMessageAdapterImpl(handler_param),
-    MessageBrokerController(server_address, port, "SDL") {
+                                           const std::string& server_address,
+                                           uint16_t port)
+    : HMIMessageAdapterImpl(handler_param),
+      MessageBrokerController(server_address, port, "SDL") {
   LOG4CXX_TRACE(logger_, "Created MessageBrokerAdapter");
 }
 
-
-MessageBrokerAdapter::~MessageBrokerAdapter() {
-}
+MessageBrokerAdapter::~MessageBrokerAdapter() {}
 
 void MessageBrokerAdapter::SendMessageToHMI(
-  hmi_message_handler::MessageSharedPointer message) {
+    hmi_message_handler::MessageSharedPointer message) {
   LOG4CXX_AUTO_TRACE(logger_);
 
   if (!message.valid()) {
@@ -74,7 +72,7 @@ void MessageBrokerAdapter::SendMessageToHMI(
 }
 
 void MessageBrokerAdapter::processResponse(std::string method,
-    Json::Value& root) {
+                                           Json::Value& root) {
   LOG4CXX_AUTO_TRACE(logger_);
   ProcessRecievedFromMB(root);
 }
@@ -96,7 +94,8 @@ void MessageBrokerAdapter::SubscribeTo() {
   MessageBrokerController::subscribeTo("UI.OnCommand");
   MessageBrokerController::subscribeTo("VR.OnCommand");
   MessageBrokerController::subscribeTo("BasicCommunication.OnReady");
-  MessageBrokerController::subscribeTo("BasicCommunication.OnExitAllApplications");
+  MessageBrokerController::subscribeTo(
+      "BasicCommunication.OnExitAllApplications");
   MessageBrokerController::subscribeTo("UI.OnDriverDistraction");
   MessageBrokerController::subscribeTo("UI.OnSystemContext");
   MessageBrokerController::subscribeTo("UI.OnAppActivated");
@@ -105,12 +104,14 @@ void MessageBrokerAdapter::SubscribeTo() {
   MessageBrokerController::subscribeTo("UI.OnResetTimeout");
   MessageBrokerController::subscribeTo("TTS.OnResetTimeout");
   MessageBrokerController::subscribeTo("BasicCommunication.OnAppDeactivated");
-  MessageBrokerController::subscribeTo("BasicCommunication.OnStartDeviceDiscovery");
+  MessageBrokerController::subscribeTo(
+      "BasicCommunication.OnStartDeviceDiscovery");
   MessageBrokerController::subscribeTo("BasicCommunication.OnUpdateDeviceList");
   MessageBrokerController::subscribeTo("BasicCommunication.OnFindApplications");
   MessageBrokerController::subscribeTo("BasicCommunication.OnAppActivated");
   MessageBrokerController::subscribeTo("BasicCommunication.OnExitApplication");
-  MessageBrokerController::subscribeTo("BasicCommunication.OnExitAllApplications");
+  MessageBrokerController::subscribeTo(
+      "BasicCommunication.OnExitAllApplications");
   MessageBrokerController::subscribeTo("BasicCommunication.OnDeviceChosen");
   MessageBrokerController::subscribeTo("BasicCommunication.OnPhoneCall");
   MessageBrokerController::subscribeTo("BasicCommunication.OnEmergencyEvent");
@@ -124,8 +125,10 @@ void MessageBrokerAdapter::SubscribeTo() {
   MessageBrokerController::subscribeTo("VR.Started");
   MessageBrokerController::subscribeTo("VR.Stopped");
   MessageBrokerController::subscribeTo("BasicCommunication.OnSystemRequest");
-  MessageBrokerController::subscribeTo("BasicCommunication.OnIgnitionCycleOver");
-  MessageBrokerController::subscribeTo("BasicCommunication.OnSystemInfoChanged");
+  MessageBrokerController::subscribeTo(
+      "BasicCommunication.OnIgnitionCycleOver");
+  MessageBrokerController::subscribeTo(
+      "BasicCommunication.OnSystemInfoChanged");
   MessageBrokerController::subscribeTo("SDL.OnAppPermissionConsent");
   MessageBrokerController::subscribeTo("SDL.OnAllowSDLFunctionality");
   MessageBrokerController::subscribeTo("SDL.OnReceivedPolicyUpdate");
@@ -163,8 +166,10 @@ void MessageBrokerAdapter::ProcessRecievedFromMB(Json::Value& root) {
 
   // Messages from HMI (sent through message broker) have no priority so far
   // assign default priority
-  hmi_message_handler::MessageSharedPointer message = hmi_message_handler::MessageSharedPointer(new application_manager::Message(
-        protocol_handler::MessagePriority::kDefault));
+  hmi_message_handler::MessageSharedPointer message =
+      hmi_message_handler::MessageSharedPointer(
+          new application_manager::Message(
+              protocol_handler::MessagePriority::kDefault));
   // message->set_message_type()
   message->set_json_message(message_string);
   message->set_protocol_version(application_manager::ProtocolVersion::kHMI);
diff --git a/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_hmi_message_adapter_impl.h b/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_hmi_message_adapter_impl.h
index d941ed9f3a..0ec82b7862 100644
--- a/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_hmi_message_adapter_impl.h
+++ b/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_hmi_message_adapter_impl.h
@@ -30,7 +30,6 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */
 
-
 #include "gmock/gmock.h"
 #include "hmi_message_handler/hmi_message_adapter_impl.h"
 #include "hmi_message_handler/hmi_message_handler.h"
@@ -48,12 +47,10 @@ class MockHMIMessageAdapterImpl : public HMIMessageAdapterImpl {
   MockHMIMessageAdapterImpl(HMIMessageHandler* handler)
       : HMIMessageAdapterImpl(handler) {}
 
-  MOCK_METHOD0(SubscribeTo,
-      void());
-  MOCK_METHOD1(SendMessageToHMI,
-      void(MessageSharedPointer SPtr));
+  MOCK_METHOD0(SubscribeTo, void());
+  MOCK_METHOD1(SendMessageToHMI, void(MessageSharedPointer SPtr));
 
-  HMIMessageHandler* get_handler(){
+  HMIMessageHandler* get_handler() {
     return HMIMessageAdapterImpl::handler();
   }
 };