diff options
Diffstat (limited to 'src/components/application_manager/test/include/application_manager')
-rw-r--r-- | src/components/application_manager/test/include/application_manager/commands/command_request_test.h | 13 | ||||
-rw-r--r-- | src/components/application_manager/test/include/application_manager/commands/commands_test.h | 23 | ||||
-rw-r--r-- | src/components/application_manager/test/include/application_manager/mock_command_factory.h (renamed from src/components/application_manager/test/include/application_manager/mock_hmi_command_factory.h) | 13 |
3 files changed, 29 insertions, 20 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; diff --git a/src/components/application_manager/test/include/application_manager/commands/commands_test.h b/src/components/application_manager/test/include/application_manager/commands/commands_test.h index 744a22e9c4..ab392c5ba0 100644 --- a/src/components/application_manager/test/include/application_manager/commands/commands_test.h +++ b/src/components/application_manager/test/include/application_manager/commands/commands_test.h @@ -42,10 +42,12 @@ #include "utils/make_shared.h" #include "application_manager/mock_application_manager.h" #include "test/application_manager/mock_application_manager_settings.h" -#include "application_manager/mock_hmi_interface.h" -#include "application_manager/mock_application.h" -#include "application_manager/mock_message_helper.h" +#include "application_manager/test/include/application_manager/mock_hmi_interface.h" +#include "application_manager/test/include/application_manager/mock_application.h" +#include "application_manager/test/include/application_manager/mock_message_helper.h" #include "application_manager/mock_rpc_service.h" +#include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/policies/mock_policy_handler_interface.h" namespace test { namespace components { namespace commands_test { @@ -122,7 +124,10 @@ class CommandsTest : public ::testing::Test { MessageSharedPtr& msg) { InitCommand(timeout); return ::utils::MakeShared<Command>((msg ? msg : msg = CreateMessage()), - app_mngr_); + app_mngr_, + mock_rpc_service_, + mock_hmi_capabilities_, + mock_policy_handler_); } template <class Command> @@ -134,16 +139,22 @@ class CommandsTest : public ::testing::Test { SharedPtr<Command> CreateCommand(const uint32_t timeout = kDefaultTimeout_) { InitCommand(timeout); MessageSharedPtr msg = CreateMessage(); - return ::utils::MakeShared<Command>(msg, app_mngr_); + return ::utils::MakeShared<Command>(msg, + app_mngr_, + mock_rpc_service_, + mock_hmi_capabilities_, + mock_policy_handler_); } enum { kDefaultTimeout_ = 100 }; MockAppManager app_mngr_; + MockRPCService mock_rpc_service_; + application_manager_test::MockHMICapabilities mock_hmi_capabilities_; + policy_test::MockPolicyHandlerInterface mock_policy_handler_; MockAppManagerSettings app_mngr_settings_; MOCK(am::MockHmiInterfaces) mock_hmi_interfaces_; am::MockMessageHelper& mock_message_helper_; - MockRPCService rpc_service_; protected: virtual void InitCommand(const uint32_t& timeout) { diff --git a/src/components/application_manager/test/include/application_manager/mock_hmi_command_factory.h b/src/components/application_manager/test/include/application_manager/mock_command_factory.h index cf40d7b98b..ca4616cbd2 100644 --- a/src/components/application_manager/test/include/application_manager/mock_hmi_command_factory.h +++ b/src/components/application_manager/test/include/application_manager/mock_command_factory.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_HMI_COMMAND_FACTORY_H_ #include <gmock/gmock.h> -#include "application_manager/application_manager.h" +#include "application_manager/command_factory.h" #include "application_manager/commands/command.h" #include "smart_objects/smart_object.h" #include "utils/shared_ptr.h" @@ -43,14 +43,15 @@ namespace test { namespace components { namespace application_manager_test { -class MockHMICommandFactory { +class MockCommandFactory : public application_manager::CommandFactory { public: MOCK_METHOD2(CreateCommand, - utils::SharedPtr<application_manager::commands::Command>( - const utils::SharedPtr<smart_objects::SmartObject>&, - application_manager::ApplicationManager&)); + application_manager::CommandSharedPtr( + const application_manager::commands::MessageSharedPtr&, + application_manager::commands::Command::CommandSource)); - static MockHMICommandFactory* mock_hmi_command_factory(); + // const commands::MessageSharedPtr& message, + // application_manager::commands::Command::CommandSource)); }; } // namespace application_manager_test |