summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshwin Karemore <akaremor@ford.com>2018-07-02 17:35:54 +0200
committerAKalinich-Luxoft <AKalinich@luxoft.com>2018-07-26 18:58:33 +0300
commitac1216b8b697b287217175b76da6ad6b0f5649ba (patch)
treea3a712c7f26d59cdec9c5857dbe70ff5ca5ff178
parent193aaf8b290128669cc0e75b176931a16d6ca5a0 (diff)
downloadsdl_core-ac1216b8b697b287217175b76da6ad6b0f5649ba.tar.gz
fix style
-rw-r--r--src/components/application_manager/include/application_manager/message_helper.h7
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc6
-rw-r--r--src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc3
-rw-r--r--src/components/application_manager/src/message_helper/message_helper.cc18
-rw-r--r--src/components/application_manager/test/message_helper/message_helper_test.cc6
5 files changed, 17 insertions, 23 deletions
diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index b1bf3bd567..127ff967b4 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -615,10 +615,9 @@ class MessageHelper {
* @param app current application
* @return verification result
*/
- static void ApplyImagePath(
- smart_objects::SmartObject& image,
- ApplicationConstSharedPtr app,
- ApplicationManager& app_mngr);
+ static void ApplyImagePath(smart_objects::SmartObject& image,
+ ApplicationConstSharedPtr app,
+ ApplicationManager& app_mngr);
/*
* @brief Verify image and add image file full path
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 94338aae67..fedb4966f5 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 =
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
index 6b9d8cc468..6f1ccb9cc3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
@@ -491,7 +491,8 @@ TEST_F(SetGlobalPropertiesRequestTest, Run_VRWithMenuAndKeyboard_SUCCESS) {
command->Run();
}
-TEST_F(SetGlobalPropertiesRequestTest, Run_VRWithMenuAndKeyboard_Menu_WARNINGS) {
+TEST_F(SetGlobalPropertiesRequestTest,
+ Run_VRWithMenuAndKeyboard_Menu_WARNINGS) {
MessageSharedPtr msg = CreateMsgParams();
SmartObject vr_help_title("yes");
SmartObject vr_help_array(smart_objects::SmartType_Array);
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index 58b3552e9f..052d619fcc 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -94,8 +94,8 @@ bool ValidateSoftButtons(smart_objects::SmartObject& soft_buttons) {
// Check if image parameter is valid
if (button.keyExists(strings::image)) {
SmartObject& buttonImage = button[strings::image];
- if (false == MessageHelper::VerifyString(
- buttonImage[strings::value].asString())) {
+ if (false ==
+ MessageHelper::VerifyString(buttonImage[strings::value].asString())) {
return false;
}
}
@@ -2598,11 +2598,9 @@ mobile_apis::Result::eType MessageHelper::VerifyImageFiles(
return mobile_apis::Result::SUCCESS;
}
-void MessageHelper::ApplyImagePath(
- smart_objects::SmartObject& image,
- ApplicationConstSharedPtr app,
- ApplicationManager& app_mngr) {
-
+void MessageHelper::ApplyImagePath(smart_objects::SmartObject& image,
+ ApplicationConstSharedPtr app,
+ ApplicationManager& app_mngr) {
const std::string& file_name = image[strings::value].asString();
const std::string& full_file_path = GetAppFilePath(file_name, app, app_mngr);
@@ -2669,19 +2667,17 @@ mobile_apis::Result::eType MessageHelper::VerifyImage(
smart_objects::SmartObject& image,
ApplicationConstSharedPtr app,
ApplicationManager& app_mngr) {
-
const uint32_t image_type = image[strings::image_type].asUInt();
mobile_apis::ImageType::eType type =
static_cast<mobile_apis::ImageType::eType>(image_type);
const std::string& file_name = image[strings::value].asString();
-
- if(!VerifyString(file_name)){
+ if (!VerifyString(file_name)) {
return mobile_apis::Result::INVALID_DATA;
}
if (mobile_apis::ImageType::STATIC == type) {
- return mobile_apis::Result::SUCCESS;
+ return mobile_apis::Result::SUCCESS;
}
ApplyImagePath(image, app, app_mngr);
diff --git a/src/components/application_manager/test/message_helper/message_helper_test.cc b/src/components/application_manager/test/message_helper/message_helper_test.cc
index d8cc4329d3..15a09c33cc 100644
--- a/src/components/application_manager/test/message_helper/message_helper_test.cc
+++ b/src/components/application_manager/test/message_helper/message_helper_test.cc
@@ -869,10 +869,8 @@ TEST_F(MessageHelperTest,
message[1][strings::image][strings::image_type] =
mobile_apis::ImageType::STATIC;
- message[0][strings::image][strings::value] =
- "static_icon";
- message[1][strings::image][strings::value] =
- "static_icon";
+ message[0][strings::image][strings::value] = "static_icon";
+ message[1][strings::image][strings::value] = "static_icon";
// Method call
mobile_apis::Result::eType result = MessageHelper::VerifyImageVrHelpItems(
message, appSharedMock, mock_application_manager);