TimeTester refatctoring.

	Removed singletone using from TimeTester.
	TimeTester renamed -> TelemetryMonitor.
	All files and directories corrected.
	Tests corrected, all works.
	Disabled 2 tests(task created).

	Related to : APPLINK-21915

11 files changed, 89 insertions, 83 deletions

diff --git a/src/components/transport_manager/include/transport_manager/time_metric_observer.h b/src/components/transport_manager/include/transport_manager/telemetry_observer.h
index ce59a9b4c4..8fe98a1553 100644
--- a/src/components/transport_manager/include/transport_manager/time_metric_observer.h
+++ b/src/components/transport_manager/include/transport_manager/telemetry_observer.h
@@ -39,7 +39,7 @@
 
 namespace transport_manager {
 
-class TMMetricObserver {
+class TMTelemetryObserver {
  public:
   struct MessageMetric {
     TimevalStruct begin;
@@ -49,7 +49,7 @@ class TMMetricObserver {
   virtual void StartRawMsg(const protocol_handler::RawMessage* ptr) = 0;
   virtual void StopRawMsg(const protocol_handler::RawMessage* ptr) = 0;
 
-  virtual ~TMMetricObserver(){}
+  virtual ~TMTelemetryObserver(){}
 };
 }  // transport_manager
 #endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TIME_METRIC_OBSERVER_H_
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
index b51db9e3a5..0cf28f7a16 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
@@ -46,9 +46,9 @@
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
 #include "transport_manager/transport_adapter/connection.h"
 
-#ifdef TIME_TESTER
-#include "transport_manager/time_metric_observer.h"
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+#include "transport_manager/telemetry_observer.h"
+#endif  // TELEMETRY_MONITOR
 
 namespace transport_manager {
 
@@ -398,21 +398,21 @@ class TransportAdapterImpl : public TransportAdapter,
    */
   virtual std::string GetConnectionType() const;
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   /**
    * @brief Setup observer for time metric.
    *
    * @param observer - pointer to observer
    */
-  void SetTimeMetricObserver(TMMetricObserver* observer);
+  void SetTelemetryObserver(TMTelemetryObserver* observer);
 
   /**
    * @brief Return Time metric observer
    *
    * @param return pointer to Time metric observer
    */
-  virtual TMMetricObserver* GetTimeMetricObserver();
-#endif  // TIME_TESTER
+  virtual TMTelemetryObserver* GetTelemetryObserver();
+#endif  // TELEMETRY_MONITOR
 
  protected:
   /**
@@ -529,12 +529,12 @@ class TransportAdapterImpl : public TransportAdapter,
   mutable sync_primitives::RWLock connections_lock_;
 
  protected:
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   /**
    * @brief Pointer to time metric observer
    */
-  TMMetricObserver* metric_observer_;
-#endif  // TIME_TESTER
+  TMTelemetryObserver* metric_observer_;
+#endif  // TELEMETRY_MONITOR
 
   /**
    * @brief Pointer to the device scanner.
diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
index 3a10a8d00f..7d0e2b177d 100644
--- a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
@@ -48,11 +48,12 @@
 #include "transport_manager/transport_manager_listener.h"
 #include "transport_manager/transport_adapter/transport_adapter_listener_impl.h"
 #include "protocol/common.h"
-#ifdef TIME_TESTER
-#include "transport_manager/time_metric_observer.h"
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+#include "transport_manager/telemetry_observer.h"
+#endif  // TELEMETRY_MONITOR
 #include "utils/threads/message_loop_thread.h"
 #include "transport_manager/transport_adapter/transport_adapter_event.h"
+#include "telemetry_monitor/telemetry_observable.h"
 
 namespace transport_manager {
 
@@ -65,9 +66,14 @@ typedef utils::SharedPtr<timer::Timer> TimerSPtr;
 /**
  * @brief Implementation of transport manager.s
  */
-class TransportManagerImpl : public TransportManager,
-                             public RawMessageLoopThread::Handler,
-                             public TransportAdapterEventLoopThread::Handler {
+class TransportManagerImpl
+    : public TransportManager,
+      public RawMessageLoopThread::Handler
+#ifdef TELEMETRY_MONITOR
+      ,
+      public telemetry_monitor::TelemetryObservable<TMTelemetryObserver>
+#endif  // TELEMETRY_MONITOR
+      , public TransportAdapterEventLoopThread::Handler {
  public:
   struct Connection {
     ConnectionUID id;
@@ -219,14 +225,14 @@ class TransportManagerImpl : public TransportManager,
    */
   void UpdateDeviceList(TransportAdapter* ta);
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   /**
    * @brief Setup observer for time metric.
    *
    * @param observer - pointer to observer
    */
-  void SetTimeMetricObserver(TMMetricObserver* observer);
-#endif  // TIME_TESTER
+  void SetTelemetryObserver(TMTelemetryObserver* observer);
+#endif  // TELEMETRY_MONITOR
 
 
   /**
@@ -272,9 +278,9 @@ class TransportManagerImpl : public TransportManager,
    */
   bool is_initialized_;
 
-#ifdef TIME_TESTER
-  TMMetricObserver* metric_observer_;
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+  TMTelemetryObserver* metric_observer_;
+#endif  // TELEMETRY_MONITOR
 
  private:
   /**
diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
index 84b6166489..2ae8776a3e 100644
--- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
+++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
@@ -65,9 +65,9 @@ TransportAdapterImpl::TransportAdapterImpl(
     devices_mutex_(),
     connections_(),
     connections_lock_(),
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
     metric_observer_(NULL),
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
     device_scanner_(device_scanner),
     server_connection_factory_(server_connection_factory),
     client_connection_listener_(client_connection_listener) {
@@ -589,11 +589,11 @@ void TransportAdapterImpl::DataReceiveDone(const DeviceUID& device_id,
   LOG4CXX_TRACE(logger_, "enter. device_id: " << &device_id << ", app_handle: " <<
                 &app_handle << ", message: " << message);
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
     metric_observer_->StartRawMsg(message.get());
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
   for (TransportAdapterListenerList::iterator it = listeners_.begin();
        it != listeners_.end(); ++it) {
@@ -773,17 +773,17 @@ std::string TransportAdapterImpl::GetConnectionType() const {
   return devicesType[GetDeviceType()];
 }
 
-#ifdef TIME_TESTER
-void TransportAdapterImpl::SetTimeMetricObserver(TMMetricObserver* observer) {
+#ifdef TELEMETRY_MONITOR
+void TransportAdapterImpl::SetTelemetryObserver(TMTelemetryObserver* observer) {
   metric_observer_ = observer;
 }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
-#ifdef TIME_TESTER
-TMMetricObserver* TransportAdapterImpl::GetTimeMetricObserver() {
+#ifdef TELEMETRY_MONITOR
+TMTelemetryObserver* TransportAdapterImpl::GetTelemetryObserver() {
   return metric_observer_;
 }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
 void TransportAdapterImpl::Store() const {
 }
diff --git a/src/components/transport_manager/src/transport_manager_default.cc b/src/components/transport_manager/src/transport_manager_default.cc
index 835c2c17ed..41e43a1aff 100644
--- a/src/components/transport_manager/src/transport_manager_default.cc
+++ b/src/components/transport_manager/src/transport_manager_default.cc
@@ -64,32 +64,32 @@ int TransportManagerDefault::Init() {
 
   ta = new transport_adapter::BluetoothTransportAdapter;
 
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
-    ta->SetTimeMetricObserver(metric_observer_);
+    ta->SetTelemetryObserver(metric_observer_);
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
   AddTransportAdapter(ta);
 #endif
 
 
   uint16_t port = profile::Profile::instance()->transport_manager_tcp_adapter_port();
   ta = new transport_adapter::TcpTransportAdapter(port);
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
-    ta->SetTimeMetricObserver(metric_observer_);
+    ta->SetTelemetryObserver(metric_observer_);
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
   AddTransportAdapter(ta);
 
 
 #if defined(USB_SUPPORT)
   ta = new transport_adapter::UsbAoaAdapter();
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
-    ta->SetTimeMetricObserver(metric_observer_);
+    ta->SetTelemetryObserver(metric_observer_);
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
   AddTransportAdapter(ta);
 #endif  // USB_SUPPORT
 
diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc
index 0745e55583..cbae02d4b3 100644
--- a/src/components/transport_manager/src/transport_manager_impl.cc
+++ b/src/components/transport_manager/src/transport_manager_impl.cc
@@ -72,9 +72,9 @@ TransportManagerImpl::Connection TransportManagerImpl::convert(
 
 TransportManagerImpl::TransportManagerImpl()
   : is_initialized_(false),
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
     metric_observer_(NULL),
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
     connection_id_counter_(0),
     message_queue_("TM MessageQueue", this),
     event_queue_("TM EventQueue", this) {
@@ -304,11 +304,11 @@ int TransportManagerImpl::SendMessageToDevice(const ::protocol_handler::RawMessa
     return E_CONNECTION_IS_TO_SHUTDOWN;
   }
   }
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
     metric_observer_->StartRawMsg(message.get());
   }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
   this->PostMessage(message);
   LOG4CXX_TRACE(logger_, "exit with E_SUCCESS");
   return E_SUCCESS;
@@ -679,11 +679,11 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) {
       break;
     }
     case TransportAdapterListenerImpl::EventTypeEnum::ON_SEND_DONE: {
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
       if (metric_observer_) {
         metric_observer_->StopRawMsg(event.event_data.get());
       }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
       sync_primitives::AutoReadLock lock(connections_lock_);
       ConnectionInternal* connection =
           GetConnection(event.device_uid, event.application_id);
@@ -705,11 +705,11 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) {
       break;
     }
     case TransportAdapterListenerImpl::EventTypeEnum::ON_SEND_FAIL: {
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
       if (metric_observer_) {
         metric_observer_->StopRawMsg(event.event_data.get());
       }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
       {
       sync_primitives::AutoReadLock lock(connections_lock_);
       ConnectionInternal* connection =
@@ -752,11 +752,11 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) {
       }
       event.event_data->set_connection_key(connection->id);
       }
-#ifdef TIME_TESTER
+#ifdef TELEMETRY_MONITOR
       if (metric_observer_) {
         metric_observer_->StopRawMsg(event.event_data.get());
       }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
       RaiseEvent(&TransportManagerListener::OnTMMessageReceived, event.event_data);
       LOG4CXX_DEBUG(logger_, "event_type = ON_RECEIVED_DONE");
       break;
@@ -808,11 +808,11 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) {
   LOG4CXX_TRACE(logger_, "exit");
 }
 
-#ifdef TIME_TESTER
-void TransportManagerImpl::SetTimeMetricObserver(TMMetricObserver* observer) {
+#ifdef TELEMETRY_MONITOR
+void TransportManagerImpl::SetTelemetryObserver(TMTelemetryObserver* observer) {
   metric_observer_ = observer;
 }
-#endif  // TIME_TESTER
+#endif  // TELEMETRY_MONITOR
 
 void TransportManagerImpl::Handle(::protocol_handler::RawMessagePtr msg) {
   LOG4CXX_TRACE(logger_, "enter");
diff --git a/src/components/transport_manager/test/CMakeLists.txt b/src/components/transport_manager/test/CMakeLists.txt
index 5a149f3063..251877cfd4 100644
--- a/src/components/transport_manager/test/CMakeLists.txt
+++ b/src/components/transport_manager/test/CMakeLists.txt
@@ -32,12 +32,12 @@ if(BUILD_TESTS)
 set(TM_TEST_DIR ${COMPONENTS_DIR}/transport_manager/test)
 
 include_directories(
+  include
   ${LOG4CXX_INCLUDE_DIRECTORY}
   ${GMOCK_INCLUDE_DIRECTORY}
   ${COMPONENTS_DIR}/smart_objects/include
   ${COMPONENTS_DIR}/transport_manager/include
   ${COMPONENTS_DIR}/utils/include
-  ${COMPONENTS_DIR}/include
   ${COMPONENTS_DIR}/connection_handler/include
   ${JSONCPP_INCLUDE_DIRECTORY}
   ${CMAKE_BINARY_DIR}
diff --git a/src/components/transport_manager/test/include/time_metric_observer_mock.h b/src/components/transport_manager/test/include/mock_telemetry_observer.h
index 5936f8c655..e2c41f658e 100644
--- a/src/components/transport_manager/test/include/time_metric_observer_mock.h
+++ b/src/components/transport_manager/test/include/mock_telemetry_observer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Ford Motor Company
+ * Copyright (c) 2014, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,26 +30,26 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TIME_METRIC_OBSERVER_MOCK_H_
-#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TIME_METRIC_OBSERVER_MOCK_H_
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TEST_MOCK_TELEMETRY_OBSERVER_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TEST_MOCK_TELEMETRY_OBSERVER_H_
 
-#include <string>
 #include "gmock/gmock.h"
-#include "transport_manager/time_metric_observer.h"
-#include "protocol/raw_message.h"
+#include "transport_manager/telemetry_observer.h"
 
 namespace test {
 namespace components {
 namespace transport_manager_test {
 
-class TMMetricObserverMock: public ::transport_manager::TMMetricObserver {
+class MockTMTelemetryObserver
+    : public ::transport_manager::TMTelemetryObserver {
  public:
   MOCK_METHOD1(StartRawMsg,
-               void(const protocol_handler::RawMessage* ptr));
+      void(const protocol_handler::RawMessage* ptr));
   MOCK_METHOD1(StopRawMsg,
-               void(const protocol_handler::RawMessage* ptr));
+      void(const protocol_handler::RawMessage* ptr));
 };
-}  // namespace transport_manager_test
-}  // namespace components
-}  // namespace test
-#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TIME_METRIC_OBSERVER_MOCK_H_
+
+}  // transport_manager_test
+}  // components
+}  // test
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TEST_MOCK_TELEMETRY_OBSERVER_H_
diff --git a/src/components/transport_manager/test/include/transport_adapter_mock.h b/src/components/transport_manager/test/include/transport_adapter_mock.h
index 86e044d13b..599cec29df 100644
--- a/src/components/transport_manager/test/include/transport_adapter_mock.h
+++ b/src/components/transport_manager/test/include/transport_adapter_mock.h
@@ -92,9 +92,9 @@ class TransportAdapterMock
       DeviceName,
       std::string(const ::transport_manager::DeviceUID& device_handle));
 
-#ifdef TIME_TESTER
-  MOCK_METHOD0(GetTimeMetricObserver, ::transport_manager::TMMetricObserver*());
-#endif  // TIME_TESTER
+#ifdef TELEMETRY_MONITOR
+  MOCK_METHOD0(GetTelemetryObserver, ::transport_manager::TMTelemetryObserver*());
+#endif  // TELEMETRY_MONITOR
 };
 
 }  // namespace transport_manager_test
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 c5cca9ea2d..918304772a 100644
--- a/src/components/transport_manager/test/transport_adapter_listener_test.cc
+++ b/src/components/transport_manager/test/transport_adapter_listener_test.cc
@@ -52,7 +52,7 @@ class TransportAdapterListenerTest : public ::testing::Test {
  protected:
   const int app_handle;
   const std::string dev_id;
-  TransportManagerMock tr_mock;
+  MockTransportManager tr_mock;
   TransportAdapterMock adapter_mock;
   TransportAdapterListenerImpl transport_listener;
 };
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 bf30f92675..fea2cf3c0a 100644
--- a/src/components/transport_manager/test/transport_manager_impl_test.cc
+++ b/src/components/transport_manager/test/transport_manager_impl_test.cc
@@ -38,7 +38,7 @@
 #include "include/transport_adapter_mock.h"
 #include "include/transport_manager_listener_mock.h"
 #include "include/transport_adapter_listener_mock.h"
-#include "include/time_metric_observer_mock.h"
+#include "include/mock_telemetry_observer.h"
 
 #include "transport_manager/transport_adapter/transport_adapter_event.h"
 
@@ -442,8 +442,8 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice_SendingFailed) {
   // Arrange
   HandleConnection();
 
-  TMMetricObserverMock* mock_metric_observer = new TMMetricObserverMock();
-  tm.SetTimeMetricObserver(mock_metric_observer);
+  MockTMTelemetryObserver* mock_metric_observer = new MockTMTelemetryObserver();
+  tm.SetTelemetryObserver(mock_metric_observer);
   EXPECT_CALL(*mock_metric_observer, StartRawMsg(_));
 
   EXPECT_CALL(*mock_adapter,
@@ -463,8 +463,8 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice_StartTimeObserver) {
   // Arrange
   HandleConnection();
 
-  TMMetricObserverMock* mock_metric_observer = new TMMetricObserverMock();
-  tm.SetTimeMetricObserver(mock_metric_observer);
+  MockTMTelemetryObserver* mock_metric_observer = new MockTMTelemetryObserver();
+  tm.SetTelemetryObserver(mock_metric_observer);
   EXPECT_CALL(*mock_adapter,
               SendData(mac_address_, application_id, test_message_))
       .WillOnce(Return(TransportAdapter::OK));
@@ -479,8 +479,8 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice_SendDone) {
   // Arrange
   HandleConnection();
 
-  TMMetricObserverMock* mock_metric_observer = new TMMetricObserverMock();
-  tm.SetTimeMetricObserver(mock_metric_observer);
+  MockTMTelemetryObserver* mock_metric_observer = new MockTMTelemetryObserver();
+  tm.SetTelemetryObserver(mock_metric_observer);
   EXPECT_CALL(*mock_adapter,
               SendData(mac_address_, application_id, test_message_))
       .WillOnce(Return(TransportAdapter::OK));
@@ -499,8 +499,8 @@ TEST_F(TransportManagerImplTest, SendMessageFailed_GetHandleSendFailed) {
   // Arrange
   HandleConnection();
 
-  TMMetricObserverMock* mock_metric_observer = new TMMetricObserverMock();
-  tm.SetTimeMetricObserver(mock_metric_observer);
+  MockTMTelemetryObserver* mock_metric_observer = new MockTMTelemetryObserver();
+  tm.SetTelemetryObserver(mock_metric_observer);
   EXPECT_CALL(*mock_metric_observer, StartRawMsg(_));
 
   EXPECT_CALL(*mock_adapter,