Fix unit test failure

3 files changed, 39 insertions, 6 deletions

diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
index 9fb0921c4b..df9628f732 100644
--- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
+++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
@@ -82,6 +82,7 @@ TransportAdapterImpl::TransportAdapterImpl(
 }
 
 TransportAdapterImpl::~TransportAdapterImpl() {
+  listeners_.clear();
   Terminate();
 
   if (device_scanner_) {
@@ -158,7 +159,7 @@ TransportAdapter::Error TransportAdapterImpl::Init() {
 
   initialised_ = (error == OK);
 
-  if (get_settings().use_last_state()) {
+  if (get_settings().use_last_state() && initialised_) {
     if (!Restore()) {
       LOG4CXX_WARN(logger_, "could not restore transport adapter state");
       error = FAIL;
diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc
index f7b44d255b..83419a50c9 100644
--- a/src/components/transport_manager/src/transport_manager_impl.cc
+++ b/src/components/transport_manager/src/transport_manager_impl.cc
@@ -435,16 +435,17 @@ int TransportManagerImpl::AddTransportAdapter(
     return E_ADAPTER_EXISTS;
   }
 
-  transport_adapter_listeners_[transport_adapter] =
+  auto listener =
       new TransportAdapterListenerImpl(this, transport_adapter);
-  transport_adapter->AddListener(
-      transport_adapter_listeners_[transport_adapter]);
+
+  transport_adapter->AddListener(listener);
   
   if (transport_adapter->IsInitialised() ||
       transport_adapter->Init() == TransportAdapter::OK) {
+    transport_adapter_listeners_[transport_adapter] = listener;
     transport_adapters_.push_back(transport_adapter);
   } else {
-    transport_adapter_listeners_.erase(transport_adapter);
+    delete listener;
     delete transport_adapter;
   }
   LOG4CXX_TRACE(logger_, "exit with E_SUCCESS");
diff --git a/src/components/transport_manager/test/transport_manager_default_test.cc b/src/components/transport_manager/test/transport_manager_default_test.cc
index fd48ab8f22..d095a51cb6 100644
--- a/src/components/transport_manager/test/transport_manager_default_test.cc
+++ b/src/components/transport_manager/test/transport_manager_default_test.cc
@@ -73,7 +73,7 @@ TEST(TestTransportManagerDefault, Init_LastStateNotUsed) {
   EXPECT_CALL(transport_manager_settings, use_last_state())
       .WillRepeatedly(Return(false));
   EXPECT_CALL(transport_manager_settings, transport_manager_tcp_adapter_port())
-      .WillRepeatedly(Return(1u));
+      .WillRepeatedly(Return(12345u));
 
   transport_manager.Init(mock_last_state);
   transport_manager.Stop();
@@ -105,6 +105,37 @@ TEST(TestTransportManagerDefault, Init_LastStateUsed) {
   EXPECT_CALL(transport_manager_settings, use_last_state())
       .WillRepeatedly(Return(true));
   EXPECT_CALL(transport_manager_settings, transport_manager_tcp_adapter_port())
+      .WillRepeatedly(Return(12345u));
+  transport_manager.Init(mock_last_state);
+  transport_manager.Stop();
+}
+
+TEST(TestTransportManagerDefault, Init_LastStateUsed_InvalidPort) {
+  MockTransportManagerSettings transport_manager_settings;
+  transport_manager::TransportManagerDefault transport_manager(
+      transport_manager_settings);
+
+  NiceMock<MockLastState> mock_last_state;
+  Json::Value custom_dictionary;
+  Json::Value tcp_device;
+  tcp_device[kDeviceName] = "unique_tcp_device_name";
+  tcp_device[kDeviceAddress] = "127.0.0.1";
+  tcp_device[kDeviceApplications][0][kApplicationPort] = "1";
+  Json::Value bluetooth_device;
+  bluetooth_device[kDeviceName] = "unique_bluetooth_device_name";
+  bluetooth_device[kDeviceAddress] = "AB:CD:EF:GH:IJ:KL";
+  bluetooth_device[kDeviceApplications][0][kApplicationRfcomm] =
+      kApplicationRfcommValue;
+  custom_dictionary[kTransportManager][kTcpAdapter][kDevices][0] = tcp_device;
+  custom_dictionary[kTransportManager][kBluetoothAdapter][kDevices][0] =
+      bluetooth_device;
+
+  ON_CALL(mock_last_state, get_dictionary())
+      .WillByDefault(ReturnRef(custom_dictionary));
+
+  EXPECT_CALL(transport_manager_settings, use_last_state())
+      .WillRepeatedly(Return(true));
+  EXPECT_CALL(transport_manager_settings, transport_manager_tcp_adapter_port())
       .WillRepeatedly(Return(1u));
   transport_manager.Init(mock_last_state);
   transport_manager.Stop();