Rename mock files to correct naming

Files renamed.
Duplicates deleted.

Related tasks APPLINK-30588 APPLINK-30974

1 files changed, 36 insertions, 35 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_