diff options
Diffstat (limited to 'src/components/application_manager/test/commands/hmi/sdl_activate_app_request_test.cc')
-rw-r--r-- | src/components/application_manager/test/commands/hmi/sdl_activate_app_request_test.cc | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/components/application_manager/test/commands/hmi/sdl_activate_app_request_test.cc b/src/components/application_manager/test/commands/hmi/sdl_activate_app_request_test.cc index 3805df5834..d36b55ee25 100644 --- a/src/components/application_manager/test/commands/hmi/sdl_activate_app_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/sdl_activate_app_request_test.cc @@ -62,7 +62,6 @@ using testing::Return; using testing::ReturnRef; using testing::Mock; using ::testing::NiceMock; -using am::MockMessageHelper; using policy_test::MockPolicyHandlerInterface; using am::event_engine::Event; @@ -102,15 +101,9 @@ MATCHER_P2(CheckMsgParams, result, corr_id, "") { class SDLActivateAppRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> { protected: - SDLActivateAppRequestTest() - : message_helper_mock_(am::MockMessageHelper::message_helper_mock()) { - Mock::VerifyAndClearExpectations(message_helper_mock_); - } - ~SDLActivateAppRequestTest() { // Fix DataAccessor release and WinQt crash Mock::VerifyAndClearExpectations(&app_mngr_); - Mock::VerifyAndClearExpectations(message_helper_mock_); } void InitCommand(const uint32_t& timeout) OVERRIDE { @@ -127,7 +120,6 @@ class SDLActivateAppRequestTest ApplicationSet app_list_; ::sync_primitives::Lock lock_; - am::MockMessageHelper* message_helper_mock_; policy_test::MockPolicyHandlerInterface policy_handler_; application_manager_test::MockStateController mock_state_controller_; NiceMock<event_engine_test::MockEventDispatcher> mock_event_dispatcher_; @@ -220,7 +212,7 @@ TEST_F(SDLActivateAppRequestTest, FindAppToRegister_SUCCESS) { const std::string package = "package"; ON_CALL(*mock_app_first, PackageName()).WillByDefault(Return(package)); - EXPECT_CALL(*message_helper_mock_, SendLaunchApp(_, _, _, _)); + EXPECT_CALL(mock_message_helper_, SendLaunchApp(_, _, _, _)); command->Run(); } @@ -299,7 +291,7 @@ TEST_F(SDLActivateAppRequestTest, FirstAppActive_SUCCESS) { ON_CALL(*mock_app_first, device()).WillByDefault(Return(kHandle)); EXPECT_CALL(*mock_app_first, is_foreground()).WillRepeatedly(Return(true)); - EXPECT_CALL(*message_helper_mock_, SendLaunchApp(_, _, _, _)); + EXPECT_CALL(mock_message_helper_, SendLaunchApp(_, _, _, _)); command->Run(); } @@ -328,7 +320,6 @@ TEST_F(SDLActivateAppRequestTest, FirstAppNotActive_SUCCESS) { } TEST_F(SDLActivateAppRequestTest, FirstAppIsForeground_SUCCESS) { - Mock::VerifyAndClearExpectations(&message_helper_mock_); MessageSharedPtr msg = CreateMessage(); SetCorrelationAndAppID(msg); @@ -363,10 +354,9 @@ TEST_F(SDLActivateAppRequestTest, FirstAppIsForeground_SUCCESS) { ON_CALL(*mock_app_first, device()).WillByDefault(Return(kHandle)); EXPECT_CALL(*mock_app_first, is_foreground()).WillOnce(Return(true)); - EXPECT_CALL(*message_helper_mock_, SendLaunchApp(_, schema, package_name, _)); + EXPECT_CALL(mock_message_helper_, SendLaunchApp(_, schema, package_name, _)); command->Run(); - Mock::VerifyAndClearExpectations(&message_helper_mock_); } TEST_F(SDLActivateAppRequestTest, FirstAppNotRegisteredAndEmpty_SUCCESS) { @@ -397,7 +387,7 @@ TEST_F(SDLActivateAppRequestTest, FirstAppNotRegisteredAndEmpty_SUCCESS) { Return(protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_5)); EXPECT_CALL(*mock_app_first, is_foreground()).WillOnce(Return(false)); - EXPECT_CALL(*message_helper_mock_, SendLaunchApp(_, _, _, _)); + EXPECT_CALL(mock_message_helper_, SendLaunchApp(_, _, _, _)); command->Run(); } @@ -432,7 +422,7 @@ TEST_F(SDLActivateAppRequestTest, FirstAppNotRegistered_SUCCESS) { Return(protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_5)); EXPECT_CALL(*mock_app_first, is_foreground()).WillRepeatedly(Return(true)); - EXPECT_CALL(*message_helper_mock_, SendLaunchApp(_, _, _, _)); + EXPECT_CALL(mock_message_helper_, SendLaunchApp(_, _, _, _)); command->Run(); } |