From bc72a21e32db5a4dc44d10b9e364134402d9e69c Mon Sep 17 00:00:00 2001 From: Shobhit Adlakha Date: Fri, 10 May 2019 12:23:47 -0400 Subject: Fixed typo and implemented mock_rpc_handler --- .../test/rpc_passing_handler_test.cc | 13 ++++--- .../test/application_manager/mock_rpc_handler.h | 41 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 src/components/include/test/application_manager/mock_rpc_handler.h diff --git a/src/components/application_manager/test/rpc_passing_handler_test.cc b/src/components/application_manager/test/rpc_passing_handler_test.cc index c1ef29ca07..b578562dea 100644 --- a/src/components/application_manager/test/rpc_passing_handler_test.cc +++ b/src/components/application_manager/test/rpc_passing_handler_test.cc @@ -35,12 +35,12 @@ #include "application_manager/rpc_passing_handler.h" -// #include "application_manager/commands/command.h" #include "application_manager/mock_app_service_manager.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_application_manager_settings.h" #include "application_manager/mock_message_helper.h" +#include "application_manager/mock_rpc_handler.h" #include "application_manager/mock_rpc_service.h" #include "application_manager/policies/mock_policy_handler_interface.h" @@ -91,12 +91,14 @@ class RPCPassingHandlerTest : public ::testing::Test { .WillByDefault(Return()); ON_CALL(mock_app_manager_, GetAppServiceManager()) - .WillByDefault(ReturnRef(mock_app_service_manager_)) - ON_CALL(mock_app_service_manager_, GetActiveServices()) + .WillByDefault(ReturnRef(mock_app_service_manager_)); + ON_CALL(mock_app_service_manager_, GetActiveServices()) .WillByDefault(Return(app_services_)); - // app_manager_.GetRPCHandler() - // rpc_handler.ValidateRpcSO(message, msg_version, report, false)) + ON_CALL(mock_app_manager_, GetRPCHandler()) + .WillByDefault(ReturnRef(mock_rpc_handler_)); + ON_CALL(mock_rpc_handler_, ValidateRpcSO(_, _, _, _)) + .WillByDefault(Return(true)); } void TearDown() OVERRIDE { @@ -208,6 +210,7 @@ class RPCPassingHandlerTest : public ::testing::Test { MockApplicationManager mock_app_manager_; MockApplicationManagerSettings mock_app_manager_settings_; MockRPCService mock_rpc_service_; + MockRPCHandler mock_rpc_handler_; resumption_test::MockLastState mock_last_state_; MockAppServiceManager mock_app_service_manager_; am::RPCPassingHandler* rpc_passing_handler_; diff --git a/src/components/include/test/application_manager/mock_rpc_handler.h b/src/components/include/test/application_manager/mock_rpc_handler.h new file mode 100644 index 0000000000..fb577622ce --- /dev/null +++ b/src/components/include/test/application_manager/mock_rpc_handler.h @@ -0,0 +1,41 @@ +#ifndef MOCK_RPC_HANDLER_H +#define MOCK_RPC_HANDLER_H + +#include "application_manager/rpc_handler.h" +#include "telemetry_monitor/telemetry_observable.h" + +#include "gmock/gmock.h" + +namespace test { +namespace components { +namespace application_manager_test { + +class MockRPCHandler : public application_manager::rpc_handler::RPCHandler { + public: + MOCK_METHOD4(ValidateRpcSO, + bool(smart_objects::SmartObject& message, + utils::SemanticVersion& msg_version, + rpc::ValidationReport& report_out, + bool allow_unknown_parameters)); + + MOCK_METHOD1(OnMessageReceived, + void(protocol_handler::RawMessagePtr message)); + + MOCK_METHOD1(OnMobileMessageSent, + void(protocol_handler::RawMessagePtr message)); + + MOCK_METHOD1(OnMessageReceived, + void(std::shared_ptr message)); + + MOCK_METHOD1(OnErrorSending, + void(std::shared_ptr message)); + + MOCK_METHOD1(SetTelemetryObserver, + void(application_manager::AMTelemetryObserver* observer)); +}; + +} // namespace application_manager_test +} // namespace components +} // namespace test + +#endif // MOCK_RPC_HANDLER_H -- cgit v1.2.1