1 files changed, 44 insertions, 21 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 c7d7024658..ac9b801dbd 100644
--- a/src/components/transport_manager/test/transport_manager_impl_test.cc
+++ b/src/components/transport_manager/test/transport_manager_impl_test.cc
@@ -30,26 +30,25 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "transport_manager/transport_manager_impl.h"
 #include <string>
 #include "gtest/gtest.h"
 #include "protocol/raw_message.h"
+#include "resumption/last_state_impl.h"
 #include "transport_manager/common.h"
-#include "transport_manager/transport_manager_impl.h"
-#include "transport_manager/mock_telemetry_observer.h"
-#include "transport_manager/mock_transport_manager_listener.h"
 #include "transport_manager/mock_telemetry_observer.h"
-#include "transport_manager/transport_adapter/mock_transport_adapter.h"
 #include "transport_manager/mock_transport_manager_impl.h"
+#include "transport_manager/mock_transport_manager_listener.h"
 #include "transport_manager/mock_transport_manager_settings.h"
-#include "resumption/last_state_impl.h"
+#include "transport_manager/transport_adapter/mock_transport_adapter.h"
 
 #include "utils/test_async_waiter.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
+using ::testing::DoAll;
 using ::testing::Return;
 using ::testing::ReturnRef;
-using ::testing::DoAll;
 
 using ::protocol_handler::RawMessage;
 using ::protocol_handler::RawMessagePtr;
