remove struct timeval and use boost time_duration instead

also cleans up date_time namespacing but maintains helper functions

2 files changed, 44 insertions, 43 deletions

diff --git a/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc b/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc
index cc7d3f5814..cd1e53ba96 100644
--- a/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc
+++ b/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc
@@ -97,14 +97,15 @@ class AppLaunchDataJsonTest : public ::testing::Test {
 
   void AddApplicationDataWithIncreaseTable(const ApplicationData& data);
   void AddApplicationDataWithoutIncreaseTable(const ApplicationData& data);
-  TimevalStruct GetApplicationData_EXPECT_TRUE(const ApplicationData& in_data,
-                                               ApplicationData& out_data);
+  date_time::TimeDuration GetApplicationData_EXPECT_TRUE(
+      const ApplicationData& in_data, ApplicationData& out_data);
   void GetApplicationData_EXPECT_FALSE(const ApplicationData& in_data);
   std::string AddCounter(const std::string& inp, int32_t val);
 
   std::auto_ptr<resumption::LastState> test_last_state_;
   std::auto_ptr<AppLaunchDataJson> res_json_;
-  void SetTimestamp(const ApplicationData& in_data, TimevalStruct& timestamp);
+  void SetTimestamp(const ApplicationData& in_data,
+                    date_time::TimeDuration& timestamp);
 };
 
 void AppLaunchDataJsonTest::AddApplicationDataWithIncreaseTable(
@@ -129,7 +130,7 @@ void AppLaunchDataJsonTest::AddApplicationDataWithoutIncreaseTable(
   EXPECT_EQ(sizeBeforeAdding, sizeAfterAdding);
 }
 
-TimevalStruct AppLaunchDataJsonTest::GetApplicationData_EXPECT_TRUE(
+date_time::TimeDuration AppLaunchDataJsonTest::GetApplicationData_EXPECT_TRUE(
     const ApplicationData& in_data, ApplicationData& out_data) {
   uint32_t sizeBeforeGetting = res_json()->GetCurentNumberOfAppData();
 
@@ -148,9 +149,9 @@ TimevalStruct AppLaunchDataJsonTest::GetApplicationData_EXPECT_TRUE(
   out_data.bundle_id_ =
       json_data_list[index][am::strings::bundle_id].asString();
   // time stamp
-  TimevalStruct tmVal = {0};
-  tmVal.tv_sec =
-      json_data_list[index][am::strings::app_launch_last_session].asUInt64();
+  date_time::TimeDuration tmVal = date_time::seconds(
+      json_data_list[index][am::strings::app_launch_last_session].asUInt64());
+
   return tmVal;
 }
 
@@ -168,7 +169,7 @@ void AppLaunchDataJsonTest::GetApplicationData_EXPECT_FALSE(
 }
 
 void AppLaunchDataJsonTest::SetTimestamp(const ApplicationData& in_data,
-                                         TimevalStruct& timestamp) {
+                                         date_time::TimeDuration& timestamp) {
   uint32_t sizeBeforeGetting = res_json()->GetCurentNumberOfAppData();
 
   int32_t index = NotFound;
@@ -183,7 +184,7 @@ void AppLaunchDataJsonTest::SetTimestamp(const ApplicationData& in_data,
   EXPECT_EQ(sizeBeforeGetting, sizeAfterGetting);
   // time stamp
   json_data_list[index][am::strings::app_launch_last_session] =
-      static_cast<Json::Value::UInt64>(timestamp.tv_sec);
+      static_cast<Json::Value::UInt64>(date_time::getSecs(timestamp));
 }
 
 std::string AppLaunchDataJsonTest::AddCounter(const std::string& inp,
@@ -225,18 +226,18 @@ TEST_F(AppLaunchDataJsonTest, RefreshTimestamp) {
   ApplicationData data("mobile_app_id", "bundle_id", "device_mac");
   AddApplicationDataWithIncreaseTable(data);
   ApplicationData recoveredData("", "", "");
-  TimevalStruct timestamp1 =
+  date_time::TimeDuration timestamp1 =
       GetApplicationData_EXPECT_TRUE(data, recoveredData);
-  TimevalStruct tm = {0, 0};
+  date_time::TimeDuration tm = date_time::TimeDurationZero();
   SetTimestamp(data, tm);
-  TimevalStruct timestamp2 =
+  date_time::TimeDuration timestamp2 =
       GetApplicationData_EXPECT_TRUE(data, recoveredData);
-  EXPECT_NE(timestamp1.tv_sec, timestamp2.tv_sec);
+  EXPECT_NE(date_time::getSecs(timestamp1), date_time::getSecs(timestamp2));
   AddApplicationDataWithoutIncreaseTable(data);  // again insert the same
-  TimevalStruct timestamp3 =
+  date_time::TimeDuration timestamp3 =
       GetApplicationData_EXPECT_TRUE(data, recoveredData);
   EXPECT_TRUE(data == recoveredData);
-  EXPECT_NE(timestamp2.tv_sec, timestamp3.tv_sec);
+  EXPECT_NE(date_time::getSecs(timestamp2), date_time::getSecs(timestamp3));
 }
 
 TEST_F(AppLaunchDataJsonTest, MaxCount) {
@@ -250,7 +251,7 @@ TEST_F(AppLaunchDataJsonTest, MaxCount) {
 
   // insert new time stamp
   ApplicationData changedRecord("mobile_app_id_0", "bundle_id_0", "device_mac");
-  TimevalStruct tm = {0, 0};
+  date_time::TimeDuration tm = date_time::TimeDurationZero();
   SetTimestamp(changedRecord, tm);
 
   uint32_t size_max = res_json()->GetCurentNumberOfAppData();
@@ -339,6 +340,6 @@ TEST_F(AppLaunchDataJsonTest, SelectMultipleData) {
   }
 }
 
-}  // namespace app_launch
+}  // namespace test_app_launch
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/request_info_test.cc b/src/components/application_manager/test/request_info_test.cc
index 11b2d2f259..8cef39d162 100644
--- a/src/components/application_manager/test/request_info_test.cc
+++ b/src/components/application_manager/test/request_info_test.cc
@@ -49,10 +49,10 @@ class TestRequestInfo : public request_info::RequestInfo {
  public:
   TestRequestInfo(request_info::RequestPtr request,
                   const RequestType requst_type,
-                  const TimevalStruct& start_time,
+                  const date_time::TimeDuration& start_time,
                   const uint64_t timeout_msec)
       : RequestInfo(request, requst_type, start_time, timeout_msec) {}
-  void SetEndTime(const TimevalStruct& end_time) {
+  void SetEndTime(const date_time::TimeDuration& end_time) {
     end_time_ = end_time;
   }
 };
@@ -80,7 +80,7 @@ class RequestInfoTest : public ::testing::Test {
       uint32_t connection_key,
       uint32_t correlation_id,
       request_info::RequestInfo::RequestType requst_type,
-      const TimevalStruct& start_time,
+      const date_time::TimeDuration& start_time,
       uint64_t timeout_msec) {
     utils::SharedPtr<MockRequest> mock_request =
         utils::MakeShared<MockRequest>(connection_key, correlation_id);
@@ -93,7 +93,7 @@ class RequestInfoTest : public ::testing::Test {
 
 TEST_F(RequestInfoTest, RequestInfoEqualEndTime) {
   std::vector<utils::SharedPtr<TestRequestInfo> > requests;
-  const TimevalStruct& time = date_time::DateTime::getCurrentTime();
+  const date_time::TimeDuration& time = date_time::getCurrentTime();
   for (uint32_t i = 0; i < count_of_requests_for_test_; ++i) {
     utils::SharedPtr<TestRequestInfo> request = CreateTestInfo(
         i, i, request_info::RequestInfo::MobileRequest, time, default_timeout_);
@@ -109,7 +109,7 @@ TEST_F(RequestInfoTest, AddRemoveHMIRequests) {
         CreateTestInfo(hmi_connection_key_,
                        i,
                        request_info::RequestInfo::HMIRequest,
-                       date_time::DateTime::getCurrentTime(),
+                       date_time::getCurrentTime(),
                        default_timeout_);
     EXPECT_TRUE(request_info_set_.Add(request));
     EXPECT_TRUE(request_info_set_.RemoveRequest(request));
@@ -127,7 +127,7 @@ TEST_F(RequestInfoTest, AddHMIRequests_RemoveAllRequests) {
         CreateTestInfo(hmi_connection_key_,
                        i,
                        request_info::RequestInfo::HMIRequest,
-                       date_time::DateTime::getCurrentTime(),
+                       date_time::getCurrentTime(),
                        default_timeout_);
     requests.push_back(request);
     EXPECT_TRUE(request_info_set_.Add(request));
@@ -159,14 +159,14 @@ TEST_F(RequestInfoTest, AddMobileRequests_RemoveMobileRequests) {
       CreateTestInfo(mobile_connection_key1_,
                      12345,
                      request_info::RequestInfo::MobileRequest,
-                     date_time::DateTime::getCurrentTime(),
+                     date_time::getCurrentTime(),
                      default_timeout_);
   EXPECT_TRUE(request_info_set_.Add(mobile_request1));
   utils::SharedPtr<TestRequestInfo> mobile_request2 =
       CreateTestInfo(mobile_connection_key2_,
                      54321,
                      request_info::RequestInfo::MobileRequest,
-                     date_time::DateTime::getCurrentTime(),
+                     date_time::getCurrentTime(),
                      default_timeout_);
   EXPECT_TRUE(request_info_set_.Add(mobile_request2));
   EXPECT_EQ(2u, request_info_set_.Size());
@@ -183,7 +183,7 @@ TEST_F(RequestInfoTest, AddMobileRequests_RemoveMobileRequestsByConnectionKey) {
         CreateTestInfo(mobile_connection_key1_,
                        i,
                        request_info::RequestInfo::MobileRequest,
-                       date_time::DateTime::getCurrentTime(),
+                       date_time::getCurrentTime(),
                        default_timeout_);
 
     requests.push_back(mobile_request1);
@@ -196,7 +196,7 @@ TEST_F(RequestInfoTest, AddMobileRequests_RemoveMobileRequestsByConnectionKey) {
         CreateTestInfo(mobile_connection_key2_,
                        i,
                        request_info::RequestInfo::MobileRequest,
-                       date_time::DateTime::getCurrentTime(),
+                       date_time::getCurrentTime(),
                        default_timeout_);
 
     requests.push_back(mobile_request2);
@@ -218,7 +218,7 @@ TEST_F(RequestInfoTest, RequestInfoSetFront) {
         CreateTestInfo(mobile_connection_key1_,
                        i,
                        request_info::RequestInfo::HMIRequest,
-                       date_time::DateTime::getCurrentTime(),
+                       date_time::getCurrentTime(),
                        i);
     request_info_set_.Add(request);
   }
@@ -252,7 +252,7 @@ TEST_F(RequestInfoTest, RequestInfoSetFind) {
         CreateTestInfo(req_it->first,
                        req_it->second,
                        request_info::RequestInfo::HMIRequest,
-                       date_time::DateTime::getCurrentTime(),
+                       date_time::getCurrentTime(),
                        10);
     EXPECT_TRUE(request_info_set_.Add(request));
   }
@@ -281,7 +281,7 @@ TEST_F(RequestInfoTest, RequestInfoSetEqualHash) {
       CreateTestInfo(connection_key,
                      corr_id,
                      request_info::RequestInfo::HMIRequest,
-                     date_time::DateTime::getCurrentTime(),
+                     date_time::getCurrentTime(),
                      10);
   EXPECT_TRUE(request_info_set.Add(request));
   EXPECT_FALSE(request_info_set.Add(request));
@@ -305,13 +305,13 @@ TEST_F(RequestInfoTest, RequestInfoSetEqualHash) {
 }
 
 TEST_F(RequestInfoTest, EndTimeisExpired) {
-  TimevalStruct time = date_time::DateTime::getCurrentTime();
+  date_time::TimeDuration time = date_time::getCurrentTime();
+  // get just the seconds part of the current time
+  date_time::TimeDuration not_expired = date_time::seconds(date_time::getSecs(date_time::getCurrentTime()));
+  not_expired+= date_time::microseconds(std::numeric_limits<time_t>::min());
 
-  TimevalStruct not_expired = date_time::DateTime::getCurrentTime();
-  not_expired.tv_usec = std::numeric_limits<time_t>::min();
-
-  TimevalStruct expired = date_time::DateTime::getCurrentTime();
-  expired.tv_usec = std::numeric_limits<time_t>::max();
+  date_time::TimeDuration expired = date_time::seconds(date_time::getSecs(date_time::getCurrentTime()));
+  expired += date_time::microseconds(std::numeric_limits<time_t>::max());
 
   utils::SharedPtr<TestRequestInfo> request =
       CreateTestInfo(mobile_connection_key1_,
@@ -328,7 +328,7 @@ TEST_F(RequestInfoTest, EndTimeisExpired) {
 }
 
 TEST_F(RequestInfoTest, UpdateEndTime) {
-  TimevalStruct time = date_time::DateTime::getCurrentTime();
+  date_time::TimeDuration time = date_time::getCurrentTime();
   utils::SharedPtr<TestRequestInfo> request =
       CreateTestInfo(mobile_connection_key1_,
                      mobile_correlation_id,
@@ -337,12 +337,12 @@ TEST_F(RequestInfoTest, UpdateEndTime) {
                      default_timeout_);
   request->SetEndTime(time);
   request->updateEndTime();
-  TimevalStruct last_time = request->end_time();
-  EXPECT_LE(time.tv_sec, last_time.tv_sec);
+  date_time::TimeDuration last_time = request->end_time();
+  EXPECT_LE(date_time::getSecs(time), date_time::getSecs(last_time));
 }
 
 TEST_F(RequestInfoTest, UpdateTimeOut) {
-  TimevalStruct time = date_time::DateTime::getCurrentTime();
+  date_time::TimeDuration time = date_time::getCurrentTime();
   utils::SharedPtr<TestRequestInfo> request =
       CreateTestInfo(mobile_connection_key1_,
                      mobile_correlation_id,
@@ -353,9 +353,9 @@ TEST_F(RequestInfoTest, UpdateTimeOut) {
   request->updateEndTime();
 
   request->updateTimeOut(100);
-  time = date_time::DateTime::getCurrentTime();
-  TimevalStruct last_time = request->end_time();
-  EXPECT_NEAR(time.tv_sec + 100, last_time.tv_sec, 500);
+  time = date_time::getCurrentTime();
+  date_time::TimeDuration last_time = request->end_time();
+  EXPECT_NEAR(date_time::getSecs(time) + 100, date_time::getSecs(last_time), 500);
 }
 
 }  // namespace application_manager_test