diff options
author | Kozoriz <kozorizandriy@gmail.com> | 2016-03-16 10:54:41 +0200 |
---|---|---|
committer | Kozoriz <kozorizandriy@gmail.com> | 2016-03-17 09:43:51 +0200 |
commit | 08503f46dd3b829fde82ff1408933f367191466a (patch) | |
tree | 8922f1d6dbbdee989dd57d471ee76f87f0852637 /src/components/telemetry_monitor | |
parent | 253f9a224e8e78182b3e5f26c422002a3b581c2c (diff) | |
download | sdl_core-08503f46dd3b829fde82ff1408933f367191466a.tar.gz |
Changes after review
Renamed h && cc file names in telemetry_monitor.
Corrected header-guards.
Corrected commented code in gmock.
Created TODO and tasks for them.
Diffstat (limited to 'src/components/telemetry_monitor')
17 files changed, 23 insertions, 23 deletions
diff --git a/src/components/telemetry_monitor/CMakeLists.txt b/src/components/telemetry_monitor/CMakeLists.txt index 8ce8d19f85..a70a6e18b7 100644 --- a/src/components/telemetry_monitor/CMakeLists.txt +++ b/src/components/telemetry_monitor/CMakeLists.txt @@ -55,9 +55,9 @@ set(SOURCES ${TELEMETRY_MONITOR_SRC_DIR}/application_manager_observer.cc ${TELEMETRY_MONITOR_SRC_DIR}/transport_manager_observer.cc ${TELEMETRY_MONITOR_SRC_DIR}/protocol_handler_observer.cc - ${TELEMETRY_MONITOR_SRC_DIR}/application_manager_metric.cc - ${TELEMETRY_MONITOR_SRC_DIR}/transport_manager_metric.cc - ${TELEMETRY_MONITOR_SRC_DIR}/protocol_handler_metric.cc + ${TELEMETRY_MONITOR_SRC_DIR}/application_manager_metric_wrapper.cc + ${TELEMETRY_MONITOR_SRC_DIR}/transport_manager_metric_wrapper.cc + ${TELEMETRY_MONITOR_SRC_DIR}/protocol_handler_metric_wrapper.cc ) add_library("TelemetryMonitor" ${SOURCES}) diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric.h b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric_wrapper.h index df568e7ebd..df568e7ebd 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric_wrapper.h diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h index 995aad1085..4f509075b4 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h @@ -35,7 +35,7 @@ #include "utils/message_queue.h" #include "application_manager/telemetry_observer.h" -#include "telemetry_monitor/application_manager_metric.h" +#include "telemetry_monitor/application_manager_metric_wrapper.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h b/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h index 66a0dc74f3..994065e0e3 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_MECTRIC_H_ -#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_MECTRIC_H_ +#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_MECTRIC_WRAPPER_H_ +#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_MECTRIC_WRAPPER_H_ #include <string> #include "utils/resource_usage.h" @@ -56,4 +56,4 @@ class MetricWrapper { } // namespace telemetry_monitor -#endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_MECTRIC_H_ +#endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_MECTRIC_WRAPPER_H_ diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric.h b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h index d3c27ba55b..b3485e6942 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_MECTRIC_H_ -#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_MECTRIC_H_ +#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_MECTRIC_WRAPPER_H_ +#define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_MECTRIC_WRAPPER_H_ #include <string> #include "utils/shared_ptr.h" @@ -47,4 +47,4 @@ class ProtocolHandlerMecticWrapper: public MetricWrapper { virtual Json::Value GetJsonMetric(); }; } // namespace telemetry_monitor -#endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_MECTRIC_H_ +#endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_MECTRIC_WRAPPER_H_ diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_metric.h b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_metric_wrapper.h index 1e6cb501bc..8057402f11 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_metric.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_metric_wrapper.h @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_MECTRIC_H_ +#ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_MECTRIC_WRAPPER_H_ #define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_MECTRIC_H_ #include <string> @@ -45,4 +45,4 @@ class TransportManagerMecticWrapper: public MetricWrapper { virtual Json::Value GetJsonMetric(); }; } // namespace telemetry_monitor -#endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_MECTRIC_H_ +#endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_MECTRIC_WRAPPER_H_ diff --git a/src/components/telemetry_monitor/src/application_manager_metric.cc b/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc index 0af9570c41..b693d9df22 100644 --- a/src/components/telemetry_monitor/src/application_manager_metric.cc +++ b/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "telemetry_monitor/application_manager_metric.h" +#include "telemetry_monitor/application_manager_metric_wrapper.h" #include "telemetry_monitor/json_keys.h" #include "application_manager/smart_object_keys.h" #include "utils/convert_utils.h" diff --git a/src/components/telemetry_monitor/src/application_manager_observer.cc b/src/components/telemetry_monitor/src/application_manager_observer.cc index 47570497cf..e3de439b96 100644 --- a/src/components/telemetry_monitor/src/application_manager_observer.cc +++ b/src/components/telemetry_monitor/src/application_manager_observer.cc @@ -32,7 +32,7 @@ #include "telemetry_monitor/application_manager_observer.h" #include "utils/shared_ptr.h" #include "telemetry_monitor/telemetry_monitor.h" -#include "telemetry_monitor/application_manager_metric.h" +#include "telemetry_monitor/application_manager_metric_wrapper.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/protocol_handler_metric.cc b/src/components/telemetry_monitor/src/protocol_handler_metric_wrapper.cc index 35beb3e1f7..335f0dbb29 100644 --- a/src/components/telemetry_monitor/src/protocol_handler_metric.cc +++ b/src/components/telemetry_monitor/src/protocol_handler_metric_wrapper.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "telemetry_monitor/protocol_handler_metric.h" +#include "telemetry_monitor/protocol_handler_metric_wrapper.h" #include "json/json.h" #include "telemetry_monitor/json_keys.h" diff --git a/src/components/telemetry_monitor/src/protocol_handler_observer.cc b/src/components/telemetry_monitor/src/protocol_handler_observer.cc index c65e20121f..69f4564fc1 100644 --- a/src/components/telemetry_monitor/src/protocol_handler_observer.cc +++ b/src/components/telemetry_monitor/src/protocol_handler_observer.cc @@ -32,7 +32,7 @@ #include "utils/date_time.h" #include "telemetry_monitor/protocol_handler_observer.h" -#include "telemetry_monitor/protocol_handler_metric.h" +#include "telemetry_monitor/protocol_handler_metric_wrapper.h" #include "telemetry_monitor/telemetry_monitor.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/transport_manager_metric.cc b/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc index 2e62a63797..a891aa1118 100644 --- a/src/components/telemetry_monitor/src/transport_manager_metric.cc +++ b/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "telemetry_monitor/transport_manager_metric.h" +#include "telemetry_monitor/transport_manager_metric_wrapper.h" #include "json/json.h" #include "telemetry_monitor/json_keys.h" #include "application_manager/smart_object_keys.h" diff --git a/src/components/telemetry_monitor/src/transport_manager_observer.cc b/src/components/telemetry_monitor/src/transport_manager_observer.cc index b74bc55b55..36f0e3c75a 100644 --- a/src/components/telemetry_monitor/src/transport_manager_observer.cc +++ b/src/components/telemetry_monitor/src/transport_manager_observer.cc @@ -33,7 +33,7 @@ #include <time.h> -#include "telemetry_monitor/transport_manager_metric.h" +#include "telemetry_monitor/transport_manager_metric_wrapper.h" #include "telemetry_monitor/telemetry_monitor.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/test/application_manager_metric_test.cc b/src/components/telemetry_monitor/test/application_manager_metric_test.cc index 0ec23ccda0..08cac32c65 100644 --- a/src/components/telemetry_monitor/test/application_manager_metric_test.cc +++ b/src/components/telemetry_monitor/test/application_manager_metric_test.cc @@ -34,7 +34,7 @@ #include "telemetry_monitor/json_keys.h" #include "utils/resource_usage.h" #include "application_manager/smart_object_keys.h" -#include "telemetry_monitor/application_manager_metric.h" +#include "telemetry_monitor/application_manager_metric_wrapper.h" namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/application_manager_observer_test.cc b/src/components/telemetry_monitor/test/application_manager_observer_test.cc index 9ca0850c15..4925544d09 100644 --- a/src/components/telemetry_monitor/test/application_manager_observer_test.cc +++ b/src/components/telemetry_monitor/test/application_manager_observer_test.cc @@ -33,7 +33,7 @@ #include "gtest/gtest.h" #include "telemetry_monitor/mock_telemetry_monitor.h" #include "application_manager/telemetry_observer.h" -#include "telemetry_monitor/application_manager_metric.h" +#include "telemetry_monitor/application_manager_metric_wrapper.h" #include "telemetry_monitor/application_manager_observer.h" #include "utils/shared_ptr.h" #include "telemetry_monitor/telemetry_monitor.h" diff --git a/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc b/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc index d74244a97f..b8114f5511 100644 --- a/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc +++ b/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc @@ -34,7 +34,7 @@ #include "telemetry_monitor/json_keys.h" #include "json/json.h" #include "utils/resource_usage.h" -#include "telemetry_monitor/protocol_handler_metric.h" +#include "telemetry_monitor/protocol_handler_metric_wrapper.h" #include "protocol_handler/telemetry_observer.h" namespace test { diff --git a/src/components/telemetry_monitor/test/transport_manager_metric_test.cc b/src/components/telemetry_monitor/test/transport_manager_metric_test.cc index 53d4ed1ba4..1219a9b1ab 100644 --- a/src/components/telemetry_monitor/test/transport_manager_metric_test.cc +++ b/src/components/telemetry_monitor/test/transport_manager_metric_test.cc @@ -34,7 +34,7 @@ #include "telemetry_monitor/json_keys.h" #include "json/json.h" #include "utils/resource_usage.h" -#include "telemetry_monitor/transport_manager_metric.h" +#include "telemetry_monitor/transport_manager_metric_wrapper.h" #include "protocol_handler/telemetry_observer.h" namespace test { diff --git a/src/components/telemetry_monitor/test/transport_manager_observer_test.cc b/src/components/telemetry_monitor/test/transport_manager_observer_test.cc index eba786ef70..71de55e47a 100644 --- a/src/components/telemetry_monitor/test/transport_manager_observer_test.cc +++ b/src/components/telemetry_monitor/test/transport_manager_observer_test.cc @@ -33,7 +33,7 @@ #include "gtest/gtest.h" #include "telemetry_monitor/mock_telemetry_monitor.h" #include "protocol_handler/telemetry_observer.h" -#include "telemetry_monitor/transport_manager_metric.h" +#include "telemetry_monitor/transport_manager_metric_wrapper.h" #include "telemetry_monitor/transport_manager_observer.h" namespace test { |