From aed926cab3ed2cbdb8291cc92c3c61a6ab327555 Mon Sep 17 00:00:00 2001 From: Conlain Kelly Date: Tue, 17 Jul 2018 13:29:43 -0400 Subject: General cleanup, rename shared_ptr.h -> shared_ptr_helpers.h Remove extra includes and usings and unintentional find-replace errors --- .../include/application_manager/app_extension.h | 2 +- .../app_launch/app_launch_ctrl.h | 2 +- .../app_launch/app_launch_data.h | 2 +- .../include/application_manager/application.h | 2 +- .../application_manager/application_manager_impl.h | 2 +- .../include/application_manager/command_holder.h | 2 +- .../application_manager/command_holder_impl.h | 2 +- .../include/application_manager/commands/command.h | 2 +- .../include/application_manager/hmi_state.h | 2 +- .../include/application_manager/message.h | 2 +- .../application_manager/request_controller.h | 2 +- .../application_manager/resumption/resume_ctrl.h | 2 +- .../application_manager/telemetry_observer.h | 2 +- .../include/application_manager/usage_statistics.h | 2 +- .../src/app_launch/device_apps_launcher.cc | 2 +- .../application_manager/src/application_impl.cc | 2 +- .../test/application_helper_test.cc | 2 +- .../test/command_holder_test.cc | 2 +- .../test/commands/command_impl_test.cc | 4 +- .../test/commands/command_request_impl_test.cc | 4 +- .../test/commands/command_response_impl_test.cc | 4 +- .../test/commands/hmi/activate_app_request_test.cc | 4 +- .../hmi/add_statistics_info_notification_test.cc | 2 +- .../commands/hmi/allow_all_apps_response_test.cc | 2 +- .../test/commands/hmi/allow_app_response_test.cc | 2 +- .../hmi/button_get_capabilities_response_test.cc | 2 +- .../test/commands/hmi/close_popup_response_test.cc | 4 +- .../commands/hmi/get_system_info_request_test.cc | 4 +- .../commands/hmi/get_system_info_response_test.cc | 4 +- .../test/commands/hmi/get_urls_response_test.cc | 4 +- .../test/commands/hmi/get_urls_test.cc | 4 +- .../hmi_notifications/hmi_notifications_test.cc | 4 +- .../hmi/mixing_audio_supported_request_test.cc | 4 +- .../hmi/mixing_audio_supported_response_test.cc | 4 +- .../hmi/navi_audio_start_stream_request_test.cc | 2 +- .../commands/hmi/navi_is_ready_request_test.cc | 2 +- .../commands/hmi/navi_is_ready_response_test.cc | 2 +- .../hmi/navi_set_video_config_request_test.cc | 2 +- .../commands/hmi/navi_start_stream_request_test.cc | 2 +- .../commands/hmi/navi_stop_stream_requests_test.cc | 2 +- .../hmi/on_driver_distraction_notification_test.cc | 4 +- .../hmi/rc_get_capabilities_response_test.cc | 4 +- .../test/commands/hmi/rc_is_ready_request_test.cc | 2 +- .../test/commands/hmi/rc_is_ready_response_test.cc | 4 +- .../test/commands/hmi/response_from_hmi_test.cc | 4 +- .../commands/hmi/sdl_activate_app_response_test.cc | 4 +- .../commands/hmi/simple_request_from_hmi_test.cc | 4 +- .../commands/hmi/simple_requests_to_hmi_test.cc | 4 +- .../commands/hmi/simple_response_from_hmi_test.cc | 4 +- .../commands/hmi/simple_response_to_hmi_test.cc | 4 +- .../tts_get_supported_languages_response_test.cc | 4 +- .../commands/hmi/tts_is_ready_response_test.cc | 4 +- .../hmi/ui_get_capabilities_response_test.cc | 4 +- .../ui_get_supported_languages_response_test.cc | 4 +- .../test/commands/hmi/ui_is_ready_request_test.cc | 2 +- .../test/commands/hmi/ui_is_ready_response_test.cc | 4 +- .../hmi/update_device_list_request_test.cc | 4 +- .../test/commands/hmi/update_sdl_request_test.cc | 4 +- .../test/commands/hmi/update_sdl_response_test.cc | 4 +- .../hmi/vi_get_vehicle_data_response_test.cc | 2 +- .../test/commands/hmi/vi_is_ready_request_test.cc | 2 +- .../hmi/vr_get_capabilities_response_test.cc | 4 +- .../vr_get_supported_languages_response_test.cc | 4 +- .../test/commands/hmi/vr_is_ready_request_test.cc | 2 +- .../test/commands/hmi/vr_is_ready_response_test.cc | 4 +- .../commands/mobile/add_command_request_test.cc | 4 +- .../commands/mobile/alert_maneuver_request_test.cc | 2 +- .../test/commands/mobile/alert_request_test.cc | 2 +- .../commands/mobile/change_registration_test.cc | 4 +- .../mobile/create_interaction_choice_set_test.cc | 4 +- .../commands/mobile/delete_command_request_test.cc | 2 +- .../test/commands/mobile/delete_file_test.cc | 2 +- .../mobile/delete_interaction_choice_set_test.cc | 2 +- .../mobile/diagnostic_message_request_test.cc | 2 +- .../commands/mobile/dial_number_request_test.cc | 2 +- .../test/commands/mobile/get_dtcs_request_test.cc | 2 +- .../mobile/get_vehicle_data_request_test.cc | 2 +- .../commands/mobile/get_way_points_request_test.cc | 2 +- .../commands/mobile/list_files_request_test.cc | 2 +- .../mobile/on_button_notification_commands_test.cc | 4 +- .../mobile/on_command_notification_test.cc | 2 +- .../on_tbt_client_state_notification_test.cc | 2 +- .../mobile/on_touch_event_notification_test.cc | 2 +- .../mobile/on_vehicle_data_notification_test.cc | 2 +- .../on_way_point_change_notification_test.cc | 2 +- .../mobile/perform_audio_pass_thru_test.cc | 2 +- .../commands/mobile/perform_interaction_test.cc | 4 +- .../test/commands/mobile/read_did_request_test.cc | 4 +- .../mobile/register_app_interface_request_test.cc | 4 +- .../mobile/reset_global_properties_test.cc | 2 +- .../commands/mobile/scrollable_message_test.cc | 2 +- .../commands/mobile/send_location_request_test.cc | 2 +- .../test/commands/mobile/set_app_icon_test.cc | 2 +- .../commands/mobile/set_display_layout_test.cc | 2 +- .../commands/mobile/set_global_properties_test.cc | 2 +- .../test/commands/mobile/show_test.cc | 2 +- .../mobile/simple_notification_commands_test.cc | 2 +- .../mobile/simple_response_commands_test.cc | 2 +- .../test/commands/mobile/slider_test.cc | 2 +- .../test/commands/mobile/speak_request_test.cc | 5 +- .../mobile/subscribe_button_request_test.cc | 2 +- .../mobile/subscribe_way_points_request_test.cc | 2 +- .../test/commands/mobile/system_request_test.cc | 2 +- .../unregister_app_interface_request_test.cc | 2 +- .../mobile/unsubscribe_button_request_test.cc | 2 +- .../mobile/unsubscribe_vehicle_request_test.cc | 2 +- .../mobile/unsubscribe_vehicle_response_test.cc | 2 +- .../mobile/unsubscribe_way_points_request_test.cc | 2 +- .../mobile/update_turn_list_request_test.cc | 2 +- .../application_manager/test/event_engine_test.cc | 1 - .../test/hmi_language_handler_test.cc | 2 +- .../commands/command_request_test.h | 2 +- .../application_manager/commands/commands_test.h | 4 +- .../application_manager/mock_hmi_command_factory.h | 2 +- .../test/policy_handler_test.cc | 1 - .../request_controller/request_controller_test.cc | 2 +- .../application_manager/test/request_info_test.cc | 2 +- .../test/usage_statistics_test.cc | 2 +- .../include/functional_module/generic_module.h | 2 +- .../test/src/plugin_manager_test.cc | 2 +- .../test/hmi_message_adapter_test.cc | 2 +- .../application_manager/application_manager.h | 2 +- .../hmi_message_handler/hmi_message_observer.h | 2 +- src/components/include/protocol/raw_message.h | 2 +- .../include/security_manager/security_query.h | 2 +- src/components/include/transport_manager/error.h | 2 +- .../transport_manager/transport_adapter/device.h | 2 +- .../transport_adapter/transport_adapter.h | 2 +- src/components/include/utils/data_accessor.h | 2 +- src/components/include/utils/shared_ptr.h | 55 ---------------------- src/components/include/utils/shared_ptr_helpers.h | 55 ++++++++++++++++++++++ .../include/utils/threads/message_loop_thread.h | 2 +- .../include/media_manager/streamer_adapter.h | 2 +- .../media_manager/test/media_manager_impl_test.cc | 3 +- .../Smart Objects Validation/Schema Structure.txt | 6 +-- .../include/policy/access_remote_impl.h | 2 +- .../policy_external/include/policy/cache_manager.h | 2 +- .../include/policy/cache_manager_interface.h | 2 +- .../policy_external/include/policy/policy_helper.h | 2 +- .../include/policy/policy_manager_impl.h | 2 +- .../policy_external/include/policy/policy_table.h | 2 +- .../policy_external/include/policy/policy_types.h | 2 +- .../include/policy/usage_statistics/counter.h | 2 +- .../test/policy_manager_impl_test.cc | 2 +- .../test/sql_pt_ext_representation_test.cc | 2 +- .../test/sql_pt_representation_test.cc | 2 +- .../include/policy/access_remote_impl.h | 2 +- .../policy_regular/include/policy/cache_manager.h | 2 +- .../include/policy/cache_manager_interface.h | 2 +- .../policy_regular/include/policy/policy_helper.h | 2 +- .../include/policy/policy_manager_impl.h | 2 +- .../policy_regular/include/policy/policy_table.h | 2 +- .../policy_regular/include/policy/policy_types.h | 2 +- .../policy/update_status_manager_interface.h | 2 +- .../include/policy/usage_statistics/counter.h | 2 +- .../policy_regular/src/policy_manager_impl.cc | 1 - .../test/sql_pt_representation_test.cc | 2 +- .../protocol_handler/protocol_handler_impl.h | 2 +- .../protocol_handler/src/multiframe_builder.cc | 1 - .../protocol_handler/mock_telemetry_observer.h | 2 +- .../include/remote_control/commands/command.h | 2 +- .../include/remote_control/event_engine/event.h | 2 +- .../include/remote_control/rc_command_factory.h | 2 +- .../remote_control/remote_plugin_interface.h | 2 +- .../remote_control/resource_allocation_manager.h | 2 +- .../remote_control/src/rc_command_factory.cc | 2 +- .../test/commands/button_press_request_test.cc | 2 +- .../get_interior_vehicle_data_request_test.cc | 2 +- .../on_interior_vehicle_data_notification_test.cc | 2 +- .../commands/on_remote_control_settings_test.cc | 2 +- .../set_interior_vehicle_data_request_test.cc | 2 +- .../remote_control/test/src/rc_module_test.cc | 2 +- .../src/resource_allocation_manager_impl_test.cc | 2 +- .../include/security_manager/crypto_manager_impl.h | 2 +- .../security_manager/test/ssl_context_test.cc | 2 +- .../smart_objects/always_false_schema_item.h | 2 +- .../smart_objects/always_true_schema_item.h | 2 +- .../include/smart_objects/array_schema_item.h | 2 +- .../include/smart_objects/bool_schema_item.h | 2 +- .../include/smart_objects/default_shema_item.h | 2 +- .../include/smart_objects/enum_schema_item.h | 2 +- .../include/smart_objects/number_schema_item.h | 2 +- .../include/smart_objects/object_schema_item.h | 2 +- .../include/smart_objects/schema_item.h | 2 +- .../include/smart_objects/string_schema_item.h | 2 +- .../smart_objects/test/BoolSchemaItem_test.cc | 2 +- .../test/SmartObjectConvertionTime_test.cc | 2 +- .../protocol_handler_metric_wrapper.h | 2 +- .../src/application_manager_observer.cc | 2 +- .../telemetry_monitor/src/telemetry_monitor.cc | 2 +- .../test/application_manager_observer_test.cc | 2 +- .../telemetry_monitor/mock_telemetry_monitor.h | 2 +- .../test/telemetry_monitor_test.cc | 2 +- .../transport_adapter/connection.h | 2 +- .../include/transport_manager/usb/common.h | 2 +- .../src/transport_manager_impl.cc | 2 +- .../test/transport_manager_impl_test.cc | 2 +- src/components/utils/test/async_runner_test.cc | 2 +- src/components/utils/test/shared_ptr_test.cc | 2 +- .../generator/generators/SmartFactoryBase.py | 2 +- .../generator/generators/test_expected_jsonrpc.cc | 40 ++++++++-------- .../generator/generators/test_expected_jsonrpc.h | 8 ++-- .../generator/generators/test_expected_sdlrpc.cc | 40 ++++++++-------- .../generator/generators/test_expected_sdlrpc.h | 8 ++-- 204 files changed, 340 insertions(+), 346 deletions(-) delete mode 100644 src/components/include/utils/shared_ptr.h create mode 100644 src/components/include/utils/shared_ptr_helpers.h 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 7c9722b106..e7c75e2ad2 100644 --- a/src/components/application_manager/include/application_manager/app_extension.h +++ b/src/components/application_manager/include/application_manager/app_extension.h @@ -33,7 +33,7 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_ -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl.h index a93358a865..e57a209e94 100644 --- a/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl.h +++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl.h @@ -33,7 +33,7 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_CTRL_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_CTRL_H_ #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace application_manager { class Application; diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_data.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_data.h index fedc1d2d40..93083a26fa 100644 --- a/src/components/application_manager/include/application_manager/app_launch/app_launch_data.h +++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_data.h @@ -36,7 +36,7 @@ #include #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace app_launch { diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h index d287fff086..d9549490ac 100644 --- a/src/components/application_manager/include/application_manager/application.h +++ b/src/components/application_manager/include/application_manager/application.h @@ -38,7 +38,7 @@ #include #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/data_accessor.h" #include "interfaces/MOBILE_API.h" #include "connection_handler/device.h" diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index c11275890d..7c41835c1e 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -84,7 +84,7 @@ #endif // TELEMETRY_MONITOR #include "utils/macro.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/message_queue.h" #include "utils/prioritized_queue.h" #include "utils/threads/thread.h" 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 d3171aedbb..b9f4a4b740 100644 --- a/src/components/application_manager/include/application_manager/command_holder.h +++ b/src/components/application_manager/include/application_manager/command_holder.h @@ -36,7 +36,7 @@ #include #include "application_manager/application.h" #include "smart_objects/smart_object.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace application_manager { /** diff --git a/src/components/application_manager/include/application_manager/command_holder_impl.h b/src/components/application_manager/include/application_manager/command_holder_impl.h index 2a3c471e20..6be3f54e68 100644 --- a/src/components/application_manager/include/application_manager/command_holder_impl.h +++ b/src/components/application_manager/include/application_manager/command_holder_impl.h @@ -41,7 +41,7 @@ #include "application_manager/application.h" #include "smart_objects/smart_object.h" #include "utils/lock.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/macro.h" namespace application_manager { 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 cc090defa0..b47a8167e2 100644 --- a/src/components/application_manager/include/application_manager/commands/command.h +++ b/src/components/application_manager/include/application_manager/commands/command.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_H_ #include #include "smart_objects/smart_object.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/hmi_state.h b/src/components/application_manager/include/application_manager/hmi_state.h index 1192f8ae68..022f3c3f93 100644 --- a/src/components/application_manager/include/application_manager/hmi_state.h +++ b/src/components/application_manager/include/application_manager/hmi_state.h @@ -35,7 +35,7 @@ #include #include "interfaces/MOBILE_API.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/macro.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/message.h b/src/components/application_manager/include/application_manager/message.h index 8d08583a6d..4201f5698a 100644 --- a/src/components/application_manager/include/application_manager/message.h +++ b/src/components/application_manager/include/application_manager/message.h @@ -36,7 +36,7 @@ #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "protocol/message_priority.h" #include "protocol/rpc_type.h" #include "protocol/common.h" diff --git a/src/components/application_manager/include/application_manager/request_controller.h b/src/components/application_manager/include/application_manager/request_controller.h index c0bae1aac8..9b6ac9db27 100644 --- a/src/components/application_manager/include/application_manager/request_controller.h +++ b/src/components/application_manager/include/application_manager/request_controller.h @@ -38,7 +38,7 @@ #include #include "utils/lock.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/threads/thread.h" #include "utils/conditional_variable.h" #include "utils/threads/thread_delegate.h" diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h index bbebee681a..7233c5742d 100644 --- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h +++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_RESUMPTION_RESUME_CTRL_H_ #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "application_manager/resumption/resumption_data.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/telemetry_observer.h b/src/components/application_manager/include/application_manager/telemetry_observer.h index 79c8d0eb93..8c11a643bc 100644 --- a/src/components/application_manager/include/application_manager/telemetry_observer.h +++ b/src/components/application_manager/include/application_manager/telemetry_observer.h @@ -36,7 +36,7 @@ #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "json/json.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/date_time.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/usage_statistics.h b/src/components/application_manager/include/application_manager/usage_statistics.h index 57865fa4d4..b5227d60af 100644 --- a/src/components/application_manager/include/application_manager/usage_statistics.h +++ b/src/components/application_manager/include/application_manager/usage_statistics.h @@ -38,7 +38,7 @@ #include "policy/usage_statistics/counter.h" #include "policy/usage_statistics/app_stopwatch.h" #include "utils/macro.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "interfaces/MOBILE_API.h" namespace application_manager { 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 458e687b8f..df40ff3b07 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 @@ -6,7 +6,7 @@ #include "application_manager/app_launch/app_launch_data.h" #include "application_manager/app_launch/apps_launcher.h" #include "application_manager/resumption/resume_ctrl.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "utils/timer.h" #include "utils/timer_task_impl.h" diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc index 1be48cc4c7..1b887942c6 100644 --- a/src/components/application_manager/src/application_impl.cc +++ b/src/components/application_manager/src/application_impl.cc @@ -41,7 +41,7 @@ #include "utils/file_system.h" #include "utils/logger.h" #include "utils/gen_hash.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "utils/timer_task_impl.h" #include "application_manager/policies/policy_handler_interface.h" diff --git a/src/components/application_manager/test/application_helper_test.cc b/src/components/application_manager/test/application_helper_test.cc index 5039267c9a..446bfb68a5 100644 --- a/src/components/application_manager/test/application_helper_test.cc +++ b/src/components/application_manager/test/application_helper_test.cc @@ -50,7 +50,7 @@ #include "smart_objects/smart_object.h" #include "utils/custom_string.h" #include "utils/macro.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include namespace { diff --git a/src/components/application_manager/test/command_holder_test.cc b/src/components/application_manager/test/command_holder_test.cc index 5030c382b3..5dcb929bab 100644 --- a/src/components/application_manager/test/command_holder_test.cc +++ b/src/components/application_manager/test/command_holder_test.cc @@ -35,7 +35,7 @@ #include "application_manager/command_holder_impl.h" #include "application_manager/commands/command.h" #include "smart_objects/smart_object.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "application_manager/mock_application_manager.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 15b022b2dc..3483b1e2f9 100644 --- a/src/components/application_manager/test/commands/command_impl_test.cc +++ b/src/components/application_manager/test/commands/command_impl_test.cc @@ -37,7 +37,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" @@ -55,7 +55,7 @@ using ::testing::Return; using ::testing::AtLeast; using ::testing::_; -using ::std::shared_ptr; + 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 2c3741b8d0..5cae7c68e9 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 @@ -40,7 +40,7 @@ #include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" #include "utils/lock.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/data_accessor.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" @@ -65,7 +65,7 @@ using ::testing::Return; using ::testing::SaveArg; using ::testing::DoAll; -using ::std::shared_ptr; + 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 0b5b353c9d..0ae3c282f9 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 @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" @@ -49,7 +49,7 @@ namespace command_response_impl { namespace strings = ::application_manager::strings; namespace hmi_response = ::application_manager::hmi_response; -using ::std::shared_ptr; + using ::application_manager::commands::MessageSharedPtr; using ::application_manager::commands::CommandResponseImpl; diff --git a/src/components/application_manager/test/commands/hmi/activate_app_request_test.cc b/src/components/application_manager/test/commands/hmi/activate_app_request_test.cc index 2ea9a05dbe..cf44f7ff2f 100644 --- a/src/components/application_manager/test/commands/hmi/activate_app_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/activate_app_request_test.cc @@ -32,7 +32,7 @@ #include "gtest/gtest.h" #include "application_manager/commands/hmi/activate_app_request.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/commands/command_impl.h" #include "commands/commands_test.h" @@ -45,7 +45,7 @@ namespace hmi_commands_test { namespace activate_app_request { using ::testing::_; -using ::std::shared_ptr; + namespace am = ::application_manager; namespace strings = ::application_manager::strings; using am::commands::MessageSharedPtr; diff --git a/src/components/application_manager/test/commands/hmi/add_statistics_info_notification_test.cc b/src/components/application_manager/test/commands/hmi/add_statistics_info_notification_test.cc index da48d7a8ee..41e63ff399 100644 --- a/src/components/application_manager/test/commands/hmi/add_statistics_info_notification_test.cc +++ b/src/components/application_manager/test/commands/hmi/add_statistics_info_notification_test.cc @@ -32,7 +32,7 @@ #include "gtest/gtest.h" #include "application_manager/commands/hmi/add_statistics_info_notification.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/mock_application.h" #include "application_manager/smart_object_keys.h" diff --git a/src/components/application_manager/test/commands/hmi/allow_all_apps_response_test.cc b/src/components/application_manager/test/commands/hmi/allow_all_apps_response_test.cc index 96a8faf0ad..343d35e70f 100644 --- a/src/components/application_manager/test/commands/hmi/allow_all_apps_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/allow_all_apps_response_test.cc @@ -32,7 +32,7 @@ #include "gtest/gtest.h" #include "application_manager/commands/hmi/allow_all_apps_response.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/mock_application.h" #include "application_manager/commands/command_impl.h" diff --git a/src/components/application_manager/test/commands/hmi/allow_app_response_test.cc b/src/components/application_manager/test/commands/hmi/allow_app_response_test.cc index 9760d34c73..d1f4976423 100644 --- a/src/components/application_manager/test/commands/hmi/allow_app_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/allow_app_response_test.cc @@ -32,7 +32,7 @@ #include "gtest/gtest.h" #include "application_manager/commands/hmi/allow_app_response.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "application_manager/mock_application.h" #include "commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/hmi/button_get_capabilities_response_test.cc b/src/components/application_manager/test/commands/hmi/button_get_capabilities_response_test.cc index 71020f8aba..27ebdf886a 100644 --- a/src/components/application_manager/test/commands/hmi/button_get_capabilities_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/button_get_capabilities_response_test.cc @@ -32,7 +32,7 @@ #include "gtest/gtest.h" #include "application_manager/commands/hmi/button_get_capabilities_response.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/mock_hmi_capabilities.h" #include "commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/hmi/close_popup_response_test.cc b/src/components/application_manager/test/commands/hmi/close_popup_response_test.cc index 8fe75ce24b..c19a9479c5 100644 --- a/src/components/application_manager/test/commands/hmi/close_popup_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/close_popup_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command.h" @@ -48,7 +48,7 @@ namespace commands_test { namespace hmi_commands_test { namespace close_popup_response { -using ::std::shared_ptr; + namespace am = ::application_manager; using am::commands::ResponseFromHMI; using am::commands::ClosePopupResponse; diff --git a/src/components/application_manager/test/commands/hmi/get_system_info_request_test.cc b/src/components/application_manager/test/commands/hmi/get_system_info_request_test.cc index e843011222..3d04dc1c57 100644 --- a/src/components/application_manager/test/commands/hmi/get_system_info_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/get_system_info_request_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "commands/commands_test.h" @@ -49,7 +49,7 @@ namespace commands_test { namespace hmi_commands_test { namespace get_system_info_request { -using ::std::shared_ptr; + namespace am = ::application_manager; namespace strings = ::application_manager::strings; using am::commands::RequestToHMI; diff --git a/src/components/application_manager/test/commands/hmi/get_system_info_response_test.cc b/src/components/application_manager/test/commands/hmi/get_system_info_response_test.cc index 0c018611fb..0b0221855b 100644 --- a/src/components/application_manager/test/commands/hmi/get_system_info_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/get_system_info_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "commands/commands_test.h" @@ -53,7 +53,7 @@ namespace hmi_commands_test { namespace get_system_info_response { using ::testing::Return; -using ::std::shared_ptr; + using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = ::application_manager::strings; diff --git a/src/components/application_manager/test/commands/hmi/get_urls_response_test.cc b/src/components/application_manager/test/commands/hmi/get_urls_response_test.cc index 85ea2afa3f..8fab6045ae 100644 --- a/src/components/application_manager/test/commands/hmi/get_urls_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/get_urls_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command.h" @@ -52,7 +52,7 @@ namespace get_urls_response { using ::testing::_; using ::testing::Return; -using ::std::shared_ptr; + namespace am = ::application_manager; namespace strings = ::application_manager::strings; using am::commands::ResponseToHMI; diff --git a/src/components/application_manager/test/commands/hmi/get_urls_test.cc b/src/components/application_manager/test/commands/hmi/get_urls_test.cc index 6fd6dca08f..b8ff88bb73 100644 --- a/src/components/application_manager/test/commands/hmi/get_urls_test.cc +++ b/src/components/application_manager/test/commands/hmi/get_urls_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "application_manager/message.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" @@ -58,7 +58,7 @@ namespace get_urls { using namespace hmi_apis; using namespace policy; -using ::std::shared_ptr; + using ::testing::NiceMock; using ::testing::SetArgReferee; using ::test::components::application_manager_test::MockApplication; diff --git a/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc b/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc index 9385a04b71..b80e3883e7 100644 --- a/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc +++ b/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc @@ -112,7 +112,7 @@ #include "utils/lock.h" #include "utils/data_accessor.h" #include "utils/signals.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "utils/file_system.h" #include "smart_objects/smart_object.h" @@ -151,7 +151,7 @@ using ::testing::Return; using ::testing::ReturnRef; using ::testing::NiceMock; using ::testing::InSequence; -using ::std::shared_ptr; + using ::smart_objects::SmartObject; using ::application_manager::commands::MessageSharedPtr; using ::test::components::application_manager_test::MockApplicationManager; diff --git a/src/components/application_manager/test/commands/hmi/mixing_audio_supported_request_test.cc b/src/components/application_manager/test/commands/hmi/mixing_audio_supported_request_test.cc index bc20411289..26e9eea3ed 100644 --- a/src/components/application_manager/test/commands/hmi/mixing_audio_supported_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/mixing_audio_supported_request_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "commands/commands_test.h" @@ -50,7 +50,7 @@ namespace mixing_audio_supported_request { using ::testing::_; using ::testing::Return; -using ::std::shared_ptr; + namespace am = ::application_manager; namespace strings = ::application_manager::strings; using am::commands::RequestToHMI; diff --git a/src/components/application_manager/test/commands/hmi/mixing_audio_supported_response_test.cc b/src/components/application_manager/test/commands/hmi/mixing_audio_supported_response_test.cc index 137be3b8fa..659cab868f 100644 --- a/src/components/application_manager/test/commands/hmi/mixing_audio_supported_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/mixing_audio_supported_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command.h" @@ -56,7 +56,7 @@ namespace mixing_audio_supported_response { using ::testing::Return; using ::testing::ReturnRef; using ::testing::NiceMock; -using ::std::shared_ptr; + namespace am = ::application_manager; namespace strings = ::application_manager::strings; using am::commands::ResponseFromHMI; diff --git a/src/components/application_manager/test/commands/hmi/navi_audio_start_stream_request_test.cc b/src/components/application_manager/test/commands/hmi/navi_audio_start_stream_request_test.cc index 3329c09ee4..515e0ca519 100644 --- a/src/components/application_manager/test/commands/hmi/navi_audio_start_stream_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/navi_audio_start_stream_request_test.cc @@ -35,7 +35,7 @@ #include "application_manager/commands/hmi/navi_audio_start_stream_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/hmi/navi_is_ready_request_test.cc b/src/components/application_manager/test/commands/hmi/navi_is_ready_request_test.cc index 63cb6e6a28..56673be3be 100644 --- a/src/components/application_manager/test/commands/hmi/navi_is_ready_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/navi_is_ready_request_test.cc @@ -33,7 +33,7 @@ #include "application_manager/commands/hmi/navi_is_ready_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/hmi/navi_is_ready_response_test.cc b/src/components/application_manager/test/commands/hmi/navi_is_ready_response_test.cc index 93868654dc..bcdb87b38e 100644 --- a/src/components/application_manager/test/commands/hmi/navi_is_ready_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/navi_is_ready_response_test.cc @@ -51,7 +51,7 @@ namespace am = ::application_manager; namespace commands = am::commands; using ::testing::ReturnRef; -using ::std::shared_ptr; + using commands::ResponseFromHMI; using test::components::event_engine_test::MockEventDispatcher; diff --git a/src/components/application_manager/test/commands/hmi/navi_set_video_config_request_test.cc b/src/components/application_manager/test/commands/hmi/navi_set_video_config_request_test.cc index ccee25760d..e9c96f5886 100644 --- a/src/components/application_manager/test/commands/hmi/navi_set_video_config_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/navi_set_video_config_request_test.cc @@ -35,7 +35,7 @@ #include "application_manager/commands/hmi/navi_set_video_config_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/hmi/navi_start_stream_request_test.cc b/src/components/application_manager/test/commands/hmi/navi_start_stream_request_test.cc index 853882ea69..065f9a26e7 100644 --- a/src/components/application_manager/test/commands/hmi/navi_start_stream_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/navi_start_stream_request_test.cc @@ -35,7 +35,7 @@ #include "application_manager/commands/hmi/navi_start_stream_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/hmi/navi_stop_stream_requests_test.cc b/src/components/application_manager/test/commands/hmi/navi_stop_stream_requests_test.cc index 7d73b59550..54ebd9d43c 100644 --- a/src/components/application_manager/test/commands/hmi/navi_stop_stream_requests_test.cc +++ b/src/components/application_manager/test/commands/hmi/navi_stop_stream_requests_test.cc @@ -34,7 +34,7 @@ #include "application_manager/commands/hmi/navi_audio_stop_stream_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/hmi/on_driver_distraction_notification_test.cc b/src/components/application_manager/test/commands/hmi/on_driver_distraction_notification_test.cc index c516cd3635..415a0b4280 100644 --- a/src/components/application_manager/test/commands/hmi/on_driver_distraction_notification_test.cc +++ b/src/components/application_manager/test/commands/hmi/on_driver_distraction_notification_test.cc @@ -36,7 +36,7 @@ #include "gtest/gtest.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/lock.h" #include #include "utils/data_accessor.h" @@ -56,7 +56,7 @@ namespace on_driver_distraction_notification { using ::testing::_; using ::testing::Return; using ::testing::Eq; -using ::std::shared_ptr; + namespace am = ::application_manager; using am::commands::MessageSharedPtr; diff --git a/src/components/application_manager/test/commands/hmi/rc_get_capabilities_response_test.cc b/src/components/application_manager/test/commands/hmi/rc_get_capabilities_response_test.cc index f15ed38143..86a32c8bfd 100644 --- a/src/components/application_manager/test/commands/hmi/rc_get_capabilities_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/rc_get_capabilities_response_test.cc @@ -33,7 +33,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "interfaces/MOBILE_API.h" #include "application_manager/mock_hmi_capabilities.h" @@ -48,7 +48,7 @@ namespace commands_test { namespace hmi_commands_test { namespace rc_get_capabilities_response { -using ::std::shared_ptr; + using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = am::strings; diff --git a/src/components/application_manager/test/commands/hmi/rc_is_ready_request_test.cc b/src/components/application_manager/test/commands/hmi/rc_is_ready_request_test.cc index 9397ebf9d4..5bfe2bcafe 100644 --- a/src/components/application_manager/test/commands/hmi/rc_is_ready_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/rc_is_ready_request_test.cc @@ -33,7 +33,7 @@ #include "application_manager/commands/hmi/rc_is_ready_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/hmi/rc_is_ready_response_test.cc b/src/components/application_manager/test/commands/hmi/rc_is_ready_response_test.cc index 4e7460b066..9007fe10d3 100644 --- a/src/components/application_manager/test/commands/hmi/rc_is_ready_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/rc_is_ready_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "commands/commands_test.h" #include "application_manager/mock_hmi_capabilities.h" @@ -48,7 +48,7 @@ namespace hmi_commands_test { namespace rc_is_ready_response { using ::testing::Return; -using ::std::shared_ptr; + using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = ::application_manager::strings; diff --git a/src/components/application_manager/test/commands/hmi/response_from_hmi_test.cc b/src/components/application_manager/test/commands/hmi/response_from_hmi_test.cc index 18145152e0..5036eca223 100644 --- a/src/components/application_manager/test/commands/hmi/response_from_hmi_test.cc +++ b/src/components/application_manager/test/commands/hmi/response_from_hmi_test.cc @@ -33,7 +33,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" @@ -52,7 +52,7 @@ using ::testing::Return; using ::testing::SaveArg; using ::testing::DoAll; -using ::std::shared_ptr; + using ::test::components::event_engine_test::MockEventDispatcher; namespace am = ::application_manager; diff --git a/src/components/application_manager/test/commands/hmi/sdl_activate_app_response_test.cc b/src/components/application_manager/test/commands/hmi/sdl_activate_app_response_test.cc index e796dc2068..2b991b0794 100644 --- a/src/components/application_manager/test/commands/hmi/sdl_activate_app_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/sdl_activate_app_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "commands/commands_test.h" @@ -47,7 +47,7 @@ namespace commands_test { namespace hmi_commands_test { namespace sdl_activate_app_response { -using ::std::shared_ptr; + namespace am = ::application_manager; namespace strings = ::application_manager::strings; using am::commands::SDLActivateAppResponse; diff --git a/src/components/application_manager/test/commands/hmi/simple_request_from_hmi_test.cc b/src/components/application_manager/test/commands/hmi/simple_request_from_hmi_test.cc index 4201b455f9..a21e2d122c 100644 --- a/src/components/application_manager/test/commands/hmi/simple_request_from_hmi_test.cc +++ b/src/components/application_manager/test/commands/hmi/simple_request_from_hmi_test.cc @@ -31,7 +31,7 @@ */ #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" @@ -51,7 +51,7 @@ using ::testing::Types; using ::testing::NotNull; using ::testing::NiceMock; -using ::std::shared_ptr; + namespace commands = ::application_manager::commands; using commands::MessageSharedPtr; using ::application_manager::event_engine::EventObserver; diff --git a/src/components/application_manager/test/commands/hmi/simple_requests_to_hmi_test.cc b/src/components/application_manager/test/commands/hmi/simple_requests_to_hmi_test.cc index e16bbbe62f..c37e4e56b9 100644 --- a/src/components/application_manager/test/commands/hmi/simple_requests_to_hmi_test.cc +++ b/src/components/application_manager/test/commands/hmi/simple_requests_to_hmi_test.cc @@ -34,7 +34,7 @@ */ #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" @@ -131,7 +131,7 @@ using ::testing::_; using ::testing::Types; using ::testing::NotNull; -using ::std::shared_ptr; + namespace am_commands = application_manager::commands; using am_commands::MessageSharedPtr; diff --git a/src/components/application_manager/test/commands/hmi/simple_response_from_hmi_test.cc b/src/components/application_manager/test/commands/hmi/simple_response_from_hmi_test.cc index 36b46daea2..087a77a9ca 100644 --- a/src/components/application_manager/test/commands/hmi/simple_response_from_hmi_test.cc +++ b/src/components/application_manager/test/commands/hmi/simple_response_from_hmi_test.cc @@ -36,7 +36,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" @@ -119,7 +119,7 @@ using ::testing::ReturnRef; using ::testing::Types; using ::testing::Eq; -using ::std::shared_ptr; + using ::test::components::event_engine_test::MockEventDispatcher; namespace am = ::application_manager; diff --git a/src/components/application_manager/test/commands/hmi/simple_response_to_hmi_test.cc b/src/components/application_manager/test/commands/hmi/simple_response_to_hmi_test.cc index 2525b7cd8c..e74a41b0d5 100644 --- a/src/components/application_manager/test/commands/hmi/simple_response_to_hmi_test.cc +++ b/src/components/application_manager/test/commands/hmi/simple_response_to_hmi_test.cc @@ -31,7 +31,7 @@ */ #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" @@ -51,7 +51,7 @@ namespace simple_response_to_hmi_test { using ::testing::_; using ::testing::Types; using ::testing::NotNull; -using ::std::shared_ptr; + namespace commands = ::application_manager::commands; using commands::MessageSharedPtr; diff --git a/src/components/application_manager/test/commands/hmi/tts_get_supported_languages_response_test.cc b/src/components/application_manager/test/commands/hmi/tts_get_supported_languages_response_test.cc index 7ecf57f16a..74b1634289 100644 --- a/src/components/application_manager/test/commands/hmi/tts_get_supported_languages_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/tts_get_supported_languages_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "commands/commands_test.h" @@ -54,7 +54,7 @@ namespace tts_get_supported_languages_response { using ::testing::_; using ::testing::Return; -using ::std::shared_ptr; + using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = ::application_manager::strings; diff --git a/src/components/application_manager/test/commands/hmi/tts_is_ready_response_test.cc b/src/components/application_manager/test/commands/hmi/tts_is_ready_response_test.cc index 6cded6961f..c246a3ab4f 100644 --- a/src/components/application_manager/test/commands/hmi/tts_is_ready_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/tts_is_ready_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "commands/commands_test.h" @@ -55,7 +55,7 @@ namespace tts_is_ready_response { using ::testing::_; using ::testing::Return; -using ::std::shared_ptr; + using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = ::application_manager::strings; diff --git a/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc b/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc index e2fa5701d4..01504cfe80 100644 --- a/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc @@ -36,7 +36,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "smart_objects/smart_object.h" #include "interfaces/MOBILE_API.h" @@ -52,7 +52,7 @@ namespace commands_test { namespace hmi_commands_test { namespace ui_get_capabilities_response { -using ::std::shared_ptr; + using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = am::strings; diff --git a/src/components/application_manager/test/commands/hmi/ui_get_supported_languages_response_test.cc b/src/components/application_manager/test/commands/hmi/ui_get_supported_languages_response_test.cc index fdb7f3685d..66ebfa72f4 100644 --- a/src/components/application_manager/test/commands/hmi/ui_get_supported_languages_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/ui_get_supported_languages_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/application.h" @@ -51,7 +51,7 @@ namespace hmi_commands_test { namespace ui_get_supported_languages_response { using ::testing::Return; -using ::std::shared_ptr; + using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = ::application_manager::strings; diff --git a/src/components/application_manager/test/commands/hmi/ui_is_ready_request_test.cc b/src/components/application_manager/test/commands/hmi/ui_is_ready_request_test.cc index 4348998bb5..a08c1cea5e 100644 --- a/src/components/application_manager/test/commands/hmi/ui_is_ready_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/ui_is_ready_request_test.cc @@ -33,7 +33,7 @@ #include "application_manager/commands/hmi/ui_is_ready_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/hmi/ui_is_ready_response_test.cc b/src/components/application_manager/test/commands/hmi/ui_is_ready_response_test.cc index 5639558923..b123dd6ea3 100644 --- a/src/components/application_manager/test/commands/hmi/ui_is_ready_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/ui_is_ready_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "commands/commands_test.h" #include "application_manager/mock_hmi_capabilities.h" @@ -48,7 +48,7 @@ namespace hmi_commands_test { namespace ui_is_ready_response { using ::testing::Return; -using ::std::shared_ptr; + using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = ::application_manager::strings; diff --git a/src/components/application_manager/test/commands/hmi/update_device_list_request_test.cc b/src/components/application_manager/test/commands/hmi/update_device_list_request_test.cc index 86a657ae16..b8b1d70bd1 100644 --- a/src/components/application_manager/test/commands/hmi/update_device_list_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/update_device_list_request_test.cc @@ -33,7 +33,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "interfaces/HMI_API.h" #include "application_manager/smart_object_keys.h" @@ -54,7 +54,7 @@ namespace commands_test { namespace hmi_commands_test { namespace update_device_list_request { -using ::std::shared_ptr; + using testing::_; using testing::ReturnRef; using testing::Return; diff --git a/src/components/application_manager/test/commands/hmi/update_sdl_request_test.cc b/src/components/application_manager/test/commands/hmi/update_sdl_request_test.cc index 1af0cd564c..03ae81954a 100644 --- a/src/components/application_manager/test/commands/hmi/update_sdl_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/update_sdl_request_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "commands/commands_test.h" @@ -48,7 +48,7 @@ namespace commands_test { namespace hmi_commands_test { namespace update_sdl_request { -using ::std::shared_ptr; + using ::testing::ReturnRef; using ::testing::NiceMock; namespace am = ::application_manager; diff --git a/src/components/application_manager/test/commands/hmi/update_sdl_response_test.cc b/src/components/application_manager/test/commands/hmi/update_sdl_response_test.cc index c690122ff7..cc8d7bccea 100644 --- a/src/components/application_manager/test/commands/hmi/update_sdl_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/update_sdl_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "commands/commands_test.h" @@ -47,7 +47,7 @@ namespace commands_test { namespace hmi_commands_test { namespace update_sdl_response { -using ::std::shared_ptr; + namespace am = ::application_manager; namespace strings = ::application_manager::strings; using am::commands::UpdateSDLResponse; diff --git a/src/components/application_manager/test/commands/hmi/vi_get_vehicle_data_response_test.cc b/src/components/application_manager/test/commands/hmi/vi_get_vehicle_data_response_test.cc index 66dc4c4727..1e793fa940 100644 --- a/src/components/application_manager/test/commands/hmi/vi_get_vehicle_data_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/vi_get_vehicle_data_response_test.cc @@ -35,7 +35,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/hmi/vi_is_ready_request_test.cc b/src/components/application_manager/test/commands/hmi/vi_is_ready_request_test.cc index 55ea754d78..9503089830 100644 --- a/src/components/application_manager/test/commands/hmi/vi_is_ready_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/vi_is_ready_request_test.cc @@ -33,7 +33,7 @@ #include "application_manager/commands/hmi/vi_is_ready_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/hmi/vr_get_capabilities_response_test.cc b/src/components/application_manager/test/commands/hmi/vr_get_capabilities_response_test.cc index 334b487413..06d778254d 100644 --- a/src/components/application_manager/test/commands/hmi/vr_get_capabilities_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/vr_get_capabilities_response_test.cc @@ -33,7 +33,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "interfaces/MOBILE_API.h" #include "application_manager/mock_hmi_capabilities.h" @@ -48,7 +48,7 @@ namespace commands_test { namespace hmi_commands_test { namespace vr_get_capabilities_response { -using ::std::shared_ptr; + using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = am::strings; diff --git a/src/components/application_manager/test/commands/hmi/vr_get_supported_languages_response_test.cc b/src/components/application_manager/test/commands/hmi/vr_get_supported_languages_response_test.cc index 191dc3adcf..515cbcae9d 100644 --- a/src/components/application_manager/test/commands/hmi/vr_get_supported_languages_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/vr_get_supported_languages_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/application.h" @@ -51,7 +51,7 @@ namespace hmi_commands_test { namespace vr_get_supported_languages_response { using ::testing::Return; -using ::std::shared_ptr; + using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = ::application_manager::strings; diff --git a/src/components/application_manager/test/commands/hmi/vr_is_ready_request_test.cc b/src/components/application_manager/test/commands/hmi/vr_is_ready_request_test.cc index ea65fade35..0f1f5dd093 100644 --- a/src/components/application_manager/test/commands/hmi/vr_is_ready_request_test.cc +++ b/src/components/application_manager/test/commands/hmi/vr_is_ready_request_test.cc @@ -33,7 +33,7 @@ #include "application_manager/commands/hmi/vr_is_ready_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/hmi/vr_is_ready_response_test.cc b/src/components/application_manager/test/commands/hmi/vr_is_ready_response_test.cc index 8f60818147..ee7cae3453 100644 --- a/src/components/application_manager/test/commands/hmi/vr_is_ready_response_test.cc +++ b/src/components/application_manager/test/commands/hmi/vr_is_ready_response_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "commands/commands_test.h" #include "application_manager/mock_hmi_capabilities.h" @@ -48,7 +48,7 @@ namespace hmi_commands_test { namespace vr_is_ready_response { using ::testing::Return; -using ::std::shared_ptr; + using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = ::application_manager::strings; diff --git a/src/components/application_manager/test/commands/mobile/add_command_request_test.cc b/src/components/application_manager/test/commands/mobile/add_command_request_test.cc index 7496f6ae8e..aa8b6f9afc 100644 --- a/src/components/application_manager/test/commands/mobile/add_command_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/add_command_request_test.cc @@ -37,7 +37,7 @@ #include "application_manager/commands/mobile/add_command_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/helpers.h" #include #include "smart_objects/smart_object.h" @@ -62,7 +62,7 @@ using am::ApplicationManager; using am::commands::MessageSharedPtr; using am::ApplicationSharedPtr; using ::testing::_; -using ::std::shared_ptr; + using ::testing::Return; using ::testing::InSequence; using am::commands::AddCommandRequest; diff --git a/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc b/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc index 33ac2d8574..19d373ed2f 100644 --- a/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/mobile/alert_request_test.cc b/src/components/application_manager/test/commands/mobile/alert_request_test.cc index ac72a37b4e..3fc837e8ed 100644 --- a/src/components/application_manager/test/commands/mobile/alert_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/alert_request_test.cc @@ -56,7 +56,7 @@ using am::commands::AlertRequest; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; using am::MockMessageHelper; -using ::std::shared_ptr; + using am::event_engine::Event; using policy_test::MockPolicyHandlerInterface; using ::testing::_; diff --git a/src/components/application_manager/test/commands/mobile/change_registration_test.cc b/src/components/application_manager/test/commands/mobile/change_registration_test.cc index bc900e56ee..66cf7af448 100644 --- a/src/components/application_manager/test/commands/mobile/change_registration_test.cc +++ b/src/components/application_manager/test/commands/mobile/change_registration_test.cc @@ -37,7 +37,7 @@ #include "application_manager/commands/mobile/change_registration_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/helpers.h" #include #include "utils/custom_string.h" @@ -66,7 +66,7 @@ using am::commands::MessageSharedPtr; using am::ApplicationSharedPtr; using am::MockMessageHelper; using ::testing::_; -using ::std::shared_ptr; + using ::testing::Return; using ::testing::ReturnRef; using ::testing::SetArgPointee; diff --git a/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc b/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc index 66b611f726..9f714f9258 100644 --- a/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc +++ b/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc @@ -38,7 +38,7 @@ #include "application_manager/commands/mobile/create_interaction_choice_set_response.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/helpers.h" #include #include "smart_objects/smart_object.h" @@ -65,7 +65,7 @@ using am::commands::MessageSharedPtr; using am::ApplicationSharedPtr; using am::MockMessageHelper; using ::testing::_; -using ::std::shared_ptr; + using ::testing::Return; using ::testing::ReturnRef; using ::testing::AtLeast; diff --git a/src/components/application_manager/test/commands/mobile/delete_command_request_test.cc b/src/components/application_manager/test/commands/mobile/delete_command_request_test.cc index 4e846a566a..e880264760 100644 --- a/src/components/application_manager/test/commands/mobile/delete_command_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/delete_command_request_test.cc @@ -36,7 +36,7 @@ #include "application_manager/commands/mobile/delete_command_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/test/include/application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/mobile/delete_file_test.cc b/src/components/application_manager/test/commands/mobile/delete_file_test.cc index b3409a73b5..1cd794ce2d 100644 --- a/src/components/application_manager/test/commands/mobile/delete_file_test.cc +++ b/src/components/application_manager/test/commands/mobile/delete_file_test.cc @@ -39,7 +39,7 @@ #include "mobile/delete_file_response.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.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/test/commands/mobile/delete_interaction_choice_set_test.cc b/src/components/application_manager/test/commands/mobile/delete_interaction_choice_set_test.cc index 3e41f80996..41c9a07f14 100644 --- a/src/components/application_manager/test/commands/mobile/delete_interaction_choice_set_test.cc +++ b/src/components/application_manager/test/commands/mobile/delete_interaction_choice_set_test.cc @@ -37,7 +37,7 @@ #include "mobile/delete_interaction_choice_set_response.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/mobile/diagnostic_message_request_test.cc b/src/components/application_manager/test/commands/mobile/diagnostic_message_request_test.cc index fd6c44b0bc..ef1810da0d 100644 --- a/src/components/application_manager/test/commands/mobile/diagnostic_message_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/diagnostic_message_request_test.cc @@ -35,7 +35,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/test/include/application_manager/commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/mobile/dial_number_request_test.cc b/src/components/application_manager/test/commands/mobile/dial_number_request_test.cc index 9ea887de11..27f975a0cb 100644 --- a/src/components/application_manager/test/commands/mobile/dial_number_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/dial_number_request_test.cc @@ -35,7 +35,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/test/include/application_manager/commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/mobile/get_dtcs_request_test.cc b/src/components/application_manager/test/commands/mobile/get_dtcs_request_test.cc index 6723a587fd..9b1ed2273c 100644 --- a/src/components/application_manager/test/commands/mobile/get_dtcs_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/get_dtcs_request_test.cc @@ -35,7 +35,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/test/include/application_manager/commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc b/src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc index a0745a3a19..ec414101ee 100644 --- a/src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc @@ -35,7 +35,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/test/include/application_manager/commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/mobile/get_way_points_request_test.cc b/src/components/application_manager/test/commands/mobile/get_way_points_request_test.cc index bf67382004..97ec6697a4 100644 --- a/src/components/application_manager/test/commands/mobile/get_way_points_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/get_way_points_request_test.cc @@ -31,7 +31,7 @@ */ #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "commands/commands_test.h" #include "commands/command_request_test.h" #include "application_manager/application.h" diff --git a/src/components/application_manager/test/commands/mobile/list_files_request_test.cc b/src/components/application_manager/test/commands/mobile/list_files_request_test.cc index 17eb1a1598..2be525aa54 100644 --- a/src/components/application_manager/test/commands/mobile/list_files_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/list_files_request_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/test/include/application_manager/commands/commands_test.h" #include "application_manager/test/include/application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc b/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc index d83c9c2f7b..6074c7c703 100644 --- a/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc +++ b/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" @@ -60,7 +60,7 @@ using ::testing::_; using ::testing::Types; using ::testing::Return; -using ::std::shared_ptr; + using am::commands::MessageSharedPtr; namespace { diff --git a/src/components/application_manager/test/commands/mobile/on_command_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_command_notification_test.cc index 41eaa08d90..c46b9e1722 100644 --- a/src/components/application_manager/test/commands/mobile/on_command_notification_test.cc +++ b/src/components/application_manager/test/commands/mobile/on_command_notification_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/mobile/on_tbt_client_state_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_tbt_client_state_notification_test.cc index fbc9823d5f..c5254933ff 100644 --- a/src/components/application_manager/test/commands/mobile/on_tbt_client_state_notification_test.cc +++ b/src/components/application_manager/test/commands/mobile/on_tbt_client_state_notification_test.cc @@ -35,7 +35,7 @@ #include "gtest/gtest.h" #include "application_manager/commands/mobile/on_tbt_client_state_notification.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/mobile/on_touch_event_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_touch_event_notification_test.cc index 333b5f741b..4382971c94 100644 --- a/src/components/application_manager/test/commands/mobile/on_touch_event_notification_test.cc +++ b/src/components/application_manager/test/commands/mobile/on_touch_event_notification_test.cc @@ -35,7 +35,7 @@ #include "gtest/gtest.h" #include "application_manager/commands/mobile/on_touch_event_notification.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/mobile/on_vehicle_data_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_vehicle_data_notification_test.cc index 1abbb840f4..9f345b57f1 100644 --- a/src/components/application_manager/test/commands/mobile/on_vehicle_data_notification_test.cc +++ b/src/components/application_manager/test/commands/mobile/on_vehicle_data_notification_test.cc @@ -36,7 +36,7 @@ #include "gtest/gtest.h" #include "application_manager/commands/mobile/on_vehicle_data_notification.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/custom_string.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" diff --git a/src/components/application_manager/test/commands/mobile/on_way_point_change_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_way_point_change_notification_test.cc index e09e20bf1f..87aea4e132 100644 --- a/src/components/application_manager/test/commands/mobile/on_way_point_change_notification_test.cc +++ b/src/components/application_manager/test/commands/mobile/on_way_point_change_notification_test.cc @@ -35,7 +35,7 @@ #include "gtest/gtest.h" #include "application_manager/commands/mobile/on_way_point_change_notification.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" diff --git a/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc b/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc index 78070d7004..c41a491ac0 100644 --- a/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc +++ b/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc @@ -55,7 +55,7 @@ using am::commands::PerformAudioPassThruRequest; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; using am::MockMessageHelper; -using ::std::shared_ptr; + using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; diff --git a/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc b/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc index 2ed973f4c0..b1bcb36c0f 100644 --- a/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc +++ b/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc @@ -37,7 +37,7 @@ #include "application_manager/commands/mobile/perform_interaction_request.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/helpers.h" #include #include "smart_objects/smart_object.h" @@ -63,7 +63,7 @@ using am::commands::MessageSharedPtr; using am::ApplicationSharedPtr; using am::MockMessageHelper; using ::testing::_; -using ::std::shared_ptr; + using ::testing::Return; using ::testing::ReturnRef; using am::commands::PerformInteractionRequest; diff --git a/src/components/application_manager/test/commands/mobile/read_did_request_test.cc b/src/components/application_manager/test/commands/mobile/read_did_request_test.cc index 92f4b3cdef..460d3e1cab 100644 --- a/src/components/application_manager/test/commands/mobile/read_did_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/read_did_request_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/test/include/application_manager/commands/commands_test.h" #include "application_manager/test/include/application_manager/commands/command_request_test.h" @@ -62,7 +62,7 @@ namespace am = ::application_manager; using am::commands::ReadDIDRequest; using am::commands::MessageSharedPtr; using am::event_engine::Event; -using ::std::shared_ptr; + class ReadDIDRequestTest : public CommandRequestTest {}; diff --git a/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc index 7e4bfa6d2c..5938a1e22f 100644 --- a/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc @@ -36,7 +36,7 @@ #include "gtest/gtest.h" #include "mobile/register_app_interface_request.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" @@ -70,7 +70,7 @@ using ::testing::DoAll; namespace am = ::application_manager; -using ::std::shared_ptr; + using am::commands::MessageSharedPtr; using am::commands::RegisterAppInterfaceRequest; diff --git a/src/components/application_manager/test/commands/mobile/reset_global_properties_test.cc b/src/components/application_manager/test/commands/mobile/reset_global_properties_test.cc index f86435a2f9..dd1fc9f81b 100644 --- a/src/components/application_manager/test/commands/mobile/reset_global_properties_test.cc +++ b/src/components/application_manager/test/commands/mobile/reset_global_properties_test.cc @@ -38,7 +38,7 @@ #include "mobile/reset_global_properties_response.h" #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "smart_objects/smart_object.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc b/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc index 9ce2e7f399..55f010510b 100644 --- a/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc +++ b/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc @@ -61,7 +61,7 @@ using am::commands::ScrollableMessageRequest; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; using am::MockMessageHelper; -using ::std::shared_ptr; + using ::testing::_; using ::testing::Eq; using ::testing::Ref; diff --git a/src/components/application_manager/test/commands/mobile/send_location_request_test.cc b/src/components/application_manager/test/commands/mobile/send_location_request_test.cc index 714c620d7e..2fb8344ffb 100644 --- a/src/components/application_manager/test/commands/mobile/send_location_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/send_location_request_test.cc @@ -36,7 +36,7 @@ #include "application_manager/commands/mobile/send_location_request.h" #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_message_helper.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "commands/command_request_test.h" namespace test { diff --git a/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc b/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc index ffcefb2c92..a546f34d9b 100644 --- a/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc +++ b/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc @@ -60,7 +60,7 @@ using am::MockMessageHelper; using am::MockHmiInterfaces; using test::components::protocol_handler_test::MockProtocolHandler; using test::components::protocol_handler_test::MockProtocolHandlerSettings; -using ::std::shared_ptr; + using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; diff --git a/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc b/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc index f676c047e0..6658035f6f 100644 --- a/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc +++ b/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc @@ -57,7 +57,7 @@ using am::commands::SetDisplayLayoutRequest; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; using am::MockMessageHelper; -using ::std::shared_ptr; + using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; diff --git a/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc b/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc index 821adb235f..9020a4c946 100644 --- a/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc +++ b/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc @@ -57,7 +57,7 @@ using am::commands::MessageSharedPtr; using am::MockMessageHelper; using am::CommandsMap; using utils::custom_string::CustomString; -using ::std::shared_ptr; + using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; diff --git a/src/components/application_manager/test/commands/mobile/show_test.cc b/src/components/application_manager/test/commands/mobile/show_test.cc index ea56795d41..1199a847c3 100644 --- a/src/components/application_manager/test/commands/mobile/show_test.cc +++ b/src/components/application_manager/test/commands/mobile/show_test.cc @@ -57,7 +57,7 @@ using am::commands::CommandImpl; using am::commands::MessageSharedPtr; using am::MockMessageHelper; using test::components::policy_test::MockPolicyHandlerInterface; -using ::std::shared_ptr; + using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; diff --git a/src/components/application_manager/test/commands/mobile/simple_notification_commands_test.cc b/src/components/application_manager/test/commands/mobile/simple_notification_commands_test.cc index 56a8524b8e..49b6017432 100644 --- a/src/components/application_manager/test/commands/mobile/simple_notification_commands_test.cc +++ b/src/components/application_manager/test/commands/mobile/simple_notification_commands_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/mock_message_helper.h" diff --git a/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc b/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc index dd5e1c9119..288b57b87a 100644 --- a/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc +++ b/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc @@ -35,7 +35,7 @@ #include "gtest/gtest.h" #include "utils/helpers.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "commands/commands_test.h" #include "application_manager/mock_application_manager.h" #include "mobile/read_did_response.h" diff --git a/src/components/application_manager/test/commands/mobile/slider_test.cc b/src/components/application_manager/test/commands/mobile/slider_test.cc index b1d81d6b40..936f947507 100644 --- a/src/components/application_manager/test/commands/mobile/slider_test.cc +++ b/src/components/application_manager/test/commands/mobile/slider_test.cc @@ -57,7 +57,7 @@ using am::commands::CommandImpl; using am::commands::MessageSharedPtr; using am::MockMessageHelper; using policy_test::MockPolicyHandlerInterface; -using ::std::shared_ptr; + using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; diff --git a/src/components/application_manager/test/commands/mobile/speak_request_test.cc b/src/components/application_manager/test/commands/mobile/speak_request_test.cc index 6ccba871cb..eababf7e4e 100644 --- a/src/components/application_manager/test/commands/mobile/speak_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/speak_request_test.cc @@ -34,12 +34,11 @@ #include #include "gtest/gtest.h" #include "mobile/speak_request.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "commands/commands_test.h" #include "commands/command_request_test.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" -#include "utils/shared_ptr.h" #include "utils/helpers.h" #include #include "smart_objects/smart_object.h" @@ -68,7 +67,7 @@ using am::commands::MessageSharedPtr; using am::ApplicationSharedPtr; using am::MockMessageHelper; using ::testing::_; -using ::std::shared_ptr; + using ::testing::Return; using ::testing::ReturnRef; using am::commands::SpeakRequest; diff --git a/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc b/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc index 8c39a404b5..63a5fe11c7 100644 --- a/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc b/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc index 19555a1e81..39dbb9116b 100644 --- a/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/subscribe_way_points_request_test.cc @@ -31,7 +31,7 @@ */ #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/test/include/application_manager/commands/commands_test.h" #include "application_manager/test/include/application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/mobile/system_request_test.cc b/src/components/application_manager/test/commands/mobile/system_request_test.cc index 6937c5d9da..22b4f6aae7 100644 --- a/src/components/application_manager/test/commands/mobile/system_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/system_request_test.cc @@ -58,7 +58,7 @@ using am::MockHmiInterfaces; using am::event_engine::Event; using am::MessageType; using policy_test::MockPolicyHandlerInterface; -using ::std::shared_ptr; + using ::testing::_; using ::testing::DoAll; using ::testing::Return; diff --git a/src/components/application_manager/test/commands/mobile/unregister_app_interface_request_test.cc b/src/components/application_manager/test/commands/mobile/unregister_app_interface_request_test.cc index f5fef71e69..3d4c198c34 100644 --- a/src/components/application_manager/test/commands/mobile/unregister_app_interface_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/unregister_app_interface_request_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "application_manager/commands/command_request_test.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_message_helper.h" diff --git a/src/components/application_manager/test/commands/mobile/unsubscribe_button_request_test.cc b/src/components/application_manager/test/commands/mobile/unsubscribe_button_request_test.cc index 478c5bafd4..cdee170f34 100644 --- a/src/components/application_manager/test/commands/mobile/unsubscribe_button_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/unsubscribe_button_request_test.cc @@ -2,7 +2,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "application_manager/commands/command_request_test.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_message_helper.h" diff --git a/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_request_test.cc b/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_request_test.cc index e5123a6090..cc6a71975e 100644 --- a/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_request_test.cc @@ -34,7 +34,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "application_manager/commands/command_request_test.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_message_helper.h" diff --git a/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_response_test.cc b/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_response_test.cc index 31bac0629f..6eb470c67b 100644 --- a/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_response_test.cc +++ b/src/components/application_manager/test/commands/mobile/unsubscribe_vehicle_response_test.cc @@ -34,7 +34,7 @@ #include #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "application_manager/commands/commands_test.h" #include "application_manager/mock_application_manager.h" diff --git a/src/components/application_manager/test/commands/mobile/unsubscribe_way_points_request_test.cc b/src/components/application_manager/test/commands/mobile/unsubscribe_way_points_request_test.cc index 0040d12efb..378e908306 100644 --- a/src/components/application_manager/test/commands/mobile/unsubscribe_way_points_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/unsubscribe_way_points_request_test.cc @@ -36,7 +36,7 @@ #include "gtest/gtest.h" #include "mobile/unsubscribe_way_points_request.h" #include "interfaces/MOBILE_API.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "commands/commands_test.h" #include "commands/command_request_test.h" diff --git a/src/components/application_manager/test/commands/mobile/update_turn_list_request_test.cc b/src/components/application_manager/test/commands/mobile/update_turn_list_request_test.cc index 8b6f36f47c..b0afd15f2c 100644 --- a/src/components/application_manager/test/commands/mobile/update_turn_list_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/update_turn_list_request_test.cc @@ -36,7 +36,7 @@ #include "gtest/gtest.h" #include "application_manager/commands/mobile/update_turn_list_request.h" #include "interfaces/MOBILE_API.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" diff --git a/src/components/application_manager/test/event_engine_test.cc b/src/components/application_manager/test/event_engine_test.cc index 5b1851ef17..36b2992723 100644 --- a/src/components/application_manager/test/event_engine_test.cc +++ b/src/components/application_manager/test/event_engine_test.cc @@ -38,7 +38,6 @@ #include "application_manager/mock_event_observer.h" #include "application_manager/mock_event_dispatcher.h" #include "smart_objects/smart_object.h" -#include #include "interfaces/HMI_API.h" namespace test { 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 f145db0c6d..360b9ac8a2 100644 --- a/src/components/application_manager/test/hmi_language_handler_test.cc +++ b/src/components/application_manager/test/hmi_language_handler_test.cc @@ -44,7 +44,7 @@ #include "application_manager/mock_application.h" #include "application_manager/smart_object_keys.h" #include "test/resumption/mock_last_state.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "utils/lock.h" diff --git a/src/components/application_manager/test/include/application_manager/commands/command_request_test.h b/src/components/application_manager/test/include/application_manager/commands/command_request_test.h index e5a45c1549..0953032f77 100644 --- a/src/components/application_manager/test/include/application_manager/commands/command_request_test.h +++ b/src/components/application_manager/test/include/application_manager/commands/command_request_test.h @@ -36,7 +36,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" 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 0a253d5d07..2f483c3755 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,7 @@ #include #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/commands/command.h" #include @@ -57,7 +57,7 @@ using ::testing::NiceMock; using ::testing::Mock; using ::testing::_; -using ::std::shared_ptr; + using ::smart_objects::SmartObject; using am::commands::MessageSharedPtr; using ::test::components::application_manager_test::MockApplicationManager; diff --git a/src/components/application_manager/test/include/application_manager/mock_hmi_command_factory.h b/src/components/application_manager/test/include/application_manager/mock_hmi_command_factory.h index 839ad3ede3..ce6362ea25 100644 --- a/src/components/application_manager/test/include/application_manager/mock_hmi_command_factory.h +++ b/src/components/application_manager/test/include/application_manager/mock_hmi_command_factory.h @@ -37,7 +37,7 @@ #include "application_manager/application_manager.h" #include "application_manager/commands/command.h" #include "smart_objects/smart_object.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace test { namespace components { diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc index 5c368796ef..c9a67e9ed4 100644 --- a/src/components/application_manager/test/policy_handler_test.cc +++ b/src/components/application_manager/test/policy_handler_test.cc @@ -59,7 +59,6 @@ #include "policy/usage_statistics/statistics_manager.h" #include "interfaces/MOBILE_API.h" #include "policy/mock_policy_settings.h" -#include #include "application_manager/mock_application.h" #include "policy/usage_statistics/mock_statistics_manager.h" #include "protocol_handler/mock_session_observer.h" diff --git a/src/components/application_manager/test/request_controller/request_controller_test.cc b/src/components/application_manager/test/request_controller/request_controller_test.cc index 496314f1f9..984b99a51c 100644 --- a/src/components/application_manager/test/request_controller/request_controller_test.cc +++ b/src/components/application_manager/test/request_controller/request_controller_test.cc @@ -36,7 +36,7 @@ #include "application_manager/request_controller.h" #include "application_manager/request_info.h" #include "application_manager/mock_request.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "application_manager/commands/command_request_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/test/request_info_test.cc b/src/components/application_manager/test/request_info_test.cc index 962af25a4a..e69b7fe7d9 100644 --- a/src/components/application_manager/test/request_info_test.cc +++ b/src/components/application_manager/test/request_info_test.cc @@ -36,7 +36,7 @@ #include #include #include "gmock/gmock.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include namespace request_info = application_manager::request_controller; diff --git a/src/components/application_manager/test/usage_statistics_test.cc b/src/components/application_manager/test/usage_statistics_test.cc index f65e0ea16e..3f5850175d 100644 --- a/src/components/application_manager/test/usage_statistics_test.cc +++ b/src/components/application_manager/test/usage_statistics_test.cc @@ -37,7 +37,7 @@ #include "policy/usage_statistics/mock_statistics_manager.h" #include "policy/usage_statistics/mock_app_stopwatch.h" #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace test { namespace components { diff --git a/src/components/functional_module/include/functional_module/generic_module.h b/src/components/functional_module/include/functional_module/generic_module.h index 2307a83d28..a8a67f32b8 100644 --- a/src/components/functional_module/include/functional_module/generic_module.h +++ b/src/components/functional_module/include/functional_module/generic_module.h @@ -37,7 +37,7 @@ #include #include "functional_module/module_observer.h" #include "functional_module/function_ids.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "application_manager/service.h" namespace functional_modules { diff --git a/src/components/functional_module/test/src/plugin_manager_test.cc b/src/components/functional_module/test/src/plugin_manager_test.cc index 8e5a35f2c4..b82b388290 100644 --- a/src/components/functional_module/test/src/plugin_manager_test.cc +++ b/src/components/functional_module/test/src/plugin_manager_test.cc @@ -4,7 +4,7 @@ #include "mock_generic_module.h" #include "mock_service.h" #include "application_manager/mock_application.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include using application_manager::Message; 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 5e388ec4f3..9ee00df580 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 @@ -31,7 +31,7 @@ */ #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "hmi_message_handler/hmi_message_handler_impl.h" diff --git a/src/components/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h index 131f17dc6e..aa7c0fbd85 100644 --- a/src/components/include/application_manager/application_manager.h +++ b/src/components/include/application_manager/application_manager.h @@ -41,7 +41,7 @@ #include "application_manager/commands/command.h" #include "connection_handler/connection_handler.h" #include "utils/data_accessor.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "telemetry_monitor/telemetry_observable.h" #include "application_manager/policies/policy_handler_interface.h" #include "application_manager/application_manager_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 966a78dd19..4339573092 100644 --- a/src/components/include/hmi_message_handler/hmi_message_observer.h +++ b/src/components/include/hmi_message_handler/hmi_message_observer.h @@ -33,7 +33,7 @@ #ifndef SRC_COMPONENTS_INCLUDE_HMI_MESSAGE_HANDLER_HMI_MESSAGE_OBSERVER_H_ #define SRC_COMPONENTS_INCLUDE_HMI_MESSAGE_HANDLER_HMI_MESSAGE_OBSERVER_H_ -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace application_manager { class Message; diff --git a/src/components/include/protocol/raw_message.h b/src/components/include/protocol/raw_message.h index 8ee7b6b0ea..0466b0f48d 100644 --- a/src/components/include/protocol/raw_message.h +++ b/src/components/include/protocol/raw_message.h @@ -33,7 +33,7 @@ #define SRC_COMPONENTS_INCLUDE_PROTOCOL_RAW_MESSAGE_H_ #include "utils/macro.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "protocol/service_type.h" #include "protocol/message_priority.h" diff --git a/src/components/include/security_manager/security_query.h b/src/components/include/security_manager/security_query.h index 44fdb64b2a..c014148714 100644 --- a/src/components/include/security_manager/security_query.h +++ b/src/components/include/security_manager/security_query.h @@ -37,7 +37,7 @@ #include #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace security_manager { /** diff --git a/src/components/include/transport_manager/error.h b/src/components/include/transport_manager/error.h index d3ecd58e8e..cc7f6a1290 100644 --- a/src/components/include/transport_manager/error.h +++ b/src/components/include/transport_manager/error.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_ERROR_H_ #include -#include +#include namespace transport_manager { diff --git a/src/components/include/transport_manager/transport_adapter/device.h b/src/components/include/transport_manager/transport_adapter/device.h index 0c6dcbf39f..fe22e2e3d0 100644 --- a/src/components/include/transport_manager/transport_adapter/device.h +++ b/src/components/include/transport_manager/transport_adapter/device.h @@ -37,7 +37,7 @@ #include #include "transport_manager/common.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/macro.h" namespace transport_manager { 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 7f6d347535..0f99f24ccf 100644 --- a/src/components/include/transport_manager/transport_adapter/transport_adapter.h +++ b/src/components/include/transport_manager/transport_adapter/transport_adapter.h @@ -41,7 +41,7 @@ #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "transport_manager/transport_adapter/device.h" #include "transport_manager/common.h" diff --git a/src/components/include/utils/data_accessor.h b/src/components/include/utils/data_accessor.h index f7612a2dd4..79d5794d55 100644 --- a/src/components/include/utils/data_accessor.h +++ b/src/components/include/utils/data_accessor.h @@ -33,7 +33,7 @@ #define SRC_COMPONENTS_INCLUDE_UTILS_DATA_ACCESSOR_H_ #include "utils/lock.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" // This class is for thread-safe access to data template diff --git a/src/components/include/utils/shared_ptr.h b/src/components/include/utils/shared_ptr.h deleted file mode 100644 index abae83a423..0000000000 --- a/src/components/include/utils/shared_ptr.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2013, Ford Motor Company - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Ford Motor Company nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SRC_COMPONENTS_INCLUDE_UTILS_SHARED_PTR_H_ -#define SRC_COMPONENTS_INCLUDE_UTILS_SHARED_PTR_H_ - -#include -#include -#include -#include - -#include "utils/atomic.h" -#include "utils/macro.h" -namespace utils { - -/* Test if the given shared ptr is valid and in use - */ -template -bool ValidSPtr(std::shared_ptr ptr) { - return ptr && ptr.use_count() > 0; -} -} // namespace utils - -#endif // SRC_COMPONENTS_INCLUDE_UTILS_SHARED_PTR_H_ - -// vim: set ts=2 sw=2 et: diff --git a/src/components/include/utils/shared_ptr_helpers.h b/src/components/include/utils/shared_ptr_helpers.h new file mode 100644 index 0000000000..0f918cac80 --- /dev/null +++ b/src/components/include/utils/shared_ptr_helpers.h @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2013, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef SRC_COMPONENTS_INCLUDE_UTILS_SHARED_PTR_HELPERS_H_ +#define SRC_COMPONENTS_INCLUDE_UTILS_SHARED_PTR_HELPERS_H_ + +#include +#include +#include +#include + +#include "utils/atomic.h" +#include "utils/macro.h" +namespace utils { + +/* Test if the given shared ptr is valid and in use + */ +template +bool ValidSPtr(std::shared_ptr ptr) { + return ptr && ptr.use_count() > 0; +} +} // namespace utils + +#endif // SRC_COMPONENTS_INCLUDE_UTILS_SHARED_PTR_HELPERS_H_ + +// vim: set ts=2 sw=2 et: diff --git a/src/components/include/utils/threads/message_loop_thread.h b/src/components/include/utils/threads/message_loop_thread.h index 15023f02dd..0bde4ef9da 100644 --- a/src/components/include/utils/threads/message_loop_thread.h +++ b/src/components/include/utils/threads/message_loop_thread.h @@ -40,7 +40,7 @@ #include "utils/macro.h" #include "utils/message_queue.h" #include "utils/threads/thread.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/lock.h" namespace threads { diff --git a/src/components/media_manager/include/media_manager/streamer_adapter.h b/src/components/media_manager/include/media_manager/streamer_adapter.h index 6a0954a1a3..2838e842b0 100644 --- a/src/components/media_manager/include/media_manager/streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/streamer_adapter.h @@ -38,7 +38,7 @@ #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" #include "utils/atomic_object.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "protocol/raw_message.h" namespace media_manager { 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 e6786fb4a7..9c57883c67 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,7 @@ #include "protocol_handler/mock_protocol_handler.h" #include "protocol/common.h" #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/file_system.h" #include "utils/scope_guard.h" @@ -58,7 +58,6 @@ using namespace ::media_manager; using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; -using ::std::shared_ptr; using ::utils::ScopeGuard; using ::utils::MakeGuard; using ::testing::NiceMock; diff --git a/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt index 91e21b2939..2e611f74b9 100644 --- a/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt +++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt @@ -57,17 +57,17 @@ Example: // // true, if successful // false, if failed -Tshared_ptr success_SchemaItem = CBoolSchemaItem::create(TSchemaItemParameter()); +TSharedPtr success_SchemaItem = CBoolSchemaItem::create(TSchemaItemParameter()); // Function parameter resultCode. // // See Result -Tshared_ptr resultCode_SchemaItem = TEnumSchemaItem::create(resultCode_allowedEnumSubsetValues, TSchemaItemParameter()); +TSharedPtr resultCode_SchemaItem = TEnumSchemaItem::create(resultCode_allowedEnumSubsetValues, TSchemaItemParameter()); // Function parameter info. // // Provides additional human readable info regarding the result. -Tshared_ptr info_SchemaItem = CStringSchemaItem::create(TSchemaItemParameter(1000), TSchemaItemParameter()); +TSharedPtr info_SchemaItem = CStringSchemaItem::create(TSchemaItemParameter(1000), TSchemaItemParameter()); schemaMembersMap["success"] = CObjectSchemaItem::SMember(success_SchemaItem, true); diff --git a/src/components/policy/policy_external/include/policy/access_remote_impl.h b/src/components/policy/policy_external/include/policy/access_remote_impl.h index 7b968f5da9..ac4aeefb0c 100644 --- a/src/components/policy/policy_external/include/policy/access_remote_impl.h +++ b/src/components/policy/policy_external/include/policy/access_remote_impl.h @@ -35,7 +35,7 @@ #include #include "policy/policy_table/types.h" #include "utils/macro.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "policy/access_remote.h" #include "policy/cache_manager.h" 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 2d8e1c03be..4e45079753 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,7 @@ #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #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/cache_manager_interface.h b/src/components/policy/policy_external/include/policy/cache_manager_interface.h index aab48846cc..5ed07d1c09 100644 --- a/src/components/policy/policy_external/include/policy/cache_manager_interface.h +++ b/src/components/policy/policy_external/include/policy/cache_manager_interface.h @@ -38,7 +38,7 @@ #include "policy/policy_table/types.h" #include "policy/pt_representation.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "policy/usage_statistics/counter.h" #include "policy/policy_types.h" #include "policy/policy_settings.h" diff --git a/src/components/policy/policy_external/include/policy/policy_helper.h b/src/components/policy/policy_external/include/policy/policy_helper.h index 3b3e094ca2..984f1111dc 100644 --- a/src/components/policy/policy_external/include/policy/policy_helper.h +++ b/src/components/policy/policy_external/include/policy/policy_helper.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_HELPER_H_ #include "policy/policy_table/functions.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "policy/policy_types.h" namespace policy { diff --git a/src/components/policy/policy_external/include/policy/policy_manager_impl.h b/src/components/policy/policy_external/include/policy/policy_manager_impl.h index 96ae01e579..de11084fd2 100644 --- a/src/components/policy/policy_external/include/policy/policy_manager_impl.h +++ b/src/components/policy/policy_external/include/policy/policy_manager_impl.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_MANAGER_IMPL_H_ #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/lock.h" #include "policy/policy_manager.h" #include "policy/policy_table.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 5b5ea5e00b..ab2dfbfc11 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,7 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_H_ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_H_ -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "policy/pt_representation.h" #include "policy/pt_ext_representation.h" diff --git a/src/components/policy/policy_external/include/policy/policy_types.h b/src/components/policy/policy_external/include/policy/policy_types.h index 3383621497..2060e31e2d 100644 --- a/src/components/policy/policy_external/include/policy/policy_types.h +++ b/src/components/policy/policy_external/include/policy/policy_types.h @@ -39,7 +39,7 @@ #include #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/helpers.h" #include "transport_manager/common.h" diff --git a/src/components/policy/policy_external/include/policy/usage_statistics/counter.h b/src/components/policy/policy_external/include/policy/usage_statistics/counter.h index f93f17249f..2da419156b 100644 --- a/src/components/policy/policy_external/include/policy/usage_statistics/counter.h +++ b/src/components/policy/policy_external/include/policy/usage_statistics/counter.h @@ -36,7 +36,7 @@ #include #include "policy/usage_statistics/statistics_manager.h" #include "policy/usage_statistics/app_stopwatch.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/timer.h" #include "utils/macro.h" 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 6606b3a2c2..859fdc49c2 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,7 +38,7 @@ #include "policy/policy_manager_impl_test_base.h" #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" using ::testing::_; using ::testing::Return; 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 e16449cbf3..90f0c3d8f7 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 @@ -44,7 +44,7 @@ #include "rpc_base/rpc_base.h" #include "policy/policy_table/types.h" #include "policy/mock_policy_settings.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include using namespace ::policy; 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 6cf685b17b..8244f14037 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 @@ -49,7 +49,7 @@ #include "policy/policy_table/enums.h" #include "rpc_base/rpc_base.h" #include "policy/mock_policy_settings.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace policy_table = rpc::policy_table_interface_base; using policy::SQLPTRepresentation; diff --git a/src/components/policy/policy_regular/include/policy/access_remote_impl.h b/src/components/policy/policy_regular/include/policy/access_remote_impl.h index abb74061e0..352af61a10 100644 --- a/src/components/policy/policy_regular/include/policy/access_remote_impl.h +++ b/src/components/policy/policy_regular/include/policy/access_remote_impl.h @@ -35,7 +35,7 @@ #include #include "policy/policy_table/types.h" #include "utils/macro.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "policy/access_remote.h" #include "policy/cache_manager.h" 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 2ae2b0166a..8b3c30736d 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,7 @@ #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #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 43b93a31b7..a070832349 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,7 @@ #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #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_helper.h b/src/components/policy/policy_regular/include/policy/policy_helper.h index 707779c99d..6524ff3555 100644 --- a/src/components/policy/policy_regular/include/policy/policy_helper.h +++ b/src/components/policy/policy_regular/include/policy/policy_helper.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_HELPER_H_ #include "policy/policy_table/functions.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "policy/policy_types.h" namespace policy { 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 8d4965ec5b..61ee995dec 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,7 @@ #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #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 6fe3f7ecc4..1b92fdf537 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,7 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_TABLE_H_ #define SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_TABLE_H_ -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "policy/pt_representation.h" #include "policy/pt_ext_representation.h" diff --git a/src/components/policy/policy_regular/include/policy/policy_types.h b/src/components/policy/policy_regular/include/policy/policy_types.h index 76bc6237d3..97b692c5ef 100644 --- a/src/components/policy/policy_regular/include/policy/policy_types.h +++ b/src/components/policy/policy_regular/include/policy/policy_types.h @@ -39,7 +39,7 @@ #include #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/helpers.h" #include "transport_manager/common.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 662b516bbd..232c2ab4fe 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,7 @@ #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 "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "policy/policy_types.h" #include "policy/status.h" diff --git a/src/components/policy/policy_regular/include/policy/usage_statistics/counter.h b/src/components/policy/policy_regular/include/policy/usage_statistics/counter.h index ef9ff407da..6539974944 100644 --- a/src/components/policy/policy_regular/include/policy/usage_statistics/counter.h +++ b/src/components/policy/policy_regular/include/policy/usage_statistics/counter.h @@ -36,7 +36,7 @@ #include #include "policy/usage_statistics/statistics_manager.h" #include "policy/usage_statistics/app_stopwatch.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/timer.h" #include "utils/macro.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 bd094db39f..08b75cb1bd 100644 --- a/src/components/policy/policy_regular/src/policy_manager_impl.cc +++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc @@ -49,7 +49,6 @@ #include "policy/update_status_manager.h" #include "config_profile/profile.h" #include "utils/timer_task_impl.h" -#include #ifdef SDL_REMOTE_CONTROL #include "policy/access_remote.h" 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 2db3b32651..567e963b3f 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 @@ -47,7 +47,7 @@ #include "json/writer.h" #include "json/reader.h" #include "rpc_base/rpc_base.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "utils/file_system.h" #include "utils/sqlite_wrapper/sql_database.h" diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h index 0efb81cdd7..a95c524a99 100644 --- a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h +++ b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h @@ -42,7 +42,7 @@ #include "utils/prioritized_queue.h" #include "utils/message_queue.h" #include "utils/threads/message_loop_thread.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "utils/messagemeter.h" #include "protocol_handler/protocol_handler.h" diff --git a/src/components/protocol_handler/src/multiframe_builder.cc b/src/components/protocol_handler/src/multiframe_builder.cc index 2de6815983..e69b511860 100644 --- a/src/components/protocol_handler/src/multiframe_builder.cc +++ b/src/components/protocol_handler/src/multiframe_builder.cc @@ -35,7 +35,6 @@ #include #include "utils/logger.h" -#include #include "utils/lock.h" #include "utils/date_time.h" 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 11cb3607e7..521ed7243e 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 @@ -35,7 +35,7 @@ #include "gmock/gmock.h" #include "protocol_handler/time_metric_observer.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace test { namespace components { diff --git a/src/components/remote_control/include/remote_control/commands/command.h b/src/components/remote_control/include/remote_control/commands/command.h index 0e03f8b330..65132a59b6 100644 --- a/src/components/remote_control/include/remote_control/commands/command.h +++ b/src/components/remote_control/include/remote_control/commands/command.h @@ -33,7 +33,7 @@ #ifndef SRC_COMPONENTS_REMOTE_CONTROL_INCLUDE_REMOTE_CONTROL_COMMANDS_COMMAND_H_ #define SRC_COMPONENTS_REMOTE_CONTROL_INCLUDE_REMOTE_CONTROL_COMMANDS_COMMAND_H_ -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "remote_control/remote_plugin_interface.h" #include "remote_control/event_engine/event.h" diff --git a/src/components/remote_control/include/remote_control/event_engine/event.h b/src/components/remote_control/include/remote_control/event_engine/event.h index 0da248e5a7..00186ddc9e 100644 --- a/src/components/remote_control/include/remote_control/event_engine/event.h +++ b/src/components/remote_control/include/remote_control/event_engine/event.h @@ -35,7 +35,7 @@ #include #include "remote_control/event_engine/event_dispatcher.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "application_manager/message.h" namespace rc_event_engine { diff --git a/src/components/remote_control/include/remote_control/rc_command_factory.h b/src/components/remote_control/include/remote_control/rc_command_factory.h index 78f13083ad..5659562ac5 100644 --- a/src/components/remote_control/include/remote_control/rc_command_factory.h +++ b/src/components/remote_control/include/remote_control/rc_command_factory.h @@ -33,7 +33,7 @@ #ifndef SRC_COMPONENTS_REMOTE_CONTROL_INCLUDE_REMOTE_CONTROL_RC_COMMAND_FACTORY_H_ #define SRC_COMPONENTS_REMOTE_CONTROL_INCLUDE_REMOTE_CONTROL_RC_COMMAND_FACTORY_H_ -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "remote_control/commands/command.h" #include "remote_control/remote_control_plugin.h" #include "application_manager/message.h" diff --git a/src/components/remote_control/include/remote_control/remote_plugin_interface.h b/src/components/remote_control/include/remote_control/remote_plugin_interface.h index a6cfeb8e1f..519b46c60c 100644 --- a/src/components/remote_control/include/remote_control/remote_plugin_interface.h +++ b/src/components/remote_control/include/remote_control/remote_plugin_interface.h @@ -39,7 +39,7 @@ #include "remote_control/request_controller.h" #include "remote_control/event_engine/event_dispatcher.h" #include "utils/threads/message_loop_thread.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace remote_control { diff --git a/src/components/remote_control/include/remote_control/resource_allocation_manager.h b/src/components/remote_control/include/remote_control/resource_allocation_manager.h index f789fe4af9..9e5d5fdd98 100644 --- a/src/components/remote_control/include/remote_control/resource_allocation_manager.h +++ b/src/components/remote_control/include/remote_control/resource_allocation_manager.h @@ -2,7 +2,7 @@ #define SRC_COMPONENTS_REMOTE_CONTROL_INCLUDE_REMOTE_CONTROL_RESOURCE_ALLOCATION_H #include #include "utils/macro.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "interfaces/HMI_API.h" #include "remote_control/event_engine/event.h" #include "functional_module/generic_module.h" diff --git a/src/components/remote_control/src/rc_command_factory.cc b/src/components/remote_control/src/rc_command_factory.cc index abad52ca1c..6f59038f98 100644 --- a/src/components/remote_control/src/rc_command_factory.cc +++ b/src/components/remote_control/src/rc_command_factory.cc @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "remote_control/rc_command_factory.h" #include "functional_module/function_ids.h" diff --git a/src/components/remote_control/test/commands/button_press_request_test.cc b/src/components/remote_control/test/commands/button_press_request_test.cc index 5c0d9ae421..794a710d77 100644 --- a/src/components/remote_control/test/commands/button_press_request_test.cc +++ b/src/components/remote_control/test/commands/button_press_request_test.cc @@ -44,7 +44,7 @@ #include "remote_control/rc_module_constants.h" #include "functional_module/function_ids.h" #include "include/mock_service.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include using functional_modules::RCFunctionID; diff --git a/src/components/remote_control/test/commands/get_interior_vehicle_data_request_test.cc b/src/components/remote_control/test/commands/get_interior_vehicle_data_request_test.cc index 8db88e9beb..1823d4aa88 100644 --- a/src/components/remote_control/test/commands/get_interior_vehicle_data_request_test.cc +++ b/src/components/remote_control/test/commands/get_interior_vehicle_data_request_test.cc @@ -42,7 +42,7 @@ #include "remote_control/event_engine/event_dispatcher.h" #include "functional_module/function_ids.h" #include "include/mock_service.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include using functional_modules::RCFunctionID; diff --git a/src/components/remote_control/test/commands/on_interior_vehicle_data_notification_test.cc b/src/components/remote_control/test/commands/on_interior_vehicle_data_notification_test.cc index cdd85c608b..48fce6efac 100644 --- a/src/components/remote_control/test/commands/on_interior_vehicle_data_notification_test.cc +++ b/src/components/remote_control/test/commands/on_interior_vehicle_data_notification_test.cc @@ -42,7 +42,7 @@ #include "remote_control/event_engine/event_dispatcher.h" #include "functional_module/function_ids.h" #include "include/mock_service.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include using functional_modules::RCFunctionID; diff --git a/src/components/remote_control/test/commands/on_remote_control_settings_test.cc b/src/components/remote_control/test/commands/on_remote_control_settings_test.cc index 47815fa1cc..4e249e7075 100644 --- a/src/components/remote_control/test/commands/on_remote_control_settings_test.cc +++ b/src/components/remote_control/test/commands/on_remote_control_settings_test.cc @@ -43,7 +43,7 @@ #include "remote_control/event_engine/event_dispatcher.h" #include "functional_module/function_ids.h" #include "include/mock_service.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include using functional_modules::RCFunctionID; diff --git a/src/components/remote_control/test/commands/set_interior_vehicle_data_request_test.cc b/src/components/remote_control/test/commands/set_interior_vehicle_data_request_test.cc index 1dd12f50ed..ebd6cb5675 100644 --- a/src/components/remote_control/test/commands/set_interior_vehicle_data_request_test.cc +++ b/src/components/remote_control/test/commands/set_interior_vehicle_data_request_test.cc @@ -43,7 +43,7 @@ #include "remote_control/event_engine/event_dispatcher.h" #include "functional_module/function_ids.h" #include "include/mock_service.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include using functional_modules::RCFunctionID; diff --git a/src/components/remote_control/test/src/rc_module_test.cc b/src/components/remote_control/test/src/rc_module_test.cc index 26c1213adb..949802fef3 100644 --- a/src/components/remote_control/test/src/rc_module_test.cc +++ b/src/components/remote_control/test/src/rc_module_test.cc @@ -38,7 +38,7 @@ #include "functional_module/module_observer.h" #include "application_manager/mock_application.h" #include "include/mock_service.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "application_manager/mock_message_helper.h" #include "application_manager/mock_application_manager_settings.h" diff --git a/src/components/remote_control/test/src/resource_allocation_manager_impl_test.cc b/src/components/remote_control/test/src/resource_allocation_manager_impl_test.cc index 83ef5606d7..4c814b6504 100644 --- a/src/components/remote_control/test/src/resource_allocation_manager_impl_test.cc +++ b/src/components/remote_control/test/src/resource_allocation_manager_impl_test.cc @@ -40,7 +40,7 @@ #include "functional_module/module_observer.h" #include "application_manager/mock_application.h" #include "include/mock_service.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" 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 fdae8fc882..6265cfdf15 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 @@ -46,7 +46,7 @@ #include "utils/macro.h" #include "utils/lock.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace security_manager { class CryptoManagerImpl : public CryptoManager { diff --git a/src/components/security_manager/test/ssl_context_test.cc b/src/components/security_manager/test/ssl_context_test.cc index 9060b1da91..72e05e77f3 100644 --- a/src/components/security_manager/test/ssl_context_test.cc +++ b/src/components/security_manager/test/ssl_context_test.cc @@ -41,7 +41,7 @@ #include "security_manager/ssl_context.h" #include "utils/custom_string.h" #include "security_manager/mock_security_manager_settings.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include using ::testing::Return; 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 bb888a5667..d7d3403041 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,7 @@ #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 "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.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 c010a8ab17..3e1d09e0f3 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,7 @@ #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 "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.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 f82ad6fb67..303b3abe70 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,7 @@ #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.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 f5626291a7..44e7188b17 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,7 +33,7 @@ #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 "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/default_shema_item.h" 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 56952dbac1..0aeb0e769e 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 @@ -33,7 +33,7 @@ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_DEFAULT_SHEMA_ITEM_H_ #include "utils/macro.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/schema_item.h" #include "smart_objects/schema_item_parameter.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 b8ba81b624..5b72f670e4 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,7 @@ #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/default_shema_item.h" namespace NsSmartDeviceLink { 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 b647a25a43..2af8a483ea 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 @@ -35,7 +35,7 @@ #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/default_shema_item.h" #include "smart_objects/schema_item_parameter.h" #include "utils/convert_utils.h" diff --git a/src/components/smart_objects/include/smart_objects/object_schema_item.h b/src/components/smart_objects/include/smart_objects/object_schema_item.h index e9ac7db098..6134fe722a 100644 --- a/src/components/smart_objects/include/smart_objects/object_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/object_schema_item.h @@ -37,7 +37,7 @@ #include #include "utils/macro.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/schema_item.h" #include "smart_objects/schema_item_parameter.h" diff --git a/src/components/smart_objects/include/smart_objects/schema_item.h b/src/components/smart_objects/include/smart_objects/schema_item.h index dc5aeb25cd..5cb70bda83 100644 --- a/src/components/smart_objects/include/smart_objects/schema_item.h +++ b/src/components/smart_objects/include/smart_objects/schema_item.h @@ -33,7 +33,7 @@ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_SCHEMA_ITEM_H_ #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "rpc_base/validation_report.h" #include "smart_objects/errors.h" 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 9b749943fe..98b80770b0 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,7 +36,7 @@ #include #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/default_shema_item.h" #include "smart_objects/schema_item_parameter.h" diff --git a/src/components/smart_objects/test/BoolSchemaItem_test.cc b/src/components/smart_objects/test/BoolSchemaItem_test.cc index 8d67aa59b2..4ae6445f42 100644 --- a/src/components/smart_objects/test/BoolSchemaItem_test.cc +++ b/src/components/smart_objects/test/BoolSchemaItem_test.cc @@ -34,7 +34,7 @@ #include "gmock/gmock.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.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 b11560914e..8b4eba4782 100644 --- a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc +++ b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc @@ -36,7 +36,7 @@ #include "gmock/gmock.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "smart_objects/smart_object.h" #include "smart_objects/smart_schema.h" diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h index 09142870fa..c0a88f2d15 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_METRIC_WRAPPER_H_ #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "telemetry_monitor/metric_wrapper.h" #include "protocol_handler_observer.h" diff --git a/src/components/telemetry_monitor/src/application_manager_observer.cc b/src/components/telemetry_monitor/src/application_manager_observer.cc index 5ba1398809..7ab4f31c04 100644 --- a/src/components/telemetry_monitor/src/application_manager_observer.cc +++ b/src/components/telemetry_monitor/src/application_manager_observer.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "telemetry_monitor/application_manager_observer.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "telemetry_monitor/telemetry_monitor.h" #include "telemetry_monitor/application_manager_metric_wrapper.h" diff --git a/src/components/telemetry_monitor/src/telemetry_monitor.cc b/src/components/telemetry_monitor/src/telemetry_monitor.cc index 6b97ce512f..b8ef73fd07 100644 --- a/src/components/telemetry_monitor/src/telemetry_monitor.cc +++ b/src/components/telemetry_monitor/src/telemetry_monitor.cc @@ -43,7 +43,7 @@ #include "transport_manager/transport_manager_default.h" #include "utils/resource_usage.h" #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "telemetry_monitor/telemetry_observable.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/test/application_manager_observer_test.cc b/src/components/telemetry_monitor/test/application_manager_observer_test.cc index bca0051f71..f03a8d3d37 100644 --- a/src/components/telemetry_monitor/test/application_manager_observer_test.cc +++ b/src/components/telemetry_monitor/test/application_manager_observer_test.cc @@ -35,7 +35,7 @@ #include "application_manager/telemetry_observer.h" #include "telemetry_monitor/application_manager_metric_wrapper.h" #include "telemetry_monitor/application_manager_observer.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include "telemetry_monitor/telemetry_monitor.h" namespace test { 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 feb738fd1a..ee3cdcc4db 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 @@ -37,7 +37,7 @@ #include "gmock/gmock.h" #include "telemetry_monitor/telemetry_monitor.h" #include "telemetry_monitor/metric_wrapper.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/telemetry_monitor_test.cc b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc index c144efb2a9..6605d37cad 100644 --- a/src/components/telemetry_monitor/test/telemetry_monitor_test.cc +++ b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc @@ -40,7 +40,7 @@ #include "connection_handler/mock_connection_handler.h" #include "transport_manager/mock_transport_manager.h" #include "telemetry_monitor/mock_telemetry_observable.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include using testing::Return; 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 4aff059e35..8394b8a281 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,7 @@ #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 "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.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 ce622e13e6..9f19f5a14a 100644 --- a/src/components/transport_manager/include/transport_manager/usb/common.h +++ b/src/components/transport_manager/include/transport_manager/usb/common.h @@ -35,7 +35,7 @@ #include -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #if defined(__QNXNTO__) #include "transport_manager/usb/qnx/usb_handler.h" diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc index 34758f7c70..3d83b9a9b1 100644 --- a/src/components/transport_manager/src/transport_manager_impl.cc +++ b/src/components/transport_manager/src/transport_manager_impl.cc @@ -1066,7 +1066,7 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { LOG4CXX_ERROR(logger_, "Transport adapter failed to send data"); // TODO(YK): potential error case -> thread unsafe // update of message content - if (event.event_data && event.event_data.use_count() > 0) { + if (utils::ValidSPtr(event.event_data)) { event.event_data->set_waiting(true); } else { LOG4CXX_DEBUG(logger_, "Data is invalid"); 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 90ed2f5333..67ed25bb87 100644 --- a/src/components/transport_manager/test/transport_manager_impl_test.cc +++ b/src/components/transport_manager/test/transport_manager_impl_test.cc @@ -42,7 +42,7 @@ #include "transport_manager/mock_transport_manager_impl.h" #include "transport_manager/mock_transport_manager_settings.h" #include "resumption/last_state_impl.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "utils/test_async_waiter.h" diff --git a/src/components/utils/test/async_runner_test.cc b/src/components/utils/test/async_runner_test.cc index 4e36d68d0c..83cac3ece0 100644 --- a/src/components/utils/test/async_runner_test.cc +++ b/src/components/utils/test/async_runner_test.cc @@ -36,7 +36,7 @@ #include "utils/lock.h" #include "utils/threads/async_runner.h" #include "utils/conditional_variable.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include #include "gtest/gtest.h" diff --git a/src/components/utils/test/shared_ptr_test.cc b/src/components/utils/test/shared_ptr_test.cc index e34ccd7e24..5e5559b033 100644 --- a/src/components/utils/test/shared_ptr_test.cc +++ b/src/components/utils/test/shared_ptr_test.cc @@ -34,7 +34,7 @@ #include #include #include "gmock/gmock.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace test { namespace components { diff --git a/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py b/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py index 7faf780db0..26e561eb0b 100755 --- a/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py +++ b/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py @@ -1283,7 +1283,7 @@ class CodeGenerator(object): u'''#include "formatters/CSmartFactory.h"\n''' u'''#include "smart_objects/smart_schema.h"\n''' u'''#include "smart_objects/schema_item.h"\n''' - u'''#include "utils/shared_ptr.h"\n''' + u'''#include "utils/shared_ptr_helpers.h"\n''' u'''#include "$header_file_name"\n''' u'''\n''' u'''$namespace_open''' diff --git a/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc b/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc index 7e864213fa..458c27543b 100644 --- a/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc +++ b/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc @@ -69,7 +69,7 @@ XXX::YYY::ZZZ::Test::Test() InitFunctionSchemes(struct_schema_items, function_id_items, message_type_items); } -Tshared_ptr XXX::YYY::ZZZ::Test::ProvideObjectSchemaItemForStruct( +TSharedPtr XXX::YYY::ZZZ::Test::ProvideObjectSchemaItemForStruct( const TStructsSchemaItems &struct_schema_items, const StructIdentifiers::eType struct_id) { const TStructsSchemaItems::const_iterator it = struct_schema_items.find(struct_id); @@ -82,11 +82,11 @@ Tshared_ptr XXX::YYY::ZZZ::Test::ProvideObjectSchemaItemForStruct( void XXX::YYY::ZZZ::Test::InitStructSchemes( TStructsSchemaItems &struct_schema_items) { - Tshared_ptr struct_schema_item_Struct2 = InitStructSchemaItem_Struct2(struct_schema_items); + TSharedPtr struct_schema_item_Struct2 = InitStructSchemaItem_Struct2(struct_schema_items); struct_schema_items.insert(std::make_pair(StructIdentifiers::Struct2, struct_schema_item_Struct2)); structs_schemes_.insert(std::make_pair(StructIdentifiers::Struct2, CSmartSchema(struct_schema_item_Struct2))); - Tshared_ptr struct_schema_item_Struct1 = InitStructSchemaItem_Struct1(struct_schema_items); + TSharedPtr struct_schema_item_Struct1 = InitStructSchemaItem_Struct1(struct_schema_items); struct_schema_items.insert(std::make_pair(StructIdentifiers::Struct1, struct_schema_item_Struct1)); structs_schemes_.insert(std::make_pair(StructIdentifiers::Struct1, CSmartSchema(struct_schema_item_Struct1))); } @@ -142,10 +142,10 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_name1_request( // // ToDo: Do1 // ToDo: Do2 - Tshared_ptr param1_SchemaItem = TEnumSchemaItem::create(Enum_new4_all_enum_values, TSchemaItemParameter(Enum_new4::_11)); + TSharedPtr param1_SchemaItem = TEnumSchemaItem::create(Enum_new4_all_enum_values, TSchemaItemParameter(Enum_new4::_11)); // Function parameter param2. - Tshared_ptr param2_SchemaItem = TEnumSchemaItem::create(param2_allowed_enum_subset_values, TSchemaItemParameter(name1)); + TSharedPtr param2_SchemaItem = TEnumSchemaItem::create(param2_allowed_enum_subset_values, TSchemaItemParameter(name1)); std::map schema_members; @@ -208,7 +208,7 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_val_2_notification( //----------- Structs schema items initialization ------------ -Tshared_ptr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct1( +TSharedPtr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct1( const TStructsSchemaItems &struct_schema_items) { std::set Enum1_all_enum_values; Enum1_all_enum_values.insert(Enum1::name1); @@ -232,43 +232,43 @@ Tshared_ptr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct1( sub3_allowed_enum_subset_values.insert(Enum_new4::_22); // Struct member intParam. - Tshared_ptr intParam_SchemaItem = TNumberSchemaItem::create(TSchemaItemParameter(), TSchemaItemParameter(2), TSchemaItemParameter()); + TSharedPtr intParam_SchemaItem = TNumberSchemaItem::create(TSchemaItemParameter(), TSchemaItemParameter(2), TSchemaItemParameter()); // Struct member doubleParam. - Tshared_ptr doubleParam_SchemaItem = TNumberSchemaItem::create(TSchemaItemParameter(0.333), TSchemaItemParameter(), TSchemaItemParameter()); + TSharedPtr doubleParam_SchemaItem = TNumberSchemaItem::create(TSchemaItemParameter(0.333), TSchemaItemParameter(), TSchemaItemParameter()); // Struct member boolParam. - Tshared_ptr boolParam_SchemaItem = CBoolSchemaItem::create(TSchemaItemParameter()); + TSharedPtr boolParam_SchemaItem = CBoolSchemaItem::create(TSchemaItemParameter()); // Struct member structParam. - Tshared_ptr structParam_SchemaItem = ProvideObjectSchemaItemForStruct(struct_schema_items, StructIdentifiers::Struct2); + TSharedPtr structParam_SchemaItem = ProvideObjectSchemaItemForStruct(struct_schema_items, StructIdentifiers::Struct2); // Struct member enumParam. - Tshared_ptr enumParam_SchemaItem = TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()); + TSharedPtr enumParam_SchemaItem = TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()); // Struct member enumParam1. - Tshared_ptr enumParam1_SchemaItem = TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()); + TSharedPtr enumParam1_SchemaItem = TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()); // Struct member enumSubset1. - Tshared_ptr enumSubset1_SchemaItem = TEnumSchemaItem::create(enumSubset1_allowed_enum_subset_values, TSchemaItemParameter()); + TSharedPtr enumSubset1_SchemaItem = TEnumSchemaItem::create(enumSubset1_allowed_enum_subset_values, TSchemaItemParameter()); // Struct member arrayOfInt. - Tshared_ptr arrayOfInt_SchemaItem = CArraySchemaItem::create(CBoolSchemaItem::create(TSchemaItemParameter()), TSchemaItemParameter(0), TSchemaItemParameter(20)); + TSharedPtr arrayOfInt_SchemaItem = CArraySchemaItem::create(CBoolSchemaItem::create(TSchemaItemParameter()), TSchemaItemParameter(0), TSchemaItemParameter(20)); // Struct member arrayOfEnum1. - Tshared_ptr arrayOfEnum1_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()), TSchemaItemParameter(0), TSchemaItemParameter(20)); + TSharedPtr arrayOfEnum1_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()), TSchemaItemParameter(0), TSchemaItemParameter(20)); // Struct member arrayOfEnum3. - Tshared_ptr arrayOfEnum3_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(Enum_new2_all_enum_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(40)); + TSharedPtr arrayOfEnum3_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(Enum_new2_all_enum_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(40)); // Struct member arrayOfEnum4. - Tshared_ptr arrayOfEnum4_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub1_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(41)); + TSharedPtr arrayOfEnum4_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub1_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(41)); // Struct member arrayOfEnum5. - Tshared_ptr arrayOfEnum5_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub2_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(42)); + TSharedPtr arrayOfEnum5_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub2_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(42)); // Struct member arrayOfEnum6. - Tshared_ptr arrayOfEnum6_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub3_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(43)); + TSharedPtr arrayOfEnum6_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub3_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(43)); std::map schema_members; @@ -289,7 +289,7 @@ Tshared_ptr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct1( return CObjectSchemaItem::create(schema_members); } -Tshared_ptr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct2( +TSharedPtr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct2( const TStructsSchemaItems &struct_schema_items) { std::map schema_members; diff --git a/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.h b/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.h index 498b8f073b..b265603480 100644 --- a/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.h +++ b/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.h @@ -234,7 +234,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory > TStructsSchemaItems; + typedef std::map > TStructsSchemaItems; /** * @brief Helper that allows to make reference to struct @@ -244,7 +244,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory ProvideObjectSchemaItemForStruct( + static NsSmartDeviceLink::NsSmartObjects::TSharedPtr ProvideObjectSchemaItemForStruct( const TStructsSchemaItems &struct_schema_items, const StructIdentifiers::eType struct_id); @@ -304,7 +304,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory InitStructSchemaItem_Struct1( + static NsSmartDeviceLink::NsSmartObjects::TSharedPtr InitStructSchemaItem_Struct1( const TStructsSchemaItems &struct_schema_items); /** @@ -314,7 +314,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory InitStructSchemaItem_Struct2( + static NsSmartDeviceLink::NsSmartObjects::TSharedPtr InitStructSchemaItem_Struct2( const TStructsSchemaItems &struct_schema_items); }; diff --git a/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc b/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc index bc49e3be76..53e5b7f78a 100644 --- a/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc +++ b/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc @@ -68,7 +68,7 @@ XXX::YYY::ZZZ::Test::Test() InitFunctionSchemes(struct_schema_items, function_id_items, message_type_items); } -Tshared_ptr XXX::YYY::ZZZ::Test::ProvideObjectSchemaItemForStruct( +TSharedPtr XXX::YYY::ZZZ::Test::ProvideObjectSchemaItemForStruct( const TStructsSchemaItems &struct_schema_items, const StructIdentifiers::eType struct_id) { const TStructsSchemaItems::const_iterator it = struct_schema_items.find(struct_id); @@ -81,11 +81,11 @@ Tshared_ptr XXX::YYY::ZZZ::Test::ProvideObjectSchemaItemForStruct( void XXX::YYY::ZZZ::Test::InitStructSchemes( TStructsSchemaItems &struct_schema_items) { - Tshared_ptr struct_schema_item_Struct2 = InitStructSchemaItem_Struct2(struct_schema_items); + TSharedPtr struct_schema_item_Struct2 = InitStructSchemaItem_Struct2(struct_schema_items); struct_schema_items.insert(std::make_pair(StructIdentifiers::Struct2, struct_schema_item_Struct2)); structs_schemes_.insert(std::make_pair(StructIdentifiers::Struct2, CSmartSchema(struct_schema_item_Struct2))); - Tshared_ptr struct_schema_item_Struct1 = InitStructSchemaItem_Struct1(struct_schema_items); + TSharedPtr struct_schema_item_Struct1 = InitStructSchemaItem_Struct1(struct_schema_items); struct_schema_items.insert(std::make_pair(StructIdentifiers::Struct1, struct_schema_item_Struct1)); structs_schemes_.insert(std::make_pair(StructIdentifiers::Struct1, CSmartSchema(struct_schema_item_Struct1))); } @@ -125,10 +125,10 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_name1_request( // // ToDo: Do1 // ToDo: Do2 - Tshared_ptr param1_SchemaItem = TEnumSchemaItem::create(Enum_new4_all_enum_values, TSchemaItemParameter(Enum_new4::_11)); + TSharedPtr param1_SchemaItem = TEnumSchemaItem::create(Enum_new4_all_enum_values, TSchemaItemParameter(Enum_new4::_11)); // Function parameter param2. - Tshared_ptr param2_SchemaItem = TEnumSchemaItem::create(param2_allowed_enum_subset_values, TSchemaItemParameter(name1)); + TSharedPtr param2_SchemaItem = TEnumSchemaItem::create(param2_allowed_enum_subset_values, TSchemaItemParameter(name1)); std::map schema_members; @@ -190,7 +190,7 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_val_2_notification( //----------- Structs schema items initialization ------------ -Tshared_ptr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct1( +TSharedPtr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct1( const TStructsSchemaItems &struct_schema_items) { std::set Enum1_all_enum_values; Enum1_all_enum_values.insert(Enum1::name1); @@ -214,43 +214,43 @@ Tshared_ptr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct1( sub3_allowed_enum_subset_values.insert(Enum_new4::_22); // Struct member intParam. - Tshared_ptr intParam_SchemaItem = TNumberSchemaItem::create(TSchemaItemParameter(), TSchemaItemParameter(2), TSchemaItemParameter()); + TSharedPtr intParam_SchemaItem = TNumberSchemaItem::create(TSchemaItemParameter(), TSchemaItemParameter(2), TSchemaItemParameter()); // Struct member doubleParam. - Tshared_ptr doubleParam_SchemaItem = TNumberSchemaItem::create(TSchemaItemParameter(0.333), TSchemaItemParameter(), TSchemaItemParameter()); + TSharedPtr doubleParam_SchemaItem = TNumberSchemaItem::create(TSchemaItemParameter(0.333), TSchemaItemParameter(), TSchemaItemParameter()); // Struct member boolParam. - Tshared_ptr boolParam_SchemaItem = CBoolSchemaItem::create(TSchemaItemParameter()); + TSharedPtr boolParam_SchemaItem = CBoolSchemaItem::create(TSchemaItemParameter()); // Struct member structParam. - Tshared_ptr structParam_SchemaItem = ProvideObjectSchemaItemForStruct(struct_schema_items, StructIdentifiers::Struct2); + TSharedPtr structParam_SchemaItem = ProvideObjectSchemaItemForStruct(struct_schema_items, StructIdentifiers::Struct2); // Struct member enumParam. - Tshared_ptr enumParam_SchemaItem = TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()); + TSharedPtr enumParam_SchemaItem = TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()); // Struct member enumParam1. - Tshared_ptr enumParam1_SchemaItem = TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()); + TSharedPtr enumParam1_SchemaItem = TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()); // Struct member enumSubset1. - Tshared_ptr enumSubset1_SchemaItem = TEnumSchemaItem::create(enumSubset1_allowed_enum_subset_values, TSchemaItemParameter()); + TSharedPtr enumSubset1_SchemaItem = TEnumSchemaItem::create(enumSubset1_allowed_enum_subset_values, TSchemaItemParameter()); // Struct member arrayOfInt. - Tshared_ptr arrayOfInt_SchemaItem = CArraySchemaItem::create(CBoolSchemaItem::create(TSchemaItemParameter()), TSchemaItemParameter(0), TSchemaItemParameter(20)); + TSharedPtr arrayOfInt_SchemaItem = CArraySchemaItem::create(CBoolSchemaItem::create(TSchemaItemParameter()), TSchemaItemParameter(0), TSchemaItemParameter(20)); // Struct member arrayOfEnum1. - Tshared_ptr arrayOfEnum1_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()), TSchemaItemParameter(0), TSchemaItemParameter(20)); + TSharedPtr arrayOfEnum1_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(Enum1_all_enum_values, TSchemaItemParameter()), TSchemaItemParameter(0), TSchemaItemParameter(20)); // Struct member arrayOfEnum3. - Tshared_ptr arrayOfEnum3_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(Enum_new2_all_enum_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(40)); + TSharedPtr arrayOfEnum3_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(Enum_new2_all_enum_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(40)); // Struct member arrayOfEnum4. - Tshared_ptr arrayOfEnum4_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub1_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(41)); + TSharedPtr arrayOfEnum4_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub1_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(41)); // Struct member arrayOfEnum5. - Tshared_ptr arrayOfEnum5_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub2_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(42)); + TSharedPtr arrayOfEnum5_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub2_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(42)); // Struct member arrayOfEnum6. - Tshared_ptr arrayOfEnum6_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub3_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(43)); + TSharedPtr arrayOfEnum6_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem::create(sub3_allowed_enum_subset_values, TSchemaItemParameter()), TSchemaItemParameter(10), TSchemaItemParameter(43)); std::map schema_members; @@ -271,7 +271,7 @@ Tshared_ptr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct1( return CObjectSchemaItem::create(schema_members); } -Tshared_ptr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct2( +TSharedPtr XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct2( const TStructsSchemaItems &struct_schema_items) { std::map schema_members; diff --git a/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.h b/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.h index 8e7c69eced..826ea55ce1 100644 --- a/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.h +++ b/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.h @@ -229,7 +229,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory > TStructsSchemaItems; + typedef std::map > TStructsSchemaItems; /** * @brief Helper that allows to make reference to struct @@ -239,7 +239,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory ProvideObjectSchemaItemForStruct( + static NsSmartDeviceLink::NsSmartObjects::TSharedPtr ProvideObjectSchemaItemForStruct( const TStructsSchemaItems &struct_schema_items, const StructIdentifiers::eType struct_id); @@ -299,7 +299,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory InitStructSchemaItem_Struct1( + static NsSmartDeviceLink::NsSmartObjects::TSharedPtr InitStructSchemaItem_Struct1( const TStructsSchemaItems &struct_schema_items); /** @@ -309,7 +309,7 @@ class Test : public NsSmartDeviceLink::NsJSONHandler::CSmartFactory InitStructSchemaItem_Struct2( + static NsSmartDeviceLink::NsSmartObjects::TSharedPtr InitStructSchemaItem_Struct2( const TStructsSchemaItems &struct_schema_items); }; -- cgit v1.2.1