1 files changed, 57 insertions, 27 deletions
diff --git a/src/components/transport_manager/test/tcp_client_listener_test.cc b/src/components/transport_manager/test/tcp_client_listener_test.cc
index 916f8bac58..782b363a38 100644
--- a/src/components/transport_manager/test/tcp_client_listener_test.cc
+++ b/src/components/transport_manager/test/tcp_client_listener_test.cc
@@ -31,9 +31,9 @@
  */
 
 #include "gtest/gtest.h"
-#include "include/transport_adapter_mock.h"
+#include "transport_manager/transport_adapter_mock.h"
 #include "transport_manager/tcp/tcp_client_listener.h"
-#include "include/transport_manager_mock.h"
+#include "transport_manager/mock_transport_manager.h"
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
 #include "transport_manager/transport_adapter/device.h"
 
@@ -45,34 +45,65 @@ using ::testing::Return;
 using namespace ::transport_manager;
 using namespace ::transport_manager::transport_adapter;
 
-class MockTransportAdapterController: public TransportAdapterController {
-public:
- MOCK_METHOD1(AddDevice,DeviceSptr(DeviceSptr device));
- MOCK_METHOD0(AckDevices,void());
- MOCK_METHOD1(SearchDeviceDone, void(const DeviceVector& devices));
- MOCK_METHOD1(SearchDeviceFailed, void(const SearchDeviceError& error));
- MOCK_CONST_METHOD1(FindDevice, DeviceSptr(const DeviceUID& device_handle));
- MOCK_METHOD3(ConnectionCreated, void(ConnectionSPtr connection, const DeviceUID& device_handle, const ApplicationHandle& app_handle));
- MOCK_METHOD2(ConnectDone, void(const DeviceUID& device_handle, const ApplicationHandle& app_handle));
- MOCK_METHOD3(ConnectFailed, void(const DeviceUID& device_handle, const ApplicationHandle& app_handle, const ConnectError& error));
- MOCK_METHOD2(ConnectionFinished, void(const DeviceUID& device_handle, const ApplicationHandle& app_handle));
- MOCK_METHOD3(ConnectionAborted,void(const DeviceUID& device_handle, const ApplicationHandle& app_handle, const CommunicationError& error));
- MOCK_METHOD2(DisconnectDone, void(const DeviceUID& device_handle, const ApplicationHandle& app_handle));
- MOCK_METHOD3(DataReceiveDone, void(const DeviceUID& device_handle, const ApplicationHandle& app_handle, const ::protocol_handler::RawMessagePtr message));
- MOCK_METHOD3(DataReceiveFailed, void(const DeviceUID& device_handle, const ApplicationHandle& app_handle, const DataReceiveError& error));
- MOCK_METHOD3(DataSendDone, void(const DeviceUID& device_handle, const ApplicationHandle& app_handle, const ::protocol_handler::RawMessagePtr message));
- MOCK_METHOD4(DataSendFailed, void(const DeviceUID& device_handle, const ApplicationHandle& app_handle, const ::protocol_handler::RawMessagePtr message, const DataSendError& error));
- MOCK_METHOD0(FindNewApplicationsRequest, void());
- MOCK_METHOD1(ApplicationListUpdated, void(const DeviceUID& device_handle));
- MOCK_METHOD2(DeviceDisconnected, void (const DeviceUID& device_handle,const DisconnectDeviceError& error));
+class MockTransportAdapterController : public TransportAdapterController {
+ public:
+  MOCK_METHOD1(AddDevice, DeviceSptr(DeviceSptr device));
+  MOCK_METHOD0(AckDevices, void());
+  MOCK_METHOD1(SearchDeviceDone, void(const DeviceVector& devices));
+  MOCK_METHOD1(SearchDeviceFailed, void(const SearchDeviceError& error));
+  MOCK_CONST_METHOD1(FindDevice, DeviceSptr(const DeviceUID& device_handle));
+  MOCK_METHOD3(ConnectionCreated,
+               void(ConnectionSPtr connection,
+                    const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle));
+  MOCK_METHOD2(ConnectDone,
+               void(const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle));
+  MOCK_METHOD3(ConnectFailed,
+               void(const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle,
+                    const ConnectError& error));
+  MOCK_METHOD2(ConnectionFinished,
+               void(const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle));
+  MOCK_METHOD3(ConnectionAborted,
+               void(const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle,
+                    const CommunicationError& error));
+  MOCK_METHOD2(DisconnectDone,
+               void(const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle));
+  MOCK_METHOD3(DataReceiveDone,
+               void(const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle,
+                    const ::protocol_handler::RawMessagePtr message));
+  MOCK_METHOD3(DataReceiveFailed,
+               void(const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle,
+                    const DataReceiveError& error));
+  MOCK_METHOD3(DataSendDone,
+               void(const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle,
+                    const ::protocol_handler::RawMessagePtr message));
+  MOCK_METHOD4(DataSendFailed,
+               void(const DeviceUID& device_handle,
+                    const ApplicationHandle& app_handle,
+                    const ::protocol_handler::RawMessagePtr message,
+                    const DataSendError& error));
+  MOCK_METHOD0(FindNewApplicationsRequest, void());
+  MOCK_METHOD1(ApplicationListUpdated, void(const DeviceUID& device_handle));
+  MOCK_METHOD2(DeviceDisconnected,
+               void(const DeviceUID& device_handle,
+                    const DisconnectDeviceError& error));
 };
 
 class TcpClientListenerTest : public ::testing::Test {
  public:
   TcpClientListenerTest()
-      : port_(0),
-        enable_keep_alive_(false),
-        tcp_client_listener_(&adapter_controller_mock_, port_, enable_keep_alive_) {}
+      : port_(0)
+      , enable_keep_alive_(false)
+      , tcp_client_listener_(
+            &adapter_controller_mock_, port_, enable_keep_alive_) {}
 
  protected:
   uint16_t port_;
@@ -88,7 +119,7 @@ TEST_F(TcpClientListenerTest, Ctor_test) {
 }
 
 TEST_F(TcpClientListenerTest, IsInitialised) {
- EXPECT_TRUE(tcp_client_listener_.IsInitialised());
+  EXPECT_TRUE(tcp_client_listener_.IsInitialised());
 }
 
 TEST_F(TcpClientListenerTest, Init) {
@@ -98,4 +129,3 @@ TEST_F(TcpClientListenerTest, Init) {
 }  // namespace transport_manager_test
 }  // namespace components
 }  // namespace test
-