@@ -64,7 +63,7 @@ namespace {
 const std::string kAppStorageFolder = "app_storage_folder";
 const std::string kAppInfoFolder = "app_info_folder";
 const uint32_t kAsyncExpectationsTimeout = 10000u;
-}
+}  // namespace
 
 class TransportManagerImplTest : public ::testing::Test {
  protected:
@@ -102,7 +101,7 @@ class TransportManagerImplTest : public ::testing::Test {
     unsigned char data[kSize] = {
         0x20, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     test_message_ = std::make_shared<RawMessage>(
-        connection_key_, version_protocol_, data, kSize);
+        connection_key_, version_protocol_, data, kSize, false);
   }
 
   DeviceInfo ConstructDeviceInfo(const std::string& mac_address,
@@ -665,15 +664,23 @@ TEST_F(TransportManagerImplTest, RemoveDevice_DeviceWasAdded) {
 }
 
 TEST_F(TransportManagerImplTest, SetVisibilityOn_StartClientListening) {
-  EXPECT_CALL(*mock_adapter_, StartClientListening())
+  EXPECT_CALL(
+      *mock_adapter_,
+      ChangeClientListening(transport_manager::TransportAction::kVisibilityOn))
       .WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(::transport_manager::E_SUCCESS, tm_.Visibility(true));
+  EXPECT_EQ(::transport_manager::E_SUCCESS,
+            tm_.PerformActionOnClients(
+                transport_manager::TransportAction::kVisibilityOn));
 }
 
 TEST_F(TransportManagerImplTest, SetVisibilityOff_StopClientListening) {
-  EXPECT_CALL(*mock_adapter_, StopClientListening())
+  EXPECT_CALL(
+      *mock_adapter_,
+      ChangeClientListening(transport_manager::TransportAction::kVisibilityOff))
       .WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(::transport_manager::E_SUCCESS, tm_.Visibility(false));
+  EXPECT_EQ(::transport_manager::E_SUCCESS,
+            tm_.PerformActionOnClients(
+                transport_manager::TransportAction::kVisibilityOff));
 }
 
 TEST_F(TransportManagerImplTest, StopTransportManager) {
@@ -692,12 +699,14 @@ TEST_F(TransportManagerImplTest, StopTransportManager) {
 TEST_F(TransportManagerImplTest, Reinit) {
   EXPECT_CALL(*mock_adapter_, Terminate());
   EXPECT_CALL(*mock_adapter_, Init()).WillOnce(Return(TransportAdapter::OK));
+  tm_.Deinit();
   EXPECT_EQ(E_SUCCESS, tm_.Reinit());
 }
 
 TEST_F(TransportManagerImplTest, Reinit_InitAdapterFailed) {
   EXPECT_CALL(*mock_adapter_, Terminate());
   EXPECT_CALL(*mock_adapter_, Init()).WillOnce(Return(TransportAdapter::FAIL));
+  tm_.Deinit();
   EXPECT_EQ(E_ADAPTERS_FAIL, tm_.Reinit());
 }
 
@@ -941,17 +950,22 @@ TEST_F(TransportManagerImplTest, RemoveDevice_TMIsNotInitialized) {
 
 TEST_F(TransportManagerImplTest, Visibility_TMIsNotInitialized) {
   // Arrange
-  const bool visible = true;
+  const transport_manager::TransportAction action =
+      transport_manager::TransportAction::kVisibilityOn;
   // Check before Act
   UninitializeTM();
   // Act and Assert
-  EXPECT_CALL(*mock_adapter_, StartClientListening()).Times(0);
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.Visibility(visible));
+  EXPECT_CALL(
+      *mock_adapter_,
+      ChangeClientListening(transport_manager::TransportAction::kVisibilityOn))
+      .Times(0);
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.PerformActionOnClients(action));
 }
 
 TEST_F(TransportManagerImplTest, HandleMessage_ConnectionNotExist) {
   EXPECT_CALL(*mock_adapter_,
-              SendData(mac_address_, application_id_, test_message_)).Times(0);
+              SendData(mac_address_, application_id_, test_message_))
+      .Times(0);
 
   TestAsyncWaiter waiter;
   EXPECT_CALL(*tm_listener_, OnTMMessageSendFailed(_, test_message_))
@@ -971,16 +985,24 @@ TEST_F(TransportManagerImplTest, SearchDevices_TMIsNotInitialized) {
 }
 
 TEST_F(TransportManagerImplTest, SetVisibilityOn_TransportAdapterNotSupported) {
-  EXPECT_CALL(*mock_adapter_, StartClientListening())
+  EXPECT_CALL(
+      *mock_adapter_,
+      ChangeClientListening(transport_manager::TransportAction::kVisibilityOn))
       .WillOnce(Return(TransportAdapter::NOT_SUPPORTED));
-  EXPECT_EQ(E_SUCCESS, tm_.Visibility(true));
+  EXPECT_EQ(E_SUCCESS,
+            tm_.PerformActionOnClients(
+                transport_manager::TransportAction::kVisibilityOn));
 }
 
 TEST_F(TransportManagerImplTest,
        SetVisibilityOff_TransportAdapterNotSupported) {
-  EXPECT_CALL(*mock_adapter_, StopClientListening())
+  EXPECT_CALL(
+      *mock_adapter_,
+      ChangeClientListening(transport_manager::TransportAction::kVisibilityOff))
       .WillOnce(Return(TransportAdapter::NOT_SUPPORTED));
-  EXPECT_EQ(E_SUCCESS, tm_.Visibility(false));
+  EXPECT_EQ(E_SUCCESS,
+            tm_.PerformActionOnClients(
+                transport_manager::TransportAction::kVisibilityOff));
 }
 
 TEST_F(TransportManagerImplTest,
@@ -1232,7 +1254,8 @@ TEST_F(TransportManagerImplTest,
   EXPECT_CALL(mock_transport_manager_settings_, app_transport_change_timer())
       .WillOnce(Return(timeout));
   EXPECT_CALL(mock_transport_manager_settings_,
-              app_transport_change_timer_addition()).WillOnce(Return(0));
+              app_transport_change_timer_addition())
+      .WillOnce(Return(0));
 
   EXPECT_CALL(*tm_listener_, OnDeviceSwitchingStart(mac_address_, usb_serial));