Rename mock files to correct naming

Files renamed.
Duplicates deleted.

Related tasks APPLINK-30588 APPLINK-30974

3 files changed, 125 insertions, 84 deletions

diff --git a/src/components/include/test/transport_manager/mock_transport_manager_listener.h b/src/components/include/test/transport_manager/mock_transport_manager_listener.h
index c989556ace..ebf4ea20c1 100644
--- a/src/components/include/test/transport_manager/mock_transport_manager_listener.h
+++ b/src/components/include/test/transport_manager/mock_transport_manager_listener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Ford Motor Company
+ * Copyright (c) 2015, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,61 +30,62 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_LISTENER_H_
-#define SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_LISTENER_H_
-
-#include "gmock/gmock.h"
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_LISTENER_MOCK_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_LISTENER_MOCK_H_
 
+#include <vector>
+#include <gmock/gmock.h>
 #include "transport_manager/transport_manager_listener.h"
+#include "protocol/raw_message.h"
 
 namespace test {
 namespace components {
 namespace transport_manager_test {
 
-class MockTransportManagerListener
-    : public transport_manager::TransportManagerListener {
+using namespace transport_manager;
+using ::protocol_handler::RawMessage;
+using ::protocol_handler::RawMessagePtr;
+
+class TransportManagerListenerMock : public TransportManagerListener {
  public:
   MOCK_METHOD1(OnDeviceListUpdated,
-      void(const std::vector<DeviceInfo>));
-  MOCK_METHOD0(OnFindNewApplicationsRequest,
-      void());
-  MOCK_METHOD1(OnDeviceFound,
-      void(const DeviceInfo& device_info));
-  MOCK_METHOD1(OnDeviceAdded,
-      void(const DeviceInfo& device_info));
-  MOCK_METHOD1(OnDeviceRemoved,
-      void(const DeviceInfo& device_info));
-  MOCK_METHOD0(OnScanDevicesFinished,
-      void());
-  MOCK_METHOD1(OnScanDevicesFailed,
-      void(const SearchDeviceError& error));
+               void(const std::vector<DeviceInfo>& device_info));
+  MOCK_METHOD0(OnFindNewApplicationsRequest, void());
+  MOCK_METHOD1(OnDeviceFound, void(const DeviceInfo& device_info));
+  MOCK_METHOD1(OnDeviceAdded, void(const DeviceInfo& device_info));
+  MOCK_METHOD1(OnDeviceRemoved, void(const DeviceInfo& device_info));
+  MOCK_METHOD0(OnScanDevicesFinished, void());
+  MOCK_METHOD1(OnScanDevicesFailed, void(const SearchDeviceError& error));
   MOCK_METHOD2(OnConnectionEstablished,
-      void(const DeviceInfo& device_info, const ConnectionUID connection_id));
+               void(const DeviceInfo& device_info,
+                    const ConnectionUID connection_id));
   MOCK_METHOD2(OnConnectionFailed,
-      void(const DeviceInfo& device_info, const ConnectError& error));
-  MOCK_METHOD1(OnConnectionClosed,
-      void(const ConnectionUID connection_id));
+               void(const DeviceInfo& device_info, const ConnectError& error));
+  MOCK_METHOD1(OnConnectionClosed, void(const ConnectionUID connection_id));
   MOCK_METHOD2(OnUnexpectedDisconnect,
-      void(const ConnectionUID connection_id, const CommunicationError& error));
+               void(const ConnectionUID connection_id,
+                    const CommunicationError& error));
   MOCK_METHOD2(OnConnectionClosedFailure,
-      void(const ConnectionUID connection_id, const DisconnectError& error));
+               void(const ConnectionUID connection_id,
+                    const DisconnectError& error));
   MOCK_METHOD2(OnDeviceConnectionLost,
-      void(const DeviceHandle& device, const DisconnectDeviceError& error));
+               void(const DeviceHandle& device,
+                    const DisconnectDeviceError& error));
   MOCK_METHOD2(OnDisconnectFailed,
-      void(const DeviceHandle& device, const DisconnectDeviceError& error));
+               void(const DeviceHandle& device,
+                    const DisconnectDeviceError& error));
   MOCK_METHOD1(OnTMMessageReceived,
-      void(const ::protocol_handler::RawMessagePtr message));
-  MOCK_METHOD1(OnTMMessageReceiveFailed,
-      void(const DataReceiveError& error));
+               void(const ::protocol_handler::RawMessagePtr message));
+  MOCK_METHOD1(OnTMMessageReceiveFailed, void(const DataReceiveError& error));
   MOCK_METHOD1(OnTMMessageSend,
-      void(const ::protocol_handler::RawMessagePtr message));
+               void(const ::protocol_handler::RawMessagePtr message));
   MOCK_METHOD2(OnTMMessageSendFailed,
-      void(const DataSendError& error, const ::protocol_handler::RawMessagePtr message));
+               void(const DataSendError& error,
+                    const ::protocol_handler::RawMessagePtr message));
 };
 
