diff options
author | Conlain Kelly <conlain.k@gmail.com> | 2018-07-18 11:13:50 -0400 |
---|---|---|
committer | Conlain Kelly <conlain.k@gmail.com> | 2018-07-18 11:13:50 -0400 |
commit | 5019af50b9a2236dd75e630aae5b82e440be9620 (patch) | |
tree | add78dac2559a43a8ee7d82159a01fc15a971c19 /src/components/transport_manager/test/transport_manager_impl_test.cc | |
parent | 4dde9552b3d9ab5fa29502810be48bdf0f793cd7 (diff) | |
download | sdl_core-5019af50b9a2236dd75e630aae5b82e440be9620.tar.gz |
Replace utils::SharedPtr with std::shared_ptr, remove non-standard usage
Diffstat (limited to 'src/components/transport_manager/test/transport_manager_impl_test.cc')
-rw-r--r-- | src/components/transport_manager/test/transport_manager_impl_test.cc | 18 |
1 files changed, 9 insertions, 9 deletions
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 9ba95ea99a..863c32f2ab 100644 --- a/src/components/transport_manager/test/transport_manager_impl_test.cc +++ b/src/components/transport_manager/test/transport_manager_impl_test.cc @@ -42,8 +42,8 @@ #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/make_shared.h" + + #include "utils/test_async_waiter.h" using ::testing::_; @@ -55,7 +55,7 @@ using ::testing::DoAll; using ::protocol_handler::RawMessage; using ::protocol_handler::RawMessagePtr; -using utils::MakeShared; +using std::make_shared; namespace test { namespace components { @@ -85,7 +85,7 @@ class TransportManagerImplTest : public ::testing::Test { "app_info_storage"); tm_.Init(last_state_); mock_adapter_ = new MockTransportAdapter(); - tm_listener_ = MakeShared<MockTransportManagerListener>(); + tm_listener_ = std::make_shared<MockTransportManagerListener>(); #ifdef TELEMETRY_MONITOR tm_.SetTelemetryObserver(&mock_metric_observer_); @@ -96,14 +96,14 @@ class TransportManagerImplTest : public ::testing::Test { EXPECT_EQ(E_SUCCESS, tm_.AddTransportAdapter(mock_adapter_)); connection_key_ = 1; - error_ = MakeShared<BaseError>(); + error_ = std::make_shared<BaseError>(); const unsigned int version_protocol_ = 1; const unsigned int kSize = 12; unsigned char data[kSize] = { 0x20, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; test_message_ = - MakeShared<RawMessage>(connection_key_, version_protocol_, data, kSize); + std::make_shared<RawMessage>(connection_key_, version_protocol_, data, kSize); } DeviceInfo ConstructDeviceInfo(const std::string& mac_address, @@ -331,7 +331,7 @@ class TransportManagerImplTest : public ::testing::Test { #endif // TELEMETRY_MONITOR MockTransportAdapter* mock_adapter_; - utils::SharedPtr<MockTransportManagerListener> tm_listener_; + std::shared_ptr<MockTransportManagerListener> tm_listener_; MockTransportManagerImpl tm_; const ApplicationHandle application_id_ = 1; ConnectionUID connection_key_; @@ -1144,7 +1144,7 @@ TEST_F(TransportManagerImplTest, test_message_, error_)); - auto second_mock_adapter = utils::MakeShared<MockTransportAdapter>(); + auto second_mock_adapter = std::make_shared<MockTransportAdapter>(); const auto usb_serial = "USB_serial"; DeviceInfo second_device = @@ -1220,7 +1220,7 @@ TEST_F(TransportManagerImplTest, test_message_, error_)); - auto second_mock_adapter = utils::MakeShared<MockTransportAdapter>(); + auto second_mock_adapter = std::make_shared<MockTransportAdapter>(); DeviceInfo second_device = ConstructDeviceInfo("MA:CA:DR:ES:S", "USB_IOS", "SecondDeviceName"); |