Updates mocks and tests, makes code buildable with tests enabled

3 files changed, 102 insertions, 172 deletions

diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h
index 8302a63beb..5e873211b2 100644
--- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h
@@ -61,6 +61,7 @@ class MockTransportAdapterListener : public TransportAdapterListener {
                void(const TransportAdapter* adapter));
   MOCK_METHOD1(OnDeviceListUpdated,
                void(const TransportAdapter* transport_adapter));
+  MOCK_METHOD1(OnDeviceAdded, void(DeviceUID device_uid));
   MOCK_METHOD3(OnConnectDone,
                void(const TransportAdapter* transport_adapter,
                     const DeviceUID& device_handle,
diff --git a/src/components/transport_manager/test/transport_adapter_listener_test.cc b/src/components/transport_manager/test/transport_adapter_listener_test.cc
index c8e9af7d63..14b8850b49 100644
--- a/src/components/transport_manager/test/transport_adapter_listener_test.cc
+++ b/src/components/transport_manager/test/transport_adapter_listener_test.cc
@@ -45,16 +45,16 @@ using namespace ::transport_manager;
 class TransportAdapterListenerTest : public ::testing::Test {
  public:
   TransportAdapterListenerTest()
-      : app_handle(1)
-      , dev_id("device_id")
-      , transport_listener(&tr_mock, &adapter_mock) {}
+      : dev_id("device_id")
+      , transport_listener(&tr_mock, &adapter_mock)
+      , app_handle(1) {}
 
  protected:
-  const int app_handle;
   const std::string dev_id;
   MockTransportManager tr_mock;
   MockTransportAdapter adapter_mock;
   TransportAdapterListenerImpl transport_listener;
+  const int app_handle;
 };
 
 MATCHER_P4(IsEvent, eventType, adapter, dev_id, app_id, "") {
@@ -73,33 +73,30 @@ MATCHER_P5(IsEvent, eventType, adapter, dev_id, app_id, data, "") {
 TEST_F(TransportAdapterListenerTest, OnCommunicationError) {
   EXPECT_CALL(
       tr_mock,
-      ReceiveEventFromDevice(IsEvent(
-          TransportAdapterListenerImpl::EventTypeEnum::ON_COMMUNICATION_ERROR,
-          &adapter_mock,
-          dev_id,
-          app_handle))).WillOnce(Return(E_SUCCESS));
+      ReceiveEventFromDevice(IsEvent(EventTypeEnum::ON_COMMUNICATION_ERROR,
+                                     &adapter_mock,
+                                     dev_id,
+                                     app_handle))).WillOnce(Return(E_SUCCESS));
   transport_listener.OnCommunicationError(&adapter_mock, dev_id, app_handle);
 }
 
 TEST_F(TransportAdapterListenerTest, OnConnectDone) {
-  EXPECT_CALL(tr_mock,
-              ReceiveEventFromDevice(IsEvent(
-                  TransportAdapterListenerImpl::EventTypeEnum::ON_CONNECT_DONE,
-                  &adapter_mock,
-                  dev_id,
-                  app_handle))).WillOnce(Return(E_SUCCESS));
+  EXPECT_CALL(
+      tr_mock,
+      ReceiveEventFromDevice(IsEvent(
+          EventTypeEnum::ON_CONNECT_DONE, &adapter_mock, dev_id, app_handle)))
+      .WillOnce(Return(E_SUCCESS));
   transport_listener.OnConnectDone(&adapter_mock, dev_id, app_handle);
 }
 
 TEST_F(TransportAdapterListenerTest, OnConnectFailed) {
   ConnectError er;
 
-  EXPECT_CALL(tr_mock,
-              ReceiveEventFromDevice(IsEvent(
-                  TransportAdapterListenerImpl::EventTypeEnum::ON_CONNECT_FAIL,
-                  &adapter_mock,
-                  dev_id,
-                  app_handle))).WillOnce(Return(E_SUCCESS));
+  EXPECT_CALL(
+      tr_mock,
+      ReceiveEventFromDevice(IsEvent(
+          EventTypeEnum::ON_CONNECT_FAIL, &adapter_mock, dev_id, app_handle)))
+      .WillOnce(Return(E_SUCCESS));
   transport_listener.OnConnectFailed(&adapter_mock, dev_id, app_handle, er);
 }
 
@@ -107,12 +104,12 @@ TEST_F(TransportAdapterListenerTest, OnDataReceiveDone) {
   ::protocol_handler::RawMessagePtr data_container;
 
   EXPECT_CALL(tr_mock,
-              ReceiveEventFromDevice(IsEvent(
-                  TransportAdapterListenerImpl::EventTypeEnum::ON_RECEIVED_DONE,
-                  &adapter_mock,
-                  dev_id,
-                  app_handle,
-                  data_container))).WillOnce(Return(E_SUCCESS));
+              ReceiveEventFromDevice(IsEvent(EventTypeEnum::ON_RECEIVED_DONE,
+                                             &adapter_mock,
+                                             dev_id,
+                                             app_handle,
+                                             data_container)))
+      .WillOnce(Return(E_SUCCESS));
   transport_listener.OnDataReceiveDone(
       &adapter_mock, dev_id, app_handle, data_container);
 }
@@ -120,12 +117,11 @@ TEST_F(TransportAdapterListenerTest, OnDataReceiveDone) {
 TEST_F(TransportAdapterListenerTest, OnDataReceiveFailed) {
   DataReceiveError err;
 
-  EXPECT_CALL(tr_mock,
-              ReceiveEventFromDevice(IsEvent(
-                  TransportAdapterListenerImpl::EventTypeEnum::ON_RECEIVED_FAIL,
-                  &adapter_mock,
-                  dev_id,
-                  app_handle))).WillOnce(Return(E_SUCCESS));
+  EXPECT_CALL(
+      tr_mock,
+      ReceiveEventFromDevice(IsEvent(
+          EventTypeEnum::ON_RECEIVED_FAIL, &adapter_mock, dev_id, app_handle)))
+      .WillOnce(Return(E_SUCCESS));
   transport_listener.OnDataReceiveFailed(
       &adapter_mock, dev_id, app_handle, err);
 }
@@ -136,12 +132,12 @@ TEST_F(TransportAdapterListenerTest, OnDataSendDone) {
       new ::protocol_handler::RawMessage(1, 1, data, 3);
 
   EXPECT_CALL(tr_mock,
-              ReceiveEventFromDevice(IsEvent(
-                  TransportAdapterListenerImpl::EventTypeEnum::ON_SEND_DONE,
-                  &adapter_mock,
-                  dev_id,
-                  app_handle,
-                  data_container))).WillOnce(Return(E_SUCCESS));
+              ReceiveEventFromDevice(IsEvent(EventTypeEnum::ON_SEND_DONE,
+                                             &adapter_mock,
+                                             dev_id,
+                                             app_handle,
+                                             data_container)))
+      .WillOnce(Return(E_SUCCESS));
   transport_listener.OnDataSendDone(
       &adapter_mock, dev_id, app_handle, data_container);
 }
@@ -153,56 +149,50 @@ TEST_F(TransportAdapterListenerTest, OnDataSendFailed) {
   DataSendError err;
 
   EXPECT_CALL(tr_mock,
-              ReceiveEventFromDevice(IsEvent(
-                  TransportAdapterListenerImpl::EventTypeEnum::ON_SEND_FAIL,
-                  &adapter_mock,
-                  dev_id,
-                  app_handle,
-                  data_container))).WillOnce(Return(E_SUCCESS));
+              ReceiveEventFromDevice(IsEvent(EventTypeEnum::ON_SEND_FAIL,
+                                             &adapter_mock,
+                                             dev_id,
+                                             app_handle,
+                                             data_container)))
+      .WillOnce(Return(E_SUCCESS));
   transport_listener.OnDataSendFailed(
       &adapter_mock, dev_id, app_handle, data_container, err);
 }
 
 TEST_F(TransportAdapterListenerTest, OnDeviceListUpdated) {
-  EXPECT_CALL(
-      tr_mock,
-      ReceiveEventFromDevice(IsEvent(
-          TransportAdapterListenerImpl::EventTypeEnum::ON_DEVICE_LIST_UPDATED,
-          &adapter_mock,
-          "",
-          0))).WillOnce(Return(E_SUCCESS));
+  EXPECT_CALL(tr_mock,
+              ReceiveEventFromDevice(IsEvent(
+                  EventTypeEnum::ON_DEVICE_LIST_UPDATED, &adapter_mock, "", 0)))
+      .WillOnce(Return(E_SUCCESS));
   transport_listener.OnDeviceListUpdated(&adapter_mock);
 }
 
 TEST_F(TransportAdapterListenerTest, OnDisconnectDeviceDone) {
-  EXPECT_CALL(
-      tr_mock,
-      ReceiveEventFromDevice(IsEvent(
-          TransportAdapterListenerImpl::EventTypeEnum::ON_DISCONNECT_DONE,
-          &adapter_mock,
-          dev_id,
-          app_handle))).WillOnce(Return(E_SUCCESS));
+  EXPECT_CALL(tr_mock,
+              ReceiveEventFromDevice(IsEvent(EventTypeEnum::ON_DISCONNECT_DONE,
+                                             &adapter_mock,
+                                             dev_id,
+                                             app_handle)))
+      .WillOnce(Return(E_SUCCESS));
   transport_listener.OnDisconnectDone(&adapter_mock, dev_id, app_handle);
 }
 
 TEST_F(TransportAdapterListenerTest, OnDisconnectFailed) {
   DisconnectError err;
 
-  EXPECT_CALL(
-      tr_mock,
-      ReceiveEventFromDevice(IsEvent(
-          TransportAdapterListenerImpl::EventTypeEnum::ON_DISCONNECT_FAIL,
-          &adapter_mock,
-          dev_id,
-          app_handle))).WillOnce(Return(E_SUCCESS));
+  EXPECT_CALL(tr_mock,
+              ReceiveEventFromDevice(IsEvent(EventTypeEnum::ON_DISCONNECT_FAIL,
+                                             &adapter_mock,
+                                             dev_id,
+                                             app_handle)))
+      .WillOnce(Return(E_SUCCESS));
   transport_listener.OnDisconnectFailed(&adapter_mock, dev_id, app_handle, err);
 }
 
 TEST_F(TransportAdapterListenerTest, OnFindNewApplicationsRequest) {
   EXPECT_CALL(tr_mock,
               ReceiveEventFromDevice(
-                  IsEvent(TransportAdapterListenerImpl::EventTypeEnum::
-                              ON_FIND_NEW_APPLICATIONS_REQUEST,
+                  IsEvent(EventTypeEnum::ON_FIND_NEW_APPLICATIONS_REQUEST,
                           &adapter_mock,
                           "",
                           0))).WillOnce(Return(E_SUCCESS));
@@ -211,11 +201,9 @@ TEST_F(TransportAdapterListenerTest, OnFindNewApplicationsRequest) {
 
 TEST_F(TransportAdapterListenerTest, OnSearchDeviceDone) {
   EXPECT_CALL(tr_mock,
-              ReceiveEventFromDevice(IsEvent(
-                  TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_DONE,
-                  &adapter_mock,
-                  "",
-                  0))).WillOnce(Return(E_SUCCESS));
+              ReceiveEventFromDevice(
+                  IsEvent(EventTypeEnum::ON_SEARCH_DONE, &adapter_mock, "", 0)))
+      .WillOnce(Return(E_SUCCESS));
   transport_listener.OnSearchDeviceDone(&adapter_mock);
 }
 
@@ -223,11 +211,9 @@ TEST_F(TransportAdapterListenerTest, OnSearchDeviceFailed) {
   SearchDeviceError er;
 
   EXPECT_CALL(tr_mock,
-              ReceiveEventFromDevice(IsEvent(
-                  TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_FAIL,
-                  &adapter_mock,
-                  "",
-                  0))).WillOnce(Return(E_SUCCESS));
+              ReceiveEventFromDevice(
+                  IsEvent(EventTypeEnum::ON_SEARCH_FAIL, &adapter_mock, "", 0)))
+      .WillOnce(Return(E_SUCCESS));
   transport_listener.OnSearchDeviceFailed(&adapter_mock, er);
 }
 
@@ -236,11 +222,10 @@ TEST_F(TransportAdapterListenerTest, OnUnexpectedDisconnect) {
 
   EXPECT_CALL(
       tr_mock,
-      ReceiveEventFromDevice(IsEvent(
-          TransportAdapterListenerImpl::EventTypeEnum::ON_UNEXPECTED_DISCONNECT,
-          &adapter_mock,
-          dev_id,
-          app_handle))).WillOnce(Return(E_SUCCESS));
+      ReceiveEventFromDevice(IsEvent(EventTypeEnum::ON_UNEXPECTED_DISCONNECT,
+                                     &adapter_mock,
+                                     dev_id,
+                                     app_handle))).WillOnce(Return(E_SUCCESS));
   transport_listener.OnUnexpectedDisconnect(
       &adapter_mock, dev_id, app_handle, err);
 }
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 c7cf3b2cb2..b3fbc2d9a4 100644
--- a/src/components/transport_manager/test/transport_manager_impl_test.cc
+++ b/src/components/transport_manager/test/transport_manager_impl_test.cc
@@ -102,10 +102,7 @@ class TransportManagerImplTest : public ::testing::Test {
   }
 
   void HandleDeviceListUpdated() {
-    const int type = static_cast<int>(
-        TransportAdapterListenerImpl::EventTypeEnum::ON_DEVICE_LIST_UPDATED);
-
-    TransportAdapterEvent test_event(type,
+    TransportAdapterEvent test_event(EventTypeEnum::ON_DEVICE_LIST_UPDATED,
                                      mock_adapter_,
                                      dev_info_.mac_address(),
                                      application_id_,
@@ -133,10 +130,7 @@ class TransportManagerImplTest : public ::testing::Test {
   }
 
   void HandleConnection() {
-    const int type = static_cast<int>(
-        TransportAdapterListenerImpl::EventTypeEnum::ON_CONNECT_DONE);
-
-    TransportAdapterEvent test_event(type,
+    TransportAdapterEvent test_event(EventTypeEnum::ON_CONNECT_DONE,
                                      mock_adapter_,
                                      dev_info_.mac_address(),
                                      application_id_,
@@ -155,10 +149,7 @@ class TransportManagerImplTest : public ::testing::Test {
   }
 
   void HandleConnectionFailed() {
-    const int type = static_cast<int>(
-        TransportAdapterListenerImpl::EventTypeEnum::ON_CONNECT_FAIL);
-
-    TransportAdapterEvent test_event(type,
+    TransportAdapterEvent test_event(EventTypeEnum::ON_CONNECT_FAIL,
                                      mock_adapter_,
                                      dev_info_.mac_address(),
                                      application_id_,
@@ -176,9 +167,7 @@ class TransportManagerImplTest : public ::testing::Test {
   }
 
   void HandleSendDone() {
-    const int type = static_cast<int>(
-        TransportAdapterListenerImpl::EventTypeEnum::ON_SEND_DONE);
-    TransportAdapterEvent test_event(type,
+    TransportAdapterEvent test_event(EventTypeEnum::ON_SEND_DONE,
                                      mock_adapter_,
                                      mac_address_,
                                      application_id_,
@@ -193,9 +182,7 @@ class TransportManagerImplTest : public ::testing::Test {
   }
 
   void HandleReceiveDone() {
-    const int type = static_cast<int>(
-        TransportAdapterListenerImpl::EventTypeEnum::ON_RECEIVED_DONE);
-    TransportAdapterEvent test_event(type,
+    TransportAdapterEvent test_event(EventTypeEnum::ON_RECEIVED_DONE,
                                      mock_adapter_,
                                      mac_address_,
                                      application_id_,
@@ -210,10 +197,7 @@ class TransportManagerImplTest : public ::testing::Test {
   }
 
   void HandleSendFailed() {
-    const int type = static_cast<int>(
-        TransportAdapterListenerImpl::EventTypeEnum::ON_SEND_FAIL);
-
-    TransportAdapterEvent test_event(type,
+    TransportAdapterEvent test_event(EventTypeEnum::ON_SEND_FAIL,
                                      mock_adapter_,
                                      mac_address_,
                                      application_id_,
@@ -226,10 +210,7 @@ class TransportManagerImplTest : public ::testing::Test {
   }
 
   void HandleSearchDone() {
-    const int type = static_cast<int>(
-        TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_DONE);
-
-    TransportAdapterEvent test_event(type,
+    TransportAdapterEvent test_event(EventTypeEnum::ON_SEARCH_DONE,
                                      mock_adapter_,
                                      mac_address_,
                                      application_id_,
@@ -242,10 +223,7 @@ class TransportManagerImplTest : public ::testing::Test {
   }
 
   void HandleSearchFail() {
-    const int type = static_cast<int>(
-        TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_FAIL);
-
-    TransportAdapterEvent test_event(type,
+    TransportAdapterEvent test_event(EventTypeEnum::ON_SEARCH_FAIL,
                                      mock_adapter_,
                                      mac_address_,
                                      application_id_,
@@ -258,16 +236,13 @@ class TransportManagerImplTest : public ::testing::Test {
   }
 
   void HandleFindNewApplicationsRequest() {
-    const int type =
-        static_cast<int>(TransportAdapterListenerImpl::EventTypeEnum::
-                             ON_FIND_NEW_APPLICATIONS_REQUEST);
-
-    TransportAdapterEvent test_event(type,
-                                     mock_adapter_,
-                                     mac_address_,
-                                     application_id_,
-                                     test_message_,
-                                     error_);
+    TransportAdapterEvent test_event(
+        EventTypeEnum::ON_FIND_NEW_APPLICATIONS_REQUEST,
+        mock_adapter_,
+        mac_address_,
+        application_id_,
+        test_message_,
+        error_);
 
     EXPECT_CALL(*tm_listener_, OnFindNewApplicationsRequest());
 
@@ -275,10 +250,7 @@ class TransportManagerImplTest : public ::testing::Test {
   }
 
   void HandleConnectionClosed() {
-    const int type = static_cast<int>(
-        TransportAdapterListenerImpl::EventTypeEnum::ON_DISCONNECT_DONE);
-
-    TransportAdapterEvent test_event(type,
+    TransportAdapterEvent test_event(EventTypeEnum::ON_DISCONNECT_DONE,
                                      mock_adapter_,
                                      mac_address_,
                                      application_id_,
@@ -293,10 +265,7 @@ class TransportManagerImplTest : public ::testing::Test {
   }
 
   void HandleDisconnectionFailed() {
-    const int type = static_cast<int>(
-        TransportAdapterListenerImpl::EventTypeEnum::ON_DISCONNECT_FAIL);
-
-    TransportAdapterEvent test_event(type,
+    TransportAdapterEvent test_event(EventTypeEnum::ON_DISCONNECT_FAIL,
                                      mock_adapter_,
                                      mac_address_,
                                      application_id_,
@@ -676,11 +645,8 @@ TEST_F(TransportManagerImplTest, UpdateDeviceList_RemoveDevice) {
  * Tests which check correct handling and receiving events
  */
 TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_OnSearchDeviceDone) {
-  const int type = static_cast<int>(
-      TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_DONE);
-
   TestAsyncWaiter waiter;
-  TransportAdapterEvent test_event(type,
+  TransportAdapterEvent test_event(EventTypeEnum::ON_SEARCH_DONE,
                                    mock_adapter_,
                                    mac_address_,
                                    application_id_,
@@ -696,11 +662,8 @@ TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_OnSearchDeviceDone) {
 }
 
 TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_OnSearchDeviceFail) {
-  const int type = static_cast<int>(
-      TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_FAIL);
-
   TestAsyncWaiter waiter;
-  TransportAdapterEvent test_event(type,
+  TransportAdapterEvent test_event(EventTypeEnum::ON_SEARCH_FAIL,
                                    mock_adapter_,
                                    mac_address_,
                                    application_id_,
@@ -716,10 +679,7 @@ TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_OnSearchDeviceFail) {
 }
 
 TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_DeviceListUpdated) {
-  const int type = static_cast<int>(
-      TransportAdapterListenerImpl::EventTypeEnum::ON_DEVICE_LIST_UPDATED);
-
-  TransportAdapterEvent test_event(type,
+  TransportAdapterEvent test_event(EventTypeEnum::ON_DEVICE_LIST_UPDATED,
                                    mock_adapter_,
                                    dev_info_.mac_address(),
                                    application_id_,
@@ -772,10 +732,7 @@ TEST_F(TransportManagerImplTest, CheckReceiveEvent) {
 
 TEST_F(TransportManagerImplTest, CheckReceiveFailedEvent) {
   // Arrange
-  const int type = static_cast<int>(
-      TransportAdapterListenerImpl::EventTypeEnum::ON_RECEIVED_FAIL);
-
-  TransportAdapterEvent test_event(type,
+  TransportAdapterEvent test_event(EventTypeEnum::ON_RECEIVED_FAIL,
                                    mock_adapter_,
                                    mac_address_,
                                    application_id_,
@@ -790,10 +747,7 @@ TEST_F(TransportManagerImplTest, CheckReceiveFailedEvent) {
 
 TEST_F(TransportManagerImplTest, CheckUnexpectedDisconnect) {
   // Arrange
-  const int type = static_cast<int>(
-      TransportAdapterListenerImpl::EventTypeEnum::ON_UNEXPECTED_DISCONNECT);
-
-  TransportAdapterEvent test_event(type,
+  TransportAdapterEvent test_event(EventTypeEnum::ON_UNEXPECTED_DISCONNECT,
                                    mock_adapter_,
                                    mac_address_,
                                    application_id_,
@@ -875,10 +829,12 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice_ConnectionNotExist) {
 
 TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_TMIsNotInitialized) {
   // Arrange
-  const int type = static_cast<int>(
-      TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_DONE);
-  TransportAdapterEvent test_event(
-      type, NULL, mac_address_, application_id_, test_message_, error_);
+  TransportAdapterEvent test_event(EventTypeEnum::ON_SEARCH_DONE,
+                                   NULL,
+                                   mac_address_,
+                                   application_id_,
+                                   test_message_,
+                                   error_);
   // Check before Act
   UninitializeTM();
   // Act and Assert
@@ -1012,10 +968,7 @@ TEST_F(TransportManagerImplTest,
        CheckEventOnDisconnectDone_ConnectionNotExist) {
   // SetUp does not add connections
   // Arrange
-  const int type = static_cast<int>(
-      TransportAdapterListenerImpl::EventTypeEnum::ON_DISCONNECT_DONE);
-
-  TransportAdapterEvent test_event(type,
+  TransportAdapterEvent test_event(EventTypeEnum::ON_DISCONNECT_DONE,
                                    mock_adapter_,
                                    mac_address_,
                                    application_id_,
@@ -1031,10 +984,7 @@ TEST_F(TransportManagerImplTest,
 TEST_F(TransportManagerImplTest, CheckEventOnSendDone_ConnectionNotExist) {
   // SetUp does not add connections
   // Arrange
-  const int type = static_cast<int>(
-      TransportAdapterListenerImpl::EventTypeEnum::ON_SEND_DONE);
-
-  TransportAdapterEvent test_event(type,
+  TransportAdapterEvent test_event(EventTypeEnum::ON_SEND_DONE,
                                    mock_adapter_,
                                    mac_address_,
                                    application_id_,
@@ -1052,9 +1002,7 @@ TEST_F(TransportManagerImplTest, CheckEventOnSendDone_ConnectionNotExist) {
 TEST_F(TransportManagerImplTest, CheckEventOnReceivedDone_ConnectionNotExist) {
   // SetUp does not add connections
   // Arrange
-  const int type = static_cast<int>(
-      TransportAdapterListenerImpl::EventTypeEnum::ON_RECEIVED_DONE);
-  TransportAdapterEvent test_event(type,
+  TransportAdapterEvent test_event(EventTypeEnum::ON_RECEIVED_DONE,
                                    mock_adapter_,
                                    mac_address_,
                                    application_id_,
@@ -1071,9 +1019,7 @@ TEST_F(TransportManagerImplTest, CheckEventOnReceivedDone_ConnectionNotExist) {
 TEST_F(TransportManagerImplTest, CheckEventOnReceivedFail_ConnectionNotExist) {
   // SetUp does not add connections
   // Arrange
-  const int type = static_cast<int>(
-      TransportAdapterListenerImpl::EventTypeEnum::ON_RECEIVED_FAIL);
-  TransportAdapterEvent test_event(type,
+  TransportAdapterEvent test_event(EventTypeEnum::ON_RECEIVED_FAIL,
                                    mock_adapter_,
                                    mac_address_,
                                    application_id_,
@@ -1088,9 +1034,7 @@ TEST_F(TransportManagerImplTest,
        CheckEventOnUnexpectedDisconnect_ConnectionNotExist) {
   // SetUp does not add connections
   // Arrange
-  const int type = static_cast<int>(
-      TransportAdapterListenerImpl::EventTypeEnum::ON_UNEXPECTED_DISCONNECT);
-  TransportAdapterEvent test_event(type,
+  TransportAdapterEvent test_event(EventTypeEnum::ON_UNEXPECTED_DISCONNECT,
                                    mock_adapter_,
                                    mac_address_,
                                    application_id_,