diff options
| author | Conlain Kelly <conlain.k@gmail.com> | 2018-07-18 11:24:11 -0400 |
|---|---|---|
| committer | Conlain Kelly <conlain.k@gmail.com> | 2018-07-18 11:24:11 -0400 |
| commit | 81fb6ddaf3ba4ecb5e0129401239af75db45d84d (patch) | |
| tree | c71fc838d006b6b37b008e6f452e6ac2d7463f8c | |
| parent | 5019af50b9a2236dd75e630aae5b82e440be9620 (diff) | |
| download | sdl_core-81fb6ddaf3ba4ecb5e0129401239af75db45d84d.tar.gz | |
style fix
155 files changed, 496 insertions, 627 deletions
diff --git a/src/appMain/life_cycle.h b/src/appMain/life_cycle.h index 4f61191d02..a9b18e1bd9 100644 --- a/src/appMain/life_cycle.h +++ b/src/appMain/life_cycle.h @@ -36,7 +36,6 @@ #include <unistd.h> #include "utils/macro.h" - #include "config_profile/profile.h" #include "hmi_message_handler/hmi_message_handler_impl.h" #if (defined(MESSAGEBROKER_HMIADAPTER) || defined(PASA_HMI)) diff --git a/src/components/application_manager/include/application_manager/app_extension.h b/src/components/application_manager/include/application_manager/app_extension.h index 5f193bf331..91bef0753a 100644 --- a/src/components/application_manager/include/application_manager/app_extension.h +++ b/src/components/application_manager/include/application_manager/app_extension.h @@ -33,8 +33,6 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_ - - namespace NsSmartDeviceLink { namespace NsSmartObjects { class SmartObject; diff --git a/src/components/application_manager/include/application_manager/command_holder.h b/src/components/application_manager/include/application_manager/command_holder.h index 3551a13707..8cfe5f0889 100644 --- a/src/components/application_manager/include/application_manager/command_holder.h +++ b/src/components/application_manager/include/application_manager/command_holder.h @@ -37,7 +37,6 @@ #include "application_manager/application.h" #include "smart_objects/smart_object.h" - namespace application_manager { /** * @brief The CommandHolder class should hold commands for particular diff --git a/src/components/application_manager/include/application_manager/commands/command.h b/src/components/application_manager/include/application_manager/commands/command.h index 1bd6441c76..f8ea7db24d 100644 --- a/src/components/application_manager/include/application_manager/commands/command.h +++ b/src/components/application_manager/include/application_manager/commands/command.h @@ -35,7 +35,6 @@ #include <stdint.h> #include "smart_objects/smart_object.h" - namespace application_manager { namespace commands { diff --git a/src/components/application_manager/include/application_manager/message.h b/src/components/application_manager/include/application_manager/message.h index 908305015b..7c3f0a13c9 100644 --- a/src/components/application_manager/include/application_manager/message.h +++ b/src/components/application_manager/include/application_manager/message.h @@ -36,7 +36,6 @@ #include <string> #include <vector> - #include "protocol/message_priority.h" #include "protocol/rpc_type.h" #include "protocol/common.h" diff --git a/src/components/application_manager/include/application_manager/rpc_handler_impl.h b/src/components/application_manager/include/application_manager/rpc_handler_impl.h index 515e289400..44954d41f7 100644 --- a/src/components/application_manager/include/application_manager/rpc_handler_impl.h +++ b/src/components/application_manager/include/application_manager/rpc_handler_impl.h @@ -58,8 +58,6 @@ #include "utils/threads/message_loop_thread.h" - - namespace application_manager { namespace rpc_handler { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc index 7bc72faced..8bcb6b08ed 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc @@ -105,8 +105,8 @@ void RCOnRemoteControlSettingsNotification::DisallowRCFunctionality() { app->app_id(), mobile_apis::HMILevel::eType::HMI_NONE); const RCAppExtensionPtr extension = - std::static_pointer_cast< - RCAppExtension>(app->QueryInterface(RCRPCPlugin::kRCPluginID)); + std::static_pointer_cast<RCAppExtension>( + app->QueryInterface(RCRPCPlugin::kRCPluginID)); if (extension) { UnsubscribeFromInteriorVehicleDataForAllModules(extension); } diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc index 8238e9a943..fca9962fb5 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc @@ -70,9 +70,8 @@ void OnInteriorVehicleDataNotification::Run() { DCHECK(*it); application_manager::Application& app = **it; - RCAppExtensionPtr extension = - std::static_pointer_cast< - RCAppExtension>(app.QueryInterface(RCRPCPlugin::kRCPluginID)); + RCAppExtensionPtr extension = std::static_pointer_cast<RCAppExtension>( + app.QueryInterface(RCRPCPlugin::kRCPluginID)); DCHECK(extension); LOG4CXX_TRACE(logger_, "Check subscription for " diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc index a562e45b1d..984d6ec9a0 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc @@ -91,7 +91,8 @@ void RCRPCPlugin::OnApplicationEvent( } switch (event) { case plugins::kApplicationRegistered: { - application->AddExtension(std::shared_ptr<RCAppExtension>(new RCAppExtension(kRCPluginID))); + application->AddExtension( + std::shared_ptr<RCAppExtension>(new RCAppExtension(kRCPluginID))); resource_allocation_manager_->SendOnRCStatusNotifications( NotificationTrigger::APP_REGISTRATION, application); break; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc index 01c2e3a7c6..011950b35a 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc @@ -42,7 +42,6 @@ #include "json/json.h" #include "utils/helpers.h" - namespace rc_rpc_plugin { CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule") @@ -197,9 +196,7 @@ RCAppExtensionPtr ResourceAllocationManagerImpl::GetApplicationExtention( return rc_app_extension; } - rc_app_extension = - std::static_pointer_cast<RCAppExtension>( - app_extension); + rc_app_extension = std::static_pointer_cast<RCAppExtension>(app_extension); return rc_app_extension; } diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc index 329f4de5a6..8613fb1829 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc @@ -42,7 +42,6 @@ #include "application_manager/commands/command_request_test.h" #include "application_manager/policies/mock_policy_handler_interface.h" - #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" @@ -147,15 +146,14 @@ class ButtonPressRequestTest } template <class Command> - std::shared_ptr<Command> CreateRCCommand( - MessageSharedPtr& msg) { + std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) { InitCommand(kDefaultTimeout_); return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), - app_mngr_, - mock_rpc_service_, - mock_hmi_capabilities_, - mock_policy_handler_, - mock_allocation_manager_); + app_mngr_, + mock_rpc_service_, + mock_hmi_capabilities_, + mock_policy_handler_, + mock_allocation_manager_); } protected: @@ -195,8 +193,8 @@ TEST_F(ButtonPressRequestTest, .WillOnce(Return(true)); // Act - std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> - command = CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>( + std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> command = + CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>( mobile_message); ASSERT_TRUE(command->Init()); command->Run(); @@ -234,8 +232,8 @@ TEST_F( .WillOnce(DoAll(SaveArg<0>(&command_result), Return(true))); // Act - std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> - command = CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>( + std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> command = + CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>( mobile_message); ASSERT_TRUE(command->Init()); command->Run(); @@ -273,8 +271,8 @@ TEST_F(ButtonPressRequestTest, OnEvent_ExpectSuccessfullResponseSentToMobile) { application_manager::event_engine::Event event( hmi_apis::FunctionID::Buttons_ButtonPress); event.set_smart_object(*hmi_message); - std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> - command = CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>( + std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> command = + CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>( mobile_message); command->on_event(event); } @@ -312,8 +310,8 @@ TEST_F(ButtonPressRequestTest, application_manager::event_engine::Event event( hmi_apis::FunctionID::Buttons_ButtonPress); event.set_smart_object(*hmi_message); - std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> - command = CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>( + std::shared_ptr<rc_rpc_plugin::commands::ButtonPressRequest> command = + CreateRCCommand<rc_rpc_plugin::commands::ButtonPressRequest>( mobile_message); command->on_event(event); } diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc index 8f69b29275..a6f0ee12ca 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc @@ -41,8 +41,6 @@ #include "application_manager/commands/command_request_test.h" #include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" - - using ::testing::_; using ::testing::Mock; using ::testing::NiceMock; @@ -116,15 +114,14 @@ class GetInteriorVehicleDataRequestTest return message; } template <class Command> - std::shared_ptr<Command> CreateRCCommand( - MessageSharedPtr& msg) { + std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) { InitCommand(kDefaultTimeout_); return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), - app_mngr_, - mock_rpc_service_, - mock_hmi_capabilities_, - mock_policy_handler_, - mock_allocation_manager_); + app_mngr_, + mock_rpc_service_, + mock_hmi_capabilities_, + mock_policy_handler_, + mock_allocation_manager_); } protected: diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc index 690586d0e1..df11bf8c88 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc @@ -85,15 +85,14 @@ class OnInteriorVehicleDataNotificationTest } template <class Command> - std::shared_ptr<Command> CreateRCCommand( - MessageSharedPtr& msg) { + std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) { InitCommand(kDefaultTimeout_); return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), - app_mngr_, - mock_rpc_service_, - mock_hmi_capabilities_, - mock_policy_handler_, - mock_allocation_manager_); + app_mngr_, + mock_rpc_service_, + mock_hmi_capabilities_, + mock_policy_handler_, + mock_allocation_manager_); } protected: @@ -126,9 +125,8 @@ TEST_F(OnInteriorVehicleDataNotificationTest, EXPECT_CALL(mock_rpc_service_, SendMessageToMobile(_, false)) .WillOnce(SaveArg<0>(&message)); // Act - std::shared_ptr< - rc_rpc_plugin::commands::OnInteriorVehicleDataNotification> command = - CreateRCCommand< + std::shared_ptr<rc_rpc_plugin::commands::OnInteriorVehicleDataNotification> + command = CreateRCCommand< rc_rpc_plugin::commands::OnInteriorVehicleDataNotification>( mobile_message); command->Run(); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc index 907292f150..9054ce4830 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc @@ -85,15 +85,14 @@ class RCOnRemoteControlSettingsNotificationTest } template <class Command> - std::shared_ptr<Command> CreateRCCommand( - MessageSharedPtr& msg) { + std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) { InitCommand(kDefaultTimeout_); return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), - app_mngr_, - mock_rpc_service_, - mock_hmi_capabilities_, - mock_policy_handler_, - mock_allocation_manager_); + app_mngr_, + mock_rpc_service_, + mock_hmi_capabilities_, + mock_policy_handler_, + mock_allocation_manager_); } protected: 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 a1fff199ee..7d32d64a87 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 @@ -54,7 +54,6 @@ #include "include/test/protocol_handler/mock_protocol_handler.h" #include "test/application_manager/mock_application_manager_settings.h" - using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; @@ -146,15 +145,14 @@ class RCGetInteriorVehicleDataConsentTest } template <class Command> - std::shared_ptr<Command> CreateRCCommand( - MessageSharedPtr& msg) { + std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) { InitCommand(kDefaultTimeout_); return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), - app_mngr_, - rpc_service, - mock_hmi_capabilities_, - mock_policy_handler_, - mock_allocation_manager_); + app_mngr_, + rpc_service, + mock_hmi_capabilities_, + mock_policy_handler_, + mock_allocation_manager_); } MessageSharedPtr CreateBasicMessage() { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc index fdee55a30c..8072783a71 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc @@ -106,15 +106,14 @@ class SetInteriorVehicleDataRequestTest } template <class Command> - std::shared_ptr<Command> CreateRCCommand( - MessageSharedPtr& msg) { + std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) { InitCommand(kDefaultTimeout_); return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), - app_mngr_, - mock_rpc_service_, - mock_hmi_capabilities_, - mock_policy_handler_, - mock_allocation_manager_); + app_mngr_, + mock_rpc_service_, + mock_hmi_capabilities_, + mock_policy_handler_, + mock_allocation_manager_); } protected: diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc index 3842814f84..3358dfbe4c 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc @@ -40,7 +40,6 @@ #include "application_manager/mock_rpc_service.h" #include "application_manager/policies/mock_policy_handler_interface.h" - #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc index ae8806c4eb..cf83c48a5a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc @@ -41,7 +41,6 @@ #include "policy/policy_types.h" #include "smart_objects/smart_object.h" - namespace { /** diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc index 32dd8caefd..a5fb9b206e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc @@ -38,7 +38,6 @@ #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" - namespace sdl_rpc_plugin { using namespace application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc index 1ba092a446..9d250d288e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc @@ -109,7 +109,8 @@ void OnExitAllApplicationsNotification::SendOnSDLPersistenceComplete() { LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObjectSPtr message = - std::make_shared<smart_objects::SmartObject>(smart_objects::SmartType_Map); + std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map); (*message)[strings::params][strings::function_id] = hmi_apis::FunctionID::BasicCommunication_OnSDLPersistenceComplete; (*message)[strings::params][strings::message_type] = diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc index 92d44d4fe8..4d1e4339f5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc @@ -301,7 +301,8 @@ void PutFileRequest::Run() { void PutFileRequest::SendOnPutFileNotification() { LOG4CXX_INFO(logger_, "SendOnPutFileNotification"); smart_objects::SmartObjectSPtr notification = - std::make_shared<smart_objects::SmartObject>(smart_objects::SmartType_Map); + std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map); smart_objects::SmartObject& message = *notification; message[strings::params][strings::function_id] = diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc index 32113228f5..3d7e2f6437 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc @@ -126,7 +126,6 @@ #include "sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h" #include "interfaces/MOBILE_API.h" - CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager") namespace sdl_rpc_plugin { using namespace application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/close_popup_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/close_popup_response_test.cc index 775f3b653f..6914a4ca7e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/close_popup_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/close_popup_response_test.cc @@ -49,7 +49,6 @@ namespace commands_test { namespace hmi_commands_test { namespace close_popup_response { - namespace am = ::application_manager; using application_manager::commands::ResponseFromHMI; using sdl_rpc_plugin::commands::ClosePopupResponse; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_request_test.cc index ee576aedb6..4cbe7305ea 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_request_test.cc @@ -49,7 +49,6 @@ namespace commands_test { namespace hmi_commands_test { namespace get_system_info_request { - namespace am = ::application_manager; namespace strings = ::application_manager::strings; using am::commands::RequestToHMI; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc index bdbf2db216..c2ff08a6d9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc @@ -91,7 +91,6 @@ #include "utils/data_accessor.h" #include "utils/signals.h" - #include "utils/file_system.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_response_test.cc index 4140d18110..06fa61db29 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_response_test.cc @@ -44,7 +44,6 @@ namespace commands_test { namespace hmi_commands_test { namespace navi_set_video_config_response { - using sdl_rpc_plugin::commands::NaviSetVideoConfigResponse; using test::components::event_engine_test::MockEventDispatcher; using testing::_; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc index 1ec04c68ae..007aef3a0f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc @@ -57,7 +57,6 @@ using ::testing::_; using ::testing::Return; using ::testing::Eq; - namespace am = ::application_manager; using am::commands::MessageSharedPtr; using sdl_rpc_plugin::commands::hmi::OnDriverDistractionNotification; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc index d62a2897f8..8e62c1a409 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc @@ -48,7 +48,6 @@ namespace commands_test { namespace hmi_commands_test { namespace rc_get_capabilities_response { - using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = am::strings; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/response_from_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/response_from_hmi_test.cc index 3e084bd6cc..010cbab1ff 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/response_from_hmi_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/response_from_hmi_test.cc @@ -51,7 +51,6 @@ using ::testing::Return; using ::testing::SaveArg; using ::testing::DoAll; - using ::test::components::event_engine_test::MockEventDispatcher; namespace am = ::application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_response_test.cc index 1dc41e1486..77b94690cc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_response_test.cc @@ -47,7 +47,6 @@ namespace commands_test { namespace hmi_commands_test { namespace sdl_activate_app_response { - namespace am = ::application_manager; namespace strings = ::application_manager::strings; using sdl_rpc_plugin::commands::SDLActivateAppResponse; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_notifications_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_notifications_test.cc index e610628416..581913d3a5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_notifications_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_notifications_test.cc @@ -62,7 +62,8 @@ TYPED_TEST_CASE(SimpleNotificationsTest, CommandsList); TYPED_TEST(SimpleNotificationsTest, Run_SendMessageToHMI_SUCCESS) { typedef typename TestFixture::CommandType CommandType; - std::shared_ptr<CommandType> command = this->template CreateCommand<CommandType>(); + std::shared_ptr<CommandType> command = + this->template CreateCommand<CommandType>(); // Current implementation always return `true` EXPECT_TRUE(command->Init()); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_request_from_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_request_from_hmi_test.cc index 028054c626..4950dc0a41 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_request_from_hmi_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_request_from_hmi_test.cc @@ -51,7 +51,6 @@ using ::testing::Types; using ::testing::NotNull; using ::testing::NiceMock; - namespace commands = ::application_manager::commands; using commands::MessageSharedPtr; using ::application_manager::event_engine::EventObserver; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc index 42b1b9a182..2e4d695251 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc @@ -120,8 +120,6 @@ using ::testing::_; using ::testing::Types; using ::testing::NotNull; - - namespace am_commands = application_manager::commands; using am_commands::MessageSharedPtr; using event_engine_test::MockEventDispatcher; @@ -235,7 +233,8 @@ TYPED_TEST_CASE(RequestToHMICommandsTest3, RequestCommandsList3); TYPED_TEST(RequestToHMICommandsTest, Run_SendMessageToHMI_SUCCESS) { typedef typename TestFixture::CommandType CommandType; - std::shared_ptr<CommandType> command = this->template CreateCommand<CommandType>(); + std::shared_ptr<CommandType> command = + this->template CreateCommand<CommandType>(); EXPECT_CALL(this->mock_rpc_service_, SendMessageToHMI(NotNull())); @@ -245,7 +244,8 @@ TYPED_TEST(RequestToHMICommandsTest, Run_SendMessageToHMI_SUCCESS) { TYPED_TEST(RequestToHMICommandsTest2, Run_SendMessageToHMI_SUCCESS) { typedef typename TestFixture::CommandType CommandType; - std::shared_ptr<CommandType> command = this->template CreateCommand<CommandType>(); + std::shared_ptr<CommandType> command = + this->template CreateCommand<CommandType>(); EXPECT_CALL(this->mock_rpc_service_, SendMessageToHMI(NotNull())); command->Run(); @@ -254,7 +254,8 @@ TYPED_TEST(RequestToHMICommandsTest2, Run_SendMessageToHMI_SUCCESS) { TYPED_TEST(RequestToHMICommandsTest3, Run_SendMessageToHMI_SUCCESS) { typedef typename TestFixture::CommandType CommandType; - std::shared_ptr<CommandType> command = this->template CreateCommand<CommandType>(); + std::shared_ptr<CommandType> command = + this->template CreateCommand<CommandType>(); EXPECT_CALL(this->mock_rpc_service_, SendMessageToHMI(NotNull())); command->Run(); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc index c3b9809814..1874a13b7b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc @@ -109,7 +109,6 @@ using ::testing::ReturnRef; using ::testing::Types; using ::testing::Eq; - using ::test::components::event_engine_test::MockEventDispatcher; namespace am = ::application_manager; @@ -244,7 +243,8 @@ TYPED_TEST(ResponseFromHMICommandsTest, Run_SendMessageToHMI_SUCCESS) { typedef typename TestFixture::CommandData CommandData; typedef typename CommandData::CommandType CommandType; - std::shared_ptr<CommandType> command = this->template CreateCommand<CommandType>(); + std::shared_ptr<CommandType> command = + this->template CreateCommand<CommandType>(); EXPECT_CALL(this->event_dispatcher_, raise_event(EventIdIsEqualTo(CommandData::kEventId))); @@ -255,7 +255,8 @@ TYPED_TEST(ResponseFromHMICommandsTest, Run_SendMessageToHMI_SUCCESS) { TYPED_TEST(EmptyResponseFromHMICommandsTest, Run_SUCCESS) { typedef typename TestFixture::CommandType CommandType; - std::shared_ptr<CommandType> command = this->template CreateCommand<CommandType>(); + std::shared_ptr<CommandType> command = + this->template CreateCommand<CommandType>(); command->Run(); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_to_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_to_hmi_test.cc index 2a52601a44..f556f544b6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_to_hmi_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_to_hmi_test.cc @@ -52,7 +52,6 @@ using ::testing::_; using ::testing::Types; using ::testing::NotNull; - namespace commands = sdl_rpc_plugin::commands; using application_manager::commands::MessageSharedPtr; @@ -73,7 +72,8 @@ TYPED_TEST_CASE(ResponseToHMICommandsTest, ResponseCommandsList); TYPED_TEST(ResponseToHMICommandsTest, Run_SendMessageToHMI_SUCCESS) { typedef typename TestFixture::CommandType CommandType; - std::shared_ptr<CommandType> command = this->template CreateCommand<CommandType>(); + std::shared_ptr<CommandType> command = + this->template CreateCommand<CommandType>(); EXPECT_CALL(this->mock_rpc_service_, SendMessageToHMI(NotNull())); command->Run(); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_language_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_language_response_test.cc index b67976cc07..0d22500f48 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_language_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_language_response_test.cc @@ -44,7 +44,6 @@ namespace commands_test { namespace hmi_commands_test { namespace tts_get_language_response { - using sdl_rpc_plugin::commands::TTSGetLanguageResponse; using test::components::application_manager_test::MockHMICapabilities; using test::components::event_engine_test::MockEventDispatcher; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc index 36581ba665..a98ea7c23a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc @@ -34,7 +34,6 @@ #include "gtest/gtest.h" - #include "smart_objects/smart_object.h" #include "interfaces/MOBILE_API.h" #include "application_manager/mock_hmi_capabilities.h" @@ -49,7 +48,6 @@ namespace commands_test { namespace hmi_commands_test { namespace ui_get_capabilities_response { - using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = am::strings; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_language_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_language_response_test.cc index 01a7ae41f4..de69c5de5c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_language_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_language_response_test.cc @@ -44,7 +44,6 @@ namespace commands_test { namespace hmi_commands_test { namespace ui_get_language_response { - using sdl_rpc_plugin::commands::UIGetLanguageResponse; using test::components::event_engine_test::MockEventDispatcher; using testing::_; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_device_list_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_device_list_request_test.cc index b29a0fde57..0cc75c3d07 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_device_list_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_device_list_request_test.cc @@ -54,7 +54,6 @@ namespace commands_test { namespace hmi_commands_test { namespace update_device_list_request { - using testing::_; using testing::ReturnRef; using testing::Return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_request_test.cc index b22dba73e5..5e6116abbd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_request_test.cc @@ -48,7 +48,6 @@ namespace commands_test { namespace hmi_commands_test { namespace update_sdl_request { - using ::testing::ReturnRef; using ::testing::NiceMock; namespace am = ::application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_response_test.cc index 3e09ce29fd..92049a147e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_response_test.cc @@ -47,7 +47,6 @@ namespace commands_test { namespace hmi_commands_test { namespace update_sdl_response { - namespace am = ::application_manager; namespace strings = ::application_manager::strings; using sdl_rpc_plugin::commands::UpdateSDLResponse; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_capabilities_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_capabilities_response_test.cc index 954925731c..3258182b59 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_capabilities_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_capabilities_response_test.cc @@ -48,7 +48,6 @@ namespace commands_test { namespace hmi_commands_test { namespace vr_get_capabilities_response { - using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = am::strings; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_language_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_language_response_test.cc index 287ea3b7f3..05ed186963 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_language_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_language_response_test.cc @@ -44,7 +44,6 @@ namespace commands_test { namespace hmi_commands_test { namespace vr_get_language_response { - using sdl_rpc_plugin::commands::VRGetLanguageResponse; using test::components::event_engine_test::MockEventDispatcher; using testing::_; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc index 2ea0091332..869a17c630 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc @@ -61,7 +61,6 @@ using ::testing::_; using ::testing::Types; using ::testing::Return; - using am::commands::MessageSharedPtr; namespace { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc index 6f151d4080..df4f69f0d0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc @@ -42,7 +42,6 @@ #include "mobile/put_file_response.h" #include "mobile/put_file_request.h" - #include "utils/file_system.h" #include "smart_objects/smart_object.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc index 807d59fac2..41a7fded62 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc @@ -70,7 +70,6 @@ using ::testing::DoAll; namespace am = ::application_manager; - using am::commands::MessageSharedPtr; using sdl_rpc_plugin::commands::RegisterAppInterfaceRequest; @@ -217,11 +216,10 @@ class RegisterAppInterfaceRequestTest ManageHMICommand(HMIResultCodeIs( hmi_apis::FunctionID::VR_ChangeRegistration))).Times(0); - EXPECT_CALL( - app_mngr_, - OnApplicationSwitched( - std::static_pointer_cast<application_manager::Application>( - mock_app))); + EXPECT_CALL(app_mngr_, + OnApplicationSwitched( + std::static_pointer_cast<application_manager::Application>( + mock_app))); } MessageSharedPtr msg_; @@ -434,8 +432,7 @@ TEST_F(RegisterAppInterfaceRequestTest, EXPECT_CALL( mock_resume_crt_, CheckApplicationHash( - std::static_pointer_cast<application_manager::Application>( - mock_app), + std::static_pointer_cast<application_manager::Application>(mock_app), request_hash_id)).WillOnce(Return(true)); EXPECT_CALL(mock_resume_crt_, RemoveApplicationFromSaved(_)).Times(0); @@ -469,15 +466,13 @@ TEST_F(RegisterAppInterfaceRequestTest, EXPECT_CALL( mock_resume_crt_, CheckApplicationHash( - std::static_pointer_cast<application_manager::Application>( - mock_app), + std::static_pointer_cast<application_manager::Application>(mock_app), request_hash_id)).WillOnce(Return(false)); EXPECT_CALL( mock_application_helper_, RecallApplicationData( - std::static_pointer_cast<application_manager::Application>( - mock_app), + std::static_pointer_cast<application_manager::Application>(mock_app), _)); EXPECT_CALL(app_mngr_, RegisterApplication(msg_)).Times(0); @@ -506,8 +501,7 @@ TEST_F(RegisterAppInterfaceRequestTest, EXPECT_CALL( mock_application_helper_, RecallApplicationData( - std::static_pointer_cast<application_manager::Application>( - mock_app), + std::static_pointer_cast<application_manager::Application>(mock_app), _)); EXPECT_CALL(app_mngr_, RegisterApplication(msg_)).Times(0); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc index 6eafae16c2..33c0911835 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc @@ -39,7 +39,6 @@ #include "gtest/gtest.h" - #include "smart_objects/smart_object.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" @@ -69,7 +68,8 @@ using am::commands::MessageSharedPtr; using am::event_engine::Event; using am::MockMessageHelper; -typedef std::shared_ptr<ResetGlobalPropertiesRequest> ResetGlobalPropertiesRequestPtr; +typedef std::shared_ptr<ResetGlobalPropertiesRequest> + ResetGlobalPropertiesRequestPtr; typedef std::shared_ptr<ResetGlobalPropertiesResponse> ResetGlobalPropertiesResponsePtr; 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 e849866c1a..06ddf4069c 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 @@ -126,8 +126,9 @@ class SetGlobalPropertiesRequestTest .WillOnce(Return(mock_app_)); } - void OnEventUISetupHelper(MessageSharedPtr msg, - std::shared_ptr<SetGlobalPropertiesRequest> command) { + void OnEventUISetupHelper( + MessageSharedPtr msg, + std::shared_ptr<SetGlobalPropertiesRequest> command) { SmartObject vr_help_title("yes"); SmartObject vr_help_array(smart_objects::SmartType_Array); VRArraySetupHelper(msg, vr_help_title, vr_help_array); @@ -153,8 +154,9 @@ class SetGlobalPropertiesRequestTest command->Run(); } - void OnEventTTSSetupHelper(MessageSharedPtr msg, - std::shared_ptr<SetGlobalPropertiesRequest> command) { + void OnEventTTSSetupHelper( + MessageSharedPtr msg, + std::shared_ptr<SetGlobalPropertiesRequest> command) { SmartObject help_prompt(smart_objects::SmartType_Array); help_prompt[0][am::strings::text] = "Help_Prompt_One"; (*msg)[am::strings::msg_params][am::strings::help_prompt] = help_prompt; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/slider_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/slider_test.cc index 9e7d826f2a..7c7319975b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/slider_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/slider_test.cc @@ -140,8 +140,7 @@ TEST_F(SliderRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) { MessageSharedPtr msg_ui = CreateFullParamsUISO(); (*msg_ui)[am::strings::params][am::strings::connection_key] = kConnectionKey; - std::shared_ptr<SliderRequest> command = - CreateCommand<SliderRequest>(msg_ui); + std::shared_ptr<SliderRequest> command = CreateCommand<SliderRequest>(msg_ui); MockAppPtr mock_app = CreateMockApp(); ON_CALL(app_mngr_, application(kConnectionKey)) diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/speak_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/speak_request_test.cc index dfb8452003..9eb23eeee3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/speak_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/speak_request_test.cc @@ -129,8 +129,7 @@ class SpeakRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> { }; TEST_F(SpeakRequestTest, OnEvent_SUCCESS_Expect_true) { - std::shared_ptr<SpeakRequest> command = - CreateCommand<SpeakRequest>(request_); + std::shared_ptr<SpeakRequest> command = CreateCommand<SpeakRequest>(request_); (*response_)[strings::params][hmi_response::code] = hmi_apis::Common_Result::SUCCESS; diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc index a19fdbee97..3b1d411841 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc @@ -118,8 +118,7 @@ VehicleInfoAppExtension& VehicleInfoAppExtension::ExtractVIExtension( DCHECK(ext_ptr); DCHECK(dynamic_cast<VehicleInfoAppExtension*>(ext_ptr.get())); auto vi_app_extension = - std::static_pointer_cast< - VehicleInfoAppExtension>(ext_ptr); + std::static_pointer_cast<VehicleInfoAppExtension>(ext_ptr); DCHECK(vi_app_extension); return *vi_app_extension; } diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc index b16993b002..bd8eb1920d 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc @@ -74,7 +74,8 @@ void VehicleInfoPlugin::OnApplicationEvent( plugins::ApplicationEvent event, app_mngr::ApplicationSharedPtr application) { if (plugins::ApplicationEvent::kApplicationRegistered == event) { - application->AddExtension(std::make_shared<VehicleInfoAppExtension>(*this, *application)); + application->AddExtension( + std::make_shared<VehicleInfoAppExtension>(*this, *application)); } } diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc index c468a82bad..c0a07fb57c 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc @@ -63,7 +63,6 @@ using vehicle_info_plugin::commands::ReadDIDRequest; using am::commands::MessageSharedPtr; using am::event_engine::Event; - class ReadDIDRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> {}; diff --git a/src/components/application_manager/src/app_launch/app_launch_ctrl_impl.cc b/src/components/application_manager/src/app_launch/app_launch_ctrl_impl.cc index 25cb5a7e1e..8df3d436bd 100644 --- a/src/components/application_manager/src/app_launch/app_launch_ctrl_impl.cc +++ b/src/components/application_manager/src/app_launch/app_launch_ctrl_impl.cc @@ -39,7 +39,6 @@ #include "application_manager/application.h" #include "utils/timer_task_impl.h" - namespace app_launch { CREATE_LOGGERPTR_GLOBAL(logger_, "AppLaunch") diff --git a/src/components/application_manager/src/app_launch/app_launch_data_db.cc b/src/components/application_manager/src/app_launch/app_launch_data_db.cc index 9a7ae0dee8..393b01c952 100644 --- a/src/components/application_manager/src/app_launch/app_launch_data_db.cc +++ b/src/components/application_manager/src/app_launch/app_launch_data_db.cc @@ -38,7 +38,6 @@ #include "application_manager/smart_object_keys.h" #include "application_manager/message_helper.h" - namespace app_launch { CREATE_LOGGERPTR_GLOBAL(logger_, "AppLaunch") diff --git a/src/components/application_manager/src/app_launch/device_apps_launcher.cc b/src/components/application_manager/src/app_launch/device_apps_launcher.cc index 3532cb819a..a4468d87bc 100644 --- a/src/components/application_manager/src/app_launch/device_apps_launcher.cc +++ b/src/components/application_manager/src/app_launch/device_apps_launcher.cc @@ -7,7 +7,6 @@ #include "application_manager/app_launch/apps_launcher.h" #include "application_manager/resumption/resume_ctrl.h" - #include "utils/timer.h" #include "utils/timer_task_impl.h" #include <iostream> @@ -107,8 +106,7 @@ struct LauncherGenerator { , apps_launcher_(apps_launcher) {} LauncherPtr operator()() const { - return std::make_shared<Launcher>( - resume_ctrl_, interface_, apps_launcher_); + return std::make_shared<Launcher>(resume_ctrl_, interface_, apps_launcher_); } resumption::ResumeCtrl& resume_ctrl_; diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc index aca4b9ba05..a26418d917 100644 --- a/src/components/application_manager/src/application_impl.cc +++ b/src/components/application_manager/src/application_impl.cc @@ -42,7 +42,6 @@ #include "utils/logger.h" #include "utils/gen_hash.h" - #include "utils/timer_task_impl.h" #include "application_manager/policies/policy_handler_interface.h" #include "application_manager/resumption/resume_ctrl.h" diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 41dcdf3885..8efd92a0d1 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -1021,7 +1021,8 @@ void ApplicationManagerImpl::OnDeviceListUpdated( return; } - smart_objects::SmartObjectSPtr update_list = std::make_shared<smart_objects::SmartObject>(); + smart_objects::SmartObjectSPtr update_list = + std::make_shared<smart_objects::SmartObject>(); smart_objects::SmartObject& so_to_send = *update_list; so_to_send[jhs::S_PARAMS][jhs::S_FUNCTION_ID] = hmi_apis::FunctionID::BasicCommunication_UpdateDeviceList; @@ -2421,7 +2422,8 @@ void ApplicationManagerImpl::SendOnSDLClose() { // must be sent to PASA HMI on shutdown synchronously smart_objects::SmartObjectSPtr msg = - std::make_shared<smart_objects::SmartObject>(smart_objects::SmartType_Map); + std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map); (*msg)[strings::params][strings::function_id] = hmi_apis::FunctionID::BasicCommunication_OnSDLClose; diff --git a/src/components/application_manager/src/commands/command_request_impl.cc b/src/components/application_manager/src/commands/command_request_impl.cc index 18b3d2a94e..420dbf6156 100644 --- a/src/components/application_manager/src/commands/command_request_impl.cc +++ b/src/components/application_manager/src/commands/command_request_impl.cc @@ -145,7 +145,8 @@ struct DisallowedParamsInserter { VehicleData::const_iterator it = vehicle_data.find(param); if (vehicle_data.end() != it) { smart_objects::SmartObjectSPtr disallowed_param = - std::make_shared<smart_objects::SmartObject>(smart_objects::SmartType_Map); + std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map); (*disallowed_param)[strings::data_type] = (*it).second; (*disallowed_param)[strings::result_code] = code_; response_[strings::msg_params][param.c_str()] = *disallowed_param; @@ -417,7 +418,8 @@ uint32_t CommandRequestImpl::SendHMIRequest( const hmi_apis::FunctionID::eType& function_id, const smart_objects::SmartObject* msg_params, bool use_events) { - smart_objects::SmartObjectSPtr result = std::make_shared<smart_objects::SmartObject>(); + smart_objects::SmartObjectSPtr result = + std::make_shared<smart_objects::SmartObject>(); const uint32_t hmi_correlation_id = application_manager_.GetNextHMICorrelationID(); @@ -455,7 +457,8 @@ uint32_t CommandRequestImpl::SendHMIRequest( void CommandRequestImpl::CreateHMINotification( const hmi_apis::FunctionID::eType& function_id, const NsSmart::SmartObject& msg_params) const { - smart_objects::SmartObjectSPtr result = std::make_shared<smart_objects::SmartObject>(); + smart_objects::SmartObjectSPtr result = + std::make_shared<smart_objects::SmartObject>(); if (!result) { LOG4CXX_ERROR(logger_, "Memory allocation failed."); return; diff --git a/src/components/application_manager/src/commands/notification_from_hmi.cc b/src/components/application_manager/src/commands/notification_from_hmi.cc index 649b52fde9..c8765be18a 100644 --- a/src/components/application_manager/src/commands/notification_from_hmi.cc +++ b/src/components/application_manager/src/commands/notification_from_hmi.cc @@ -76,7 +76,8 @@ void NotificationFromHMI::SendNotificationToMobile( void NotificationFromHMI::CreateHMIRequest( const hmi_apis::FunctionID::eType& function_id, const smart_objects::SmartObject& msg_params) const { - smart_objects::SmartObjectSPtr result = std::make_shared<smart_objects::SmartObject>(); + smart_objects::SmartObjectSPtr result = + std::make_shared<smart_objects::SmartObject>(); if (!result) { LOG4CXX_ERROR(logger_, "Memory allocation failed."); return; diff --git a/src/components/application_manager/src/commands/request_from_hmi.cc b/src/components/application_manager/src/commands/request_from_hmi.cc index b993ab033e..ff760c2d2a 100644 --- a/src/components/application_manager/src/commands/request_from_hmi.cc +++ b/src/components/application_manager/src/commands/request_from_hmi.cc @@ -34,7 +34,6 @@ #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" - namespace application_manager { namespace commands { diff --git a/src/components/application_manager/src/commands/response_from_hmi.cc b/src/components/application_manager/src/commands/response_from_hmi.cc index bf732830f2..bdf5686159 100644 --- a/src/components/application_manager/src/commands/response_from_hmi.cc +++ b/src/components/application_manager/src/commands/response_from_hmi.cc @@ -80,7 +80,8 @@ void ResponseFromHMI::SendResponseToMobile( void ResponseFromHMI::CreateHMIRequest( const hmi_apis::FunctionID::eType& function_id, const smart_objects::SmartObject& msg_params) const { - smart_objects::SmartObjectSPtr result = std::make_shared<smart_objects::SmartObject>(); + smart_objects::SmartObjectSPtr result = + std::make_shared<smart_objects::SmartObject>(); if (!result) { LOG4CXX_ERROR(logger_, "Memory allocation failed."); diff --git a/src/components/application_manager/src/help_prompt_manager_impl.cc b/src/components/application_manager/src/help_prompt_manager_impl.cc index 6fb88ddd3b..803a0e6743 100644 --- a/src/components/application_manager/src/help_prompt_manager_impl.cc +++ b/src/components/application_manager/src/help_prompt_manager_impl.cc @@ -39,7 +39,6 @@ #include "smart_objects/smart_object.h" #include "utils/logger.h" - CREATE_LOGGERPTR_GLOBAL(logger_, "HelpPromptManagerImpl") namespace { diff --git a/src/components/application_manager/src/hmi_language_handler.cc b/src/components/application_manager/src/hmi_language_handler.cc index b1872dfaab..6e89b2419c 100644 --- a/src/components/application_manager/src/hmi_language_handler.cc +++ b/src/components/application_manager/src/hmi_language_handler.cc @@ -223,7 +223,8 @@ void HMILanguageHandler::SendOnLanguageChangeToMobile( const uint32_t connection_key) { LOG4CXX_AUTO_TRACE(logger_); - smart_objects::SmartObjectSPtr notification =std::make_shared<smart_objects::SmartObject>(); + smart_objects::SmartObjectSPtr notification = + std::make_shared<smart_objects::SmartObject>(); DCHECK_OR_RETURN_VOID(notification); smart_objects::SmartObject& message = *notification; message[strings::params][strings::function_id] = 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 aa3f2449ee..978724a671 100644 --- a/src/components/application_manager/src/message_helper/message_helper.cc +++ b/src/components/application_manager/src/message_helper/message_helper.cc @@ -62,7 +62,6 @@ #include "utils/macro.h" #include "utils/logger.h" - #include "formatters/formatter_json_rpc.h" #include "formatters/CFormatterJsonSDLRPCv2.h" #include "formatters/CFormatterJsonSDLRPCv1.h" @@ -698,7 +697,8 @@ void MessageHelper::SendHMIStatusNotification( const Application& application_impl, ApplicationManager& application_manager) { LOG4CXX_AUTO_TRACE(logger_); - smart_objects::SmartObjectSPtr notification = std::make_shared<smart_objects::SmartObject>(); + smart_objects::SmartObjectSPtr notification = + std::make_shared<smart_objects::SmartObject>(); if (!notification) { LOG4CXX_ERROR(logger_, "Failed to create smart object"); return; @@ -740,7 +740,8 @@ void MessageHelper::SendActivateAppToHMI( } std::shared_ptr<smart_objects::SmartObject> message = - std::make_shared<smart_objects::SmartObject>(smart_objects::SmartType_Map); + std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map); (*message)[strings::params][strings::function_id] = hmi_apis::FunctionID::BasicCommunication_ActivateApp; @@ -1833,7 +1834,8 @@ void MessageHelper::SendGetUserFriendlyMessageResponse( ApplicationManager& app_mngr) { LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObjectSPtr message = - std::make_shared<smart_objects::SmartObject>(smart_objects::SmartType_Map); + std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map); if (!message) { return; } diff --git a/src/components/application_manager/src/rpc_handler_impl.cc b/src/components/application_manager/src/rpc_handler_impl.cc index 3152d1f749..e6cc0fc849 100644 --- a/src/components/application_manager/src/rpc_handler_impl.cc +++ b/src/components/application_manager/src/rpc_handler_impl.cc @@ -93,7 +93,8 @@ void RPCHandlerImpl::ProcessMessageFromMobile( void RPCHandlerImpl::ProcessMessageFromHMI( const std::shared_ptr<Message> message) { LOG4CXX_AUTO_TRACE(logger_); - smart_objects::SmartObjectSPtr smart_object = std::make_shared<smart_objects::SmartObject>(); + smart_objects::SmartObjectSPtr smart_object = + std::make_shared<smart_objects::SmartObject>(); if (!smart_object) { LOG4CXX_ERROR(logger_, "Null pointer"); diff --git a/src/components/application_manager/src/usage_statistics.cc b/src/components/application_manager/src/usage_statistics.cc index 8081dee139..1146d60717 100644 --- a/src/components/application_manager/src/usage_statistics.cc +++ b/src/components/application_manager/src/usage_statistics.cc @@ -36,7 +36,6 @@ #include "policy/usage_statistics/statistics_manager.h" #include "utils/macro.h" - using namespace mobile_apis; using namespace NsSmartDeviceLink::NsSmartObjects; using namespace usage_statistics; diff --git a/src/components/application_manager/test/application_helper_test.cc b/src/components/application_manager/test/application_helper_test.cc index e84dc5f7be..3203839fc2 100644 --- a/src/components/application_manager/test/application_helper_test.cc +++ b/src/components/application_manager/test/application_helper_test.cc @@ -51,7 +51,6 @@ #include "utils/custom_string.h" #include "utils/macro.h" - #include "test/resumption/mock_last_state.h" #include "media_manager/mock_media_manager.h" diff --git a/src/components/application_manager/test/application_impl_test.cc b/src/components/application_manager/test/application_impl_test.cc index ce1d4ed326..301ed227b8 100644 --- a/src/components/application_manager/test/application_impl_test.cc +++ b/src/components/application_manager/test/application_impl_test.cc @@ -39,7 +39,6 @@ #include "application_manager/hmi_state.h" #include "utils/file_system.h" - #include "application_manager/mock_message_helper.h" #include "utils/custom_string.h" #include "application_manager/mock_application_manager.h" diff --git a/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc b/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc index b168f7a480..8ab852779a 100644 --- a/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc +++ b/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc @@ -146,8 +146,7 @@ class ApplicationManagerImplMockHmiTest : public ::testing::Test { Return(0))); } - std::shared_ptr<NiceMock<resumption_test::MockResumptionData> > - mock_storage_; + std::shared_ptr<NiceMock<resumption_test::MockResumptionData> > mock_storage_; application_manager_test::MockApplicationManager mock_app_mngr_; NiceMock<policy_handler_test::MockPolicySettings> mock_policy_settings_; NiceMock<connection_handler_test::MockConnectionHandler> @@ -214,13 +213,13 @@ TEST_F(ApplicationManagerImplMockHmiTest, const uint32_t correlation_id_3 = 3u; std::shared_ptr<NiceMock<MockRequest> > cmd_1 = std::make_shared<NiceMock<MockRequest> >(connection_key, - correlation_id_1); + correlation_id_1); std::shared_ptr<NiceMock<MockRequest> > cmd_2 = std::make_shared<NiceMock<MockRequest> >(connection_key, - correlation_id_2); + correlation_id_2); std::shared_ptr<NiceMock<MockRequest> > cmd_3 = std::make_shared<NiceMock<MockRequest> >(connection_key, - correlation_id_3); + correlation_id_3); EXPECT_CALL(mock_command_factory, CreateCommand(_, _)) .WillOnce(Return(cmd_1)) diff --git a/src/components/application_manager/test/application_manager_impl_test.cc b/src/components/application_manager/test/application_manager_impl_test.cc index 5b3a148357..e368163cca 100644 --- a/src/components/application_manager/test/application_manager_impl_test.cc +++ b/src/components/application_manager/test/application_manager_impl_test.cc @@ -196,8 +196,7 @@ class ApplicationManagerImplTest : public ::testing::Test { uint32_t app_id_; NiceMock<policy_test::MockPolicySettings> mock_policy_settings_; - std::shared_ptr<NiceMock<resumption_test::MockResumptionData> > - mock_storage_; + std::shared_ptr<NiceMock<resumption_test::MockResumptionData> > mock_storage_; std::unique_ptr<rpc_service::RPCService> mock_rpc_service_; NiceMock<con_test::MockConnectionHandler> mock_connection_handler_; @@ -232,16 +231,14 @@ TEST_F(ApplicationManagerImplTest, ProcessQueryApp_ExpectSuccess) { TEST_F(ApplicationManagerImplTest, SubscribeAppForWayPoints_ExpectSubscriptionApp) { - auto app_ptr = - std::static_pointer_cast<am::Application>(mock_app_ptr_); + auto app_ptr = std::static_pointer_cast<am::Application>(mock_app_ptr_); app_manager_impl_->SubscribeAppForWayPoints(app_ptr); EXPECT_TRUE(app_manager_impl_->IsAppSubscribedForWayPoints(app_ptr)); } TEST_F(ApplicationManagerImplTest, UnsubscribeAppForWayPoints_ExpectUnsubscriptionApp) { - auto app_ptr = - std::static_pointer_cast<am::Application>(mock_app_ptr_); + auto app_ptr = std::static_pointer_cast<am::Application>(mock_app_ptr_); app_manager_impl_->SubscribeAppForWayPoints(app_ptr); EXPECT_TRUE(app_manager_impl_->IsAppSubscribedForWayPoints(app_ptr)); app_manager_impl_->UnsubscribeAppFromWayPoints(app_ptr); @@ -262,8 +259,7 @@ TEST_F( TEST_F( ApplicationManagerImplTest, GetAppsSubscribedForWayPoints_SubcribeAppForWayPoints_ExpectCorrectResult) { - auto app_ptr = - std::static_pointer_cast<am::Application>(mock_app_ptr_); + auto app_ptr = std::static_pointer_cast<am::Application>(mock_app_ptr_); app_manager_impl_->SubscribeAppForWayPoints(app_ptr); std::set<int32_t> result = app_manager_impl_->GetAppsSubscribedForWayPoints(); EXPECT_EQ(1u, result.size()); diff --git a/src/components/application_manager/test/application_state_test.cc b/src/components/application_manager/test/application_state_test.cc index c19fd00930..a0bfa2890f 100644 --- a/src/components/application_manager/test/application_state_test.cc +++ b/src/components/application_manager/test/application_state_test.cc @@ -41,8 +41,6 @@ #include "application_manager/state_controller.h" #include "application_manager/resumption/resume_ctrl.h" - - namespace test { namespace components { namespace application_manager_test { diff --git a/src/components/application_manager/test/command_holder_test.cc b/src/components/application_manager/test/command_holder_test.cc index 588dc8e6ab..56e24b8d29 100644 --- a/src/components/application_manager/test/command_holder_test.cc +++ b/src/components/application_manager/test/command_holder_test.cc @@ -36,8 +36,6 @@ #include "application_manager/commands/command.h" #include "smart_objects/smart_object.h" - - #include "application_manager/mock_application_manager.h" #include "application_manager/mock_application.h" #include "application_manager/mock_rpc_service.h" diff --git a/src/components/application_manager/test/commands/command_impl_test.cc b/src/components/application_manager/test/commands/command_impl_test.cc index 2b15397769..222f16ef46 100644 --- a/src/components/application_manager/test/commands/command_impl_test.cc +++ b/src/components/application_manager/test/commands/command_impl_test.cc @@ -55,7 +55,6 @@ using ::testing::Return; using ::testing::AtLeast; using ::testing::_; - namespace strings = ::application_manager::strings; using ::application_manager::commands::CommandImpl; using ::application_manager::ApplicationManager; diff --git a/src/components/application_manager/test/commands/command_request_impl_test.cc b/src/components/application_manager/test/commands/command_request_impl_test.cc index 968c606855..c70dd14852 100644 --- a/src/components/application_manager/test/commands/command_request_impl_test.cc +++ b/src/components/application_manager/test/commands/command_request_impl_test.cc @@ -65,7 +65,6 @@ using ::testing::Return; using ::testing::SaveArg; using ::testing::DoAll; - using am::commands::MessageSharedPtr; using am::CommandParametersPermissions; using am::event_engine::EventObserver; diff --git a/src/components/application_manager/test/commands/command_response_impl_test.cc b/src/components/application_manager/test/commands/command_response_impl_test.cc index eb1cb473e0..41cc654a24 100644 --- a/src/components/application_manager/test/commands/command_response_impl_test.cc +++ b/src/components/application_manager/test/commands/command_response_impl_test.cc @@ -57,7 +57,8 @@ class CommandResponseImplTest : public CommandsTest<CommandsTestMocks::kIsNice> {}; TEST_F(CommandResponseImplTest, BasicMethodsOverloads_SUCCESS) { - std::shared_ptr<CommandResponseImpl> command = CreateCommand<CommandResponseImpl>(); + std::shared_ptr<CommandResponseImpl> command = + CreateCommand<CommandResponseImpl>(); // Current implementation always return `true` EXPECT_TRUE(command->Init()); EXPECT_TRUE(command->CleanUp()); @@ -108,7 +109,7 @@ TEST_F(CommandResponseImplTest, TEST_F(CommandResponseImplTest, SendResponse_EmptyMessageInvalidResultCode_SUCCESS) { MessageSharedPtr msg; - std::shared_ptr<CommandResponseImpl> command = + std::shared_ptr<CommandResponseImpl> command = CreateCommand<CommandResponseImpl>(msg); const bool kSuccess = true; diff --git a/src/components/application_manager/test/help_prompt_manager_test.cc b/src/components/application_manager/test/help_prompt_manager_test.cc index 3be730c2c9..f921eb1dde 100644 --- a/src/components/application_manager/test/help_prompt_manager_test.cc +++ b/src/components/application_manager/test/help_prompt_manager_test.cc @@ -126,10 +126,10 @@ class HelpPromptManagerTest : public ::testing::Test { template <class Command> std::shared_ptr<Command> CreateCommand(MessageSharedPtr& msg) { return std::make_shared<Command>(msg, - app_mngr_, - mock_rpc_service_, - mock_hmi_capabilities_, - mock_policy_handler_); + app_mngr_, + mock_rpc_service_, + mock_hmi_capabilities_, + mock_policy_handler_); } protected: diff --git a/src/components/application_manager/test/hmi_language_handler_test.cc b/src/components/application_manager/test/hmi_language_handler_test.cc index 9777183b8b..ec88075212 100644 --- a/src/components/application_manager/test/hmi_language_handler_test.cc +++ b/src/components/application_manager/test/hmi_language_handler_test.cc @@ -46,7 +46,6 @@ #include "application_manager/smart_object_keys.h" #include "test/resumption/mock_last_state.h" - #include "utils/lock.h" namespace test { @@ -58,7 +57,6 @@ namespace am = ::application_manager; using am::event_engine::Event; using am::ApplicationSet; - using ::testing::Return; using ::testing::ReturnRef; using ::testing::NiceMock; 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 a93e33b373..d795557f80 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 @@ -36,7 +36,6 @@ #include <stdint.h> #include "gtest/gtest.h" - #include "smart_objects/smart_object.h" #include "application_manager/commands/command.h" @@ -60,7 +59,6 @@ using ::testing::NiceMock; using ::testing::Mock; using ::testing::_; - using ::smart_objects::SmartObject; using am::commands::MessageSharedPtr; using ::test::components::application_manager_test::MockApplicationManager; @@ -121,13 +119,13 @@ class CommandsTest : public ::testing::Test { template <class Command> std::shared_ptr<Command> CreateCommand(const uint32_t timeout, - MessageSharedPtr& msg) { + MessageSharedPtr& msg) { InitCommand(timeout); return std::make_shared<Command>((msg ? msg : msg = CreateMessage()), - app_mngr_, - mock_rpc_service_, - mock_hmi_capabilities_, - mock_policy_handler_); + app_mngr_, + mock_rpc_service_, + mock_hmi_capabilities_, + mock_policy_handler_); } template <class Command> @@ -136,14 +134,15 @@ class CommandsTest : public ::testing::Test { } template <class Command> - std::shared_ptr<Command> CreateCommand(const uint32_t timeout = kDefaultTimeout_) { + std::shared_ptr<Command> CreateCommand( + const uint32_t timeout = kDefaultTimeout_) { InitCommand(timeout); MessageSharedPtr msg = CreateMessage(); return std::make_shared<Command>(msg, - app_mngr_, - mock_rpc_service_, - mock_hmi_capabilities_, - mock_policy_handler_); + app_mngr_, + mock_rpc_service_, + mock_hmi_capabilities_, + mock_policy_handler_); } enum { kDefaultTimeout_ = 100 }; diff --git a/src/components/application_manager/test/include/application_manager/mock_command_factory.h b/src/components/application_manager/test/include/application_manager/mock_command_factory.h index cb48f2220e..e4bdc3abe1 100644 --- a/src/components/application_manager/test/include/application_manager/mock_command_factory.h +++ b/src/components/application_manager/test/include/application_manager/mock_command_factory.h @@ -38,7 +38,6 @@ #include "application_manager/commands/command.h" #include "smart_objects/smart_object.h" - namespace test { namespace components { namespace application_manager_test { diff --git a/src/components/application_manager/test/mobile_message_handler_test.cc b/src/components/application_manager/test/mobile_message_handler_test.cc index 2122dc463e..23957b61fb 100644 --- a/src/components/application_manager/test/mobile_message_handler_test.cc +++ b/src/components/application_manager/test/mobile_message_handler_test.cc @@ -42,7 +42,6 @@ #include "application_manager/message.h" #include "protocol/raw_message.h" - namespace test { namespace components { namespace application_manager_test { @@ -107,11 +106,11 @@ class MobileMessageHandlerTest : public testing::Test { size_t full_size = sizeof(uint8_t) * full_data.size(); message_ptr_ = std::make_shared<RawMessage>(connection_key_, - protocol_version, - &full_data[0], - full_size, - ServiceType::kRpc, - payload_size); + protocol_version, + &full_data[0], + full_size, + ServiceType::kRpc, + payload_size); return MobileMessageHandler::HandleIncomingMessageProtocol(message_ptr_); } diff --git a/src/components/application_manager/test/mobile_message_handler_v1_test.cc b/src/components/application_manager/test/mobile_message_handler_v1_test.cc index 72edf741f9..5cbc28b20c 100644 --- a/src/components/application_manager/test/mobile_message_handler_v1_test.cc +++ b/src/components/application_manager/test/mobile_message_handler_v1_test.cc @@ -41,7 +41,6 @@ #include "application_manager/message.h" #include "protocol/raw_message.h" - using protocol_handler::RawMessage; using protocol_handler::RawMessagePtr; using protocol_handler::PROTOCOL_HEADER_V1_SIZE; diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc index c7baac7923..855d318f24 100644 --- a/src/components/application_manager/test/policy_handler_test.cc +++ b/src/components/application_manager/test/policy_handler_test.cc @@ -2109,8 +2109,8 @@ TEST_F(PolicyHandlerTest, // Expected to get 0 as application id so SDL does not have valid application // with such id EXPECT_CALL(app_manager_, application(0)) - .WillOnce(Return( - std::shared_ptr<application_manager_test::MockApplication>())); + .WillOnce( + Return(std::shared_ptr<application_manager_test::MockApplication>())); EXPECT_FALSE(policy_handler_.SendMessageToSDK(msg, url)); } diff --git a/src/components/application_manager/test/request_info_test.cc b/src/components/application_manager/test/request_info_test.cc index 85cb4f3a37..7275f9b343 100644 --- a/src/components/application_manager/test/request_info_test.cc +++ b/src/components/application_manager/test/request_info_test.cc @@ -37,8 +37,6 @@ #include <limits> #include "gmock/gmock.h" - - namespace request_info = application_manager::request_controller; namespace test { diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc index 2a430ae655..54c76fcf94 100644 --- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc +++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc @@ -158,8 +158,7 @@ class ResumeCtrlTest : public ::testing::Test { mock_app_extension_; MockStateController mock_state_controller_; std::shared_ptr<ResumeCtrl> res_ctrl_; - std::shared_ptr<NiceMock<resumption_test::MockResumptionData> > - mock_storage_; + std::shared_ptr<NiceMock<resumption_test::MockResumptionData> > mock_storage_; std::shared_ptr<NiceMock<MockApplication> > mock_app_; std::shared_ptr<MockHelpPromptManager> mock_help_prompt_manager_; application_manager::ApplicationConstSharedPtr const_app_; diff --git a/src/components/application_manager/test/resumption/resumption_data_json_test.cc b/src/components/application_manager/test/resumption/resumption_data_json_test.cc index 442aacb609..d049d0f541 100644 --- a/src/components/application_manager/test/resumption/resumption_data_json_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_json_test.cc @@ -69,7 +69,8 @@ class ResumptionDataJsonTest : public ResumptionDataTest { : last_state_("app_storage_folder", "app_info_storage") , res_json(last_state_, mock_application_manager_) {} virtual void SetUp() { - app_mock = std::make_shared<NiceMock<application_manager_test::MockApplication>>(); + app_mock = std::make_shared< + NiceMock<application_manager_test::MockApplication> >(); policy_app_id_ = "test_policy_app_id"; app_id_ = 10; diff --git a/src/components/application_manager/test/resumption/resumption_data_test.cc b/src/components/application_manager/test/resumption/resumption_data_test.cc index ced9ca84af..5658ab8535 100644 --- a/src/components/application_manager/test/resumption/resumption_data_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_test.cc @@ -41,7 +41,6 @@ #include "utils/data_accessor.h" #include "application_manager/message_helper.h" - #include "application_manager/resumption_data_test.h" namespace test { @@ -322,8 +321,8 @@ void ResumptionDataTest::CheckVRTitle( } void ResumptionDataTest::PrepareData() { - mock_app_extension_ = std::make_shared< - NiceMock<application_manager_test::MockAppExtension> >(); + mock_app_extension_ = + std::make_shared<NiceMock<application_manager_test::MockAppExtension> >(); extensions_.insert(extensions_.begin(), mock_app_extension_); ON_CALL(*app_mock, Extensions()).WillByDefault(ReturnRef(extensions_)); SetGlobalProporties(); diff --git a/src/components/application_manager/test/state_controller/state_controller_test.cc b/src/components/application_manager/test/state_controller/state_controller_test.cc index 001a4da3af..fd2503da33 100644 --- a/src/components/application_manager/test/state_controller/state_controller_test.cc +++ b/src/components/application_manager/test/state_controller/state_controller_test.cc @@ -646,8 +646,7 @@ class StateControllerImplTest : public ::testing::Test { app_id = (*it_begin)->app_id(); app_type = AppType(app_id); app = (*it_begin); - am::HmiStatePtr state_first = - std::make_shared<T>(app, app_manager_mock_); + am::HmiStatePtr state_first = std::make_shared<T>(app, app_manager_mock_); am::HmiStatePtr state_second = std::make_shared<Q>(app, app_manager_mock_); TestSetSeveralState( @@ -2223,7 +2222,7 @@ TEST_F(StateControllerImplTest, TEST_F(StateControllerImplTest, SetNaviStreamingStateForNonMediaApplication) { am::HmiStatePtr state_navi_streming = std::make_shared<am::VideoStreamingHmiState>(simple_app_, - app_manager_mock_); + app_manager_mock_); TestSetState(simple_app_, state_navi_streming, APP_TYPE_NON_MEDIA, @@ -2234,7 +2233,7 @@ TEST_F(StateControllerImplTest, DISABLED_SetNaviStreamingStateMediaApplicationAttenuatedNotSupported) { am::HmiStatePtr state_navi_streming = std::make_shared<am::VideoStreamingHmiState>(media_app_, - app_manager_mock_); + app_manager_mock_); EXPECT_CALL(app_manager_mock_, is_attenuated_supported()) .WillRepeatedly(Return(false)); TestSetState(media_app_, @@ -2247,7 +2246,7 @@ TEST_F(StateControllerImplTest, DISABLED_SetNaviStreamingStateMediaApplicationAttenuatedSupported) { am::HmiStatePtr state_navi_streming = std::make_shared<am::VideoStreamingHmiState>(media_app_, - app_manager_mock_); + app_manager_mock_); EXPECT_CALL(app_manager_mock_, is_attenuated_supported()) .WillRepeatedly(Return(true)); TestSetState(media_app_, @@ -2283,7 +2282,7 @@ TEST_F(StateControllerImplTest, TEST_F(StateControllerImplTest, DISABLED_SetNaviStreamingStateNaviApplication) { am::HmiStatePtr state_navi_streming = std::make_shared<am::VideoStreamingHmiState>(navi_app_, - app_manager_mock_); + app_manager_mock_); TestSetState(navi_app_, state_navi_streming, APP_TYPE_NAVI, @@ -2294,7 +2293,7 @@ TEST_F(StateControllerImplTest, DISABLED_SetNaviStreamingStateMediaNaviApplication) { am::HmiStatePtr state_navi_streming = std::make_shared<am::VideoStreamingHmiState>(media_navi_app_, - app_manager_mock_); + app_manager_mock_); TestSetState(media_navi_app_, state_navi_streming, APP_TYPE_NAVI, diff --git a/src/components/application_manager/test/usage_statistics_test.cc b/src/components/application_manager/test/usage_statistics_test.cc index 28e71f6f60..8d2ed690b6 100644 --- a/src/components/application_manager/test/usage_statistics_test.cc +++ b/src/components/application_manager/test/usage_statistics_test.cc @@ -37,8 +37,6 @@ #include "policy/usage_statistics/mock_statistics_manager.h" #include "policy/usage_statistics/mock_app_stopwatch.h" - - namespace test { namespace components { namespace usage_statistics_test { @@ -69,8 +67,7 @@ const std::string kAppId = "SPT"; class UsageStatisticsTest : public testing::Test { public: UsageStatisticsTest() - : mock_statistics_manager_sptr_( - std::make_shared<MockStatisticsManager>()) + : mock_statistics_manager_sptr_(std::make_shared<MockStatisticsManager>()) , usage_statistics_test_object1_sptr_( new application_manager::UsageStatistics( kAppId, mock_statistics_manager_sptr_)) diff --git a/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc b/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc index 2ac91ba16d..73fe76640d 100644 --- a/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc +++ b/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc @@ -32,8 +32,6 @@ #include "gtest/gtest.h" - - #include "hmi_message_handler/hmi_message_handler_impl.h" #include "hmi_message_handler/mock_hmi_message_adapter_impl.h" #include "hmi_message_handler/mock_hmi_message_handler_settings.h" diff --git a/src/components/include/hmi_message_handler/hmi_message_observer.h b/src/components/include/hmi_message_handler/hmi_message_observer.h index d9ae422b8f..e7ba2619ee 100644 --- a/src/components/include/hmi_message_handler/hmi_message_observer.h +++ b/src/components/include/hmi_message_handler/hmi_message_observer.h @@ -33,8 +33,6 @@ #ifndef SRC_COMPONENTS_INCLUDE_HMI_MESSAGE_HANDLER_HMI_MESSAGE_OBSERVER_H_ #define SRC_COMPONENTS_INCLUDE_HMI_MESSAGE_HANDLER_HMI_MESSAGE_OBSERVER_H_ - - namespace application_manager { class Message; } diff --git a/src/components/include/transport_manager/transport_adapter/transport_adapter.h b/src/components/include/transport_manager/transport_adapter/transport_adapter.h index 630ec4e85f..8bba7ade8b 100644 --- a/src/components/include/transport_manager/transport_adapter/transport_adapter.h +++ b/src/components/include/transport_manager/transport_adapter/transport_adapter.h @@ -44,8 +44,6 @@ #include <list> #include <map> - - #include "transport_manager/transport_adapter/device.h" #include "transport_manager/common.h" #include "transport_manager/error.h" diff --git a/src/components/include/utils/data_accessor.h b/src/components/include/utils/data_accessor.h index 0c1eb6ebbd..b828f513eb 100644 --- a/src/components/include/utils/data_accessor.h +++ b/src/components/include/utils/data_accessor.h @@ -35,7 +35,6 @@ #include <iostream> #include "utils/lock.h" - // This class is for thread-safe const access to data template <class T> class DataAccessor { diff --git a/src/components/media_manager/src/media_manager_impl.cc b/src/components/media_manager/src/media_manager_impl.cc index 1a95227461..15b58aee1f 100644 --- a/src/components/media_manager/src/media_manager_impl.cc +++ b/src/components/media_manager/src/media_manager_impl.cc @@ -120,29 +120,36 @@ void MediaManagerImpl::Init() { #endif if ("socket" == settings().video_server_type()) { - streamer_[ServiceType::kMobileNav]= std::make_shared<SocketVideoStreamerAdapter>( - settings().server_address(), settings().video_streaming_port()); + streamer_[ServiceType::kMobileNav] = + std::make_shared<SocketVideoStreamerAdapter>( + settings().server_address(), settings().video_streaming_port()); } else if ("pipe" == settings().video_server_type()) { - streamer_[ServiceType::kMobileNav]= std::make_shared<PipeVideoStreamerAdapter>( - settings().named_video_pipe_path(), settings().app_storage_folder()); + streamer_[ServiceType::kMobileNav] = + std::make_shared<PipeVideoStreamerAdapter>( + settings().named_video_pipe_path(), + settings().app_storage_folder()); } else if ("file" == settings().video_server_type()) { - streamer_[ServiceType::kMobileNav]= std::make_shared<FileVideoStreamerAdapter>( - settings().video_stream_file(), settings().app_storage_folder()); + streamer_[ServiceType::kMobileNav] = + std::make_shared<FileVideoStreamerAdapter>( + settings().video_stream_file(), settings().app_storage_folder()); } if ("socket" == settings().audio_server_type()) { - streamer_[ServiceType::kAudio]= std::make_shared<SocketAudioStreamerAdapter>( - settings().server_address(), settings().audio_streaming_port()); + streamer_[ServiceType::kAudio] = + std::make_shared<SocketAudioStreamerAdapter>( + settings().server_address(), settings().audio_streaming_port()); } else if ("pipe" == settings().audio_server_type()) { - streamer_[ServiceType::kAudio]= std::make_shared<PipeAudioStreamerAdapter>( + streamer_[ServiceType::kAudio] = std::make_shared<PipeAudioStreamerAdapter>( settings().named_audio_pipe_path(), settings().app_storage_folder()); } else if ("file" == settings().audio_server_type()) { - streamer_[ServiceType::kAudio]= std::make_shared<FileAudioStreamerAdapter>( + streamer_[ServiceType::kAudio] = std::make_shared<FileAudioStreamerAdapter>( settings().audio_stream_file(), settings().app_storage_folder()); } - streamer_listener_[ServiceType::kMobileNav] = std::make_shared<StreamerListener>(*this); - streamer_listener_[ServiceType::kAudio] = std::make_shared<StreamerListener>(*this); + streamer_listener_[ServiceType::kMobileNav] = + std::make_shared<StreamerListener>(*this); + streamer_listener_[ServiceType::kAudio] = + std::make_shared<StreamerListener>(*this); if (streamer_[ServiceType::kMobileNav]) { streamer_[ServiceType::kMobileNav]->AddListener( @@ -187,8 +194,8 @@ void MediaManagerImpl::StartMicrophoneRecording(int32_t application_key, std::string file_path = settings().app_storage_folder(); file_path += "/"; file_path += output_file; - from_mic_listener_ = - std::make_shared<FromMicRecorderListener>(file_path, application_manager_); + from_mic_listener_ = std::make_shared<FromMicRecorderListener>( + file_path, application_manager_); #ifdef EXTENDED_MEDIA_MODE if (from_mic_recorder_) { from_mic_recorder_->AddListener(from_mic_listener_); diff --git a/src/components/media_manager/test/include/media_manager/mock_media_adapter_impl.h b/src/components/media_manager/test/include/media_manager/mock_media_adapter_impl.h index 6c5bd7b7b9..96499d9358 100644 --- a/src/components/media_manager/test/include/media_manager/mock_media_adapter_impl.h +++ b/src/components/media_manager/test/include/media_manager/mock_media_adapter_impl.h @@ -44,8 +44,7 @@ using namespace media_manager; class MockMediaAdapterImpl : public ::media_manager::MediaAdapterImpl { public: - MOCK_METHOD1(AddListener, - void(const std::shared_ptr<MediaAdapterListener>&)); + MOCK_METHOD1(AddListener, void(const std::shared_ptr<MediaAdapterListener>&)); MOCK_METHOD1(RemoveListener, void(const std::shared_ptr<MediaAdapterListener>&)); MOCK_METHOD2(SendData, diff --git a/src/components/media_manager/test/media_manager_impl_test.cc b/src/components/media_manager/test/media_manager_impl_test.cc index eae7bda680..ca0dac761a 100644 --- a/src/components/media_manager/test/media_manager_impl_test.cc +++ b/src/components/media_manager/test/media_manager_impl_test.cc @@ -45,7 +45,6 @@ #include "protocol_handler/mock_protocol_handler.h" #include "protocol/common.h" - #include "utils/file_system.h" #include "utils/scope_guard.h" @@ -106,8 +105,7 @@ class MediaManagerImplTest : public ::testing::Test { public: // media_adapter_mock_ will be deleted in media_manager_impl (dtor) MediaManagerImplTest() : media_adapter_mock_(new MockMediaAdapter()) { - media_adapter_listener_mock_ = - std::make_shared<MockMediaAdapterListener>(); + media_adapter_listener_mock_ = std::make_shared<MockMediaAdapterListener>(); ON_CALL(mock_media_manager_settings_, video_server_type()) .WillByDefault(ReturnRef(kDefaultValue)); ON_CALL(mock_media_manager_settings_, audio_server_type()) diff --git a/src/components/policy/policy_external/include/policy/cache_manager.h b/src/components/policy/policy_external/include/policy/cache_manager.h index 36ddaf0415..6c7bbeb9c9 100644 --- a/src/components/policy/policy_external/include/policy/cache_manager.h +++ b/src/components/policy/policy_external/include/policy/cache_manager.h @@ -35,7 +35,6 @@ #include <map> - #include "policy/pt_representation.h" #include "policy/pt_ext_representation.h" #include "policy/usage_statistics/statistics_manager.h" diff --git a/src/components/policy/policy_external/include/policy/policy_table.h b/src/components/policy/policy_external/include/policy/policy_table.h index 27f4cc33a2..fe27f1cb57 100644 --- a/src/components/policy/policy_external/include/policy/policy_table.h +++ b/src/components/policy/policy_external/include/policy/policy_table.h @@ -33,7 +33,6 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_H_ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_H_ - #include "policy/pt_representation.h" #include "policy/pt_ext_representation.h" diff --git a/src/components/policy/policy_external/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc index b30ed3c224..38c6d50e99 100644 --- a/src/components/policy/policy_external/src/cache_manager.cc +++ b/src/components/policy/policy_external/src/cache_manager.cc @@ -2237,8 +2237,7 @@ bool CacheManager::Init(const std::string& file_name, LOG4CXX_AUTO_TRACE(logger_); settings_ = settings; InitResult init_result = backup_->Init(settings); - ex_backup_ = std::dynamic_pointer_cast< - PTExtRepresentation>(backup_); + ex_backup_ = std::dynamic_pointer_cast<PTExtRepresentation>(backup_); bool result = true; switch (init_result) { diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc index c75d14a67a..4a5731f24f 100644 --- a/src/components/policy/policy_external/src/policy_manager_impl.cc +++ b/src/components/policy/policy_external/src/policy_manager_impl.cc @@ -213,8 +213,8 @@ PolicyManagerImpl::PolicyManagerImpl() : PolicyManager() , listener_(NULL) , cache_(new CacheManager) - , access_remote_(new AccessRemoteImpl( - std::static_pointer_cast<CacheManager>(cache_))) + , access_remote_( + new AccessRemoteImpl(std::static_pointer_cast<CacheManager>(cache_))) , retry_sequence_timeout_(60) , retry_sequence_index_(0) , ignition_check(true) @@ -224,8 +224,8 @@ PolicyManagerImpl::PolicyManagerImpl(bool in_memory) : PolicyManager() , listener_(NULL) , cache_(new CacheManager(in_memory)) - , access_remote_(new AccessRemoteImpl( - std::static_pointer_cast<CacheManager>(cache_))) + , access_remote_( + new AccessRemoteImpl(std::static_pointer_cast<CacheManager>(cache_))) , retry_sequence_timeout_(60) , retry_sequence_index_(0) , ignition_check(true) @@ -1776,7 +1776,7 @@ StatusNotifier PolicyManagerImpl::AddApplication( if (IsNewApplication(application_id)) { AddNewApplication(application_id, device_consent); return std::make_shared<CallStatusChange>(update_status_manager_, - device_consent); + device_consent); } else { PromoteExistedApplication(application_id, device_consent); return std::make_shared<utils::CallNothing>(); diff --git a/src/components/policy/policy_external/src/status.cc b/src/components/policy/policy_external/src/status.cc index 34f65339c1..c2ee4e4bbc 100644 --- a/src/components/policy/policy_external/src/status.cc +++ b/src/components/policy/policy_external/src/status.cc @@ -33,7 +33,6 @@ #include "policy/status.h" #include "policy/update_status_manager.h" - policy::UpToDateStatus::UpToDateStatus() : Status(kUpToDate, policy::PolicyTableStatus::StatusUpToDate) {} diff --git a/src/components/policy/policy_external/src/update_status_manager.cc b/src/components/policy/policy_external/src/update_status_manager.cc index aee22a3b0c..1f00a440b3 100644 --- a/src/components/policy/policy_external/src/update_status_manager.cc +++ b/src/components/policy/policy_external/src/update_status_manager.cc @@ -34,7 +34,6 @@ #include "policy/policy_listener.h" #include "utils/logger.h" - namespace policy { CREATE_LOGGERPTR_GLOBAL(logger_, "Policy") diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_test.cc index f049018848..cbefc12cc7 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_test.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_test.cc @@ -38,8 +38,6 @@ #include "policy/policy_manager_impl_test_base.h" - - using ::testing::_; using ::testing::Return; using ::testing::SetArgReferee; diff --git a/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc b/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc index fc4b0ae7b0..b87598b986 100644 --- a/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc +++ b/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc @@ -45,8 +45,6 @@ #include "policy/policy_table/types.h" #include "policy/mock_policy_settings.h" - - using namespace ::policy; namespace policy_table = rpc::policy_table_interface_base; using std::string; diff --git a/src/components/policy/policy_external/test/sql_pt_representation_test.cc b/src/components/policy/policy_external/test/sql_pt_representation_test.cc index bfcf9f2172..b0f340b0f2 100644 --- a/src/components/policy/policy_external/test/sql_pt_representation_test.cc +++ b/src/components/policy/policy_external/test/sql_pt_representation_test.cc @@ -50,7 +50,6 @@ #include "rpc_base/rpc_base.h" #include "policy/mock_policy_settings.h" - namespace policy_table = rpc::policy_table_interface_base; using policy::SQLPTRepresentation; using policy::CheckPermissionResult; diff --git a/src/components/policy/policy_regular/include/policy/cache_manager.h b/src/components/policy/policy_regular/include/policy/cache_manager.h index 236722415f..e84c0fb782 100644 --- a/src/components/policy/policy_regular/include/policy/cache_manager.h +++ b/src/components/policy/policy_regular/include/policy/cache_manager.h @@ -35,7 +35,6 @@ #include <map> - #include "policy/pt_representation.h" #include "policy/pt_ext_representation.h" #include "policy/usage_statistics/statistics_manager.h" diff --git a/src/components/policy/policy_regular/include/policy/cache_manager_interface.h b/src/components/policy/policy_regular/include/policy/cache_manager_interface.h index ba6728c520..10a6ea7f89 100644 --- a/src/components/policy/policy_regular/include/policy/cache_manager_interface.h +++ b/src/components/policy/policy_regular/include/policy/cache_manager_interface.h @@ -36,7 +36,6 @@ #include <string> #include <vector> - #include "policy/usage_statistics/counter.h" #include "policy/policy_types.h" #include "policy/policy_settings.h" diff --git a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h index 549fdd5a53..51d4ee88aa 100644 --- a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h +++ b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h @@ -37,7 +37,6 @@ #include <list> #include <cstdint> - #include "utils/lock.h" #include "policy/policy_manager.h" #include "policy/policy_table.h" diff --git a/src/components/policy/policy_regular/include/policy/policy_table.h b/src/components/policy/policy_regular/include/policy/policy_table.h index 9531bb8c79..353cdda871 100644 --- a/src/components/policy/policy_regular/include/policy/policy_table.h +++ b/src/components/policy/policy_regular/include/policy/policy_table.h @@ -33,7 +33,6 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_TABLE_H_ #define SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_TABLE_H_ - #include "policy/pt_representation.h" #include "policy/pt_ext_representation.h" diff --git a/src/components/policy/policy_regular/include/policy/update_status_manager_interface.h b/src/components/policy/policy_regular/include/policy/update_status_manager_interface.h index 520615489a..b9da90f929 100644 --- a/src/components/policy/policy_regular/include/policy/update_status_manager_interface.h +++ b/src/components/policy/policy_regular/include/policy/update_status_manager_interface.h @@ -33,7 +33,6 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_INTERFACE_H_ #define SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_INTERFACE_H_ - #include "policy/policy_types.h" #include "policy/status.h" diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc index f1e51f3f83..297d538165 100644 --- a/src/components/policy/policy_regular/src/policy_manager_impl.cc +++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc @@ -73,8 +73,8 @@ PolicyManagerImpl::PolicyManagerImpl() : PolicyManager() , listener_(NULL) , cache_(new CacheManager) - , access_remote_(new AccessRemoteImpl( - std::static_pointer_cast<CacheManager>(cache_))) + , access_remote_( + new AccessRemoteImpl(std::static_pointer_cast<CacheManager>(cache_))) , retry_sequence_timeout_(kDefaultRetryTimeoutInMSec) , retry_sequence_index_(0) , timer_retry_sequence_("Retry sequence timer", @@ -1067,7 +1067,7 @@ StatusNotifier PolicyManagerImpl::AddApplication( if (IsNewApplication(application_id)) { AddNewApplication(application_id, device_consent); return std::make_shared<CallStatusChange>(update_status_manager_, - device_consent); + device_consent); } else { PromoteExistedApplication(application_id, device_consent); return std::make_shared<utils::CallNothing>(); @@ -1164,7 +1164,7 @@ void PolicyManagerImpl::SaveUpdateStatusRequired(bool is_update_needed) { } void PolicyManagerImpl::set_cache_manager( - CacheManagerInterface* cache_manager) { + CacheManagerInterface* cache_manager) { cache_ = std::shared_ptr<CacheManagerInterface>(cache_manager); } diff --git a/src/components/policy/policy_regular/src/status.cc b/src/components/policy/policy_regular/src/status.cc index 306fa87529..00a6a95af3 100644 --- a/src/components/policy/policy_regular/src/status.cc +++ b/src/components/policy/policy_regular/src/status.cc @@ -33,7 +33,6 @@ #include "policy/status.h" #include "policy/update_status_manager_interface.h" - policy::UpToDateStatus::UpToDateStatus() : Status("UP_TO_DATE", policy::PolicyTableStatus::StatusUpToDate) {} diff --git a/src/components/policy/policy_regular/src/update_status_manager.cc b/src/components/policy/policy_regular/src/update_status_manager.cc index 401de1ea79..66d21dea54 100644 --- a/src/components/policy/policy_regular/src/update_status_manager.cc +++ b/src/components/policy/policy_regular/src/update_status_manager.cc @@ -34,7 +34,6 @@ #include "policy/policy_listener.h" #include "utils/logger.h" - namespace policy { CREATE_LOGGERPTR_GLOBAL(logger_, "Policy") diff --git a/src/components/policy/policy_regular/test/counter_test.cc b/src/components/policy/policy_regular/test/counter_test.cc index a333ec2ee5..d11bcec2ac 100644 --- a/src/components/policy/policy_regular/test/counter_test.cc +++ b/src/components/policy/policy_regular/test/counter_test.cc @@ -53,7 +53,7 @@ TEST( StatisticsManagerIncrementMethod1Arg, GlobalCounterOverloadedIncrement_CallONCE_StatisticsManagerIncrementCalledONCE) { // Arrange - auto msm = std::make_shared<StrictMock<MockStatisticsManager>>(); + auto msm = std::make_shared<StrictMock<MockStatisticsManager> >(); GlobalCounter reboots_counter(msm, SYNC_REBOOTS); // Assert @@ -67,7 +67,7 @@ TEST( StatisticsManagerIncrementMethod1Arg, GlobalCounterOverloadedIncrement_CallTWICE_StatisticsManagerIncrementCalledTWICE) { // Arrange - auto msm = std::make_shared<StrictMock<MockStatisticsManager>>(); + auto msm = std::make_shared<StrictMock<MockStatisticsManager> >(); GlobalCounter reboots_counter(msm, SYNC_REBOOTS); // Assert @@ -82,7 +82,7 @@ TEST( StatisticsManagerIncrementMethod2Args, AppCounterOverloadedIncrement_CallONCE_StatisticsManagerIncrementCalledONCE) { // Arrange - auto msm = std::make_shared<StrictMock<MockStatisticsManager>>(); + auto msm = std::make_shared<StrictMock<MockStatisticsManager> >(); AppCounter user_selections_counter(msm, "HelloApp", USER_SELECTIONS); // Assert @@ -96,7 +96,7 @@ TEST( StatisticsManagerIncrementMethod2Args, AppCounterOverloadedIncrement_CallTWICE_StatisticsManagerIncrementCalledTWICE) { // Arrange - auto msm = std::make_shared<StrictMock<MockStatisticsManager>>(); + auto msm = std::make_shared<StrictMock<MockStatisticsManager> >(); AppCounter user_selections_counter(msm, "HelloApp", USER_SELECTIONS); // Assert @@ -110,7 +110,7 @@ TEST( TEST(StatisticsManagerSetMethod, AppInfoUpdateMethod_CallONCE_StatisticsManagerSetMethodCalledONCE) { // Arrange - auto msm = std::make_shared<StrictMock<MockStatisticsManager>>(); + auto msm = std::make_shared<StrictMock<MockStatisticsManager> >(); AppInfo gui_language_info(msm, "HelloApp", LANGUAGE_GUI); // Assert @@ -123,7 +123,7 @@ TEST(StatisticsManagerSetMethod, TEST(StatisticsManagerSetMethod, AppInfoUpdateMethod_CallTWICE_StatisticsManagerSetMethodCalledTWICE) { // Arrange - auto msm = std::make_shared<StrictMock<MockStatisticsManager>>(); + auto msm = std::make_shared<StrictMock<MockStatisticsManager> >(); AppInfo gui_language_info(msm, "HelloApp", LANGUAGE_GUI); // Assert @@ -138,7 +138,7 @@ TEST(StatisticsManagerSetMethod, TEST(StatisticsManagerAddMethod, AppStopwatchStartMethod_CallONCE_StatisticsManagerAddMethodCalledONCE) { // Arrange - auto msm = std::make_shared<StrictMock<MockStatisticsManager>>(); + auto msm = std::make_shared<StrictMock<MockStatisticsManager> >(); const std::uint32_t time_out = 1; AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp", time_out); @@ -155,7 +155,7 @@ TEST(StatisticsManagerAddMethod, TEST(StatisticsManagerAddMethod, DISABLED_AppStopwatchSwitchMethod_Call_StatisticsManagerAddMethodCalled) { // Arrange - auto msm = std::make_shared<StrictMock<MockStatisticsManager>>(); + auto msm = std::make_shared<StrictMock<MockStatisticsManager> >(); AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp"); hmi_full_stopwatch.Start(SECONDS_HMI_FULL); @@ -171,7 +171,7 @@ TEST( StatisticsManagerAddMethod, DISABLED_AppStopwatchSwitchMethod_CallAnd1SecSleepAfter_StatisticsManagerAddMethodCalledWith1SecTimespan) { // Arrange - auto msm = std::make_shared<StrictMock<MockStatisticsManager>>(); + auto msm = std::make_shared<StrictMock<MockStatisticsManager> >(); const std::uint32_t time_out = 1; AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp", time_out); diff --git a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc index 70db02b8a7..7d192515dc 100644 --- a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc +++ b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc @@ -48,7 +48,6 @@ #include "json/reader.h" #include "rpc_base/rpc_base.h" - #include "utils/file_system.h" #include "utils/sqlite_wrapper/sql_database.h" diff --git a/src/components/policy/policy_regular/test/update_status_manager_test.cc b/src/components/policy/policy_regular/test/update_status_manager_test.cc index 7c73a11175..6f301c6720 100644 --- a/src/components/policy/policy_regular/test/update_status_manager_test.cc +++ b/src/components/policy/policy_regular/test/update_status_manager_test.cc @@ -35,7 +35,6 @@ #include "policy/policy_manager_impl.h" #include "policy/update_status_manager.h" - namespace test { namespace components { namespace policy_test { diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc index 57b2b8682d..872a8dc755 100644 --- a/src/components/protocol_handler/src/protocol_handler_impl.cc +++ b/src/components/protocol_handler/src/protocol_handler_impl.cc @@ -925,8 +925,7 @@ void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message, } #ifdef TELEMETRY_MONITOR if (metric_observer_) { - auto metric = - std::make_shared<PHTelemetryObserver::MessageMetric>(); + auto metric = std::make_shared<PHTelemetryObserver::MessageMetric>(); metric->message_id = message_id; metric->connection_key = message->connection_key(); metric->raw_msg = message; @@ -1384,8 +1383,7 @@ RESULT_CODE ProtocolHandlerImpl::HandleSingleFrameMessage( } #ifdef TELEMETRY_MONITOR if (metric_observer_) { - auto metric = - std::make_shared<PHTelemetryObserver::MessageMetric>(); + auto metric = std::make_shared<PHTelemetryObserver::MessageMetric>(); metric->message_id = packet->message_id(); metric->connection_key = connection_key; metric->raw_msg = rawMessage; @@ -2054,8 +2052,7 @@ void ProtocolHandlerImpl::PopValideAndExpirateMultiframes() { #ifdef TELEMETRY_MONITOR if (metric_observer_) { - auto metric = - std::make_shared<PHTelemetryObserver::MessageMetric>(); + auto metric = std::make_shared<PHTelemetryObserver::MessageMetric>(); metric->raw_msg = rawMessage; metric_observer_->EndMessageProcess(metric); } diff --git a/src/components/protocol_handler/test/include/protocol_handler/mock_telemetry_observer.h b/src/components/protocol_handler/test/include/protocol_handler/mock_telemetry_observer.h index 2bfe9c925f..f42a0b4a15 100644 --- a/src/components/protocol_handler/test/include/protocol_handler/mock_telemetry_observer.h +++ b/src/components/protocol_handler/test/include/protocol_handler/mock_telemetry_observer.h @@ -36,7 +36,6 @@ #include "gmock/gmock.h" #include "protocol_handler/time_metric_observer.h" - namespace test { namespace components { namespace protocol_handler_test { diff --git a/src/components/protocol_handler/test/incoming_data_handler_test.cc b/src/components/protocol_handler/test/incoming_data_handler_test.cc index 6274cf4e10..9abf5d69af 100644 --- a/src/components/protocol_handler/test/incoming_data_handler_test.cc +++ b/src/components/protocol_handler/test/incoming_data_handler_test.cc @@ -193,48 +193,50 @@ TEST_F(IncomingDataHandlerTest, MixedPayloadData_TwoConnections) { FrameList mobile_packets; // single packet RPC mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_1, - PROTECTION_OFF, - FRAME_TYPE_SINGLE, - kRpc, - FRAME_DATA_SINGLE, - some_session_id, - some_data_size, - protov1_message_id, - some_data)); + PROTOCOL_VERSION_1, + PROTECTION_OFF, + FRAME_TYPE_SINGLE, + kRpc, + FRAME_DATA_SINGLE, + some_session_id, + some_data_size, + protov1_message_id, + some_data)); // consecutive packet Audio - mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_2, - PROTECTION_ON, - FRAME_TYPE_CONSECUTIVE, - kAudio, - FRAME_DATA_LAST_CONSECUTIVE, - ++some_session_id, - some_data2_size, - some_message_id, - some_data2)); + mobile_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_2, + PROTECTION_ON, + FRAME_TYPE_CONSECUTIVE, + kAudio, + FRAME_DATA_LAST_CONSECUTIVE, + ++some_session_id, + some_data2_size, + some_message_id, + some_data2)); // single packet Nav mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_3, - PROTECTION_ON, - FRAME_TYPE_SINGLE, - kMobileNav, - FRAME_DATA_SINGLE, - ++some_session_id, - some_data_size, - ++some_message_id, - some_data)); + PROTOCOL_VERSION_3, + PROTECTION_ON, + FRAME_TYPE_SINGLE, + kMobileNav, + FRAME_DATA_SINGLE, + ++some_session_id, + some_data_size, + ++some_message_id, + some_data)); // consecutive packet Bulk - mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_3, - PROTECTION_ON, - FRAME_TYPE_CONSECUTIVE, - kBulk, - FRAME_DATA_LAST_CONSECUTIVE, - ++some_session_id, - some_data2_size, - ++some_message_id, - some_data2)); + mobile_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_3, + PROTECTION_ON, + FRAME_TYPE_CONSECUTIVE, + kBulk, + FRAME_DATA_LAST_CONSECUTIVE, + ++some_session_id, + some_data2_size, + ++some_message_id, + some_data2)); for (FrameList::iterator it = mobile_packets.begin(); it != mobile_packets.end(); ++it) { @@ -268,16 +270,17 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_Version) { malformed_versions.push_back(version); } for (size_t i = 0; i < malformed_versions.size(); ++i) { - malformed_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - malformed_versions[i], - PROTECTION_OFF, - FRAME_TYPE_CONTROL, - kControl, - FRAME_DATA_HEART_BEAT, - some_session_id, - 0u, - some_message_id, - nullptr)); + malformed_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + malformed_versions[i], + PROTECTION_OFF, + FRAME_TYPE_CONTROL, + kControl, + FRAME_DATA_HEART_BEAT, + some_session_id, + 0u, + some_message_id, + nullptr)); } // We count malformed only first time when it occurs after correct message @@ -316,16 +319,17 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_ServiceType) { malformed_serv_types.push_back(0x0D); malformed_serv_types.push_back(0x0E); for (size_t i = 0; i < malformed_serv_types.size(); ++i) { - malformed_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_3, - PROTECTION_OFF, - FRAME_TYPE_CONTROL, - malformed_serv_types[i], - FRAME_DATA_HEART_BEAT, - some_session_id, - 0u, - some_message_id, - nullptr)); + malformed_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_3, + PROTECTION_OFF, + FRAME_TYPE_CONTROL, + malformed_serv_types[i], + FRAME_DATA_HEART_BEAT, + some_session_id, + 0u, + some_message_id, + nullptr)); } // We count malformed only first time when it occurs after correct message @@ -360,16 +364,17 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_FrameType) { malformed_frame_types.push_back(frame_type); } for (size_t i = 0; i < malformed_frame_types.size(); ++i) { - malformed_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_3, - PROTECTION_OFF, - malformed_frame_types[i], - kControl, - FRAME_DATA_HEART_BEAT, - some_session_id, - 0u, - some_message_id, - nullptr)); + malformed_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_3, + PROTECTION_OFF, + malformed_frame_types[i], + kControl, + FRAME_DATA_HEART_BEAT, + some_session_id, + 0u, + some_message_id, + nullptr)); } // We count malformed only first time when it occurs after correct message @@ -404,16 +409,17 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_ControlFrame) { malformed_frame_data.push_back(frame_type); } for (size_t i = 0; i < malformed_frame_data.size(); ++i) { - malformed_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_3, - PROTECTION_OFF, - FRAME_TYPE_CONTROL, - kControl, - malformed_frame_data[i], - some_session_id, - 0u, - some_message_id, - nullptr)); + malformed_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_3, + PROTECTION_OFF, + FRAME_TYPE_CONTROL, + kControl, + malformed_frame_data[i], + some_session_id, + 0u, + some_message_id, + nullptr)); } // We count malformed only first time when it occurs after correct message @@ -448,16 +454,17 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_SingleFrame) { } malformed_frame_data.push_back(FRAME_DATA_MAX_VALUE); for (size_t i = 0; i < malformed_frame_data.size(); ++i) { - malformed_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_3, - PROTECTION_OFF, - FRAME_TYPE_SINGLE, - kControl, - malformed_frame_data[i], - some_session_id, - 0u, - some_message_id, - nullptr)); + malformed_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_3, + PROTECTION_OFF, + FRAME_TYPE_SINGLE, + kControl, + malformed_frame_data[i], + some_session_id, + 0u, + some_message_id, + nullptr)); } // We count malformed only first time when it occurs after correct message @@ -492,16 +499,17 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_FirstFrame) { } malformed_frame_data.push_back(FRAME_DATA_MAX_VALUE); for (size_t i = 0; i < malformed_frame_data.size(); ++i) { - malformed_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_3, - PROTECTION_OFF, - FRAME_TYPE_SINGLE, - kControl, - malformed_frame_data[i], - some_session_id, - 0u, - some_message_id, - nullptr)); + malformed_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_3, + PROTECTION_OFF, + FRAME_TYPE_SINGLE, + kControl, + malformed_frame_data[i], + some_session_id, + 0u, + some_message_id, + nullptr)); } // We count malformed only first time when it occurs after correct message @@ -530,105 +538,109 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_AdditionalByte) { FrameList mobile_packets; // single packet RPC mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_1, - PROTECTION_OFF, - FRAME_TYPE_SINGLE, - kRpc, - FRAME_DATA_SINGLE, - some_session_id, - some_data_size, - protov1_message_id, - some_data)); + PROTOCOL_VERSION_1, + PROTECTION_OFF, + FRAME_TYPE_SINGLE, + kRpc, + FRAME_DATA_SINGLE, + some_session_id, + some_data_size, + protov1_message_id, + some_data)); AppendPacketToTMData(*mobile_packets.back()); // Add malformed byte tm_data.insert(tm_data.end(), 1, 0x1); // consecutive packet Audio - mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_2, - PROTECTION_ON, - FRAME_TYPE_CONSECUTIVE, - kAudio, - FRAME_DATA_LAST_CONSECUTIVE, - ++some_session_id, - some_data2_size, - some_message_id, - some_data2)); + mobile_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_2, + PROTECTION_ON, + FRAME_TYPE_CONSECUTIVE, + kAudio, + FRAME_DATA_LAST_CONSECUTIVE, + ++some_session_id, + some_data2_size, + some_message_id, + some_data2)); AppendPacketToTMData(*mobile_packets.back()); // Add malformed bytes tm_data.insert(tm_data.end(), 2, 0x2); // single packet Nav mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_3, - PROTECTION_ON, - FRAME_TYPE_SINGLE, - kMobileNav, - FRAME_DATA_SINGLE, - ++some_session_id, - some_data_size, - ++some_message_id, - some_data)); + PROTOCOL_VERSION_3, + PROTECTION_ON, + FRAME_TYPE_SINGLE, + kMobileNav, + FRAME_DATA_SINGLE, + ++some_session_id, + some_data_size, + ++some_message_id, + some_data)); AppendPacketToTMData(*mobile_packets.back()); // Add malformed bytes tm_data.insert(tm_data.end(), 3, 0x3); // consecutive packet Bulk - mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_3, - PROTECTION_ON, - FRAME_TYPE_CONSECUTIVE, - kBulk, - FRAME_DATA_LAST_CONSECUTIVE, - ++some_session_id, - some_data2_size, - ++some_message_id, - some_data2)); + mobile_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_3, + PROTECTION_ON, + FRAME_TYPE_CONSECUTIVE, + kBulk, + FRAME_DATA_LAST_CONSECUTIVE, + ++some_session_id, + some_data2_size, + ++some_message_id, + some_data2)); AppendPacketToTMData(*mobile_packets.back()); // Add malformed bytes tm_data.insert(tm_data.end(), 4, 0x4); // single packet RPC - mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_1, - PROTECTION_OFF, - FRAME_TYPE_CONTROL, - kRpc, - FRAME_DATA_HEART_BEAT, - some_session_id, - some_data_size, - protov1_message_id, - some_data)); + mobile_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_1, + PROTECTION_OFF, + FRAME_TYPE_CONTROL, + kRpc, + FRAME_DATA_HEART_BEAT, + some_session_id, + some_data_size, + protov1_message_id, + some_data)); AppendPacketToTMData(*mobile_packets.back()); // Add malformed bytes tm_data.insert(tm_data.end(), 5, 0x5); // single packet Audio - mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_1, - PROTECTION_OFF, - FRAME_TYPE_CONTROL, - kAudio, - FRAME_DATA_HEART_BEAT, - some_session_id, - some_data_size, - protov1_message_id, - some_data)); + mobile_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_1, + PROTECTION_OFF, + FRAME_TYPE_CONTROL, + kAudio, + FRAME_DATA_HEART_BEAT, + some_session_id, + some_data_size, + protov1_message_id, + some_data)); AppendPacketToTMData(*mobile_packets.back()); // Add malformed bytes tm_data.insert(tm_data.end(), 6, 0x6); // single packet RPC mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_1, - PROTECTION_OFF, - FRAME_TYPE_SINGLE, - kRpc, - FRAME_DATA_SINGLE, - some_session_id, - some_data_size, - protov1_message_id, - some_data)); + PROTOCOL_VERSION_1, + PROTECTION_OFF, + FRAME_TYPE_SINGLE, + kRpc, + FRAME_DATA_SINGLE, + some_session_id, + some_data_size, + protov1_message_id, + some_data)); AppendPacketToTMData(*mobile_packets.back()); ProcessData(uid1, &tm_data[0], tm_data.size()); @@ -652,28 +664,29 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_Mix) { FrameList mobile_packets; // single packet RPC mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_1, - PROTECTION_OFF, - FRAME_TYPE_SINGLE, - kRpc, - FRAME_DATA_SINGLE, - some_session_id, - some_data_size, - protov1_message_id, - some_data)); + PROTOCOL_VERSION_1, + PROTECTION_OFF, + FRAME_TYPE_SINGLE, + kRpc, + FRAME_DATA_SINGLE, + some_session_id, + some_data_size, + protov1_message_id, + some_data)); AppendPacketToTMData(*mobile_packets.back()); // consecutive packet Audio - mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_2, - PROTECTION_ON, - FRAME_TYPE_CONSECUTIVE, - kAudio, - FRAME_DATA_LAST_CONSECUTIVE, - ++some_session_id, - some_data2_size, - some_message_id, - some_data2)); + mobile_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_2, + PROTECTION_ON, + FRAME_TYPE_CONSECUTIVE, + kAudio, + FRAME_DATA_LAST_CONSECUTIVE, + ++some_session_id, + some_data2_size, + some_message_id, + some_data2)); AppendPacketToTMData(*mobile_packets.back()); // Malformed packet 1 @@ -691,16 +704,17 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_Mix) { AppendPacketToTMData(malformed_packet1); // consecutive packet Bulk - mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_3, - PROTECTION_ON, - FRAME_TYPE_CONSECUTIVE, - kBulk, - FRAME_DATA_LAST_CONSECUTIVE, - ++some_session_id, - some_data2_size, - ++some_message_id, - some_data2)); + mobile_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_3, + PROTECTION_ON, + FRAME_TYPE_CONSECUTIVE, + kBulk, + FRAME_DATA_LAST_CONSECUTIVE, + ++some_session_id, + some_data2_size, + ++some_message_id, + some_data2)); AppendPacketToTMData(*mobile_packets.back()); // Malformed packet 2 @@ -718,16 +732,17 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_Mix) { AppendPacketToTMData(malformed_packet2); // Audio packet - mobile_packets.push_back(std::make_shared<ProtocolPacket>(uid1, - PROTOCOL_VERSION_3, - PROTECTION_OFF, - FRAME_TYPE_CONTROL, - kAudio, - FRAME_DATA_HEART_BEAT, - some_session_id, - some_data_size, - protov1_message_id, - some_data)); + mobile_packets.push_back( + std::make_shared<ProtocolPacket>(uid1, + PROTOCOL_VERSION_3, + PROTECTION_OFF, + FRAME_TYPE_CONTROL, + kAudio, + FRAME_DATA_HEART_BEAT, + some_session_id, + some_data_size, + protov1_message_id, + some_data)); AppendPacketToTMData(*mobile_packets.back()); ProcessData(uid1, &tm_data[0], tm_data.size()); diff --git a/src/components/protocol_handler/test/protocol_handler_tm_test.cc b/src/components/protocol_handler/test/protocol_handler_tm_test.cc index 6ee57548b4..cfda0a550a 100644 --- a/src/components/protocol_handler/test/protocol_handler_tm_test.cc +++ b/src/components/protocol_handler/test/protocol_handler_tm_test.cc @@ -621,8 +621,7 @@ TEST_F(ProtocolHandlerImplTest, TEST_F(ProtocolHandlerImplTest, StartSession_Protected_SessionObserverAccept) { SetProtocolVersion2(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -836,8 +835,7 @@ TEST_F(ProtocolHandlerImplTest, * ProtocolHandler shall send NAck on session_observer rejection */ TEST_F(ProtocolHandlerImplTest, EndSession_SessionObserverReject) { - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -870,8 +868,7 @@ TEST_F(ProtocolHandlerImplTest, EndSession_SessionObserverReject) { * ProtocolHandler shall send NAck on wrong hash code */ TEST_F(ProtocolHandlerImplTest, EndSession_Success) { - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -904,8 +901,7 @@ TEST_F(ProtocolHandlerImplTest, EndSession_Success) { #ifdef ENABLE_SECURITY TEST_F(ProtocolHandlerImplTest, SecurityEnable_StartSessionProtocoloV1) { using namespace protocol_handler; - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -2653,8 +2649,7 @@ TEST_F(ProtocolHandlerImplTest, DISABLED_FloodVerification) { InitProtocolHandlerImpl(period_msec, max_messages); AddConnection(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -2691,8 +2686,7 @@ TEST_F(ProtocolHandlerImplTest, DISABLED_FloodVerification_ThresholdValue) { InitProtocolHandlerImpl(period_msec, max_messages); AddConnection(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -2728,8 +2722,7 @@ TEST_F(ProtocolHandlerImplTest, DISABLED_FloodVerification_VideoFrameSkip) { InitProtocolHandlerImpl(period_msec, max_messages); AddConnection(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -2757,8 +2750,7 @@ TEST_F(ProtocolHandlerImplTest, DISABLED_FloodVerification_AudioFrameSkip) { InitProtocolHandlerImpl(period_msec, max_messages); AddConnection(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -2786,8 +2778,7 @@ TEST_F(ProtocolHandlerImplTest, DISABLED_FloodVerificationDisable) { InitProtocolHandlerImpl(period_msec, max_messages); AddConnection(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -2815,8 +2806,7 @@ TEST_F(ProtocolHandlerImplTest, MalformedVerificationDisable) { InitProtocolHandlerImpl(0u, 0u, false, period_msec, max_messages); AddConnection(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -2848,8 +2838,7 @@ TEST_F(ProtocolHandlerImplTest, DISABLED_MalformedLimitVerification) { InitProtocolHandlerImpl(0u, 0u, true, period_msec, max_messages); AddConnection(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -2896,8 +2885,7 @@ TEST_F(ProtocolHandlerImplTest, InitProtocolHandlerImpl(0u, 0u, true, period_msec, max_messages); AddConnection(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -2968,8 +2956,7 @@ TEST_F(ProtocolHandlerImplTest, MalformedLimitVerification_MalformedOnly) { InitProtocolHandlerImpl(0u, 0u, true, period_msec, max_messages); AddConnection(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3029,8 +3016,7 @@ TEST_F(ProtocolHandlerImplTest, MalformedLimitVerification_NullTimePeriod) { InitProtocolHandlerImpl(0u, 0u, true, period_msec, max_messages); AddConnection(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3063,8 +3049,7 @@ TEST_F(ProtocolHandlerImplTest, MalformedLimitVerification_NullCount) { InitProtocolHandlerImpl(0u, 0u, true, period_msec, max_messages); AddConnection(); - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3107,8 +3092,7 @@ TEST_F(ProtocolHandlerImplTest, TEST_F(ProtocolHandlerImplTest, DISABLED_SendEndServicePrivate_EndSession_MessageSent) { // Arrange - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3132,8 +3116,7 @@ TEST_F(ProtocolHandlerImplTest, TEST_F(ProtocolHandlerImplTest, SendEndServicePrivate_ServiceTypeControl_MessageSent) { // Arrange - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3172,8 +3155,7 @@ TEST_F(ProtocolHandlerImplTest, SendHeartBeat_NoConnection_NotSent) { TEST_F(ProtocolHandlerImplTest, SendHeartBeat_Successful) { // Arrange - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3198,8 +3180,7 @@ TEST_F(ProtocolHandlerImplTest, SendHeartBeat_Successful) { TEST_F(ProtocolHandlerImplTest, SendHeartBeatAck_Successful) { // Arrange - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3228,8 +3209,7 @@ TEST_F(ProtocolHandlerImplTest, SendHeartBeatAck_Successful) { TEST_F(ProtocolHandlerImplTest, DISABLED_SendHeartBeatAck_WrongProtocolVersion_NotSent) { // Arrange - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3258,8 +3238,7 @@ TEST_F(ProtocolHandlerImplTest, TEST_F(ProtocolHandlerImplTest, SendMessageToMobileApp_SendSingleControlMessage) { // Arrange - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3297,8 +3276,7 @@ TEST_F(ProtocolHandlerImplTest, TEST_F(ProtocolHandlerImplTest, SendMessageToMobileApp_SendSingleNonControlMessage) { // Arrange - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3340,8 +3318,7 @@ TEST_F(ProtocolHandlerImplTest, TEST_F(ProtocolHandlerImplTest, SendMessageToMobileApp_SendMultiframeMessage) { // Arrange - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3395,8 +3372,7 @@ TEST_F(ProtocolHandlerImplTest, SendMessageToMobileApp_SendMultiframeMessage) { } TEST_F(ProtocolHandlerImplTest, SendServiceDataAck_PreVersion5) { - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); @@ -3422,8 +3398,7 @@ TEST_F(ProtocolHandlerImplTest, SendServiceDataAck_PreVersion5) { } TEST_F(ProtocolHandlerImplTest, SendServiceDataAck_AfterVersion5) { - std::shared_ptr<TestAsyncWaiter> waiter = - std::make_shared<TestAsyncWaiter>(); + std::shared_ptr<TestAsyncWaiter> waiter = std::make_shared<TestAsyncWaiter>(); uint32_t times = 0; AddSession(waiter, times); diff --git a/src/components/security_manager/include/security_manager/crypto_manager_impl.h b/src/components/security_manager/include/security_manager/crypto_manager_impl.h index 7a42c3d773..5fd7a95155 100644 --- a/src/components/security_manager/include/security_manager/crypto_manager_impl.h +++ b/src/components/security_manager/include/security_manager/crypto_manager_impl.h @@ -47,7 +47,6 @@ #include "utils/macro.h" #include "utils/lock.h" - namespace security_manager { class CryptoManagerImpl : public CryptoManager { private: diff --git a/src/components/security_manager/test/crypto_manager_impl_test.cc b/src/components/security_manager/test/crypto_manager_impl_test.cc index 9b1cd28539..5e096194f3 100644 --- a/src/components/security_manager/test/crypto_manager_impl_test.cc +++ b/src/components/security_manager/test/crypto_manager_impl_test.cc @@ -39,7 +39,6 @@ #include <fstream> #include <sstream> - #include "gtest/gtest.h" #include "security_manager/crypto_manager_impl.h" #include "security_manager/mock_security_manager_settings.h" diff --git a/src/components/security_manager/test/ssl_context_test.cc b/src/components/security_manager/test/ssl_context_test.cc index 47fa3c5560..05eeb802ad 100644 --- a/src/components/security_manager/test/ssl_context_test.cc +++ b/src/components/security_manager/test/ssl_context_test.cc @@ -42,8 +42,6 @@ #include "utils/custom_string.h" #include "security_manager/mock_security_manager_settings.h" - - using ::testing::Return; using ::testing::ReturnRef; using ::testing::NiceMock; diff --git a/src/components/smart_objects/include/smart_objects/always_false_schema_item.h b/src/components/smart_objects/include/smart_objects/always_false_schema_item.h index a25155afad..4510f2292a 100644 --- a/src/components/smart_objects/include/smart_objects/always_false_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/always_false_schema_item.h @@ -33,7 +33,6 @@ #ifndef SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_ALWAYS_FALSE_SCHEMA_ITEM_H_ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_ALWAYS_FALSE_SCHEMA_ITEM_H_ - #include "smart_objects/schema_item.h" namespace NsSmartDeviceLink { diff --git a/src/components/smart_objects/include/smart_objects/always_true_schema_item.h b/src/components/smart_objects/include/smart_objects/always_true_schema_item.h index c99cf97fb1..8a211339ba 100644 --- a/src/components/smart_objects/include/smart_objects/always_true_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/always_true_schema_item.h @@ -33,7 +33,6 @@ #ifndef SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_ALWAYS_TRUE_SCHEMA_ITEM_H_ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_ALWAYS_TRUE_SCHEMA_ITEM_H_ - #include "smart_objects/schema_item.h" namespace NsSmartDeviceLink { diff --git a/src/components/smart_objects/include/smart_objects/array_schema_item.h b/src/components/smart_objects/include/smart_objects/array_schema_item.h index 27d7180d5a..3e8be98ee0 100644 --- a/src/components/smart_objects/include/smart_objects/array_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/array_schema_item.h @@ -34,7 +34,6 @@ #include <stddef.h> - #include "smart_objects/schema_item.h" #include "smart_objects/always_true_schema_item.h" #include "smart_objects/schema_item_parameter.h" diff --git a/src/components/smart_objects/include/smart_objects/bool_schema_item.h b/src/components/smart_objects/include/smart_objects/bool_schema_item.h index a4db49c95f..14bca2f487 100644 --- a/src/components/smart_objects/include/smart_objects/bool_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/bool_schema_item.h @@ -33,8 +33,6 @@ #ifndef SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_BOOL_SCHEMA_ITEM_H_ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_BOOL_SCHEMA_ITEM_H_ - - #include "smart_objects/default_shema_item.h" namespace NsSmartDeviceLink { diff --git a/src/components/smart_objects/include/smart_objects/default_shema_item.h b/src/components/smart_objects/include/smart_objects/default_shema_item.h index b364fe7982..fdac77d029 100644 --- a/src/components/smart_objects/include/smart_objects/default_shema_item.h +++ b/src/components/smart_objects/include/smart_objects/default_shema_item.h @@ -34,7 +34,6 @@ #include "utils/macro.h" - #include "smart_objects/schema_item.h" #include "smart_objects/schema_item_parameter.h" #include "smart_objects/smart_object.h" diff --git a/src/components/smart_objects/include/smart_objects/enum_schema_item.h b/src/components/smart_objects/include/smart_objects/enum_schema_item.h index 8679d7e9dd..450bbc6c40 100644 --- a/src/components/smart_objects/include/smart_objects/enum_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/enum_schema_item.h @@ -39,7 +39,6 @@ #include <set> #include <string> - #include "smart_objects/default_shema_item.h" namespace NsSmartDeviceLink { @@ -208,10 +207,11 @@ class EnumConversionHelper { }; template <typename EnumType> -std::shared_ptr<TEnumSchemaItem<EnumType>> TEnumSchemaItem<EnumType>::create( +std::shared_ptr<TEnumSchemaItem<EnumType> > TEnumSchemaItem<EnumType>::create( const std::set<EnumType>& AllowedElements, const TSchemaItemParameter<EnumType>& DefaultValue) { - return std::shared_ptr<TEnumSchemaItem<EnumType>> (new TEnumSchemaItem<EnumType>(AllowedElements, DefaultValue)); + return std::shared_ptr<TEnumSchemaItem<EnumType> >( + new TEnumSchemaItem<EnumType>(AllowedElements, DefaultValue)); } template <typename EnumType> diff --git a/src/components/smart_objects/include/smart_objects/number_schema_item.h b/src/components/smart_objects/include/smart_objects/number_schema_item.h index c6d42066b5..2c64538953 100644 --- a/src/components/smart_objects/include/smart_objects/number_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/number_schema_item.h @@ -112,11 +112,12 @@ class TNumberSchemaItem : public CDefaultSchemaItem<NumberType> { }; template <typename NumberType> -std::shared_ptr<TNumberSchemaItem<NumberType>> TNumberSchemaItem< +std::shared_ptr<TNumberSchemaItem<NumberType> > TNumberSchemaItem< NumberType>::create(const TSchemaItemParameter<NumberType>& MinValue, const TSchemaItemParameter<NumberType>& MaxValue, const TSchemaItemParameter<NumberType>& DefaultValue) { - return std::shared_ptr<TNumberSchemaItem<NumberType>>(new TNumberSchemaItem<NumberType>(MinValue, MaxValue, DefaultValue)); + return std::shared_ptr<TNumberSchemaItem<NumberType> >( + new TNumberSchemaItem<NumberType>(MinValue, MaxValue, DefaultValue)); } template <typename NumberType> diff --git a/src/components/smart_objects/include/smart_objects/string_schema_item.h b/src/components/smart_objects/include/smart_objects/string_schema_item.h index 4783a91fea..50418debc0 100644 --- a/src/components/smart_objects/include/smart_objects/string_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/string_schema_item.h @@ -36,8 +36,6 @@ #include <stddef.h> #include <string> - - #include "smart_objects/default_shema_item.h" #include "smart_objects/schema_item_parameter.h" diff --git a/src/components/smart_objects/src/array_schema_item.cc b/src/components/smart_objects/src/array_schema_item.cc index 9bd3a9a70d..f006267f10 100644 --- a/src/components/smart_objects/src/array_schema_item.cc +++ b/src/components/smart_objects/src/array_schema_item.cc @@ -38,7 +38,8 @@ std::shared_ptr<CArraySchemaItem> CArraySchemaItem::create( const ISchemaItemPtr ElementSchemaItem, const TSchemaItemParameter<size_t>& MinSize, const TSchemaItemParameter<size_t>& MaxSize) { - return std::shared_ptr<CArraySchemaItem>(new CArraySchemaItem(ElementSchemaItem, MinSize, MaxSize)); + return std::shared_ptr<CArraySchemaItem>( + new CArraySchemaItem(ElementSchemaItem, MinSize, MaxSize)); } Errors::eType CArraySchemaItem::validate(const SmartObject& Object) { diff --git a/src/components/smart_objects/src/string_schema_item.cc b/src/components/smart_objects/src/string_schema_item.cc index 2f71533b53..b403607ede 100644 --- a/src/components/smart_objects/src/string_schema_item.cc +++ b/src/components/smart_objects/src/string_schema_item.cc @@ -42,7 +42,8 @@ std::shared_ptr<CStringSchemaItem> CStringSchemaItem::create( const TSchemaItemParameter<size_t>& MinLength, const TSchemaItemParameter<size_t>& MaxLength, const TSchemaItemParameter<std::string>& DefaultValue) { - return std::shared_ptr<CStringSchemaItem>(new CStringSchemaItem(MinLength, MaxLength, DefaultValue)); + return std::shared_ptr<CStringSchemaItem>( + new CStringSchemaItem(MinLength, MaxLength, DefaultValue)); } Errors::eType CStringSchemaItem::validate(const SmartObject& Object) { diff --git a/src/components/smart_objects/test/BoolSchemaItem_test.cc b/src/components/smart_objects/test/BoolSchemaItem_test.cc index 8299635c6a..faad0bf4bb 100644 --- a/src/components/smart_objects/test/BoolSchemaItem_test.cc +++ b/src/components/smart_objects/test/BoolSchemaItem_test.cc @@ -34,8 +34,6 @@ #include "gmock/gmock.h" - - #include "smart_objects/smart_object.h" #include "smart_objects/bool_schema_item.h" diff --git a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc index 1eb0b31cb3..fac9a5441b 100644 --- a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc +++ b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc @@ -36,8 +36,6 @@ #include "gmock/gmock.h" - - #include "smart_objects/smart_object.h" #include "smart_objects/smart_schema.h" #include "smart_objects/schema_item.h" diff --git a/src/components/telemetry_monitor/src/telemetry_monitor.cc b/src/components/telemetry_monitor/src/telemetry_monitor.cc index 6d95553a59..c17b09c567 100644 --- a/src/components/telemetry_monitor/src/telemetry_monitor.cc +++ b/src/components/telemetry_monitor/src/telemetry_monitor.cc @@ -43,7 +43,6 @@ #include "transport_manager/transport_manager_default.h" #include "utils/resource_usage.h" - #include "telemetry_monitor/telemetry_observable.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/transport_manager_observer.cc b/src/components/telemetry_monitor/src/transport_manager_observer.cc index d0c7fe42d9..fc598844a4 100644 --- a/src/components/telemetry_monitor/src/transport_manager_observer.cc +++ b/src/components/telemetry_monitor/src/transport_manager_observer.cc @@ -54,8 +54,8 @@ void TransportManagerObserver::StopRawMsg( it = time_starts.find(ptr); if (it != time_starts.end()) { auto m = std::make_shared<TransportManagerMecticWrapper>(); - m->message_metric = - std::make_shared<transport_manager::TMTelemetryObserver::MessageMetric>(); + m->message_metric = std::make_shared< + transport_manager::TMTelemetryObserver::MessageMetric>(); m->message_metric->begin = it->second; m->message_metric->end = date_time::DateTime::getCurrentTime(); m->message_metric->data_size = ptr->data_size(); diff --git a/src/components/telemetry_monitor/test/application_manager_metric_test.cc b/src/components/telemetry_monitor/test/application_manager_metric_test.cc index cd0d599690..c3f0c26cde 100644 --- a/src/components/telemetry_monitor/test/application_manager_metric_test.cc +++ b/src/components/telemetry_monitor/test/application_manager_metric_test.cc @@ -57,8 +57,8 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetric) { TimevalStruct end_time; end_time.tv_sec = 10; end_time.tv_usec = 0; - metric_test.message_metric = - std::make_shared<application_manager::AMTelemetryObserver::MessageMetric>(); + metric_test.message_metric = std::make_shared< + application_manager::AMTelemetryObserver::MessageMetric>(); metric_test.message_metric->begin = start_time; metric_test.message_metric->end = end_time; NsSmartDeviceLink::NsSmartObjects::SmartObject obj; @@ -98,8 +98,8 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetricWithGrabResources) { end_time.tv_sec = 10; end_time.tv_usec = 0; - metric_test.message_metric = - std::make_shared<application_manager::AMTelemetryObserver::MessageMetric>(); + metric_test.message_metric = std::make_shared< + application_manager::AMTelemetryObserver::MessageMetric>(); metric_test.message_metric->begin = start_time; metric_test.message_metric->end = end_time; NsSmartDeviceLink::NsSmartObjects::SmartObject obj; diff --git a/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h b/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h index 201220c863..c2aebe72b3 100644 --- a/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h +++ b/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h @@ -38,7 +38,6 @@ #include "telemetry_monitor/telemetry_monitor.h" #include "telemetry_monitor/metric_wrapper.h" - namespace test { namespace components { namespace telemetry_monitor_test { diff --git a/src/components/telemetry_monitor/test/telemetry_monitor_test.cc b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc index d0f82103d4..b8d3f9063f 100644 --- a/src/components/telemetry_monitor/test/telemetry_monitor_test.cc +++ b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc @@ -41,8 +41,6 @@ #include "transport_manager/mock_transport_manager.h" #include "telemetry_monitor/mock_telemetry_observable.h" - - using testing::Return; using testing::_; diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h b/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h index e3be189b50..2374d8a126 100644 --- a/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h +++ b/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h @@ -35,7 +35,6 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_CONNECTION_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_CONNECTION_H_ - #include "transport_manager/transport_adapter/transport_adapter.h" namespace transport_manager { diff --git a/src/components/transport_manager/include/transport_manager/usb/common.h b/src/components/transport_manager/include/transport_manager/usb/common.h index 8fa0d8468e..1db1a83a3a 100644 --- a/src/components/transport_manager/include/transport_manager/usb/common.h +++ b/src/components/transport_manager/include/transport_manager/usb/common.h @@ -35,8 +35,6 @@ #include <stdint.h> - - #if defined(__QNXNTO__) #include "transport_manager/usb/qnx/usb_handler.h" #else diff --git a/src/components/transport_manager/include/transport_manager/usb/usb_device.h b/src/components/transport_manager/include/transport_manager/usb/usb_device.h index b66943561b..ea31bb0376 100644 --- a/src/components/transport_manager/include/transport_manager/usb/usb_device.h +++ b/src/components/transport_manager/include/transport_manager/usb/usb_device.h @@ -55,8 +55,8 @@ class UsbDevice : public Device { } virtual ~UsbDevice() {} - protected: + protected: virtual bool IsSameAs(const Device* other_device) const { return unique_device_id() == other_device->unique_device_id(); } @@ -69,7 +69,6 @@ class UsbDevice : public Device { private: PlatformUsbDevice* usb_device_; - }; } // namespace transport_adapter diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc b/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc index f5dc498db9..62615cb30f 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc @@ -38,7 +38,6 @@ #include "transport_manager/bluetooth/bluetooth_socket_connection.h" #include "utils/logger.h" - namespace transport_manager { namespace transport_adapter { diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc index 4a214a7610..75ea799ce8 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc @@ -262,8 +262,8 @@ void BluetoothDeviceScanner::CheckSDLServiceOnDevices( deviceName[name_len - 1] = '\0'; } - auto bluetooth_device = - std::make_shared<BluetoothDevice>(bd_address, deviceName, sdl_rfcomm_channels[i]); + auto bluetooth_device = std::make_shared<BluetoothDevice>( + bd_address, deviceName, sdl_rfcomm_channels[i]); if (bluetooth_device) { LOG4CXX_INFO(logger_, "Bluetooth device created successfully"); discovered_devices->push_back(bluetooth_device); diff --git a/src/components/transport_manager/src/tcp/tcp_client_listener.cc b/src/components/transport_manager/src/tcp/tcp_client_listener.cc index 1697165d08..abcca43509 100644 --- a/src/components/transport_manager/src/tcp/tcp_client_listener.cc +++ b/src/components/transport_manager/src/tcp/tcp_client_listener.cc @@ -306,8 +306,8 @@ void TcpClientListener::Loop() { auto tcp_device = std::make_shared<TcpDevice>( client_address.sin_addr.s_addr, device_uid, device_name); #else - auto tcp_device = - std::make_shared<TcpDevice>(client_address.sin_addr.s_addr, device_uid); + auto tcp_device = std::make_shared<TcpDevice>( + client_address.sin_addr.s_addr, device_uid); #endif // BUILD_TESTS DeviceSptr device = controller_->AddDevice(tcp_device); diff --git a/src/components/transport_manager/src/tcp/tcp_connection_factory.cc b/src/components/transport_manager/src/tcp/tcp_connection_factory.cc index e76fadfd35..e202554f8f 100644 --- a/src/components/transport_manager/src/tcp/tcp_connection_factory.cc +++ b/src/components/transport_manager/src/tcp/tcp_connection_factory.cc @@ -36,7 +36,6 @@ #include "utils/logger.h" - namespace transport_manager { namespace transport_adapter { diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc index 96f8afd2ea..c50309d437 100644 --- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc +++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc @@ -833,9 +833,9 @@ ApplicationList TransportAdapterImpl::GetApplicationList( << lst.size() << " Condition: device.use_count() != 0"); return lst; } - LOG4CXX_TRACE( - logger_, - "exit with empty ApplicationList. Condition: NOT device.use_count() != 0"); + LOG4CXX_TRACE(logger_, + "exit with empty ApplicationList. Condition: NOT " + "device.use_count() != 0"); return ApplicationList(); } diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc index 68cfb0bc8d..abe4edd812 100644 --- a/src/components/transport_manager/src/transport_manager_impl.cc +++ b/src/components/transport_manager/src/transport_manager_impl.cc @@ -1214,8 +1214,8 @@ TransportManagerImpl::ConnectionInternal::ConnectionInternal( : transport_manager(transport_manager) , transport_adapter(transport_adapter) , timer(std::make_shared<timer::Timer, - const char*, - ::timer::TimerTaskImpl<ConnectionInternal>*>( + const char*, + ::timer::TimerTaskImpl<ConnectionInternal>*>( "TM DiscRoutine", new ::timer::TimerTaskImpl<ConnectionInternal>( this, &ConnectionInternal::DisconnectFailedRoutine))) diff --git a/src/components/transport_manager/src/usb/usb_connection_factory.cc b/src/components/transport_manager/src/usb/usb_connection_factory.cc index c34292e758..528855cd50 100644 --- a/src/components/transport_manager/src/usb/usb_connection_factory.cc +++ b/src/components/transport_manager/src/usb/usb_connection_factory.cc @@ -35,7 +35,6 @@ #include "transport_manager/transport_adapter/transport_adapter_impl.h" #include "utils/logger.h" - #if defined(__QNXNTO__) #include "transport_manager/usb/qnx/usb_connection.h" #else @@ -67,19 +66,19 @@ TransportAdapter::Error UsbConnectionFactory::CreateConnection( DeviceSptr device = controller_->FindDevice(device_uid); if (device.use_count() == 0) { LOG4CXX_ERROR(logger_, "device " << device_uid << " not found"); - LOG4CXX_TRACE( - logger_, - "exit with TransportAdapter::BAD_PARAM. Condition: device.use_count() == 0"); + LOG4CXX_TRACE(logger_, + "exit with TransportAdapter::BAD_PARAM. Condition: " + "device.use_count() == 0"); return TransportAdapter::BAD_PARAM; } UsbDevice* usb_device = static_cast<UsbDevice*>(device.get()); std::shared_ptr<UsbConnection> connection = std::make_shared<UsbConnection>(device_uid, - app_handle, - controller_, - usb_handler_, - usb_device->usb_device()); + app_handle, + controller_, + usb_handler_, + usb_device->usb_device()); controller_->ConnectionCreated(connection, device_uid, app_handle); if (connection->Init()) { LOG4CXX_INFO(logger_, "USB connection initialised"); diff --git a/src/components/transport_manager/test/tcp_transport_adapter_test.cc b/src/components/transport_manager/test/tcp_transport_adapter_test.cc index d56cb5dbdd..959180948a 100644 --- a/src/components/transport_manager/test/tcp_transport_adapter_test.cc +++ b/src/components/transport_manager/test/tcp_transport_adapter_test.cc @@ -41,8 +41,6 @@ #include "transport_manager/tcp/mock_tcp_transport_adapter.h" #include "transport_manager/mock_transport_manager_settings.h" - - namespace test { namespace components { namespace transport_manager_test { @@ -76,7 +74,8 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDeviceAndOneApplication) { MockTCPTransportAdapter transport_adapter( port, last_state_, transport_manager_settings); std::string uniq_id = "unique_device_name"; - std::shared_ptr<MockTCPDevice> mockdev = std::make_shared<MockTCPDevice>(port, uniq_id); + std::shared_ptr<MockTCPDevice> mockdev = + std::make_shared<MockTCPDevice>(port, uniq_id); transport_adapter.AddDevice(mockdev); std::vector<std::string> devList = transport_adapter.GetDeviceList(); @@ -265,7 +264,8 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDevice_RestoreData) { MockTCPTransportAdapter transport_adapter( port, last_state_, transport_manager_settings); std::string uniq_id = "unique_device_name"; - std::shared_ptr<MockTCPDevice> mockdev = std::make_shared<MockTCPDevice>(port, uniq_id); + std::shared_ptr<MockTCPDevice> mockdev = + std::make_shared<MockTCPDevice>(port, uniq_id); transport_adapter.AddDevice(mockdev); std::vector<std::string> devList = transport_adapter.GetDeviceList(); diff --git a/src/components/transport_manager/test/transport_adapter_listener_test.cc b/src/components/transport_manager/test/transport_adapter_listener_test.cc index acf9d3dcb3..a5d08035ae 100644 --- a/src/components/transport_manager/test/transport_adapter_listener_test.cc +++ b/src/components/transport_manager/test/transport_adapter_listener_test.cc @@ -129,7 +129,7 @@ TEST_F(TransportAdapterListenerTest, OnDataReceiveFailed) { TEST_F(TransportAdapterListenerTest, OnDataSendDone) { unsigned char data[3] = {0x20, 0x07, 0x01}; ::protocol_handler::RawMessagePtr data_container = - std::make_shared<::protocol_handler::RawMessage>(1, 1, data, 3); + std::make_shared< ::protocol_handler::RawMessage>(1, 1, data, 3); EXPECT_CALL(tr_mock, ReceiveEventFromDevice(IsEvent(EventTypeEnum::ON_SEND_DONE, @@ -145,7 +145,7 @@ TEST_F(TransportAdapterListenerTest, OnDataSendDone) { TEST_F(TransportAdapterListenerTest, OnDataSendFailed) { unsigned char data[3] = {0x20, 0x07, 0x01}; ::protocol_handler::RawMessagePtr data_container = - std::make_shared<::protocol_handler::RawMessage>(1, 1, data, 3); + std::make_shared< ::protocol_handler::RawMessage>(1, 1, data, 3); DataSendError err; EXPECT_CALL(tr_mock, diff --git a/src/components/transport_manager/test/transport_adapter_test.cc b/src/components/transport_manager/test/transport_adapter_test.cc index d5b9c40821..9e602332c6 100644 --- a/src/components/transport_manager/test/transport_adapter_test.cc +++ b/src/components/transport_manager/test/transport_adapter_test.cc @@ -553,7 +553,8 @@ TEST_F(TransportAdapterTest, SendData) { const unsigned int kSize = 3; unsigned char data[kSize] = {0x20, 0x07, 0x01}; - const RawMessagePtr kMessage = std::make_shared<RawMessage>(1, 1, data, kSize); + const RawMessagePtr kMessage = + std::make_shared<RawMessage>(1, 1, data, kSize); EXPECT_CALL(*mock_connection, SendData(kMessage)) .WillOnce(Return(TransportAdapter::OK)); @@ -591,7 +592,8 @@ TEST_F(TransportAdapterTest, SendData_ConnectionNotEstablished) { const unsigned int kSize = 3; unsigned char data[kSize] = {0x20, 0x07, 0x01}; - const RawMessagePtr kMessage = std::make_shared<RawMessage>(1, 1, data, kSize); + const RawMessagePtr kMessage = + std::make_shared<RawMessage>(1, 1, data, kSize); EXPECT_CALL(*mock_connection, SendData(kMessage)).Times(0); res = transport_adapter.SendData(dev_id, app_handle, kMessage); diff --git a/src/components/transport_manager/test/transport_manager_impl_test.cc b/src/components/transport_manager/test/transport_manager_impl_test.cc index 863c32f2ab..5f13adcd44 100644 --- a/src/components/transport_manager/test/transport_manager_impl_test.cc +++ b/src/components/transport_manager/test/transport_manager_impl_test.cc @@ -43,7 +43,6 @@ #include "transport_manager/mock_transport_manager_settings.h" #include "resumption/last_state_impl.h" - #include "utils/test_async_waiter.h" using ::testing::_; @@ -102,8 +101,8 @@ class TransportManagerImplTest : public ::testing::Test { const unsigned int kSize = 12; unsigned char data[kSize] = { 0x20, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - test_message_ = - std::make_shared<RawMessage>(connection_key_, version_protocol_, data, kSize); + test_message_ = std::make_shared<RawMessage>( + connection_key_, version_protocol_, data, kSize); } DeviceInfo ConstructDeviceInfo(const std::string& mac_address, diff --git a/src/components/utils/test/async_runner_test.cc b/src/components/utils/test/async_runner_test.cc index bd6e743291..f01dad8d58 100644 --- a/src/components/utils/test/async_runner_test.cc +++ b/src/components/utils/test/async_runner_test.cc @@ -37,8 +37,6 @@ #include "utils/threads/async_runner.h" #include "utils/conditional_variable.h" - - #include "gtest/gtest.h" #include "gmock/gmock.h" |