Fix UnsubscribeWayPoints typofix/unsubscribe_typo

Unsubscribe is one word, this is the only place where this typo is present

12 files changed, 41 insertions, 41 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 127ff967b4..dd4871e8e9 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -567,7 +567,7 @@ class MessageHelper {
 
   /**
    * @brief Sends UnsubscribeWayPoints request
-   * @return true if UnSubscribedWayPoints is send otherwise false
+   * @return true if UnsubscribedWayPoints is send otherwise false
    */
   static bool SendUnsubscribedWayPoints(ApplicationManager& app_mngr);
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h
index 6061858e5c..f20386a246 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h
@@ -43,31 +43,31 @@ namespace commands {
 /**
  * @brief NaviSubscribeWayPointsRequest command class
  **/
-class NaviUnSubscribeWayPointsRequest
+class NaviUnsubscribeWayPointsRequest
     : public app_mngr::commands::RequestToHMI {
  public:
   /**
-   * @brief NaviUnSubscribeWayPointsRequest class constructor
+   * @brief NaviUnsubscribeWayPointsRequest class constructor
    *
    * @param message Incoming SmartObject message
    **/
-  NaviUnSubscribeWayPointsRequest(
+  NaviUnsubscribeWayPointsRequest(
       const app_mngr::commands::MessageSharedPtr& message,
       app_mngr::ApplicationManager& application_manager,
       app_mngr::rpc_service::RPCService& rpc_service,
       app_mngr::HMICapabilities& hmi_capabilities,
       policy::PolicyHandlerInterface& policy_handle);
   /**
-   * @brief NaviUnSubscribeWayPointsRequest class destructor
+   * @brief NaviUnsubscribeWayPointsRequest class destructor
    **/
-  virtual ~NaviUnSubscribeWayPointsRequest();
+  virtual ~NaviUnsubscribeWayPointsRequest();
   /**
    * @brief Execute command
    **/
   virtual void Run() OVERRIDE;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(NaviUnSubscribeWayPointsRequest);
+  DISALLOW_COPY_AND_ASSIGN(NaviUnsubscribeWayPointsRequest);
 };
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h
index 3a02228b8b..ec4f4eb963 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h
@@ -41,13 +41,13 @@ namespace app_mngr = application_manager;
 namespace commands {
 
 /**
- * @brief NaviUnSubscribeWaypoints command class
+ * @brief NaviUnsubscribeWaypoints command class
  **/
 class NaviUnsubscribeWayPointsResponse
     : public app_mngr::commands::ResponseFromHMI {
  public:
   /**
-   * @brief NaviUnSubscribeWaypoints class constructor
+   * @brief NaviUnsubscribeWaypoints class constructor
    *
    * @param message Incoming SmartObject message
    **/
@@ -59,7 +59,7 @@ class NaviUnsubscribeWayPointsResponse
       policy::PolicyHandlerInterface& policy_handle);
 
   /**
-   * @brief NaviUnSubscribeWaypoints class destructor
+   * @brief NaviUnsubscribeWaypoints class destructor
    **/
   virtual ~NaviUnsubscribeWayPointsResponse();
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h
index b7b87f8b51..fe14f5c7eb 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h
@@ -40,13 +40,13 @@ namespace app_mngr = application_manager;
 
 namespace commands {
 
-class UnSubscribeWayPointsRequest
+class UnsubscribeWayPointsRequest
     : public app_mngr::commands::CommandRequestImpl {
  public:
   /**
-   * \brief UnSubscribeWayPointsRequest class constructor
+   * \brief UnsubscribeWayPointsRequest class constructor
    **/
-  UnSubscribeWayPointsRequest(
+  UnsubscribeWayPointsRequest(
       const app_mngr::commands::MessageSharedPtr& message,
       app_mngr::ApplicationManager& application_manager,
       app_mngr::rpc_service::RPCService& rpc_service,
@@ -54,9 +54,9 @@ class UnSubscribeWayPointsRequest
       policy::PolicyHandlerInterface& policy_handler);
 
   /**
-   * \brief UnSubscribeWayPointsRequest class destructor
+   * \brief UnsubscribeWayPointsRequest class destructor
    **/
-  ~UnSubscribeWayPointsRequest();
+  ~UnsubscribeWayPointsRequest();
 
   /**
    * @brief Execute command
@@ -76,7 +76,7 @@ class UnSubscribeWayPointsRequest
   bool Init() FINAL;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(UnSubscribeWayPointsRequest);
+  DISALLOW_COPY_AND_ASSIGN(UnsubscribeWayPointsRequest);
 };
 
 }  // commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc
index e7d416bc61..ec22c93d8f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc
@@ -37,7 +37,7 @@ using namespace application_manager;
 
 namespace commands {
 
-NaviUnSubscribeWayPointsRequest::NaviUnSubscribeWayPointsRequest(
+NaviUnsubscribeWayPointsRequest::NaviUnsubscribeWayPointsRequest(
     const application_manager::commands::MessageSharedPtr& message,
     ApplicationManager& application_manager,
     rpc_service::RPCService& rpc_service,
@@ -49,9 +49,9 @@ NaviUnSubscribeWayPointsRequest::NaviUnSubscribeWayPointsRequest(
                    hmi_capabilities,
                    policy_handle) {}
 
-NaviUnSubscribeWayPointsRequest::~NaviUnSubscribeWayPointsRequest() {}
+NaviUnsubscribeWayPointsRequest::~NaviUnsubscribeWayPointsRequest() {}
 
-void NaviUnSubscribeWayPointsRequest::Run() {
+void NaviUnsubscribeWayPointsRequest::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
   SendRequest();
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc
index 0d0836878f..40bb1ddfc9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc
@@ -39,7 +39,7 @@ using namespace application_manager;
 
 namespace commands {
 
-UnSubscribeWayPointsRequest::UnSubscribeWayPointsRequest(
+UnsubscribeWayPointsRequest::UnsubscribeWayPointsRequest(
     const application_manager::commands::MessageSharedPtr& message,
     ApplicationManager& application_manager,
     app_mngr::rpc_service::RPCService& rpc_service,
@@ -51,9 +51,9 @@ UnSubscribeWayPointsRequest::UnSubscribeWayPointsRequest(
                          hmi_capabilities,
                          policy_handler) {}
 
-UnSubscribeWayPointsRequest::~UnSubscribeWayPointsRequest() {}
+UnsubscribeWayPointsRequest::~UnsubscribeWayPointsRequest() {}
 
-void UnSubscribeWayPointsRequest::Run() {
+void UnsubscribeWayPointsRequest::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
   ApplicationSharedPtr app = application_manager_.application(connection_key());
@@ -76,13 +76,13 @@ void UnSubscribeWayPointsRequest::Run() {
       hmi_apis::FunctionID::Navigation_UnsubscribeWayPoints, NULL, true);
 }
 
-void UnSubscribeWayPointsRequest::on_event(const event_engine::Event& event) {
+void UnsubscribeWayPointsRequest::on_event(const event_engine::Event& event) {
   LOG4CXX_AUTO_TRACE(logger_);
   ApplicationSharedPtr app = application_manager_.application(connection_key());
   const smart_objects::SmartObject& message = event.smart_object();
   switch (event.id()) {
     case hmi_apis::FunctionID::Navigation_UnsubscribeWayPoints: {
-      LOG4CXX_INFO(logger_, "Received Navigation_UnSubscribeWayPoints event");
+      LOG4CXX_INFO(logger_, "Received Navigation_UnsubscribeWayPoints event");
       EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_Navigation);
       const hmi_apis::Common_Result::eType result_code =
           static_cast<hmi_apis::Common_Result::eType>(
@@ -107,7 +107,7 @@ void UnSubscribeWayPointsRequest::on_event(const event_engine::Event& event) {
   }
 }
 
-bool UnSubscribeWayPointsRequest::Init() {
+bool UnsubscribeWayPointsRequest::Init() {
   hash_update_mode_ = HashUpdateMode::kDoHashUpdate;
   return true;
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
index c510315ad8..7065c7cf7d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
@@ -607,7 +607,7 @@ CommandCreator& HMICommandFactory::get_creator_factory(
     case hmi_apis::FunctionID::Navigation_UnsubscribeWayPoints: {
       return hmi_apis::messageType::request == message_type
                  ? factory
-                       .GetCreator<commands::NaviUnSubscribeWayPointsRequest>()
+                       .GetCreator<commands::NaviUnsubscribeWayPointsRequest>()
                  : factory.GetCreator<
                        commands::NaviUnsubscribeWayPointsResponse>();
     }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
index 4251eeadc9..5207c7e432 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
@@ -273,7 +273,7 @@ CommandCreator& MobileCommandFactory::get_creator_factory(
     }
     case mobile_apis::FunctionID::UnsubscribeWayPointsID: {
       return mobile_api::messageType::request == message_type
-                 ? factory.GetCreator<commands::UnSubscribeWayPointsRequest>()
+                 ? factory.GetCreator<commands::UnsubscribeWayPointsRequest>()
                  : factory.GetCreator<commands::UnsubscribeWayPointsResponse>();
     }
     case mobile_apis::FunctionID::GetSystemCapabilityID: {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
index 0f02deded0..0e19c8873e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
@@ -423,7 +423,7 @@ typedef Types<commands::NaviIsReadyResponse,
               commands::NaviSubscribeWayPointsResponse,
               commands::NaviSubscribeWayPointsRequest,
               commands::NaviUnsubscribeWayPointsResponse,
-              commands::NaviUnSubscribeWayPointsRequest,
+              commands::NaviUnsubscribeWayPointsRequest,
               commands::ButtonGetCapabilitiesResponse,
               commands::ButtonGetCapabilitiesRequest,
               commands::OnAllowSDLFunctionalityNotification,
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc
index 9fa864d30d..0189d073e5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc
@@ -190,7 +190,7 @@ typedef Types<sdl_rpc_plugin::commands::hmi::DialNumberRequest,
               sdl_rpc_plugin::commands::BasicCommunicationSystemRequest,
               sdl_rpc_plugin::commands::ButtonGetCapabilitiesRequest,
               sdl_rpc_plugin::commands::NaviSendLocationRequest,
-              sdl_rpc_plugin::commands::NaviUnSubscribeWayPointsRequest,
+              sdl_rpc_plugin::commands::NaviUnsubscribeWayPointsRequest,
               sdl_rpc_plugin::commands::NaviUpdateTurnListRequest,
               sdl_rpc_plugin::commands::NaviShowConstantTBTRequest,
               sdl_rpc_plugin::commands::NaviStopStreamRequest,
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc
index c6601d6352..8589cbb6be 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc
@@ -282,7 +282,7 @@ typedef Types<commands::OnWayPointChangeNotification,
               commands::UnsubscribeButtonRequest,
               commands::UnsubscribeButtonResponse> MobileCommandsListSecond;
 
-typedef Types<commands::UnSubscribeWayPointsRequest,
+typedef Types<commands::UnsubscribeWayPointsRequest,
               commands::UnsubscribeWayPointsResponse,
               commands::UpdateTurnListRequest,
               commands::UpdateTurnListResponse> MobileCommandsListThird;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc
index 042604b672..f345d719c6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc
@@ -59,7 +59,7 @@ namespace mobile_result = mobile_apis::Result;
 using ::testing::_;
 using ::testing::Return;
 
-using sdl_rpc_plugin::commands::UnSubscribeWayPointsRequest;
+using sdl_rpc_plugin::commands::UnsubscribeWayPointsRequest;
 using am::commands::MessageSharedPtr;
 
 namespace {
@@ -67,21 +67,21 @@ const uint32_t kConnectionKey = 3u;
 const uint32_t kAppId = 5u;
 }  // namespace
 
-class UnSubscribeWayPointsRequestTest
+class UnsubscribeWayPointsRequestTest
     : public CommandRequestTest<CommandsTestMocks::kIsNice> {
  public:
-  UnSubscribeWayPointsRequestTest()
+  UnsubscribeWayPointsRequestTest()
       : command_msg_(CreateMessage(smart_objects::SmartType_Map))
-      , command_(CreateCommand<UnSubscribeWayPointsRequest>(command_msg_)) {
+      , command_(CreateCommand<UnsubscribeWayPointsRequest>(command_msg_)) {
     (*command_msg_)[am::strings::params][am::strings::connection_key] =
         kConnectionKey;
   }
 
   MessageSharedPtr command_msg_;
-  std::shared_ptr<UnSubscribeWayPointsRequest> command_;
+  std::shared_ptr<UnsubscribeWayPointsRequest> command_;
 };
 
-TEST_F(UnSubscribeWayPointsRequestTest,
+TEST_F(UnsubscribeWayPointsRequestTest,
        Run_ApplicationIsNotRegistered_UNSUCCESS) {
   EXPECT_CALL(app_mngr_, application(_))
       .WillOnce(Return(ApplicationSharedPtr()));
@@ -94,7 +94,7 @@ TEST_F(UnSubscribeWayPointsRequestTest,
   command_->Run();
 }
 
-TEST_F(UnSubscribeWayPointsRequestTest,
+TEST_F(UnsubscribeWayPointsRequestTest,
        Run_AppIsNotSubscribedForWayPoints_UNSUCCESS) {
   MockAppPtr mock_app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
@@ -112,7 +112,7 @@ TEST_F(UnSubscribeWayPointsRequestTest,
   command_->Run();
 }
 
-TEST_F(UnSubscribeWayPointsRequestTest, Run_AppSubscribedForWayPoints_SUCCESS) {
+TEST_F(UnsubscribeWayPointsRequestTest, Run_AppSubscribedForWayPoints_SUCCESS) {
   MockAppPtr mock_app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app));
@@ -129,7 +129,7 @@ TEST_F(UnSubscribeWayPointsRequestTest, Run_AppSubscribedForWayPoints_SUCCESS) {
   command_->Run();
 }
 
-TEST_F(UnSubscribeWayPointsRequestTest, OnEvent_UnknownEvent_UNSUCCESS) {
+TEST_F(UnsubscribeWayPointsRequestTest, OnEvent_UnknownEvent_UNSUCCESS) {
   MockAppPtr mock_app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app));
@@ -140,8 +140,8 @@ TEST_F(UnSubscribeWayPointsRequestTest, OnEvent_UnknownEvent_UNSUCCESS) {
   command_->on_event(event);
 }
 
-TEST_F(UnSubscribeWayPointsRequestTest,
-       OnEvent_ReceivedNavigationUnSubscribeWayPointsEvent_SUCCESS) {
+TEST_F(UnsubscribeWayPointsRequestTest,
+       OnEvent_ReceivedNavigationUnsubscribeWayPointsEvent_SUCCESS) {
   MockAppPtr mock_app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillRepeatedly(Return(mock_app));