diff options
Diffstat (limited to 'src/components/telemetry_monitor/test/application_manager_metric_test.cc')
-rw-r--r-- | src/components/telemetry_monitor/test/application_manager_metric_test.cc | 29 |
1 files changed, 11 insertions, 18 deletions
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 c3f0c26cde..01eb915326 100644 --- a/src/components/telemetry_monitor/test/application_manager_metric_test.cc +++ b/src/components/telemetry_monitor/test/application_manager_metric_test.cc @@ -50,13 +50,10 @@ TEST(ApplicationManagerMetricWrapper, grabResources) { TEST(ApplicationManagerMetricWrapper, GetJsonMetric) { ApplicationManagerMetricWrapper metric_test; - TimevalStruct start_time; - start_time.tv_sec = 1; - start_time.tv_usec = 0; + date_time::TimeDuration start_time = date_time::seconds(1); + + date_time::TimeDuration end_time = date_time::seconds(10); - TimevalStruct end_time; - end_time.tv_sec = 10; - end_time.tv_usec = 0; metric_test.message_metric = std::make_shared< application_manager::AMTelemetryObserver::MessageMetric>(); metric_test.message_metric->begin = start_time; @@ -75,9 +72,9 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetric) { EXPECT_EQ("null\n", jvalue[telemetry_monitor::strings::memory].toStyledString()); - EXPECT_EQ(date_time::DateTime::getuSecs(start_time), + EXPECT_EQ(date_time::getuSecs(start_time), jvalue[telemetry_monitor::strings::begin].asInt64()); - EXPECT_EQ(date_time::DateTime::getuSecs(end_time), + EXPECT_EQ(date_time::getuSecs(end_time), jvalue[telemetry_monitor::strings::end].asInt64()); EXPECT_EQ(obj["params"][application_manager::strings::correlation_id].asInt(), jvalue[telemetry_monitor::strings::correlation_id].asInt64()); @@ -90,13 +87,9 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetricWithGrabResources) { utils::ResourseUsage* resources = utils::Resources::getCurrentResourseUsage(); EXPECT_TRUE(metric_test.grabResources()); - TimevalStruct start_time; - start_time.tv_sec = 1; - start_time.tv_usec = 0; + date_time::TimeDuration start_time = date_time::seconds(1); - TimevalStruct end_time; - end_time.tv_sec = 10; - end_time.tv_usec = 0; + date_time::TimeDuration end_time = date_time::seconds(10); metric_test.message_metric = std::make_shared< application_manager::AMTelemetryObserver::MessageMetric>(); @@ -109,18 +102,18 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetricWithGrabResources) { std::make_shared<NsSmartDeviceLink::NsSmartObjects::SmartObject>(obj); Json::Value jvalue = metric_test.GetJsonMetric(); - EXPECT_EQ(date_time::DateTime::getuSecs(start_time), + EXPECT_EQ(date_time::getuSecs(start_time), jvalue[telemetry_monitor::strings::begin].asInt64()); - EXPECT_EQ(date_time::DateTime::getuSecs(end_time), + EXPECT_EQ(date_time::getuSecs(end_time), jvalue[telemetry_monitor::strings::end].asInt64()); EXPECT_EQ(obj["params"][application_manager::strings::correlation_id].asInt(), jvalue[telemetry_monitor::strings::correlation_id].asInt64()); EXPECT_EQ(obj["params"][application_manager::strings::connection_key].asInt(), jvalue[telemetry_monitor::strings::connection_key].asInt()); - EXPECT_EQ(date_time::DateTime::getuSecs(start_time), + EXPECT_EQ(date_time::getuSecs(start_time), jvalue[telemetry_monitor::strings::begin].asInt64()); - EXPECT_EQ(date_time::DateTime::getuSecs(end_time), + EXPECT_EQ(date_time::getuSecs(end_time), jvalue[telemetry_monitor::strings::end].asInt64()); EXPECT_NEAR( |