diff options
Diffstat (limited to 'src/components/application_manager/test')
102 files changed, 141 insertions, 144 deletions
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 <memory> 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 <memory> #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 <set> #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 <string> #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 <string> #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 <string> #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 <string> #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 <string> #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 <string> #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 <memory> #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 <string> #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 <string> #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 <memory> #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 <stdint.h> #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 <string> #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 <stdint.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" @@ -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 <string> #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 <stdint.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" @@ -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 <string> #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 <string> #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 <stdint.h> #include "gtest/gtest.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include <memory> #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 <string> #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 <string> #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 <stdint.h> #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 <string> #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 <string> #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 <vector> #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 <stdint.h> #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 <string> #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 <string> #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 <memory> #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 <string> #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 <memory> #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 <memory> #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 <vector> #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 <vector> #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 <vector> #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 <vector> #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 <string> #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 <string> #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 <string> #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 <memory> #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 <string> #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<CommandsTestMocks::kIsNice> {}; 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 <memory> #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 <string> #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 <string> #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 <memory> #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 <string> #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 <string> #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 <string> #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 <string> #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 <stdint.h> #include <string> #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 <memory> #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 <memory> #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 <stdint.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/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 <stdint.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/commands/command.h" #include <memory> @@ -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 <memory> #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 <vector> #include <limits> #include "gmock/gmock.h" -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" #include <memory> 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 <memory> -#include "utils/shared_ptr.h" +#include "utils/shared_ptr_helpers.h" namespace test { namespace components { |