Fix UTs

SNiukalov · SNiukalov · commit 6f752bd27390 · 2019-05-30T09:52:35.000+03:00
diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
@@ -139,6 +139,10 @@ class MockMessageHelper {
   MOCK_METHOD2(SendDecryptCertificateToHMI,
                void(const std::string& file_name,
                     ApplicationManager& app_mngr));
+  MOCK_METHOD2(
+      CreateOnSystemRequestNotificationToMobile,
+      smart_objects::SmartObjectSPtr(const std::vector<uint8_t>& policy_data,
+                                     const uint32_t connection_key));
 #ifdef EXTERNAL_PROPRIETARY_MODE
   MOCK_METHOD4(
       SendGetListOfPermissionsResponse,
diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc
@@ -612,6 +612,13 @@ MessageHelper::ServiceStatusUpdateNotificationBuilder::notification() const {
   return MockMessageHelper::on_service_update_builder_mock()->notification();
 }
 
+smart_objects::SmartObjectSPtr
+MessageHelper::CreateOnSystemRequestNotificationToMobile(
+    const std::vector<uint8_t>& policy_data, const uint32_t connection_key) {
+  return MockMessageHelper::message_helper_mock()
+      ->CreateOnSystemRequestNotificationToMobile(policy_data, connection_key);
+}
+
 smart_objects::SmartObject MessageHelper::CreateAppServiceCapabilities(
     std::vector<smart_objects::SmartObject>& all_services) {
   return MockMessageHelper::message_helper_mock()->CreateAppServiceCapabilities(
diff --git a/src/components/application_manager/test/policy_event_observer_test.cc b/src/components/application_manager/test/policy_event_observer_test.cc
@@ -38,6 +38,10 @@
 #include "policy/policy_types.h"
 #include "smart_objects/smart_object.h"
 
+#ifdef EXTERNAL_PROPRIETARY_MODE
+#include "policy/ptu_retry_handler.h"
+#endif
+
 namespace test {
 namespace components {
 namespace policy_test {
diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc
@@ -1722,7 +1722,8 @@ TEST_F(PolicyHandlerTest, OnSnapshotCreated_UrlNotAdded) {
       .WillRepeatedly(SetArgReferee<1>(test_data));
   policy_handler_.OnSnapshotCreated(msg, retry_delay_seconds, timeout_exchange);
 #else   // EXTERNAL_PROPRIETARY_MODE
-  policy_handler_.OnSnapshotCreated(msg);
+  policy_handler_.OnSnapshotCreated(msg,
+                                    policy::PTUIterationType::DefaultIteration);
 #endif  // EXTERNAL_PROPRIETARY_MODE
 }
 
@@ -1800,7 +1801,8 @@ TEST_F(PolicyHandlerTest, DISABLED_OnSnapshotCreated_UrlAdded) {
 #endif  // PROPRIETARY_MODE
 
   EXPECT_CALL(*mock_policy_manager_, OnUpdateStarted());
-  policy_handler_.OnSnapshotCreated(msg);
+  policy_handler_.OnSnapshotCreated(msg,
+                                    policy::PTUIterationType::DefaultIteration);
 }
 #endif  // EXTERNAL_PROPRIETARY_MODE
 
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
@@ -71,7 +71,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
                     const std::vector<int>& retry_delay_seconds,
                     uint32_t timeout_exchange));
 #else   // EXTERNAL_PROPRIETARY_MODE
-  MOCK_METHOD1(OnSnapshotCreated, void(const policy::BinaryMessage& pt_string));
+  MOCK_METHOD2(OnSnapshotCreated,
+               void(const policy::BinaryMessage& pt_string,
+                    const policy::PTUIterationType iteration_type));
 #endif  // EXTERNAL_PROPRIETARY_MODE
 
   MOCK_CONST_METHOD2(GetPriority,
@@ -243,6 +245,7 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
 #ifdef EXTERNAL_PROPRIETARY_MODE
   MOCK_CONST_METHOD0(GetMetaInfo, const policy::MetaInfo());
   MOCK_METHOD0(IncrementRetryIndex, void());
+  MOCK_CONST_METHOD0(ptu_retry_handler, policy::PTURetryHandler&());
 #endif  // EXTERNAL_PROPRIETARY_MODE
 
   MOCK_METHOD1(Increment, void(usage_statistics::GlobalCounterId type));
diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h b/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h
@@ -105,7 +105,7 @@ class MockPolicyListener : public ::policy::PolicyListener {
                     const std::string& hmi_level));
   MOCK_METHOD1(OnCertDecryptFinished, void(bool));
   MOCK_METHOD0(IncrementRetryIndex, void());
-  MOCK_CONST_METHOD0(IsAllowedPTURetriesExceeded, bool());
+  MOCK_CONST_METHOD0(ptu_retry_handler, policy::PTURetryHandler&());
 };
 
 }  // namespace policy_test
diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h
@@ -80,7 +80,8 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD0(IncrementIgnitionCycles, void());
   MOCK_METHOD0(ForcePTExchange, std::string());
   MOCK_METHOD0(ForcePTExchangeAtUserRequest, std::string());
-  MOCK_METHOD1(ResetRetrySequence, void(const bool send_event));
+  MOCK_METHOD1(ResetRetrySequence,
+               void(const policy::ResetRetryCountType send_event));
   MOCK_METHOD0(NextRetryTimeout, int());
   MOCK_METHOD0(TimeoutExchangeMSec, uint32_t());
   MOCK_METHOD0(RetrySequenceDelaysSeconds, const std::vector<int>());
diff --git a/src/components/include/test/policy/policy_external/policy/mock_ptu_retry_handler.h b/src/components/include/test/policy/policy_external/policy/mock_ptu_retry_handler.h
@@ -29,38 +29,20 @@
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_PTU_RETRY_HANDLER_H_
-#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_PTU_RETRY_HANDLER_H_
 
-namespace policy {
-
-class PTURetryHandler {
- public:
-  /**
-   * @brief Check whether allowed retry sequence count is exceeded
-   * @return bool value - true is allowed count is exceeded, otherwise - false
-   */
-  virtual bool IsAllowedRetryCountExceeded() const = 0;
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_MOCK_PTU_RETRY_HANDLER_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_MOCK_PTU_RETRY_HANDLER_H_
 
-  /**
-   * @brief Begins new retry sequence
-   */
-  virtual void BeginRetrySequence() = 0;
-  /**
-   * @brief Start timer waiting for OnSystemRequest from HMI.
-   */
-  virtual void StartWaitingPTURetry() = 0;
+#include "policy/ptu_retry_handler.h"
 
-  /**
-   * @brief Stop timer waiting for git OnSystemRequest from HMI.
-   */
-  virtual void StopWaitingPTURetry() = 0;
+namespace policy {
 
-  /**
-   * @brief Handle retry sequence failure
-   */
-  virtual void RetrySequenceFailed() = 0;
+class MockPTURetryHandler : public PTURetryHandler {
+ public:
+  MOCK_CONST_METHOD0(IsAllowedRetryCountExceeded, bool());
+  MOCK_METHOD0(OnSystemRequestReceived, void());
+  MOCK_METHOD0(RetrySequenceFailed, void());
 };
 }  // namespace policy
 
-#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_PTU_RETRY_HANDLER_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_MOCK_PTU_RETRY_HANDLER_H_
diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h
@@ -72,7 +72,9 @@ class MockPolicyListener : public ::policy::PolicyListener {
   MOCK_METHOD1(OnUpdateHMIAppType,
                void(std::map<std::string, policy::StringArray>));
   MOCK_METHOD1(GetAvailableApps, void(std::queue<std::string>&));
-  MOCK_METHOD1(OnSnapshotCreated, void(const policy::BinaryMessage& pt_string));
+  MOCK_METHOD2(OnSnapshotCreated,
+               void(const policy::BinaryMessage& pt_string,
+                    const policy::PTUIterationType iteration_type));
   MOCK_METHOD0(CanUpdate, bool());
   MOCK_METHOD1(OnCertificateUpdated, void(const std::string&));
   MOCK_METHOD2(OnAuthTokenUpdated,
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
@@ -68,7 +68,8 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD2(GetUpdateUrls,
                void(const std::string& service_type,
                     EndpointUrls& out_end_points));
-  MOCK_METHOD0(RequestPTUpdate, bool());
+  MOCK_METHOD1(RequestPTUpdate,
+               bool(const policy::PTUIterationType iteration_type));
   MOCK_METHOD5(CheckPermissions,
                void(const PTString& app_id,
                     const PTString& hmi_level,
@@ -81,7 +82,8 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD0(IncrementIgnitionCycles, void());
   MOCK_METHOD0(ForcePTExchange, std::string());
   MOCK_METHOD0(ForcePTExchangeAtUserRequest, std::string());
-  MOCK_METHOD0(ResetRetrySequence, void());
+  MOCK_METHOD1(ResetRetrySequence,
+               void(const policy::ResetRetryCountType send_event));
   MOCK_METHOD0(NextRetryTimeout, uint32_t());
   MOCK_METHOD0(TimeoutExchangeMSec, uint32_t());
   MOCK_METHOD0(RetrySequenceDelaysSeconds, const std::vector<int>());
diff --git a/src/components/include/test/security_manager/mock_security_manager_listener.h b/src/components/include/test/security_manager/mock_security_manager_listener.h
@@ -50,7 +50,7 @@ class MockSecurityManagerListener
   MOCK_METHOD0(OnCertificateUpdateRequired, void());
   MOCK_CONST_METHOD1(GetPolicyCertificateData, bool(std::string& data));
   MOCK_METHOD0(OnGetSystemTimeFailed, bool());
-  MOCK_METHOD0(OnPTUFailed, void());
+  MOCK_METHOD0(OnPTUFailed, bool());
 #ifdef EXTERNAL_PROPRIETARY_MODE
   MOCK_METHOD0(OnCertDecryptFailed, bool());
 #endif
diff --git a/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h b/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h
@@ -42,6 +42,7 @@
 #include "policy/mock_cache_manager.h"
 #include "policy/mock_policy_listener.h"
 #include "policy/mock_policy_settings.h"
+#include "policy/mock_ptu_retry_handler.h"
 #include "policy/mock_update_status_manager.h"
 
 namespace test {
@@ -115,6 +116,7 @@ class PolicyManagerImplTest : public ::testing::Test {
   MockCacheManagerInterface* cache_manager_;
   MockUpdateStatusManager update_manager_;
   NiceMock<MockPolicyListener> listener_;
+  NiceMock<MockPTURetryHandler> ptu_retry_handler_;
 
   void SetUp() OVERRIDE;
 
@@ -140,6 +142,7 @@ class PolicyManagerImplTest2 : public ::testing::Test {
 
   PolicyManagerImpl* policy_manager_;
   NiceMock<MockPolicyListener> listener_;
+  NiceMock<MockPTURetryHandler> ptu_retry_handler_;
   ::policy::StringArray hmi_level_;
   ::policy::StringArray pt_request_types_;
   size_t ptu_request_types_size_;
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_test.cc
@@ -37,6 +37,7 @@
 #include "json/reader.h"
 
 #include "policy/policy_manager_impl_test_base.h"
+#include "utils/date_time.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
@@ -47,30 +48,6 @@ namespace test {
 namespace components {
 namespace policy_test {
 
-TEST_F(
-    PolicyManagerImplTest,
-    RefreshRetrySequence_SetSecondsBetweenRetries_ExpectRetryTimeoutSequenceWithSameSeconds) {
-  // Arrange
-  std::vector<int> seconds;
-  seconds.push_back(50);
-  seconds.push_back(100);
-  seconds.push_back(200);
-
-  // Assert
-  EXPECT_CALL(*cache_manager_, TimeoutResponse()).WillOnce(Return(60));
-  EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_))
-      .WillOnce(DoAll(SetArgReferee<0>(seconds), Return(true)));
-
-  // Act
-  policy_manager_->RefreshRetrySequence();
-
-  // Assert
-  EXPECT_EQ(50, policy_manager_->NextRetryTimeout());
-  EXPECT_EQ(100, policy_manager_->NextRetryTimeout());
-  EXPECT_EQ(200, policy_manager_->NextRetryTimeout());
-  EXPECT_EQ(0, policy_manager_->NextRetryTimeout());
-}
-
 TEST_F(PolicyManagerImplTest, GetNotificationsNumber) {
   std::string priority = "EMERGENCY";
   uint32_t notif_number = 100;
@@ -199,31 +176,14 @@ TEST_F(PolicyManagerImplTest2, OnSystemReady) {
 TEST_F(PolicyManagerImplTest2, ResetRetrySequence) {
   // Arrange
   CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->ResetRetrySequence();
+  policy_manager_->ResetRetrySequence(
+      policy::ResetRetryCountType::kResetWithStatusUpdate);
   EXPECT_EQ("UPDATE_NEEDED", policy_manager_->GetPolicyTableStatus());
   policy_manager_->SetSendOnUpdateFlags(false, false);
   policy_manager_->OnUpdateStarted();
   EXPECT_EQ("UPDATING", policy_manager_->GetPolicyTableStatus());
 }
 
-TEST_F(PolicyManagerImplTest2, NextRetryTimeout_ExpectTimeoutsFromPT) {
-  // Arrange
-  std::ifstream ifile(preloaded_pt_filename_);
-  Json::Reader reader;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    Json::Value seconds_between_retries = Json::Value(Json::arrayValue);
-    seconds_between_retries =
-        root["policy_table"]["module_config"]["seconds_between_retries"];
-    uint32_t size = seconds_between_retries.size();
-    CreateLocalPT(preloaded_pt_filename_);
-    for (uint32_t i = 0; i < size; ++i) {
-      EXPECT_EQ(seconds_between_retries[i],
-                policy_manager_->NextRetryTimeout());
-    }
-  }
-}
-
 TEST_F(PolicyManagerImplTest2, TimeOutExchange) {
   // Arrange
   CreateLocalPT(preloaded_pt_filename_);
@@ -319,6 +279,8 @@ TEST_F(PolicyManagerImplTest2,
        OnExceededTimeout_GetPolicyTableStatus_ExpectUpdateNeeded) {
   // Arrange
   CreateLocalPT(preloaded_pt_filename_);
+  ON_CALL(ptu_retry_handler_, IsAllowedRetryCountExceeded())
+      .WillByDefault(Return(false));
   policy_manager_->ForcePTExchange();
   policy_manager_->OnExceededTimeout();
   // Check
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
@@ -218,6 +218,8 @@ void PolicyManagerImplTest::SetUp() {
   ON_CALL(*cache_manager_, GetKnownLinksFromPT())
       .WillByDefault(Return(std::map<std::string, std::string>()));
   ON_CALL(listener_, GetRegisteredLinks(_)).WillByDefault(Return());
+  ON_CALL(listener_, ptu_retry_handler())
+      .WillByDefault(ReturnRef(ptu_retry_handler_));
 }
 
 void PolicyManagerImplTest::TearDown() {
@@ -253,6 +255,8 @@ PolicyManagerImplTest2::PolicyManagerImplTest2()
 
 void PolicyManagerImplTest2::SetUp() {
   ON_CALL(listener_, GetRegisteredLinks(_)).WillByDefault(Return());
+  ON_CALL(listener_, ptu_retry_handler())
+      .WillByDefault(ReturnRef(ptu_retry_handler_));
 
   file_system::CreateDirectory(app_storage_folder_);
 
diff --git a/src/components/policy/policy_external/test/update_status_manager_test.cc b/src/components/policy/policy_external/test/update_status_manager_test.cc
@@ -33,6 +33,7 @@
 #include "policy/update_status_manager.h"
 #include "gtest/gtest.h"
 #include "policy/mock_policy_listener.h"
+#include "policy/mock_ptu_retry_handler.h"
 #include "policy/policy_manager_impl.h"
 
 #include "utils/conditional_variable.h"
@@ -52,6 +53,7 @@ class UpdateStatusManagerTest : public ::testing::Test {
   PolicyTableStatus status_;
   const uint32_t k_timeout_;
   NiceMock<MockPolicyListener> listener_;
+  NiceMock<MockPTURetryHandler> mock_ptu_retry_handler_;
   const std::string up_to_date_status_;
   const std::string update_needed_status_;
   const std::string updating_status_;
@@ -61,13 +63,16 @@ class UpdateStatusManagerTest : public ::testing::Test {
       : manager_(std::make_shared<UpdateStatusManager>())
       , k_timeout_(1000)
       , listener_()
+      , mock_ptu_retry_handler_()
       , up_to_date_status_("UP_TO_DATE")
       , update_needed_status_("UPDATE_NEEDED")
       , updating_status_("UPDATING") {}
 
   void SetUp() OVERRIDE {
     manager_->set_listener(&listener_);
     ON_CALL(listener_, OnUpdateStatusChanged(_)).WillByDefault(Return());
+    ON_CALL(listener_, ptu_retry_handler())
+        .WillByDefault(ReturnRef(mock_ptu_retry_handler_));
   }
 
   void TearDown() OVERRIDE {}
@@ -111,6 +116,11 @@ ACTION_P(NotifyAsync, waiter) {
   waiter->Notify();
 }
 
+ACTION_P2(RetryFailed, manager, listener) {
+  manager->OnResetRetrySequence();
+  listener->OnPTUFinished(false);
+}
+
 TEST_F(UpdateStatusManagerTest,
        OnUpdateSentOut_WaitForTimeoutExpired_ExpectStatusUpdateNeeded) {
   // Arrange
@@ -121,8 +131,6 @@ TEST_F(UpdateStatusManagerTest,
   WaitAsync waiter(count, timeout);
   EXPECT_CALL(listener_, OnUpdateStatusChanged(_))
       .WillRepeatedly(NotifyAsync(&waiter));
-  EXPECT_CALL(listener_, IsAllowedPTURetriesExceeded())
-      .WillRepeatedly(Return(false));
   manager_->ScheduleUpdate();
   manager_->OnUpdateSentOut(k_timeout_);
   status_ = manager_->GetLastUpdateStatus();
@@ -143,16 +151,18 @@ TEST_F(
   WaitAsync waiter(count, timeout);
   EXPECT_CALL(listener_, OnUpdateStatusChanged(_))
       .WillRepeatedly(NotifyAsync(&waiter));
+  EXPECT_CALL(mock_ptu_retry_handler_, RetrySequenceFailed())
+      .WillOnce(RetryFailed(manager_, &listener_));
   manager_->ScheduleUpdate();
   manager_->OnUpdateSentOut(k_timeout_);
   status_ = manager_->GetLastUpdateStatus();
   {
     ::testing::InSequence s;
-    EXPECT_CALL(listener_, IsAllowedPTURetriesExceeded())
+    EXPECT_CALL(mock_ptu_retry_handler_, IsAllowedRetryCountExceeded())
         .WillRepeatedly(Return(false));
-    EXPECT_CALL(listener_, IsAllowedPTURetriesExceeded())
+    EXPECT_CALL(mock_ptu_retry_handler_, IsAllowedRetryCountExceeded())
         .WillRepeatedly(Return(false));
-    EXPECT_CALL(listener_, IsAllowedPTURetriesExceeded())
+    EXPECT_CALL(mock_ptu_retry_handler_, IsAllowedRetryCountExceeded())
         .WillRepeatedly(Return(true));
     EXPECT_CALL(listener_, OnPTUFinished(false));
   }
@@ -277,7 +287,7 @@ TEST_F(UpdateStatusManagerTest, OnResetRetrySequence_ExpectStatusUpToDate) {
   manager_->OnResetRetrySequence();
   status_ = manager_->GetLastUpdateStatus();
   // Check
-  EXPECT_EQ(StatusUpdatePending, status_);
+  EXPECT_EQ(StatusUpdateRequired, status_);
 }
 
 TEST_F(UpdateStatusManagerTest,
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
diff --git a/src/components/protocol_handler/test/protocol_handler_tm_test.cc b/src/components/protocol_handler/test/protocol_handler_tm_test.cc
