diff options
Diffstat (limited to 'src/components/application_manager/test/hmi_language_handler_test.cc')
-rw-r--r-- | src/components/application_manager/test/hmi_language_handler_test.cc | 35 |
1 files changed, 21 insertions, 14 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..ec88075212 100644 --- a/src/components/application_manager/test/hmi_language_handler_test.cc +++ b/src/components/application_manager/test/hmi_language_handler_test.cc @@ -42,10 +42,10 @@ #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" -#include "utils/make_shared.h" + #include "utils/lock.h" namespace test { @@ -56,7 +56,6 @@ namespace am = ::application_manager; using am::event_engine::Event; using am::ApplicationSet; -using ::utils::SharedPtr; using ::testing::Return; using ::testing::ReturnRef; @@ -72,8 +71,9 @@ 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 std::shared_ptr<MockApp> ApplicationSharedPtr; typedef am::HMILanguageHandler::Apps Apps; namespace { @@ -82,11 +82,12 @@ const uint32_t kDefaultAppsSize = 0u; class HmiLanguageHandlerTest : public ::testing::Test { public: - HmiLanguageHandlerTest() { + HmiLanguageHandlerTest() + : app_set_lock_(std::make_shared<sync_primitives::Lock>()) { EXPECT_CALL(app_manager_, event_dispatcher()) .WillOnce(ReturnRef(event_dispatcher_)); hmi_language_handler_ = - ::utils::MakeShared<am::HMILanguageHandler>(app_manager_); + std::make_shared<am::HMILanguageHandler>(app_manager_); } void InitHMIActiveLanguages(hmi_apis::Common_Language::eType ui_language, @@ -111,7 +112,7 @@ class HmiLanguageHandlerTest : public ::testing::Test { ApplicationSharedPtr CreateMockApp(const uint32_t app_id, bool expect_call = false) const { - ApplicationSharedPtr app = ::utils::MakeShared<MockApp>(); + ApplicationSharedPtr app = std::make_shared<MockApp>(); if (expect_call) { EXPECT_CALL(*app, app_id()).WillRepeatedly(Return(app_id)); } else { @@ -132,9 +133,10 @@ class HmiLanguageHandlerTest : public ::testing::Test { MockApplicationManager app_manager_; MockHMICapabilities hmi_capabilities_; MockEventDispatcher event_dispatcher_; - SharedPtr<am::HMILanguageHandler> hmi_language_handler_; - ::sync_primitives::Lock app_set_lock_; + std::shared_ptr<am::HMILanguageHandler> hmi_language_handler_; + std::shared_ptr<sync_primitives::Lock> app_set_lock_; resumption_test::MockLastState last_state_; + MockRPCService mock_rpc_service_; }; TEST_F(HmiLanguageHandlerTest, OnEvent_AllLanguageIsReceivedAndSame_SUCCESS) { @@ -164,7 +166,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(mock_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 +204,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(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0); EXPECT_CALL(app_manager_, UnregisterApplication(_, _, _, _)).Times(0); Event tts_event(hmi_apis::FunctionID::TTS_GetLanguage); @@ -311,12 +315,14 @@ TEST_F(HmiLanguageHandlerTest, // Needed to call of `ManageMobileCommand` method ON_CALL(*am::MockMessageHelper::message_helper_mock(), GetOnAppInterfaceUnregisteredNotificationToMobile(_, _)) - .WillByDefault(Return(::utils::MakeShared<smart_objects::SmartObject>())); + .WillByDefault(Return(std::make_shared<smart_objects::SmartObject>())); // 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(mock_rpc_service_)); + EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(2); EXPECT_CALL(app_manager_, UnregisterApplication(_, _, _, _)).Times(1); hmi_language_handler_->on_event(event); } @@ -344,7 +350,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(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0); EXPECT_CALL(app_manager_, UnregisterApplication(_, _, _, _)).Times(0); hmi_language_handler_->on_event(event); } |