-
 }  // namespace transport_manager_test
 }  // namespace components
 }  // namespace test
 
-#endif  // SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_LISTENER_H_
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_LISTENER_MOCK_H_
diff --git a/src/components/include/test/transport_manager/transport_adapter/mock_device.h b/src/components/include/test/transport_manager/transport_adapter/mock_device.h
index 557a490ea6..b703428dfb 100644
--- a/src/components/include/test/transport_manager/transport_adapter/mock_device.h
+++ b/src/components/include/test/transport_manager/transport_adapter/mock_device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Ford Motor Company
+ * Copyright (c) 2015, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,30 +30,42 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_DEVICE_H_
-#define SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_DEVICE_H_
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_DEVICE_MOCK_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_DEVICE_MOCK_H_
 
 #include "gmock/gmock.h"
 #include "transport_manager/transport_adapter/device.h"
+#include "transport_manager/common.h"
+#include "transport_manager/tcp/tcp_device.h"
 
 namespace test {
 namespace components {
 namespace transport_manager_test {
 
-using transport_manager::transport_adapter::Device;
+class MockDevice : public ::transport_manager::transport_adapter::Device {
+ public:
+  MockDevice(const std::string& name, const std::string& unique_device_id)
+      : Device(name, unique_device_id) {}
+  MOCK_CONST_METHOD1(IsSameAs, bool(const Device* other_device));
+  MOCK_CONST_METHOD0(GetApplicationList, std::vector<int>());
+  MOCK_CONST_METHOD1(LaunchApp, void(const std::string& bundle_id));
+  MOCK_METHOD0(Stop, void());
+};
 
-class MockDevice : public Device {
+class MockTCPDevice : public ::transport_manager::transport_adapter::TcpDevice {
  public:
-  MOCK_CONST_METHOD1(IsSameAs,
-      bool(const Device* other_device));
-  MOCK_CONST_METHOD0(GetApplicationList,
-      transport_manager::ApplicationList());
-  MOCK_METHOD0(Stop,
-      void());
+  MockTCPDevice(const uint32_t& in_addr_t, const std::string& name)
+      : TcpDevice(in_addr_t, name) {}
+  MOCK_CONST_METHOD1(IsSameAs, bool(const Device* other_device));
+  MOCK_CONST_METHOD0(GetApplicationList, std::vector<int>());
+  MOCK_METHOD0(Stop, void());
+  MOCK_CONST_METHOD1(
+      GetApplicationPort,
+      int(const ::transport_manager::ApplicationHandle app_handle));
 };
 
 }  // namespace transport_manager_test
 }  // namespace components
 }  // namespace test
 
-#endif  // SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_DEVICE_H_
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_DEVICE_MOCK_H_
diff --git a/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h b/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h
index 618e85a4fa..815b04930a 100644
--- a/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h
+++ b/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Ford Motor Company
+ * Copyright (c) 2016, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,52 +30,80 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_H_
-#define SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_H_
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_
 
 #include "gmock/gmock.h"
-#include <string>
-#include "transport_manager/transport_manager.h"
-#include "transport_manager/transport_adapter/transport_adapter_event.h"
-#include "telemetry_monitor/telemetry_observable.h"
-#include "resumption/last_state.h"
+#include "transport_manager/transport_adapter/transport_adapter.h"
 
 namespace test {
 namespace components {
 namespace transport_manager_test {
 
-using ::transport_manager::DeviceHandle;
-using ::transport_manager::ConnectionUID;
-using ::transport_manager::transport_adapter::TransportAdapter;
-using ::transport_manager::TransportAdapterEvent;
-using ::transport_manager::TransportManagerListener;
-/*
- * MOCK implementation of ::transport_manager::TransportManager interface
- */
-class MockTransportManager : public ::transport_manager::TransportManager,
-                             public ::telemetry_monitor::TelemetryObservable<
-                                 transport_manager::TMTelemetryObserver> {
+class MockTransportAdapter
+    : public ::transport_manager::transport_adapter::TransportAdapter {
  public:
-  MOCK_METHOD1(Init, int(resumption::LastState& last_state));
-  MOCK_METHOD0(Reinit, int());
-  MOCK_METHOD0(SearchDevices, int());
-  MOCK_METHOD1(ConnectDevice, int(const DeviceHandle));
-  MOCK_METHOD1(DisconnectDevice, int(const DeviceHandle));
-  MOCK_METHOD1(Disconnect, int(const ConnectionUID));
-  MOCK_METHOD1(DisconnectForce, int(const ConnectionUID));
-  MOCK_METHOD1(SendMessageToDevice,
-               int(const ::protocol_handler::RawMessagePtr));
-  MOCK_METHOD1(ReceiveEventFromDevice, int(const TransportAdapterEvent&));
-  MOCK_METHOD1(AddTransportAdapter, int(TransportAdapter* adapter));
-  MOCK_METHOD1(AddEventListener, int(TransportManagerListener* listener));
-  MOCK_METHOD0(Stop, int());
-  MOCK_METHOD1(RemoveDevice, int(const DeviceHandle));
-  MOCK_CONST_METHOD1(Visibility, int(const bool&));
-  MOCK_METHOD1(SetTelemetryObserver,
-               void(transport_manager::TMTelemetryObserver* observer));
+  MOCK_CONST_METHOD0(GetDeviceType,
+                     ::transport_manager::transport_adapter::DeviceType());
+  MOCK_CONST_METHOD0(GetConnectionType, ::transport_manager::ConnectionType());
+  MOCK_CONST_METHOD0(IsInitialised, bool());
+  MOCK_METHOD0(
+      Init, ::transport_manager::transport_adapter::TransportAdapter::Error());
+  MOCK_METHOD0(Terminate, void());
+  MOCK_METHOD1(
+      AddListener,
+      void(::transport_manager::transport_adapter::TransportAdapterListener*
+               listener));
+  MOCK_CONST_METHOD0(IsSearchDevicesSupported, bool());
+  MOCK_METHOD0(
+      SearchDevices,
+      ::transport_manager::transport_adapter::TransportAdapter::Error());
+  MOCK_CONST_METHOD0(IsServerOriginatedConnectSupported, bool());
+  MOCK_METHOD2(Connect,
+               ::transport_manager::transport_adapter::TransportAdapter::Error(
+                   const ::transport_manager::DeviceUID& device_handle,
+                   const ::transport_manager::ApplicationHandle& app_handle));
+  MOCK_METHOD1(ConnectDevice,
+               ::transport_manager::transport_adapter::TransportAdapter::Error(
+                   const ::transport_manager::DeviceUID& device_handle));
+  MOCK_METHOD2(RunAppOnDevice, void(const std::string&, const std::string&));
+  MOCK_CONST_METHOD0(IsClientOriginatedConnectSupported, bool());
+  MOCK_METHOD0(
+      StartClientListening,
+      ::transport_manager::transport_adapter::TransportAdapter::Error());
+  MOCK_METHOD0(
+      StopClientListening,
+      ::transport_manager::transport_adapter::TransportAdapter::Error());
+  MOCK_METHOD2(RemoveFinalizedConnection,
+               void(const ::transport_manager::DeviceUID& device_handle,
+                    const ::transport_manager::ApplicationHandle& app_handle));
+  MOCK_METHOD2(Disconnect,
+               ::transport_manager::transport_adapter::TransportAdapter::Error(
+                   const ::transport_manager::DeviceUID& device_handle,
+                   const ::transport_manager::ApplicationHandle& app_handle));
+  MOCK_METHOD1(DisconnectDevice,
+               Error(const ::transport_manager::DeviceUID& device_handle));
+  MOCK_METHOD3(SendData,
+               ::transport_manager::transport_adapter::TransportAdapter::Error(
+                   const ::transport_manager::DeviceUID& device_handle,
+                   const ::transport_manager::ApplicationHandle& app_handle,
+                   const protocol_handler::RawMessagePtr data));
+  MOCK_CONST_METHOD0(GetDeviceList, ::transport_manager::DeviceList());
+  MOCK_CONST_METHOD1(GetApplicationList,
+                     ::transport_manager::ApplicationList(
+                         const ::transport_manager::DeviceUID& device_handle));
+  MOCK_CONST_METHOD1(
+      DeviceName,
+      std::string(const ::transport_manager::DeviceUID& device_handle));
+
+#ifdef TELEMETRY_MONITOR
+  MOCK_METHOD0(GetTelemetryObserver,
+               ::transport_manager::TMTelemetryObserver*());
+#endif  // TELEMETRY_MONITOR
 };
 
 }  // namespace transport_manager_test
 }  // namespace components
 }  // namespace test
-#endif  // SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_H_
+
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_