diff options
author | JackLivio <jack@livio.io> | 2018-10-19 15:05:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-19 15:05:09 -0400 |
commit | d36316738785c96dab2ee892762ed08c059fffde (patch) | |
tree | 168a7c0705b5bc8f0dee7ce4b511ccf71759d9b4 /src/components/telemetry_monitor/test/protocol_handler_metric_test.cc | |
parent | 7f7fcbb998fb17f2954fd103349af67ea9b71a3f (diff) | |
parent | 83c5e805346d55ec7fb9f4ba8b6f6855d992273e (diff) | |
download | sdl_core-hotfix/templates_updates.tar.gz |
Merge pull request #2572 from smartdevicelink/release/5.0.05.0.0hotfix/templates_updatesfeature/show_app_menufeature/progress_bar_seekfeature/open-menu-rpcfeature/open-menu-rfeature/button
Release 5.0.0
Diffstat (limited to 'src/components/telemetry_monitor/test/protocol_handler_metric_test.cc')
-rw-r--r-- | src/components/telemetry_monitor/test/protocol_handler_metric_test.cc | 34 |
1 files changed, 12 insertions, 22 deletions
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 8253cf2553..c9130411e7 100644 --- a/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc +++ b/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc @@ -51,15 +51,12 @@ TEST(ProtocolHandlerMetricTest, grabResources) { TEST(ProtocolHandlerMetricTest, GetJsonMetric) { ProtocolHandlerMecticWrapper 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 = - new protocol_handler::PHTelemetryObserver::MessageMetric(); + std::make_shared<protocol_handler::PHTelemetryObserver::MessageMetric>(); metric_test.message_metric->begin = start_time; metric_test.message_metric->end = end_time; metric_test.message_metric->message_id = 5; @@ -71,10 +68,8 @@ TEST(ProtocolHandlerMetricTest, GetJsonMetric) { EXPECT_EQ("null\n", jvalue[strings::utime].toStyledString()); EXPECT_EQ("null\n", jvalue[strings::memory].toStyledString()); - EXPECT_EQ(date_time::DateTime::getuSecs(start_time), - jvalue[strings::begin].asInt64()); - EXPECT_EQ(date_time::DateTime::getuSecs(end_time), - jvalue[strings::end].asInt64()); + EXPECT_EQ(date_time::getuSecs(start_time), jvalue[strings::begin].asInt64()); + EXPECT_EQ(date_time::getuSecs(end_time), jvalue[strings::end].asInt64()); EXPECT_EQ(5, jvalue[strings::message_id].asInt64()); EXPECT_EQ(2, jvalue[strings::connection_key].asInt()); } @@ -85,15 +80,12 @@ TEST(ProtocolHandlerMetricTest, GetJsonMetricWithGrabResources) { EXPECT_TRUE(resources != NULL); 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); + + 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 = - new protocol_handler::PHTelemetryObserver::MessageMetric(); + std::make_shared<protocol_handler::PHTelemetryObserver::MessageMetric>(); metric_test.message_metric->begin = start_time; metric_test.message_metric->end = end_time; metric_test.message_metric->message_id = 5; @@ -107,10 +99,8 @@ TEST(ProtocolHandlerMetricTest, GetJsonMetricWithGrabResources) { EXPECT_NE("null/n", jvalue[strings::utime].toStyledString()); EXPECT_NE("null/n", jvalue[strings::memory].toStyledString()); - EXPECT_EQ(date_time::DateTime::getuSecs(start_time), - jvalue[strings::begin].asInt64()); - EXPECT_EQ(date_time::DateTime::getuSecs(end_time), - jvalue[strings::end].asInt64()); + EXPECT_EQ(date_time::getuSecs(start_time), jvalue[strings::begin].asInt64()); + EXPECT_EQ(date_time::getuSecs(end_time), jvalue[strings::end].asInt64()); EXPECT_EQ(5, jvalue[strings::message_id].asInt64()); EXPECT_EQ(2, jvalue[strings::connection_key].asInt()); |