Fix typos and comments after reviewfeature/rc_OnRCStatus

4 files changed, 7 insertions, 17 deletions

diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index 504bb84c82..9559c2007e 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -73,7 +73,7 @@ class MessageHelper {
  public:
   /**
  * @brief CreateNotification creates basic mobile notification smart object
- * @param function_id Notificaiton function ID
+ * @param function_id Notification function ID
  * @param app_id application to send notification
  * @return basic mobile notification smart object
  */
@@ -81,7 +81,7 @@ class MessageHelper {
       mobile_apis::FunctionID::eType function_id, uint32_t app_id);
   /**
  * @brief CreateHMINotification creates basic hmi notification smart object
- * @param function_id Notificaiton function ID
+ * @param function_id Notification function ID
  * @return basic hmi notification smart object
  */
   static smart_objects::SmartObjectSPtr CreateHMINotification(
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc
index e9a56007df..1d2dbf8997 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc
@@ -216,16 +216,6 @@ void ResourceAllocationManagerImpl::RemoveAppsSubscriptions(const Apps& apps) {
 }
 
 template <typename EnumType>
-std::string EnumToString(EnumType enum_type) {
-  using smart_objects::EnumConversionHelper;
-  const char* str = 0;
-  if (EnumConversionHelper<EnumType>::EnumToCString(enum_type, &str)) {
-    return str;
-  }
-  return std::string("INVALID_ENUM");
-}
-
-template <typename EnumType>
 EnumType StringToEnum(const std::string& str) {
   using smart_objects::EnumConversionHelper;
   EnumType val;
@@ -237,7 +227,7 @@ void ConstructOnRCStatusNotificationParams(
     smart_objects::SmartObject& msg_params,
     const std::map<std::string, uint32_t>& allocated_resources,
     const std::vector<std::string>& supported_resources,
-    const u_int32_t app_id) {
+    const uint32_t app_id) {
   namespace strings = application_manager::strings;
   namespace message_params = rc_rpc_plugin::message_params;
   using smart_objects::SmartObject;
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc
index 03c06404a3..1c38c2788d 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc
@@ -92,7 +92,7 @@ class RAManagerTest : public ::testing::Test {
     app_ext_ptr_ = utils::MakeShared<rc_rpc_plugin::RCAppExtension>(plugin_id);
     ON_CALL(*mock_app_1_, app_id()).WillByDefault(Return(kAppId1));
 
-    OnRCStatusNotoficationExpectations();
+    OnRCStatusNotificationExpectations();
   }
 
   void CheckResultWithHMILevelAndAccessMode(
@@ -101,7 +101,7 @@ class RAManagerTest : public ::testing::Test {
       const rc_rpc_plugin::AcquireResult::eType expected_result,
       const hmi_apis::Common_RCAccessMode::eType access_mode);
 
-  void OnRCStatusNotoficationExpectations();
+  void OnRCStatusNotificationExpectations();
 
  protected:
   NiceMock<MockApplicationManager> mock_app_mngr_;
@@ -138,7 +138,7 @@ void RAManagerTest::CheckResultWithHMILevelAndAccessMode(
   EXPECT_EQ(expected_result, ra_manager.AcquireResource(kModuleType1, kAppId2));
 }
 
-void RAManagerTest::OnRCStatusNotoficationExpectations() {
+void RAManagerTest::OnRCStatusNotificationExpectations() {
   ON_CALL(mock_app_mngr_, application(kAppId1))
       .WillByDefault(Return(mock_app_1_));
   ON_CALL(*mock_app_1_, QueryInterface(rc_rpc_plugin::RCRPCPlugin::kRCPluginID))
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index 9ad7d9cc3f..47bcffd3f5 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -261,7 +261,7 @@ MessageHelper::CreateHMINotification(hmi_apis::FunctionID::eType function_id) {
       utils::MakeShared<SmartObject>(SmartType_Map);
   SmartObject& notification = *notification_ptr;
   notification[strings::params][strings::message_type] =
-      static_cast<int32_t>(application_manager::MessageType::kNotification);
+      static_cast<int32_t>(kNotification);
   notification[strings::params][strings::protocol_version] =
       commands::CommandImpl::protocol_version_;
   notification[strings::params][strings::protocol_type] =