1 files changed, 12 insertions, 4 deletions
diff --git a/src/components/application_manager/test/hmi_language_handler_test.cc b/src/components/application_manager/test/hmi_language_handler_test.cc
index 2020da5052..a51d89ef76 100644
--- a/src/components/application_manager/test/hmi_language_handler_test.cc
+++ b/src/components/application_manager/test/hmi_language_handler_test.cc
@@ -42,6 +42,7 @@
 #include "application_manager/resumption/resume_ctrl_impl.h"
 #include "application_manager/mock_hmi_capabilities.h"
 #include "application_manager/mock_application.h"
+#include "application_manager/mock_rpc_service.h"
 #include "application_manager/smart_object_keys.h"
 #include "test/resumption/mock_last_state.h"
 #include "utils/shared_ptr.h"
@@ -72,6 +73,7 @@ typedef NiceMock<
 typedef NiceMock< ::test::components::event_engine_test::MockEventDispatcher>
     MockEventDispatcher;
 typedef NiceMock<application_manager_test::MockApplication> MockApp;
+typedef NiceMock<application_manager_test::MockRPCService> MockRPCService;
 
 typedef SharedPtr<MockApp> ApplicationSharedPtr;
 typedef am::HMILanguageHandler::Apps Apps;
@@ -135,6 +137,7 @@ class HmiLanguageHandlerTest : public ::testing::Test {
   SharedPtr<am::HMILanguageHandler> hmi_language_handler_;
   ::sync_primitives::Lock app_set_lock_;
   resumption_test::MockLastState last_state_;
+  MockRPCService rpc_service_;
 };
 
 TEST_F(HmiLanguageHandlerTest, OnEvent_AllLanguageIsReceivedAndSame_SUCCESS) {
@@ -164,7 +167,8 @@ TEST_F(HmiLanguageHandlerTest, OnEvent_AllLanguageIsReceivedAndSame_SUCCESS) {
   // So if they same app_manager_'s method `applications`
   // will never be called.
   EXPECT_CALL(app_manager_, applications()).Times(0);
-  EXPECT_CALL(app_manager_, ManageMobileCommand(_, _)).Times(0);
+  EXPECT_CALL(app_manager_, GetRPCService()).Times(0);
+  EXPECT_CALL(rpc_service_, ManageMobileCommand(_, _)).Times(0);
   EXPECT_CALL(app_manager_, UnregisterApplication(_, _, _, _)).Times(0);
   Event tts_event(hmi_apis::FunctionID::TTS_GetLanguage);
   hmi_language_handler_->on_event(tts_event);
@@ -201,7 +205,8 @@ TEST_F(HmiLanguageHandlerTest, OnEvent_AllReceivedLanguagesMismatch_SUCCESS) {
   // the `applications` will be called and
   // app data will checked by `CheckApplication` method
   ON_CALL(app_manager_, applications()).WillByDefault(Return(data_accessor));
-  EXPECT_CALL(app_manager_, ManageMobileCommand(_, _)).Times(0);
+  EXPECT_CALL(app_manager_, GetRPCService()).Times(0);
+  EXPECT_CALL(rpc_service_, ManageMobileCommand(_, _)).Times(0);
   EXPECT_CALL(app_manager_, UnregisterApplication(_, _, _, _)).Times(0);
 
   Event tts_event(hmi_apis::FunctionID::TTS_GetLanguage);
@@ -316,7 +321,9 @@ TEST_F(HmiLanguageHandlerTest,
   // Wait for `ManageMobileCommand` call twice.
   // First time in `SendOnLanguageChangeToMobile`
   // method, second time in `HandleWrongLanguageApp`.
-  EXPECT_CALL(app_manager_, ManageMobileCommand(_, _)).Times(2);
+  EXPECT_CALL(app_manager_, GetRPCService())
+      .WillRepeatedly(ReturnRef(rpc_service_));
+  EXPECT_CALL(rpc_service_, ManageMobileCommand(_, _)).Times(2);
   EXPECT_CALL(app_manager_, UnregisterApplication(_, _, _, _)).Times(1);
   hmi_language_handler_->on_event(event);
 }
@@ -344,7 +351,8 @@ TEST_F(HmiLanguageHandlerTest, OnUnregisterApp_SUCCESS) {
   InitHMIActiveLanguages(hmi_apis::Common_Language::eType::RU_RU,
                          hmi_apis::Common_Language::eType::RU_RU,
                          hmi_apis::Common_Language::eType::RU_RU);
-  EXPECT_CALL(app_manager_, ManageMobileCommand(_, _)).Times(0);
+  EXPECT_CALL(app_manager_, GetRPCService()).Times(0);
+  EXPECT_CALL(rpc_service_, ManageMobileCommand(_, _)).Times(0);
   EXPECT_CALL(app_manager_, UnregisterApplication(_, _, _, _)).Times(0);
   hmi_language_handler_->on_event(event);
 }