summaryrefslogtreecommitdiff
path: root/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc')
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
index c5a8e54c6d..a1fff199ee 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
@@ -53,7 +53,7 @@
#include "interfaces/MOBILE_API.h"
#include "include/test/protocol_handler/mock_protocol_handler.h"
#include "test/application_manager/mock_application_manager_settings.h"
-#include "utils/make_shared.h"
+
using ::testing::_;
using ::testing::Return;
@@ -62,7 +62,7 @@ using ::testing::NiceMock;
using ::testing::SaveArg;
using ::testing::Mock;
using ::testing::NiceMock;
-using ::utils::SharedPtr;
+
namespace am = ::application_manager;
using am::ApplicationSet;
using am::commands::MessageSharedPtr;
@@ -99,7 +99,7 @@ class RCGetInteriorVehicleDataConsentTest
: public CommandRequestTest<CommandsTestMocks::kIsNice> {
public:
RCGetInteriorVehicleDataConsentTest()
- : mock_app_(utils::MakeShared<NiceMock<MockApplication> >())
+ : mock_app_(std::make_shared<NiceMock<MockApplication> >())
, command_holder(app_mngr_)
, request_controller(mock_request_controler)
, rpc_service(app_mngr_,
@@ -107,9 +107,9 @@ class RCGetInteriorVehicleDataConsentTest
&mock_protocol_handler,
&mock_hmi_handler,
command_holder)
- , rc_app_extention_(utils::MakeShared<RCAppExtension>(kPluginID))
+ , rc_app_extention_(std::make_shared<RCAppExtension>(kPluginID))
, mock_rpc_plugin_manager(
- utils::MakeShared<NiceMock<MockRPCPluginManager> >())
+ std::make_shared<NiceMock<MockRPCPluginManager> >())
, rpc_plugin(mock_rpc_plugin)
, optional_mock_rpc_plugin(mock_rpc_plugin) {
ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId));
@@ -146,10 +146,10 @@ class RCGetInteriorVehicleDataConsentTest
}
template <class Command>
- application_manager::SharedPtr<Command> CreateRCCommand(
+ std::shared_ptr<Command> CreateRCCommand(
MessageSharedPtr& msg) {
InitCommand(kDefaultTimeout_);
- return ::utils::MakeShared<Command>(msg ? msg : msg = CreateMessage(),
+ return std::make_shared<Command>(msg ? msg : msg = CreateMessage(),
app_mngr_,
rpc_service,
mock_hmi_capabilities_,
@@ -170,7 +170,7 @@ class RCGetInteriorVehicleDataConsentTest
}
protected:
- utils::SharedPtr<MockApplication> mock_app_;
+ std::shared_ptr<MockApplication> mock_app_;
MockRequestControlerSettings mock_request_controler;
MockProtocolHandler mock_protocol_handler;
MockHMIMessageHandler mock_hmi_handler;
@@ -182,8 +182,8 @@ class RCGetInteriorVehicleDataConsentTest
MockCommandFactory mock_command_factory;
am::request_controller::RequestController request_controller;
am::rpc_service::RPCServiceImpl rpc_service;
- utils::SharedPtr<RCAppExtension> rc_app_extention_;
- utils::SharedPtr<am::plugin_manager::MockRPCPluginManager>
+ std::shared_ptr<RCAppExtension> rc_app_extention_;
+ std::shared_ptr<am::plugin_manager::MockRPCPluginManager>
mock_rpc_plugin_manager;
utils::Optional<RPCPlugin> rpc_plugin;
utils::Optional<MockRPCPlugin> optional_mock_rpc_plugin;