diff options
author | Conlain Kelly <conlain.k@gmail.com> | 2018-06-25 13:20:36 -0400 |
---|---|---|
committer | Conlain Kelly <conlain.k@gmail.com> | 2018-06-25 13:21:22 -0400 |
commit | b4a758a70a86ad92ae8db21907be42bbe4d44809 (patch) | |
tree | e4c5257a412824bfb1f31855c50cf4089c8a8f3b | |
parent | 7e4768b922fe7693c3fa552c08ced456306cb103 (diff) | |
download | sdl_core-b4a758a70a86ad92ae8db21907be42bbe4d44809.tar.gz |
Style fix
20 files changed, 52 insertions, 58 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 diff --git a/src/components/include/protocol_handler/telemetry_observer.h b/src/components/include/protocol_handler/telemetry_observer.h index 301496589c..533ad51d62 100644 --- a/src/components/include/protocol_handler/telemetry_observer.h +++ b/src/components/include/protocol_handler/telemetry_observer.h @@ -48,8 +48,8 @@ class PHTelemetryObserver { date_time::TimeDuration begin; date_time::TimeDuration end; }; - virtual void StartMessageProcess(uint32_t message_id, - const date_time::TimeDuration& start_time) = 0; + virtual void StartMessageProcess( + uint32_t message_id, const date_time::TimeDuration& start_time) = 0; virtual void EndMessageProcess(utils::SharedPtr<MessageMetric> m) = 0; virtual ~PHTelemetryObserver() {} }; diff --git a/src/components/include/test/protocol_handler/mock_telemetry_observer.h b/src/components/include/test/protocol_handler/mock_telemetry_observer.h index 0a0eb261d3..6b24d5a919 100644 --- a/src/components/include/test/protocol_handler/mock_telemetry_observer.h +++ b/src/components/include/test/protocol_handler/mock_telemetry_observer.h @@ -44,7 +44,8 @@ namespace protocol_handler_test { class MockPHTelemetryObserver : public PHTelemetryObserver { public: MOCK_METHOD2(StartMessageProcess, - void(uint32_t message_id, const date_time::TimeDuration& start_time)); + void(uint32_t message_id, + const date_time::TimeDuration& start_time)); MOCK_METHOD1(EndMessageProcess, void(utils::SharedPtr<MessageMetric> m)); }; diff --git a/src/components/policy/policy_external/src/usage_statistics/counter.cc b/src/components/policy/policy_external/src/usage_statistics/counter.cc index e2c4d59b0e..6f3373c6a5 100644 --- a/src/components/policy/policy_external/src/usage_statistics/counter.cc +++ b/src/components/policy/policy_external/src/usage_statistics/counter.cc @@ -107,8 +107,7 @@ AppStopwatchImpl::~AppStopwatchImpl() {} void AppStopwatchImpl::Start(AppStopwatchId stopwatch_type) { stopwatch_type_ = stopwatch_type; - timer_.Start(time_out_ * date_time::MILLISECONDS_IN_SECOND, - timer::kPeriodic); + timer_.Start(time_out_ * date_time::MILLISECONDS_IN_SECOND, timer::kPeriodic); } void AppStopwatchImpl::Switch(AppStopwatchId stopwatch_type) { diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc index ba850efde5..5462601c35 100644 --- a/src/components/policy/policy_regular/src/policy_manager_impl.cc +++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc @@ -882,8 +882,7 @@ uint32_t PolicyManagerImpl::NextRetryTimeout() { } for (uint32_t i = 0u; i < retry_sequence_index_; ++i) { - next += retry_sequence_seconds_[i] * - date_time::MILLISECONDS_IN_SECOND; + next += retry_sequence_seconds_[i] * date_time::MILLISECONDS_IN_SECOND; next += retry_sequence_timeout_; } ++retry_sequence_index_; diff --git a/src/components/policy/policy_regular/src/usage_statistics/counter.cc b/src/components/policy/policy_regular/src/usage_statistics/counter.cc index 83e12194e0..a0b6b689d4 100644 --- a/src/components/policy/policy_regular/src/usage_statistics/counter.cc +++ b/src/components/policy/policy_regular/src/usage_statistics/counter.cc @@ -103,8 +103,7 @@ AppStopwatchImpl::AppStopwatchImpl( void AppStopwatchImpl::Start(AppStopwatchId stopwatch_type) { stopwatch_type_ = stopwatch_type; - timer_.Start(time_out_ * date_time::MILLISECONDS_IN_SECOND, - timer::kPeriodic); + timer_.Start(time_out_ * date_time::MILLISECONDS_IN_SECOND, timer::kPeriodic); } void AppStopwatchImpl::Switch(AppStopwatchId stopwatch_type) { diff --git a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc index c105b304fe..08a939ecda 100644 --- a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc +++ b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc @@ -903,8 +903,9 @@ TEST_F(PolicyManagerImplTest2, NextRetryTimeout_ExpectTimeoutsFromPT) { date_time::MILLISECONDS_IN_SECOND; const uint32_t first_retry = timeout_after_x_seconds; EXPECT_EQ(first_retry, manager->NextRetryTimeout()); - uint32_t next_retry = first_retry + seconds_between_retries[0].asInt() * - date_time::MILLISECONDS_IN_SECOND; + uint32_t next_retry = + first_retry + + seconds_between_retries[0].asInt() * date_time::MILLISECONDS_IN_SECOND; EXPECT_EQ(next_retry, manager->NextRetryTimeout()); next_retry = first_retry + next_retry + @@ -947,8 +948,9 @@ TEST_F(PolicyManagerImplTest2, UpdatedPreloadedPT_ExpectLPT_IsUpdated) { Json::Value val2(Json::arrayValue); val2[0] = hmi_level[index]; val[new_data.new_field_value_]["hmi_levels"] = val2; - root["policy_table"]["functional_groupings"][new_data.new_field_name_] - ["rpcs"] = val; + root["policy_table"]["functional_groupings"][new_data + .new_field_name_]["rpcs"] = + val; root["policy_table"]["functional_groupings"][new_data.new_field_name_] ["user_consent_prompt"] = new_data.new_field_name_; } diff --git a/src/components/protocol_handler/test/include/protocol_handler/mock_telemetry_observer.h b/src/components/protocol_handler/test/include/protocol_handler/mock_telemetry_observer.h index d46b8470a3..3296d716fa 100644 --- a/src/components/protocol_handler/test/include/protocol_handler/mock_telemetry_observer.h +++ b/src/components/protocol_handler/test/include/protocol_handler/mock_telemetry_observer.h @@ -43,7 +43,8 @@ namespace protocol_handler_test { class MockPHTelemetryObserver : public ::protocol_handler::PHTelemetryObserver { public: - MOCK_METHOD2(StartMessageProcess, void(uint32_t, const date_time::TimeDuration&)); + MOCK_METHOD2(StartMessageProcess, + void(uint32_t, const date_time::TimeDuration&)); MOCK_METHOD2(EndMessageProcess, void(utils::SharedPtr<MessageMetric>)); }; diff --git a/src/components/security_manager/src/crypto_manager_impl.cc b/src/components/security_manager/src/crypto_manager_impl.cc index 1506382bce..84f7773e9b 100644 --- a/src/components/security_manager/src/crypto_manager_impl.cc +++ b/src/components/security_manager/src/crypto_manager_impl.cc @@ -354,8 +354,8 @@ bool CryptoManagerImpl::IsCertificateUpdateRequired( return true; } - return seconds <= (get_settings().update_before_hours() * - date_time::SECONDS_IN_HOUR); + return seconds <= + (get_settings().update_before_hours() * date_time::SECONDS_IN_HOUR); } const CryptoManagerSettings& CryptoManagerImpl::get_settings() const { diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h index d0f1b2b96a..d0bf4ba5bb 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h @@ -49,7 +49,8 @@ class TransportManagerObserver : public transport_manager::TMTelemetryObserver { private: TelemetryMonitor* telemetry_monitor_; - std::map<const protocol_handler::RawMessage*, date_time::TimeDuration> time_starts; + std::map<const protocol_handler::RawMessage*, date_time::TimeDuration> + time_starts; }; } // namespace telemetry_monitor #endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_OBSERVER_H_ diff --git a/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc b/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc index 0b95792f0f..2dabc210f7 100644 --- a/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc +++ b/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc @@ -42,8 +42,7 @@ Json::Value ApplicationManagerMetricWrapper::GetJsonMetric() { result[strings::logger] = "ApplicationManager"; result[strings::begin] = Json::Int64(date_time::getuSecs(message_metric->begin)); - result[strings::end] = - Json::Int64(date_time::getuSecs(message_metric->end)); + result[strings::end] = Json::Int64(date_time::getuSecs(message_metric->end)); const NsSmartDeviceLink::NsSmartObjects::SmartObject& params = message_metric->message->getElement(application_manager::strings::params); result[strings::correlation_id] = utils::ConvertInt64ToLongLongInt( diff --git a/src/components/telemetry_monitor/src/protocol_handler_metric_wrapper.cc b/src/components/telemetry_monitor/src/protocol_handler_metric_wrapper.cc index 471b0dfdad..1591e00af8 100644 --- a/src/components/telemetry_monitor/src/protocol_handler_metric_wrapper.cc +++ b/src/components/telemetry_monitor/src/protocol_handler_metric_wrapper.cc @@ -41,8 +41,7 @@ Json::Value ProtocolHandlerMecticWrapper::GetJsonMetric() { result[strings::logger] = "ProtocolHandler"; result[strings::begin] = Json::Int64(date_time::getuSecs(message_metric->begin)); - result[strings::end] = - Json::Int64(date_time::getuSecs(message_metric->end)); + result[strings::end] = Json::Int64(date_time::getuSecs(message_metric->end)); result[strings::message_id] = message_metric->message_id; result[strings::connection_key] = message_metric->connection_key; return result; diff --git a/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc b/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc index 47636ed499..789da92eaf 100644 --- a/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc +++ b/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc @@ -42,8 +42,7 @@ Json::Value TransportManagerMecticWrapper::GetJsonMetric() { result[strings::logger] = "TransportManager"; result[strings::begin] = Json::Int64(date_time::getuSecs(message_metric->begin)); - result[strings::end] = - Json::Int64(date_time::getuSecs(message_metric->end)); + result[strings::end] = Json::Int64(date_time::getuSecs(message_metric->end)); result[strings::data_size] = static_cast<uint32_t>(message_metric->data_size); return result; } diff --git a/src/components/telemetry_monitor/src/transport_manager_observer.cc b/src/components/telemetry_monitor/src/transport_manager_observer.cc index c761b34210..b217ba5c53 100644 --- a/src/components/telemetry_monitor/src/transport_manager_observer.cc +++ b/src/components/telemetry_monitor/src/transport_manager_observer.cc @@ -49,8 +49,8 @@ void TransportManagerObserver::StartRawMsg( void TransportManagerObserver::StopRawMsg( const protocol_handler::RawMessage* ptr) { - std::map<const protocol_handler::RawMessage*, date_time::TimeDuration>::const_iterator - it; + std::map<const protocol_handler::RawMessage*, + date_time::TimeDuration>::const_iterator it; it = time_starts.find(ptr); if (it != time_starts.end()) { TransportManagerMecticWrapper* m = new TransportManagerMecticWrapper(); diff --git a/src/components/telemetry_monitor/test/transport_manager_metric_test.cc b/src/components/telemetry_monitor/test/transport_manager_metric_test.cc index 184a1ef9ec..ca4bc2af6e 100644 --- a/src/components/telemetry_monitor/test/transport_manager_metric_test.cc +++ b/src/components/telemetry_monitor/test/transport_manager_metric_test.cc @@ -65,10 +65,8 @@ TEST(TransportManagerMetricWrapper, GetJsonMetric) { EXPECT_EQ("null\n", jvalue[strings::utime].toStyledString()); EXPECT_EQ("null\n", jvalue[strings::memory].toStyledString()); - EXPECT_EQ(date_time::getuSecs(start_time), - jvalue[strings::begin].asInt64()); - EXPECT_EQ(date_time::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(1000, jvalue[strings::data_size].asInt()); } @@ -90,10 +88,8 @@ TEST(TransportManagerMetricWrapper, GetJsonMetricWithGrabResources) { Json::Value jvalue = metric_test.GetJsonMetric(); EXPECT_EQ("\"TransportManager\"\n", jvalue[strings::logger].toStyledString()); - EXPECT_EQ(date_time::getuSecs(start_time), - jvalue[strings::begin].asInt64()); - EXPECT_EQ(date_time::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(1000, jvalue[strings::data_size].asInt()); EXPECT_NEAR(resources->stime, jvalue[strings::stime].asInt(), 1); diff --git a/src/components/utils/test/date_time_test.cc b/src/components/utils/test/date_time_test.cc index 34d3b0f959..00085813aa 100644 --- a/src/components/utils/test/date_time_test.cc +++ b/src/components/utils/test/date_time_test.cc @@ -78,9 +78,8 @@ TEST(DateTimeTest, GetmSecs) { TEST(DateTimeTest, GetuSecs) { // arrange date_time::TimeDuration time1 = bpt::seconds(3) + bpt::microseconds(4); - int expect_value = 3 * MILLISECONDS_IN_SECOND * - MICROSECONDS_IN_MILLISECOND + - 4; + int expect_value = + 3 * MILLISECONDS_IN_SECOND * MICROSECONDS_IN_MILLISECOND + 4; // assert ASSERT_EQ(expect_value, getuSecs(time1)); @@ -90,8 +89,7 @@ TEST(DateTimeTest, GetuSecsmSecs) { // arrange date_time::TimeDuration time1 = bpt::seconds(5) + bpt::microseconds(6); - int64_t expect_value = - getuSecs(time1) / MICROSECONDS_IN_MILLISECOND; + int64_t expect_value = getuSecs(time1) / MICROSECONDS_IN_MILLISECOND; // assert ASSERT_EQ(expect_value, getmSecs(time1)); @@ -119,15 +117,13 @@ TEST(DateTimeTest, CalculateTimeDiff) { date_time::TimeDuration diff1 = bpt::seconds(1) + bpt::milliseconds(2); // assert - ASSERT_EQ(diff1.total_milliseconds(), - calculateTimeDiff(time2, time1)); + ASSERT_EQ(diff1.total_milliseconds(), calculateTimeDiff(time2, time1)); // time1 to time2, but calculateTimeDiff returns an absolute value date_time::TimeDuration diff2 = -diff1.invert_sign(); // assert - ASSERT_EQ(diff2.total_milliseconds(), - calculateTimeDiff(time1, time2)); + ASSERT_EQ(diff2.total_milliseconds(), calculateTimeDiff(time1, time2)); } TEST(DateTimeTest, CalculateEqualTimeDiff) { |