From 6ca86cb8ad83b9b75148e067829b9972ea742bb5 Mon Sep 17 00:00:00 2001 From: AKalinich-Luxoft Date: Fri, 6 Jul 2018 19:58:12 +0300 Subject: Fix affected unit tests --- .../commands/mobile/add_command_request_test.cc | 22 ++++++++++++++++++++++ .../commands/mobile/delete_command_request_test.cc | 18 +++++++++++++++++- .../test/commands/mobile/delete_sub_menu_test.cc | 9 +++++++++ .../test/application_manager_impl_test.cc | 12 ------------ .../test/help_prompt_manager_test.cc | 7 ------- .../include/application_manager/mock_application.h | 2 ++ .../application_manager/mock_help_prompt_manager.h | 11 ++++++----- .../test/message_helper/message_helper_test.cc | 15 +++++++++++++++ .../test/resumption/resume_ctrl_test.cc | 13 ++++--------- 9 files changed, 75 insertions(+), 34 deletions(-) diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc index 0067be3f1b..9f60053eb3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc @@ -49,6 +49,7 @@ #include "application_manager/mock_message_helper.h" #include "application_manager/event_engine/event.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_help_prompt_manager.h" namespace test { namespace components { @@ -57,6 +58,7 @@ namespace mobile_commands_test { namespace add_command_request { namespace am = application_manager; +namespace am_test = application_manager_test; using am::commands::CommandImpl; using am::ApplicationManager; using am::commands::MessageSharedPtr; @@ -104,6 +106,8 @@ class AddCommandRequestTest : msg_(CreateMessage()) , default_app_name_("test_default_app_name_") , lock_ptr_(std::make_shared()) + , mock_help_prompt_manager_( + std::make_shared()) , mock_app_(CreateMockApp()) { EXPECT_CALL(app_mngr_, application(kConnectionKey)) .WillRepeatedly(Return(mock_app_)); @@ -226,6 +230,7 @@ class AddCommandRequestTest SmartObjectSPtr so_ptr_; const utils::custom_string::CustomString default_app_name_; std::shared_ptr lock_ptr_; + std::shared_ptr mock_help_prompt_manager_; MockAppPtr mock_app_; }; @@ -524,6 +529,12 @@ TEST_F(AddCommandRequestTest, OnEvent_UI_SUCCESS) { mock_rpc_service_, ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_AddCommand))) .WillOnce(Return(true)); + + EXPECT_CALL(*mock_app_, help_prompt_manager()) + .WillOnce(ReturnRef(*mock_help_prompt_manager_)); + EXPECT_CALL(*mock_help_prompt_manager_, + OnVrCommandAdded(kCmdId, (*msg_)[msg_params], false)); + utils::SharedPtr request_ptr = CreateCommand(msg_); request_ptr->Run(); @@ -549,6 +560,12 @@ TEST_F(AddCommandRequestTest, OnEvent_VR_SUCCESS) { mock_rpc_service_, ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::VR_AddCommand))) .WillOnce(Return(true)); + + EXPECT_CALL(*mock_app_, help_prompt_manager()) + .WillOnce(ReturnRef(*mock_help_prompt_manager_)); + EXPECT_CALL(*mock_help_prompt_manager_, + OnVrCommandAdded(kCmdId, (*msg_)[msg_params], false)); + utils::SharedPtr request_ptr = CreateCommand(msg_); request_ptr->Run(); @@ -665,6 +682,11 @@ TEST_F(AddCommandRequestTest, EXPECT_CALL(mock_rpc_service_, ManageMobileCommand( MobileResultCodeIs(mobile_apis::Result::WARNINGS), _)); + + EXPECT_CALL(*mock_app_, help_prompt_manager()) + .WillOnce(ReturnRef(*mock_help_prompt_manager_)); + EXPECT_CALL(*mock_help_prompt_manager_, OnVrCommandAdded(kCmdId, _, false)); + utils::SharedPtr request_ptr = CreateCommand(msg_); request_ptr->Run(); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc index ac8803c2ca..e3a4e0f381 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc @@ -44,6 +44,7 @@ #include "application_manager/mock_application.h" #include "application_manager/mock_message_helper.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_help_prompt_manager.h" #include "application_manager/event_engine/event.h" namespace test { @@ -56,6 +57,7 @@ using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; namespace am = ::application_manager; +namespace am_test = application_manager_test; using sdl_rpc_plugin::commands::DeleteCommandRequest; using am::commands::MessageSharedPtr; using am::event_engine::Event; @@ -74,7 +76,10 @@ const uint32_t kConnectionKey = 2u; class DeleteCommandRequestTest : public CommandRequestTest { public: - DeleteCommandRequestTest() : mock_app_(CreateMockApp()) {} + DeleteCommandRequestTest() + : mock_help_prompt_manager_( + std::make_shared()) + , mock_app_(CreateMockApp()) {} MessageSharedPtr CreateFullParamsUISO() { MessageSharedPtr msg = CreateMessage(smart_objects::SmartType_Map); (*msg)[am::strings::params][am::strings::connection_key] = kConnectionKey; @@ -132,6 +137,7 @@ class DeleteCommandRequestTest } NiceMock hmi_interfaces_; + std::shared_ptr mock_help_prompt_manager_; MockAppPtr mock_app_; }; @@ -188,6 +194,11 @@ TEST_F(DeleteCommandRequestTest, ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&vr_command_result), Return(true))); + EXPECT_CALL(*mock_app_, help_prompt_manager()) + .WillOnce(ReturnRef(*mock_help_prompt_manager_)); + EXPECT_CALL(*mock_help_prompt_manager_, + OnVrCommandDeleted(kCommandId, false)); + command->on_event(event_vr); ResultCommandExpectations(vr_command_result, "VR is not supported by system"); @@ -241,6 +252,11 @@ TEST_F(DeleteCommandRequestTest, EXPECT_CALL(*app, UpdateHash()); + EXPECT_CALL(*app, help_prompt_manager()) + .WillOnce(ReturnRef(*mock_help_prompt_manager_)); + EXPECT_CALL(*mock_help_prompt_manager_, + OnVrCommandDeleted(kCommandId, false)); + MessageSharedPtr result_msg( CatchMobileCommandResult(CallOnEvent(*command, event_ui))); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_sub_menu_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_sub_menu_test.cc index 7a187c46d1..5dad433d6d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_sub_menu_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_sub_menu_test.cc @@ -43,6 +43,7 @@ #include "application_manager/mock_message_helper.h" #include "application_manager/event_engine/event.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_help_prompt_manager.h" namespace test { namespace components { @@ -55,6 +56,7 @@ using ::testing::Return; using ::testing::ReturnRef; using ::testing::InSequence; namespace am = ::application_manager; +namespace am_test = application_manager_test; using am::commands::MessageSharedPtr; using am::event_engine::Event; using am::MockHmiInterfaces; @@ -99,6 +101,8 @@ class DeleteSubMenuRequestTest , accessor_(commands_map_, commands_lock_) , message_(CreateMessage()) , command_(CreateCommand(message_)) + , mock_help_prompt_manager_( + std::make_shared()) , app_(CreateMockApp()) {} am::CommandsMap commands_map_; @@ -107,6 +111,7 @@ class DeleteSubMenuRequestTest MessageSharedPtr message_; DeleteSubMenuRequestPtr command_; + std::shared_ptr mock_help_prompt_manager_; MockAppPtr app_; }; @@ -276,6 +281,9 @@ TEST_F(DeleteSubMenuRequestTest, OnEvent_DeleteSubmenu_SUCCESS) { EXPECT_CALL(*app_, commands_map()).WillOnce(Return(accessor_)); EXPECT_CALL(*app_, app_id()).WillOnce(Return(kConnectionKey)); EXPECT_CALL(*app_, RemoveCommand(_)).WillOnce(DeleteCommand(&commands_map_)); + EXPECT_CALL(*app_, help_prompt_manager()) + .WillOnce(ReturnRef(*mock_help_prompt_manager_)); + EXPECT_CALL(*mock_help_prompt_manager_, OnVrCommandDeleted(kCmdId, false)); EXPECT_CALL( mock_rpc_service_, ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_DeleteCommand))) @@ -287,6 +295,7 @@ TEST_F(DeleteSubMenuRequestTest, OnEvent_DeleteSubmenu_SUCCESS) { ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS), am::commands::Command::SOURCE_SDL)); EXPECT_CALL(*app_, UpdateHash()); + DeleteSubMenuRequestPtr command = CreateCommand(message_); diff --git a/src/components/application_manager/test/application_manager_impl_test.cc b/src/components/application_manager/test/application_manager_impl_test.cc index 7c373476de..c13a47aae5 100644 --- a/src/components/application_manager/test/application_manager_impl_test.cc +++ b/src/components/application_manager/test/application_manager_impl_test.cc @@ -41,7 +41,6 @@ #include "application_manager/application_impl.h" #include "application_manager/application_manager_impl.h" #include "application_manager/mock_application.h" -#include "application_manager/mock_help_prompt_manager.h" #include "application_manager/mock_application_manager_settings.h" #include "application_manager/mock_resumption_data.h" #include "application_manager/mock_rpc_service.h" @@ -152,8 +151,6 @@ class ApplicationManagerImplTest : public ::testing::Test { app_manager_impl_.reset(new am::ApplicationManagerImpl( mock_application_manager_settings_, mock_policy_settings_)); mock_app_ptr_ = utils::SharedPtr(new MockApplication()); - mock_help_prompt_manager_ = - utils::SharedPtr(new MockHelpPromptManager()); app_manager_impl_->set_protocol_handler(&mock_protocol_handler_); ASSERT_TRUE(app_manager_impl_.get()); ASSERT_TRUE(mock_app_ptr_.get()); @@ -202,7 +199,6 @@ class ApplicationManagerImplTest : public ::testing::Test { application_manager::MockMessageHelper* mock_message_helper_; utils::SharedPtr mock_app_ptr_; - utils::SharedPtr mock_help_prompt_manager_; NiceMock mock_protocol_handler_; }; @@ -811,10 +807,6 @@ TEST_F(ApplicationManagerImplTest, EXPECT_TRUE(app_manager_impl_->IsAppInReconnectMode(policy_app_id_switch)); - EXPECT_CALL(*switching_app_ptr, help_prompt_manager()) - .WillOnce(ReturnRef(*mock_help_prompt_manager_.get())); - EXPECT_CALL(*mock_help_prompt_manager_, OnAppUnregistered()); - app_manager_impl_->OnDeviceSwitchingFinish(switching_device_id); EXPECT_FALSE( app_manager_impl_->application_by_policy_id(policy_app_id_switch)); @@ -959,10 +951,6 @@ TEST_F(ApplicationManagerImplTest, UnregisterAnotherAppDuringAudioPassThru) { audio_type); } - EXPECT_CALL(*mock_app_1, help_prompt_manager()) - .WillOnce(ReturnRef(*mock_help_prompt_manager_.get())); - EXPECT_CALL(*mock_help_prompt_manager_, OnAppUnregistered()); - // while running APT, app 1 is unregistered app_manager_impl_->UnregisterApplication( app_id_1, mobile_apis::Result::SUCCESS, false, true); diff --git a/src/components/application_manager/test/help_prompt_manager_test.cc b/src/components/application_manager/test/help_prompt_manager_test.cc index 506ee6207c..335e8e4f64 100644 --- a/src/components/application_manager/test/help_prompt_manager_test.cc +++ b/src/components/application_manager/test/help_prompt_manager_test.cc @@ -259,9 +259,6 @@ TEST_F(HelpPromptManagerTest, AddCommand_OnVrCommandAdded) { hmi_apis::Common_Result::SUCCESS; (*msg)[strings::msg_params][strings::cmd_id] = kCmdId; - EXPECT_CALL(*mock_help_prompt_manager_, - OnVrCommandAdded(kCmdId, (*msg)[strings::msg_params])); - app_impl_->AddCommand(kCmdId, (*msg)[strings::msg_params]); } @@ -274,10 +271,6 @@ TEST_F(HelpPromptManagerTest, RemoveCommand_OnVrCommandDeleted) { hmi_apis::Common_Result::SUCCESS; (*msg)[strings::msg_params][strings::cmd_id] = kCmdId; - EXPECT_CALL(*mock_help_prompt_manager_, - OnVrCommandAdded(kCmdId, (*msg)[strings::msg_params])); - EXPECT_CALL(*mock_help_prompt_manager_, OnVrCommandDeleted(kCmdId)); - app_impl_->AddCommand(kCmdId, (*msg)[strings::msg_params]); app_impl_->RemoveCommand(kCmdId); } 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 9b6f84ba52..819f90f195 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 @@ -157,6 +157,8 @@ class MockApplication : public ::application_manager::Application { MOCK_METHOD0(usage_report, ::application_manager::UsageStatistics&()); MOCK_METHOD0(help_prompt_manager, ::application_manager::HelpPromptManager&()); + MOCK_CONST_METHOD0(help_prompt_manager, + const ::application_manager::HelpPromptManager&()); MOCK_METHOD1(SetInitialState, void(::application_manager::HmiStatePtr state)); MOCK_METHOD1(SetRegularState, void(::application_manager::HmiStatePtr state)); MOCK_METHOD1(SetPostponedState, diff --git a/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h b/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h index 67c5332641..a415f94d56 100644 --- a/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h +++ b/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h @@ -43,14 +43,15 @@ using namespace application_manager; class MockHelpPromptManager : public ::application_manager::HelpPromptManager { public: MockHelpPromptManager() {} - MOCK_METHOD2(OnVrCommandAdded, + MOCK_METHOD3(OnVrCommandAdded, void(uint32_t cmd_id, - const smart_objects::SmartObject& command)); - MOCK_METHOD1(OnVrCommandDeleted, void(uint32_t cmd_id)); + const smart_objects::SmartObject& command, + const bool should_send_requests)); + MOCK_METHOD2(OnVrCommandDeleted, + void(uint32_t cmd_id, const bool should_send_requests)); MOCK_METHOD2(OnSetGlobalPropertiesReceived, void(const smart_objects::SmartObject& msg, bool is_response)); - MOCK_METHOD1(OnAppActivated, void(bool is_restore)); - MOCK_METHOD0(OnAppUnregistered, void()); + MOCK_CONST_METHOD0(GetSendingType, SendingType()); }; } // namespace application_manager_test diff --git a/src/components/application_manager/test/message_helper/message_helper_test.cc b/src/components/application_manager/test/message_helper/message_helper_test.cc index e43348cc80..0e48d39e24 100644 --- a/src/components/application_manager/test/message_helper/message_helper_test.cc +++ b/src/components/application_manager/test/message_helper/message_helper_test.cc @@ -38,6 +38,7 @@ #include "utils/make_shared.h" #include "application_manager/policies/policy_handler.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_help_prompt_manager.h" #include "utils/custom_string.h" #include "utils/lock.h" #include "policy/mock_policy_settings.h" @@ -148,6 +149,13 @@ TEST(MessageHelperTestCreate, EXPECT_CALL(*appSharedMock, help_prompt()).Times(AtLeast(1)); EXPECT_CALL(*appSharedMock, timeout_prompt()).Times(AtLeast(1)); + std::shared_ptr mock_help_prompt_manager = + std::make_shared(); + EXPECT_CALL(*appSharedMock, help_prompt_manager()) + .WillRepeatedly(ReturnRef(*mock_help_prompt_manager)); + EXPECT_CALL(*mock_help_prompt_manager, GetSendingType()) + .WillRepeatedly(Return(HelpPromptManager::SendingType::kSendBoth)); + smart_objects::SmartObjectList ptr = MessageHelper::CreateGlobalPropertiesRequestsToHMI(appSharedMock, 0u); @@ -191,6 +199,13 @@ TEST(MessageHelperTestCreate, .WillRepeatedly(Return(&(*objPtr)[4])); EXPECT_CALL(*appSharedMock, app_id()).WillRepeatedly(Return(0)); + std::shared_ptr mock_help_prompt_manager = + std::make_shared(); + EXPECT_CALL(*appSharedMock, help_prompt_manager()) + .WillRepeatedly(ReturnRef(*mock_help_prompt_manager)); + EXPECT_CALL(*mock_help_prompt_manager, GetSendingType()) + .WillRepeatedly(Return(HelpPromptManager::SendingType::kSendBoth)); + smart_objects::SmartObjectList ptr = MessageHelper::CreateGlobalPropertiesRequestsToHMI(appSharedMock, 0u); diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc index 9320bb4fdb..a8a01b9ad8 100644 --- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc +++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc @@ -320,9 +320,13 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithCommands) { .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true))); EXPECT_CALL(*mock_app_, UpdateHash()); EXPECT_CALL(*mock_app_, set_grammar_id(kTestGrammarId_)); + ON_CALL(*mock_app_, help_prompt_manager()) + .WillByDefault(ReturnRef(*mock_help_prompt_manager_)); for (uint32_t i = 0; i < count_of_commands; ++i) { EXPECT_CALL(*mock_app_, AddCommand(i, test_application_commands[i])); + EXPECT_CALL(*mock_help_prompt_manager_, + OnVrCommandAdded(i, test_application_commands[i], true)); } smart_objects::SmartObjectList requests; @@ -575,9 +579,6 @@ TEST_F(ResumeCtrlTest, StartAppHmiStateResumption_AppInFull) { ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")) .WillByDefault(Return(policy::kDeviceAllowed)); - EXPECT_CALL(*mock_app_, help_prompt_manager()) - .WillOnce(ReturnRef(*mock_help_prompt_manager_.get())); - EXPECT_CALL(*mock_help_prompt_manager_, OnAppActivated(true)); res_ctrl_->StartAppHmiStateResumption(mock_app_); } @@ -627,9 +628,6 @@ TEST_F(ResumeCtrlTest, RestoreAppHMIState_RestoreHMILevelFull) { ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")) .WillByDefault(Return(policy::kDeviceAllowed)); EXPECT_CALL(*mock_app_, set_is_resuming(true)); - EXPECT_CALL(*mock_app_, help_prompt_manager()) - .WillOnce(ReturnRef(*mock_help_prompt_manager_.get())); - EXPECT_CALL(*mock_help_prompt_manager_, OnAppActivated(true)); const bool res = res_ctrl_->RestoreAppHMIState(mock_app_); EXPECT_TRUE(res); @@ -687,9 +685,6 @@ TEST_F(ResumeCtrlTest, ApplicationResumptiOnTimer_AppInFull) { ON_CALL(mock_app_mngr_, GetUserConsentForDevice(kMacAddress_)) .WillByDefault(Return(policy::kDeviceAllowed)); - EXPECT_CALL(*mock_app_, help_prompt_manager()) - .WillOnce(ReturnRef(*mock_help_prompt_manager_.get())); - EXPECT_CALL(*mock_help_prompt_manager_, OnAppActivated(true)); res_ctrl_->StartAppHmiStateResumption(mock_app_); } -- cgit v1.2.1