diff options
Diffstat (limited to 'src/components/application_manager/test/include/application_manager/commands/command_request_test.h')
-rw-r--r-- | src/components/application_manager/test/include/application_manager/commands/command_request_test.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/components/application_manager/test/include/application_manager/commands/command_request_test.h b/src/components/application_manager/test/include/application_manager/commands/command_request_test.h index 54552ef0d5..05cb80c989 100644 --- a/src/components/application_manager/test/include/application_manager/commands/command_request_test.h +++ b/src/components/application_manager/test/include/application_manager/commands/command_request_test.h @@ -39,9 +39,10 @@ #include "utils/shared_ptr.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" +#include "application_manager/test/include/application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_impl.h" -#include "application_manager/mock_event_dispatcher.h" +#include "application_manager/test/include/application_manager/mock_event_dispatcher.h" + #include "application_manager/event_engine/event.h" namespace test { @@ -94,9 +95,7 @@ class CommandRequestTest : public CommandsTest<kIsNice> { MessageSharedPtr CatchMobileCommandResult(CallableT delegate, bool call_return = true) { MessageSharedPtr result_msg; - EXPECT_CALL(this->app_mngr_, GetRPCService()) - .WillOnce(ReturnRef(this->rpc_service_)); - EXPECT_CALL(this->rpc_service_, ManageMobileCommand(_, _)) + EXPECT_CALL(this->mock_rpc_service_, ManageMobileCommand(_, _)) .WillOnce(DoAll(SaveArg<0>(&result_msg), Return(call_return))); delegate(); return result_msg; @@ -106,9 +105,7 @@ class CommandRequestTest : public CommandsTest<kIsNice> { MessageSharedPtr CatchHMICommandResult(CallableT delegate, bool call_return = true) { MessageSharedPtr result_msg; - ON_CALL(this->app_mngr_, GetRPCService()) - .WillByDefault(ReturnRef(this->rpc_service_)); - EXPECT_CALL(this->rpc_service_, ManageHMICommand(_)) + EXPECT_CALL(this->mock_rpc_service_, ManageHMICommand(_)) .WillOnce(DoAll(SaveArg<0>(&result_msg), Return(call_return))); delegate(); return result_msg; |