diff options
Diffstat (limited to 'src/components/application_manager')
5 files changed, 19 insertions, 16 deletions
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc index 54121bae74..6333228d95 100644 --- a/src/components/application_manager/src/application_impl.cc +++ b/src/components/application_manager/src/application_impl.cc @@ -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; } @@ -808,10 +808,10 @@ bool ApplicationImpl::AreCommandLimitsExceeded( LOG4CXX_INFO(logger_, "Time Info: " - << "\n Current: " << date_time::getSecs(current) << "\n Limit: (" - << date_time::getSecs(limit.first) << "," << limit.second - << ")" - "\n frequency_restrictions: (" + << "\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 (date_time::getSecs(current) < @@ -857,7 +857,8 @@ bool ApplicationImpl::AreCommandLimitsExceeded( TimeToNumberLimit& limit = it->second; // Checking even limitation for command - if (static_cast<uint32_t>(date_time::getSecs(current) - date_time::getSecs(limit.first)) < + 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 1d7f233b49..4f9a77f22f 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -4002,8 +4002,8 @@ void ApplicationManagerImpl::OnTimerSendTTSGlobalProperties() { tts_global_properties_app_list_.end(); date_time::TimeCompare time_comp; for (; it != it_end; ++it) { - time_comp = date_time::compareTime( - date_time::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); } diff --git a/src/components/application_manager/src/request_controller.cc b/src/components/application_manager/src/request_controller.cc index 1620128f74..4710433e0c 100644 --- a/src/components/application_manager/src/request_controller.cc +++ b/src/components/application_manager/src/request_controller.cc @@ -410,8 +410,8 @@ void RequestController::TimeoutThread() { 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::getmSecs(end_time - current_time)); + const uint32_t msecs = + static_cast<uint32_t>(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 d26f69a39b..c59e2f2da2 100644 --- a/src/components/application_manager/src/request_info.cc +++ b/src/components/application_manager/src/request_info.cc @@ -96,8 +96,7 @@ void RequestInfo::updateTimeOut(const uint64_t& timeout_msec) { bool RequestInfo::isExpired() { date_time::TimeDuration curr_time = date_time::getCurrentTime(); - return date_time::getmSecs(end_time_) <= - date_time::getmSecs(curr_time); + return date_time::getmSecs(end_time_) <= date_time::getmSecs(curr_time); } uint64_t RequestInfo::hash() { diff --git a/src/components/application_manager/test/request_info_test.cc b/src/components/application_manager/test/request_info_test.cc index 8cef39d162..74145bdb08 100644 --- a/src/components/application_manager/test/request_info_test.cc +++ b/src/components/application_manager/test/request_info_test.cc @@ -307,10 +307,12 @@ TEST_F(RequestInfoTest, RequestInfoSetEqualHash) { TEST_F(RequestInfoTest, EndTimeisExpired) { 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()); + 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()); - date_time::TimeDuration expired = date_time::seconds(date_time::getSecs(date_time::getCurrentTime())); + 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 = @@ -355,7 +357,8 @@ TEST_F(RequestInfoTest, UpdateTimeOut) { request->updateTimeOut(100); 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); + EXPECT_NEAR( + date_time::getSecs(time) + 100, date_time::getSecs(last_time), 500); } } // namespace application_manager_test |