summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshwin Karemore <akaremor@ford.com>2018-06-29 15:50:57 +0200
committerAKalinich-Luxoft <AKalinich@luxoft.com>2018-07-26 18:56:37 +0300
commitfa700ca1122a7c5261170c35310e4d61f9deda27 (patch)
tree458863ac17dfbdea944e95cf5065ce39400feed9
parent32c4573733a9660e05d94ed6c1a192beeda177c1 (diff)
downloadsdl_core-fa700ca1122a7c5261170c35310e4d61f9deda27.tar.gz
fix build after resolving conflict
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
index fedb4966f5..94338aae67 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
@@ -272,10 +272,10 @@ TEST_F(AddCommandRequestTest, Run_ImageVerificationFailed_EXPECT_WARNINGS) {
am::CommandsMap commands_map;
EXPECT_CALL(*mock_app_, commands_map())
- .WillRepeatedly(Return(DataAccessor<application_manager::CommandsMap>(
- commands_map, lock_ptr_)));
+ .WillRepeatedly(Return(
+ DataAccessor<application_manager::CommandsMap>(commands_map, lock_ptr_)));
EXPECT_CALL(
- mock_rpc_service_,
+ mock_rpc_service_,
ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_AddCommand)))
.WillOnce(Return(true));
utils::SharedPtr<AddCommandRequest> request_ptr =