diff options
Diffstat (limited to 'src/components/application_manager')
14 files changed, 107 insertions, 106 deletions
diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h index e033570435..42eba1a64e 100644 --- a/src/components/application_manager/include/application_manager/application_impl.h +++ b/src/components/application_manager/include/application_manager/application_impl.h @@ -503,7 +503,7 @@ class ApplicationImpl : public virtual Application, /** * @brief Defines number per time in seconds limits */ - typedef std::pair<TimevalStruct, uint32_t> TimeToNumberLimit; + typedef std::pair<date_time::TimeDuration, uint32_t> TimeToNumberLimit; /** * @brief Defines specific command number per time in seconds limits diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index 30816e0ffa..89a2de96f5 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -1576,7 +1576,7 @@ class ApplicationManagerImpl * @brief Map contains applications which * will send TTS global properties to HMI after timeout */ - std::map<uint32_t, TimevalStruct> tts_global_properties_app_list_; + std::map<uint32_t, date_time::TimeDuration> tts_global_properties_app_list_; bool audio_pass_thru_active_; uint32_t audio_pass_thru_app_id_; diff --git a/src/components/application_manager/include/application_manager/request_info.h b/src/components/application_manager/include/application_manager/request_info.h index 5ebcac71f8..e284e5f618 100644 --- a/src/components/application_manager/include/application_manager/request_info.h +++ b/src/components/application_manager/include/application_manager/request_info.h @@ -62,7 +62,7 @@ struct RequestInfo { , app_id_(0) , requst_type_(RequestNone) , correlation_id_(0) { - start_time_ = date_time::DateTime::getCurrentTime(); + start_time_ = date_time::getCurrentTime(); updateEndTime(); } virtual ~RequestInfo() {} @@ -71,14 +71,14 @@ struct RequestInfo { const RequestType requst_type, const uint64_t timeout_msec) : request_(request), timeout_msec_(timeout_msec), correlation_id_(0) { - start_time_ = date_time::DateTime::getCurrentTime(); + start_time_ = date_time::getCurrentTime(); updateEndTime(); requst_type_ = requst_type; } RequestInfo(RequestPtr request, const RequestType requst_type, - const TimevalStruct& start_time, + const date_time::TimeDuration& start_time, const uint64_t timeout_msec); void updateEndTime(); @@ -87,11 +87,11 @@ struct RequestInfo { bool isExpired(); - TimevalStruct start_time() { + date_time::TimeDuration start_time() { return start_time_; } - void update_start_time(TimevalStruct start_time) { + void update_start_time(date_time::TimeDuration start_time) { start_time_ = start_time; } @@ -103,7 +103,7 @@ struct RequestInfo { timeout_msec_ = timeout; } - TimevalStruct end_time() { + date_time::TimeDuration end_time() { return end_time_; } @@ -128,9 +128,9 @@ struct RequestInfo { protected: RequestPtr request_; - TimevalStruct start_time_; + date_time::TimeDuration start_time_; uint64_t timeout_msec_; - TimevalStruct end_time_; + date_time::TimeDuration end_time_; uint32_t app_id_; RequestType requst_type_; uint32_t correlation_id_; @@ -141,14 +141,14 @@ typedef utils::SharedPtr<RequestInfo> RequestInfoPtr; struct MobileRequestInfo : public RequestInfo { MobileRequestInfo(RequestPtr request, const uint64_t timeout_msec); MobileRequestInfo(RequestPtr request, - const TimevalStruct& start_time, + const date_time::TimeDuration& start_time, const uint64_t timeout_msec); }; struct HMIRequestInfo : public RequestInfo { HMIRequestInfo(RequestPtr request, const uint64_t timeout_msec); HMIRequestInfo(RequestPtr request, - const TimevalStruct& start_time, + const date_time::TimeDuration& start_time, const uint64_t timeout_msec); }; @@ -270,8 +270,8 @@ class RequestInfoSet { * during time scale */ struct TimeScale { - TimeScale(const TimevalStruct& start, - const TimevalStruct& end, + TimeScale(const date_time::TimeDuration& start, + const date_time::TimeDuration& end, const uint32_t& app_id) : start_(start), end_(end), app_id_(app_id) {} @@ -292,8 +292,8 @@ struct TimeScale { } private: - TimevalStruct start_; - TimevalStruct end_; + date_time::TimeDuration start_; + date_time::TimeDuration end_; uint32_t app_id_; }; diff --git a/src/components/application_manager/include/application_manager/request_tracker.h b/src/components/application_manager/include/application_manager/request_tracker.h index 36ab3eaefb..b351e716a7 100644 --- a/src/components/application_manager/include/application_manager/request_tracker.h +++ b/src/components/application_manager/include/application_manager/request_tracker.h @@ -85,7 +85,7 @@ class RequestTracker { const mobile_apis::HMILevel::eType level); private: - typedef std::vector<TimevalStruct> RequestAddedAt; + typedef std::vector<date_time::TimeDuration> RequestAddedAt; typedef std::map<ApplicationID, RequestAddedAt> ApplicationsRequestsTracker; /** diff --git a/src/components/application_manager/include/application_manager/telemetry_observer.h b/src/components/application_manager/include/application_manager/telemetry_observer.h index 20b3aaca5a..d8fab87c40 100644 --- a/src/components/application_manager/include/application_manager/telemetry_observer.h +++ b/src/components/application_manager/include/application_manager/telemetry_observer.h @@ -44,8 +44,8 @@ namespace application_manager { class AMTelemetryObserver { public: struct MessageMetric { - TimevalStruct begin; - TimevalStruct end; + date_time::TimeDuration begin; + date_time::TimeDuration end; utils::SharedPtr<smart_objects::SmartObject> message; }; typedef utils::SharedPtr<MessageMetric> MessageMetricSharedPtr; diff --git a/src/components/application_manager/src/app_launch/app_launch_data_json.cc b/src/components/application_manager/src/app_launch/app_launch_data_json.cc index 7599dcccb3..cc01e4908f 100644 --- a/src/components/application_manager/src/app_launch/app_launch_data_json.cc +++ b/src/components/application_manager/src/app_launch/app_launch_data_json.cc @@ -133,7 +133,7 @@ bool AppLaunchDataJson::RefreshAppSessionTime(const ApplicationData& app_data) { if (index != NotFound) { if (json_data_list.empty() == false) { json_data_list[index][strings::app_launch_last_session] = - static_cast<Json::Value::UInt64>(DateTime::getCurrentTime().tv_sec); + static_cast<Json::Value::UInt64>(getSecs(getCurrentTime())); retVal = true; } } @@ -152,7 +152,7 @@ bool AppLaunchDataJson::AddNewAppData(const ApplicationData& app_data) { json_app_data[strings::app_id] = app_data.mobile_app_id_; json_app_data[strings::bundle_id] = app_data.bundle_id_; json_app_data[strings::app_launch_last_session] = - static_cast<Json::Value::UInt64>(DateTime::getCurrentTime().tv_sec); + static_cast<Json::Value::UInt64>(getSecs(getCurrentTime())); LOG4CXX_DEBUG(logger_, "New application data saved. Detatils device_id: " diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc index 8fb88ad5ff..54121bae74 100644 --- a/src/components/application_manager/src/application_impl.cc +++ b/src/components/application_manager/src/application_impl.cc @@ -72,7 +72,7 @@ mobile_apis::FileType::eType StringToFileType(const char* str) { return mobile_apis::FileType::BINARY; } } -} +} // namespace CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager") @@ -141,9 +141,9 @@ ApplicationImpl::ApplicationImpl( this, &ApplicationImpl::OnAudioStreamSuspend)) , application_manager_(application_manager) { cmd_number_to_time_limits_[mobile_apis::FunctionID::ReadDIDID] = { - date_time::DateTime::getCurrentTime(), 0}; + date_time::getCurrentTime(), 0}; cmd_number_to_time_limits_[mobile_apis::FunctionID::GetVehicleDataID] = { - date_time::DateTime::getCurrentTime(), 0}; + date_time::getCurrentTime(), 0}; set_mobile_app_id(mobile_app_id); set_name(app_name); @@ -753,7 +753,7 @@ bool ApplicationImpl::SubscribeToIVI(uint32_t vehicle_info_type) { sync_primitives::AutoLock lock(vi_lock_); return subscribed_vehicle_info_ .insert( - static_cast<mobile_apis::VehicleDataType::eType>(vehicle_info_type)) + static_cast<mobile_apis::VehicleDataType::eType>(vehicle_info_type)) .second; } @@ -776,7 +776,7 @@ UsageStatistics& ApplicationImpl::usage_report() { bool ApplicationImpl::AreCommandLimitsExceeded( mobile_apis::FunctionID::eType cmd_id, TLimitSource source) { - TimevalStruct current = date_time::DateTime::getCurrentTime(); + date_time::TimeDuration current = date_time::getCurrentTime(); switch (source) { // In case of config file values there is COMMON limitations for number of // commands per certain time in seconds, i.e. 5 requests per 10 seconds with @@ -808,13 +808,14 @@ bool ApplicationImpl::AreCommandLimitsExceeded( LOG4CXX_INFO(logger_, "Time Info: " - << "\n Current: " << current.tv_sec << "\n Limit: (" - << limit.first.tv_sec << "," << limit.second + << "\n Current: " << date_time::getSecs(current) << "\n Limit: (" + << date_time::getSecs(limit.first) << "," << limit.second << ")" "\n frequency_restrictions: (" << frequency_restrictions.first << "," << frequency_restrictions.second << ")"); - if (current.tv_sec < limit.first.tv_sec + frequency_restrictions.second) { + if (date_time::getSecs(current) < + date_time::getSecs(limit.first) + frequency_restrictions.second) { if (limit.second < frequency_restrictions.first) { ++limit.second; return false; @@ -856,7 +857,7 @@ bool ApplicationImpl::AreCommandLimitsExceeded( TimeToNumberLimit& limit = it->second; // Checking even limitation for command - if (static_cast<uint32_t>(current.tv_sec - limit.first.tv_sec) < + if (static_cast<uint32_t>(date_time::getSecs(current) - date_time::getSecs(limit.first)) < minute / cmd_limit) { return true; } diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 5edd485343..df350d13f0 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -2619,7 +2619,7 @@ void ApplicationManagerImpl::ProcessMessageFromMobile( #ifdef TELEMETRY_MONITOR AMTelemetryObserver::MessageMetricSharedPtr metric( new AMTelemetryObserver::MessageMetric()); - metric->begin = date_time::DateTime::getCurrentTime(); + metric->begin = date_time::getCurrentTime(); #endif // TELEMETRY_MONITOR smart_objects::SmartObjectSPtr so_from_mobile = utils::MakeShared<smart_objects::SmartObject>(); @@ -2642,7 +2642,7 @@ void ApplicationManagerImpl::ProcessMessageFromMobile( LOG4CXX_ERROR(logger_, "Received command didn't run successfully"); } #ifdef TELEMETRY_MONITOR - metric->end = date_time::DateTime::getCurrentTime(); + metric->end = date_time::getCurrentTime(); if (metric_observer_) { metric_observer_->OnMessage(metric); } @@ -3991,14 +3991,14 @@ void ApplicationManagerImpl::OnTimerSendTTSGlobalProperties() { std::vector<uint32_t> app_list; { sync_primitives::AutoLock lock(tts_global_properties_app_list_lock_); - std::map<uint32_t, TimevalStruct>::iterator it = + std::map<uint32_t, date_time::TimeDuration>::iterator it = tts_global_properties_app_list_.begin(); - std::map<uint32_t, TimevalStruct>::iterator it_end = + std::map<uint32_t, date_time::TimeDuration>::iterator it_end = tts_global_properties_app_list_.end(); date_time::TimeCompare time_comp; for (; it != it_end; ++it) { - time_comp = date_time::DateTime::compareTime( - date_time::DateTime::getCurrentTime(), it->second); + time_comp = date_time::compareTime( + date_time::getCurrentTime(), it->second); if (date_time::GREATER == time_comp || date_time::EQUAL == time_comp) { app_list.push_back(it->first); } @@ -4019,8 +4019,8 @@ void ApplicationManagerImpl::AddAppToTTSGlobalPropertiesList( const uint32_t app_id) { LOG4CXX_AUTO_TRACE(logger_); uint16_t timeout = get_settings().tts_global_properties_timeout(); - TimevalStruct current_time = date_time::DateTime::getCurrentTime(); - current_time.tv_sec += timeout; + date_time::TimeDuration current_time = date_time::getCurrentTime(); + current_time += date_time::seconds(timeout); // please avoid AutoLock usage to avoid deadlock tts_global_properties_app_list_lock_.Acquire(); if (tts_global_properties_app_list_.end() == @@ -4043,7 +4043,7 @@ void ApplicationManagerImpl::RemoveAppFromTTSGlobalPropertiesList( LOG4CXX_AUTO_TRACE(logger_); // please avoid AutoLock usage to avoid deadlock tts_global_properties_app_list_lock_.Acquire(); - std::map<uint32_t, TimevalStruct>::iterator it = + std::map<uint32_t, date_time::TimeDuration>::iterator it = tts_global_properties_app_list_.find(app_id); if (tts_global_properties_app_list_.end() != it) { tts_global_properties_app_list_.erase(it); diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index 123606a11e..b0f52ba227 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -661,9 +661,9 @@ void PolicyHandler::OnAppPermissionConsentInternal( void policy::PolicyHandler::SetDaysAfterEpoch() { POLICY_LIB_CHECK_VOID(); - TimevalStruct current_time = date_time::DateTime::getCurrentTime(); + date_time::TimeDuration current_time = date_time::getCurrentTime(); const int kSecondsInDay = 60 * 60 * 24; - int days_after_epoch = current_time.tv_sec / kSecondsInDay; + int days_after_epoch = date_time::getSecs(current_time) / kSecondsInDay; PTUpdatedAt(Counters::DAYS_AFTER_EPOCH, days_after_epoch); } @@ -1467,7 +1467,7 @@ void PolicyHandler::OnSnapshotCreated( std::string policy_snapshot_full_path; if (SaveSnapshot(pt_string, policy_snapshot_full_path)) { const uint32_t timeout_exchange_s = - timeout_exchange_ms / date_time::DateTime::MILLISECONDS_IN_SECOND; + timeout_exchange_ms / date_time::MILLISECONDS_IN_SECOND; MessageHelper::SendPolicyUpdate(policy_snapshot_full_path, timeout_exchange_s, retry_delay_seconds, @@ -1589,7 +1589,7 @@ uint32_t PolicyHandler::NextRetryTimeout() { } uint32_t PolicyHandler::TimeoutExchangeSec() const { - return TimeoutExchangeMSec() / date_time::DateTime::MILLISECONDS_IN_SECOND; + return TimeoutExchangeMSec() / date_time::MILLISECONDS_IN_SECOND; } uint32_t PolicyHandler::TimeoutExchangeMSec() const { diff --git a/src/components/application_manager/src/request_controller.cc b/src/components/application_manager/src/request_controller.cc index f341967842..1620128f74 100644 --- a/src/components/application_manager/src/request_controller.cc +++ b/src/components/application_manager/src/request_controller.cc @@ -407,11 +407,11 @@ void RequestController::TimeoutThread() { << " request id: " << probably_expired->requestId() << " connection_key: " << probably_expired->app_id() << " NOT expired"); - const TimevalStruct current_time = date_time::DateTime::getCurrentTime(); - const TimevalStruct end_time = probably_expired->end_time(); + const date_time::TimeDuration current_time = date_time::getCurrentTime(); + const date_time::TimeDuration end_time = probably_expired->end_time(); if (current_time < end_time) { const uint32_t msecs = static_cast<uint32_t>( - date_time::DateTime::getmSecs(end_time - current_time)); + date_time::getmSecs(end_time - current_time)); LOG4CXX_DEBUG(logger_, "Sleep for " << msecs << " millisecs"); timer_condition_.WaitFor(auto_lock, msecs); } diff --git a/src/components/application_manager/src/request_info.cc b/src/components/application_manager/src/request_info.cc index 9a5828d939..d26f69a39b 100644 --- a/src/components/application_manager/src/request_info.cc +++ b/src/components/application_manager/src/request_info.cc @@ -51,7 +51,7 @@ HMIRequestInfo::HMIRequestInfo(RequestPtr request, const uint64_t timeout_msec) } HMIRequestInfo::HMIRequestInfo(RequestPtr request, - const TimevalStruct& start_time, + const date_time::TimeDuration& start_time, const uint64_t timeout_msec) : RequestInfo(request, HMIRequest, start_time, timeout_msec) { correlation_id_ = request_->correlation_id(); @@ -66,7 +66,7 @@ MobileRequestInfo::MobileRequestInfo(RequestPtr request, } MobileRequestInfo::MobileRequestInfo(RequestPtr request, - const TimevalStruct& start_time, + const date_time::TimeDuration& start_time, const uint64_t timeout_msec) : RequestInfo(request, MobileRequest, start_time, timeout_msec) { correlation_id_ = request_.get()->correlation_id(); @@ -75,7 +75,7 @@ MobileRequestInfo::MobileRequestInfo(RequestPtr request, RequestInfo::RequestInfo(RequestPtr request, const RequestInfo::RequestType requst_type, - const TimevalStruct& start_time, + const date_time::TimeDuration& start_time, const uint64_t timeout_msec) : request_(request), start_time_(start_time), timeout_msec_(timeout_msec) { updateEndTime(); @@ -85,8 +85,8 @@ RequestInfo::RequestInfo(RequestPtr request, } void application_manager::request_controller::RequestInfo::updateEndTime() { - end_time_ = date_time::DateTime::getCurrentTime(); - date_time::DateTime::AddMilliseconds(end_time_, timeout_msec_); + end_time_ = date_time::getCurrentTime(); + date_time::AddMilliseconds(end_time_, timeout_msec_); } void RequestInfo::updateTimeOut(const uint64_t& timeout_msec) { @@ -95,9 +95,9 @@ void RequestInfo::updateTimeOut(const uint64_t& timeout_msec) { } bool RequestInfo::isExpired() { - TimevalStruct curr_time = date_time::DateTime::getCurrentTime(); - return date_time::DateTime::getmSecs(end_time_) <= - date_time::DateTime::getmSecs(curr_time); + date_time::TimeDuration curr_time = date_time::getCurrentTime(); + return date_time::getmSecs(end_time_) <= + date_time::getmSecs(curr_time); } uint64_t RequestInfo::hash() { @@ -283,7 +283,7 @@ bool RequestInfoSet::AppIdCompararator::operator()( bool RequestInfoTimeComparator::operator()(const RequestInfoPtr lhs, const RequestInfoPtr rhs) const { date_time::TimeCompare compare_result = - date_time::DateTime::compareTime(lhs->end_time(), rhs->end_time()); + date_time::compareTime(lhs->end_time(), rhs->end_time()); if (compare_result == date_time::LESS) { return true; } else if (compare_result == date_time::GREATER) { diff --git a/src/components/application_manager/src/request_tracker.cc b/src/components/application_manager/src/request_tracker.cc index 13b3d4d873..c047c82579 100644 --- a/src/components/application_manager/src/request_tracker.cc +++ b/src/components/application_manager/src/request_tracker.cc @@ -77,7 +77,7 @@ bool RequestTracker::Track(const ApplicationID& app_id, const uint32_t max_requests, ApplicationsRequestsTracker& tracker) { LOG4CXX_AUTO_TRACE(logger_); - using date_time::DateTime; + using namespace date_time; if (!time_scale || !max_requests) { LOG4CXX_INFO(logger_, "Time scale request tracking is disabled."); @@ -93,7 +93,7 @@ bool RequestTracker::Track(const ApplicationID& app_id, if (tracker.end() == it_app) { LOG4CXX_DEBUG(logger_, "Adding new application into tracking."); - tracker[app_id].push_back(DateTime::getCurrentTime()); + tracker[app_id].push_back(getCurrentTime()); return true; } @@ -102,25 +102,24 @@ bool RequestTracker::Track(const ApplicationID& app_id, if (it_app->second.size() < max_requests) { LOG4CXX_DEBUG(logger_, "Adding new request into tracking."); - tracker[app_id].push_back(DateTime::getCurrentTime()); + tracker[app_id].push_back(getCurrentTime()); return true; } LOG4CXX_DEBUG(logger_, "Oldest request is added at: " - << DateTime::getmSecs(it_app->second.front()) - << ". Current time is: " - << DateTime::getmSecs(DateTime::getCurrentTime()) + << getmSecs(it_app->second.front()) + << ". Current time is: " << getmSecs(getCurrentTime()) << ". Time scale is: " << time_scale); - if (DateTime::calculateTimeSpan(it_app->second.front()) > time_scale) { + if (calculateTimeSpan(it_app->second.front()) > time_scale) { LOG4CXX_DEBUG(logger_, "Dropping oldest request, adding new one."); ApplicationsRequestsTracker::mapped_type& times = tracker[app_id]; DCHECK_OR_RETURN(!times.empty(), false); times.erase(times.begin()); - times.push_back(DateTime::getCurrentTime()); + times.push_back(getCurrentTime()); return true; } 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 |