Check Style

8 files changed, 90 insertions, 73 deletions

diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h
index c5dec86eee..0681761b5a 100644
--- a/src/components/application_manager/include/application_manager/application.h
+++ b/src/components/application_manager/include/application_manager/application.h
@@ -127,7 +127,9 @@ class InitialApplicationData {
   virtual void set_language(const mobile_api::Language::eType& language) = 0;
   virtual void set_ui_language(
       const mobile_api::Language::eType& ui_language) = 0;
-  virtual void set_msg_version(const uint16_t major, const uint16_t minor, const uint16_t patch) = 0;
+  virtual void set_msg_version(const uint16_t major,
+                               const uint16_t minor,
+                               const uint16_t patch) = 0;
 };
 
 /*
diff --git a/src/components/application_manager/include/application_manager/application_data_impl.h b/src/components/application_manager/include/application_manager/application_data_impl.h
index 71d2c53d5b..c48b603420 100644
--- a/src/components/application_manager/include/application_manager/application_data_impl.h
+++ b/src/components/application_manager/include/application_manager/application_data_impl.h
@@ -65,7 +65,9 @@ class InitialApplicationDataImpl : public virtual Application {
   void set_ngn_media_screen_name(const smart_objects::SmartObject& ngn_name);
   void set_language(const mobile_api::Language::eType& language);
   void set_ui_language(const mobile_api::Language::eType& ui_language);
-  void set_msg_version(const uint16_t major, const uint16_t minor, const uint16_t patch);
+  void set_msg_version(const uint16_t major,
+                       const uint16_t minor,
+                       const uint16_t patch);
 
   void set_perform_interaction_layout(
       mobile_api::LayoutMode::eType layout) OVERRIDE;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
index cd566e43fd..9b546a1340 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
@@ -293,14 +293,19 @@ void RegisterAppInterfaceRequest::Run() {
     return;
   }
 
-  uint16_t major = msg_params[strings::sync_msg_version][strings::major_version].asUInt();
-  uint16_t minor = msg_params[strings::sync_msg_version][strings::minor_version].asUInt();
+  uint16_t major =
+      msg_params[strings::sync_msg_version][strings::major_version].asUInt();
+  uint16_t minor =
+      msg_params[strings::sync_msg_version][strings::minor_version].asUInt();
   uint16_t patch = 0;
-  if(msg_params[strings::sync_msg_version].keyExists(strings::patch_version)) {
-    patch = msg_params[strings::sync_msg_version][strings::patch_version].asUInt();
-  }
-  if (major < minimum_major_version || (major == minimum_major_version && minor < minimum_minor_version) 
-    || (major == minimum_major_version && minor == minimum_minor_version && patch < minimum_patch_version)) {
+  if (msg_params[strings::sync_msg_version].keyExists(strings::patch_version)) {
+    patch =
+        msg_params[strings::sync_msg_version][strings::patch_version].asUInt();
+  }
+  if (major < minimum_major_version ||
+      (major == minimum_major_version && minor < minimum_minor_version) ||
+      (major == minimum_major_version && minor == minimum_minor_version &&
+       patch < minimum_patch_version)) {
     SendResponse(false, mobile_apis::Result::REJECTED);
   }
 
@@ -311,18 +316,18 @@ void RegisterAppInterfaceRequest::Run() {
     return;
   }
 
-  //Version negotiation
+  // Version negotiation
   utils::SemanticVersion mobile_version(major, minor, patch);
-  utils::SemanticVersion module_version(major_version, minor_version, patch_version);
+  utils::SemanticVersion module_version(
+      major_version, minor_version, patch_version);
   if (mobile_version < module_version) {
-    //Use mobile RPC version as negotiated version
+    // Use mobile RPC version as negotiated version
     application->set_msg_version(major, minor, patch);
   } else {
-    //Use module version as negotiated version
+    // Use module version as negotiated version
     application->set_msg_version(major_version, minor_version, patch_version);
   }
 
-  
   // For resuming application need to restore hmi_app_id from resumeCtrl
   resumption::ResumeCtrl& resumer = application_manager_.resume_controller();
   const std::string& device_mac = application->mac_address();
@@ -609,7 +614,6 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
     return;
   }
 
-
   utils::SemanticVersion negotiated_version = application->msg_version();
 
   response_params[strings::sync_msg_version][strings::major_version] =
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc
index 8e95f43752..5d6c6dc89e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc
@@ -139,48 +139,45 @@ TEST_F(DialNumberRequestTest, Run_SUCCESS) {
 }
 
 TEST_F(DialNumberRequestTest, OnEvent_UnknownEvent_UNSUCCESS) {
- MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
- (*command_msg)[am::strings::params][am::strings::connection_key] =
-     kConnectionKey;
+  MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
+  (*command_msg)[am::strings::params][am::strings::connection_key] =
+      kConnectionKey;
 
- DialNumberRequestPtr
- command(CreateCommand<DialNumberRequest>(command_msg));
+  DialNumberRequestPtr command(CreateCommand<DialNumberRequest>(command_msg));
 
- MockAppPtr app(CreateMockApp());
- EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(app));
+  MockAppPtr app(CreateMockApp());
+  EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(app));
 
- Event event(hmi_apis::FunctionID::INVALID_ENUM);
- EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
+  Event event(hmi_apis::FunctionID::INVALID_ENUM);
+  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
 
   command->on_event(event);
 }
 
 TEST_F(DialNumberRequestTest, OnEvent_SUCCESS) {
-   MessageSharedPtr event_msg(CreateMessage(smart_objects::SmartType_Map));
-   (*event_msg)[am::strings::params][am::hmi_response::code] =
-       mobile_apis::Result::SUCCESS;
-   (*event_msg)[am::strings::params][am::strings::info] = "test_info";
-
-   Event event(hmi_apis::FunctionID::BasicCommunication_DialNumber);
-   event.set_smart_object(*event_msg);
-
-   MockAppPtr app(CreateMockApp());
-   EXPECT_CALL(app_mngr_, application(kConnectionKey))
-       .WillRepeatedly(Return(app));
-   ON_CALL(app_mngr_,
-   GetRPCService()).WillByDefault(ReturnRef(mock_rpc_service_));
-   EXPECT_CALL(
-       mock_rpc_service_,
-       ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS),
-       _));
-
-   MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
-   (*command_msg)[am::strings::params][am::strings::connection_key] =
-       kConnectionKey;
-
-   DialNumberRequestPtr
-   command(CreateCommand<DialNumberRequest>(command_msg));
-   command->on_event(event);
+  MessageSharedPtr event_msg(CreateMessage(smart_objects::SmartType_Map));
+  (*event_msg)[am::strings::params][am::hmi_response::code] =
+      mobile_apis::Result::SUCCESS;
+  (*event_msg)[am::strings::params][am::strings::info] = "test_info";
+
+  Event event(hmi_apis::FunctionID::BasicCommunication_DialNumber);
+  event.set_smart_object(*event_msg);
+
+  MockAppPtr app(CreateMockApp());
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillRepeatedly(Return(app));
+  ON_CALL(app_mngr_, GetRPCService())
+      .WillByDefault(ReturnRef(mock_rpc_service_));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS), _));
+
+  MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
+  (*command_msg)[am::strings::params][am::strings::connection_key] =
+      kConnectionKey;
+
+  DialNumberRequestPtr command(CreateCommand<DialNumberRequest>(command_msg));
+  command->on_event(event);
 }
 
 }  // namespace dial_number_request
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
index b4eba8f62a..0fcc1866ae 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
@@ -83,7 +83,7 @@ const std::string kMacAddress = "test_mac_address";
 const std::string kAppId = "test_app_id";
 const std::string kDummyString = "test_string";
 const std::vector<uint32_t> kDummyDiagModes;
-const utils::SemanticVersion mock_semantic_version(1,0,0);
+const utils::SemanticVersion mock_semantic_version(1, 0, 0);
 }  // namespace
 
 class RegisterAppInterfaceRequestTest
@@ -117,9 +117,12 @@ class RegisterAppInterfaceRequestTest
         kHmiLanguage;
     (*msg_)[am::strings::msg_params]
            [am::strings::hmi_display_language_desired] = kHmiLanguage;
-    (*msg_)[am::strings::msg_params][am::strings::sync_msg_version][am::strings::major_version] = 4;
-    (*msg_)[am::strings::msg_params][am::strings::sync_msg_version][am::strings::minor_version] = 0;
-    (*msg_)[am::strings::msg_params][am::strings::sync_msg_version][am::strings::patch_version] = 0;
+    (*msg_)[am::strings::msg_params][am::strings::sync_msg_version]
+           [am::strings::major_version] = 4;
+    (*msg_)[am::strings::msg_params][am::strings::sync_msg_version]
+           [am::strings::minor_version] = 0;
+    (*msg_)[am::strings::msg_params][am::strings::sync_msg_version]
+           [am::strings::patch_version] = 0;
   }
 
   MockAppPtr CreateBasicMockedApp() {
@@ -130,8 +133,10 @@ class RegisterAppInterfaceRequestTest
     ON_CALL(*mock_app, language()).WillByDefault(ReturnRef(kMobileLanguage));
     ON_CALL(*mock_app, ui_language()).WillByDefault(ReturnRef(kMobileLanguage));
     ON_CALL(*mock_app, policy_app_id()).WillByDefault(Return(kAppId));
-    ON_CALL(*mock_app, msg_version()).WillByDefault(ReturnRef(mock_semantic_version));
-    //EXPECT_CALL(*mock_app, msg_version()).WillOnce(Return(mock_semantic_version));
+    ON_CALL(*mock_app, msg_version())
+        .WillByDefault(ReturnRef(mock_semantic_version));
+    // EXPECT_CALL(*mock_app,
+    // msg_version()).WillOnce(Return(mock_semantic_version));
     return mock_app;
   }
 
@@ -288,7 +293,6 @@ TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) {
       .WillByDefault(Return(notify_upd_manager));
 
   EXPECT_CALL(app_mngr_, RegisterApplication(msg_)).WillOnce(Return(mock_app));
-  
 
   EXPECT_CALL(mock_rpc_service_,
               ManageHMICommand(HMIResultCodeIs(
diff --git a/src/components/application_manager/src/application_data_impl.cc b/src/components/application_manager/src/application_data_impl.cc
index 4f26ce5ef5..2d297fb0ad 100644
--- a/src/components/application_manager/src/application_data_impl.cc
+++ b/src/components/application_manager/src/application_data_impl.cc
@@ -103,12 +103,10 @@ const mobile_api::Language::eType& InitialApplicationDataImpl::ui_language()
   return ui_language_;
 }
 
-const utils::SemanticVersion& InitialApplicationDataImpl::msg_version()
-    const {
+const utils::SemanticVersion& InitialApplicationDataImpl::msg_version() const {
   return msg_version_;
 }
 
-
 void InitialApplicationDataImpl::set_app_types(
     const smart_objects::SmartObject& app_types) {
   if (app_types_) {
@@ -159,8 +157,9 @@ void InitialApplicationDataImpl::set_ui_language(
   ui_language_ = ui_language;
 }
 
-void InitialApplicationDataImpl::set_msg_version(
-    const uint16_t major, const uint16_t minor, const uint16_t patch) {
+void InitialApplicationDataImpl::set_msg_version(const uint16_t major,
+                                                 const uint16_t minor,
+                                                 const uint16_t patch) {
   msg_version_.major_version = major;
   msg_version_.minor_version = minor;
   msg_version_.patch_version = patch;
diff --git a/src/components/application_manager/src/rpc_handler_impl.cc b/src/components/application_manager/src/rpc_handler_impl.cc
index 7b3645ddf1..37319738f9 100644
--- a/src/components/application_manager/src/rpc_handler_impl.cc
+++ b/src/components/application_manager/src/rpc_handler_impl.cc
@@ -218,23 +218,30 @@ bool RPCHandlerImpl::ConvertMessageToSO(
 
       rpc::ValidationReport report("RPC");
 
-      //Attach RPC version to SmartObject if it does not exist yet. 
+      // Attach RPC version to SmartObject if it does not exist yet.
       auto app_ptr = app_manager_.application(message.connection_key());
       utils::SemanticVersion msg_version(2, 0, 0);
-      if (app_ptr && (output[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS].keyExists(NsSmartDeviceLink::NsJSONHandler::strings::S_RPC_MSG_VERSION) == false)) {
-        printf("Getting app msg version\n");
+      if (app_ptr &&
+          (output[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS]
+               .keyExists(NsSmartDeviceLink::NsJSONHandler::strings::
+                              S_RPC_MSG_VERSION) == false)) {
         msg_version = app_ptr->msg_version();
-        output[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS][NsSmartDeviceLink::NsJSONHandler::strings::S_RPC_MSG_VERSION] = msg_version.toString();
-      } else if (mobile_apis::FunctionID::RegisterAppInterfaceID == static_cast<mobile_apis::FunctionID::eType>(output[strings::params][strings::function_id].asInt())) {
-        //Assume default version 1.0.0 until properly set in RAI
-        printf("Setting default msg version\n");
-        output[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS][NsSmartDeviceLink::NsJSONHandler::strings::S_RPC_MSG_VERSION] = msg_version.toString();
-        printf("%s\n", output[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS][NsSmartDeviceLink::NsJSONHandler::strings::S_RPC_MSG_VERSION].asString().c_str());
+        output[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS]
+              [NsSmartDeviceLink::NsJSONHandler::strings::S_RPC_MSG_VERSION] =
+                  msg_version.toString();
+      } else if (mobile_apis::FunctionID::RegisterAppInterfaceID ==
+                 static_cast<mobile_apis::FunctionID::eType>(
+                     output[strings::params][strings::function_id].asInt())) {
+        // Assume default version 1.0.0 until properly set in RAI
+        output[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS]
+              [NsSmartDeviceLink::NsJSONHandler::strings::S_RPC_MSG_VERSION] =
+                  msg_version.toString();
       }
 
       if (!conversion_result ||
           !mobile_so_factory().attachSchema(output, true) ||
-          ((output.validate(&report, msg_version) != smart_objects::Errors::OK))) {
+          ((output.validate(&report, msg_version) !=
+            smart_objects::Errors::OK))) {
         LOG4CXX_WARN(logger_,
                      "Failed to parse string to smart object :"
                          << message.json_message());
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 de75bb8fd0..79a268530a 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
@@ -205,8 +205,10 @@ class MockApplication : public ::application_manager::Application {
                void(const mobile_apis::Language::eType& language));
   MOCK_METHOD1(set_ui_language,
                void(const mobile_apis::Language::eType& ui_language));
-   MOCK_METHOD3(set_msg_version,
-               void(const uint16_t major, const uint16_t minor, const uint16_t patch)); 
+  MOCK_METHOD3(set_msg_version,
+               void(const uint16_t major,
+                    const uint16_t minor,
+                    const uint16_t patch));
   // DynamicApplicationData methods
   MOCK_CONST_METHOD0(help_prompt, const smart_objects::SmartObject*());
   MOCK_CONST_METHOD0(timeout_prompt, const smart_objects::SmartObject*());