Address review commentfix/check_ptu_triggers_without_apps

9 files changed, 15 insertions, 11 deletions

diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index f385a3d8d4..2c7b878023 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -324,7 +324,7 @@ class PolicyHandler : public PolicyHandlerInterface,
 
   void OnSystemRequestReceived() const OVERRIDE;
 
-  void TriggerPTUIfRequired() OVERRIDE;
+  void TriggerPTUOnStartupIfRequired() OVERRIDE;
 
   /**
    * @brief Get appropriate message parameters and send them with response
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 00d85d5a99..878cf5765e 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -899,7 +899,7 @@ void ApplicationManagerImpl::OnHMIStartedCooperation() {
 
   RefreshCloudAppInformation();
 
-  policy_handler_->TriggerPTUIfRequired();
+  policy_handler_->TriggerPTUOnStartupIfRequired();
 }
 
 std::string ApplicationManagerImpl::PolicyIDByIconUrl(const std::string url) {
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index 1681835aef..678916f7eb 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -787,9 +787,9 @@ void PolicyHandler::OnSystemRequestReceived() const {
   policy_manager_->ResetTimeout();
 }
 
-void PolicyHandler::TriggerPTUIfRequired() {
+void PolicyHandler::TriggerPTUOnStartupIfRequired() {
 #ifndef EXTERNAL_PROPRIETARY_MODE
-  policy_manager_->TriggerPTUIfRequired();
+  policy_manager_->TriggerPTUOnStartupIfRequired();
 #endif
 }
 
diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h
index 2d44124dff..735f44a314 100644
--- a/src/components/include/application_manager/policies/policy_handler_interface.h
+++ b/src/components/include/application_manager/policies/policy_handler_interface.h
@@ -769,9 +769,13 @@ class PolicyHandlerInterface : public VehicleDataItemProvider {
   virtual void OnSystemRequestReceived() const = 0;
 
   /**
-   * @brief
+   * @brief Triggers a PolicyTableUpdate on startup (only if an update is
+   * required)
+   *
+   * Currently, this function is only implemented for regular policies
+   * since the device consent is not enabled by default for external policies.
    */
-  virtual void TriggerPTUIfRequired() = 0;
+  virtual void TriggerPTUOnStartupIfRequired() = 0;
 
  private:
 /**
diff --git a/src/components/include/policy/policy_regular/policy/policy_manager.h b/src/components/include/policy/policy_regular/policy/policy_manager.h
index 50f644581a..99f38673ef 100644
--- a/src/components/include/policy/policy_regular/policy/policy_manager.h
+++ b/src/components/include/policy/policy_regular/policy/policy_manager.h
@@ -804,7 +804,7 @@ class PolicyManager : public usage_statistics::StatisticsManager,
   /**
    * @brief Trigger a PTU once on startup if it is required
    */
-  virtual void TriggerPTUIfRequired() = 0;
+  virtual void TriggerPTUOnStartupIfRequired() = 0;
 
  protected:
   /**
diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
index dd90e28dce..0dde38bc79 100644
--- a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
+++ b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
@@ -217,7 +217,7 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
   MOCK_CONST_METHOD1(SendOnAppPropertiesChangeNotification,
                      void(const std::string& policy_app_id));
   MOCK_METHOD0(OnPTExchangeNeeded, void());
-  MOCK_METHOD0(TriggerPTUIfRequired, void());
+  MOCK_METHOD0(TriggerPTUOnStartupIfRequired, void());
   MOCK_METHOD1(GetAvailableApps, void(std::queue<std::string>& apps));
   MOCK_METHOD3(
       AddApplication,
diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h
index f79917b04c..ac0fab4328 100644
--- a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h
+++ b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h
@@ -262,7 +262,7 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD0(ExceededIgnitionCycles, bool());
   MOCK_METHOD0(ExceededDays, bool());
   MOCK_METHOD0(StartPTExchange, void());
-  MOCK_METHOD0(TriggerPTUIfRequired, void());
+  MOCK_METHOD0(TriggerPTUOnStartupIfRequired, void());
 
   // --- Statistics Manager section
   MOCK_METHOD1(Increment, void(usage_statistics::GlobalCounterId type));
diff --git a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
index e3ddd0abcb..aa77019613 100644
--- a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
+++ b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
@@ -800,7 +800,7 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief Trigger a PTU once on startup if it is required
    */
-  virtual void TriggerPTUIfRequired() OVERRIDE;
+  virtual void TriggerPTUOnStartupIfRequired() OVERRIDE;
 
 #ifdef BUILD_TESTS
   /**
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 21f797c48b..c6389b503b 100644
--- a/src/components/policy/policy_regular/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc
@@ -1872,7 +1872,7 @@ bool PolicyManagerImpl::FunctionGroupNeedEncryption(
              : false;
 }
 
-void PolicyManagerImpl::TriggerPTUIfRequired() {
+void PolicyManagerImpl::TriggerPTUOnStartupIfRequired() {
   LOG4CXX_AUTO_TRACE(logger_);
   if (ignition_check) {
     StartPTExchange();