From d48b02dd2e1fcebb1beb0fc126ca3cbafa89574b Mon Sep 17 00:00:00 2001 From: Shobhit Adlakha Date: Tue, 10 Mar 2020 16:16:54 -0400 Subject: Fix extern policy unit tests --- .../include/policy/policy_manager_impl_test_base.h | 1 + .../test/policy_manager_impl_ptu_test.cc | 2 ++ .../test/policy_manager_impl_test.cc | 6 ++++++ .../test/policy_manager_impl_test_base.cc | 2 ++ .../test/policy_manager_impl_test.cc | 24 ++++++++++++++-------- 5 files changed, 27 insertions(+), 8 deletions(-) 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 index 816b99cc2f..40b57f9ed3 100644 --- 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 @@ -117,6 +117,7 @@ class PolicyManagerImplTest : public ::testing::Test { MockUpdateStatusManager update_manager_; NiceMock listener_; NiceMock ptu_retry_handler_; + PolicyTableSPtr default_pt_snapshot_; void SetUp() OVERRIDE; diff --git a/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc index 920d2e1272..d5be757139 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc @@ -980,6 +980,8 @@ TEST_F(PolicyManagerImplTest2, TEST_F(PolicyManagerImplTest, LoadPT_SetInvalidUpdatePT_PTIsNotLoaded) { // Arrange + EXPECT_CALL(*cache_manager_, GenerateSnapshot()) + .WillOnce(Return(default_pt_snapshot_)); policy_manager_->ForcePTExchange(); policy_manager_->OnUpdateStarted(); Json::Value table(Json::objectValue); 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 index f824d37dfb..388630a68f 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_test.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_test.cc @@ -106,6 +106,8 @@ TEST_F(PolicyManagerImplTest, LoadPT_SetPT_PTIsLoaded) { // Arrange EXPECT_CALL(*cache_manager_, DaysBeforeExchange(_)) .WillOnce(Return(kNonZero)); + ON_CALL(*cache_manager_, GenerateSnapshot()) + .WillByDefault(Return(default_pt_snapshot_)); policy_manager_->ForcePTExchange(); policy_manager_->SetSendOnUpdateFlags(true); policy_manager_->OnUpdateStarted(); @@ -254,6 +256,8 @@ TEST_F(PolicyManagerImplTest2, GetPolicyTableStatus_ExpectUpToDate) { TEST_F(PolicyManagerImplTest, SetUpdateStarted_GetPolicyTableStatus_Expect_Updating) { // Arrange + EXPECT_CALL(*cache_manager_, GenerateSnapshot()) + .WillOnce(Return(default_pt_snapshot_)); policy_manager_->ForcePTExchange(); EXPECT_CALL(*cache_manager_, SaveUpdateRequired(true)); policy_manager_->OnUpdateStarted(); @@ -306,6 +310,8 @@ TEST_F(PolicyManagerImplTest, MarkUnpairedDevice) { EXPECT_CALL(*cache_manager_, IgnitionCyclesBeforeExchange()); EXPECT_CALL(*cache_manager_, DaysBeforeExchange(_)); // Act + EXPECT_CALL(*cache_manager_, GenerateSnapshot()) + .WillOnce(Return(default_pt_snapshot_)); policy_manager_->MarkUnpairedDevice(unpaired_device_id_); } 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 index dc1d7a06ef..7c2d231708 100644 --- 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 @@ -220,6 +220,8 @@ void PolicyManagerImplTest::SetUp() { ON_CALL(listener_, GetRegisteredLinks(_)).WillByDefault(Return()); ON_CALL(listener_, ptu_retry_handler()) .WillByDefault(ReturnRef(ptu_retry_handler_)); + Json::Value table = createPTforLoad(); + default_pt_snapshot_ = std::make_shared(&table); } void PolicyManagerImplTest::TearDown() { 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 4820fecec6..abf9a2ec14 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 @@ -990,7 +990,8 @@ TEST_F(PolicyManagerImplTest, ResetPT) { TEST_F(PolicyManagerImplTest, LoadPT_SetPT_PTIsLoaded) { // Arrange - EXPECT_CALL(*cache_manager, GenerateSnapshot()).WillOnce(Return(default_pt_snapshot_)); + EXPECT_CALL(*cache_manager, GenerateSnapshot()) + .WillOnce(Return(default_pt_snapshot_)); manager->ForcePTExchange(); manager->OnUpdateStarted(); Json::Value table = CreatePTforLoad(); @@ -1027,7 +1028,8 @@ TEST_F(PolicyManagerImplTest, LoadPT_SetPT_PTIsLoaded) { TEST_F(PolicyManagerImplTest, LoadPT_FunctionalGroup_removeRPC_SendUpdate) { // Arrange - EXPECT_CALL(*cache_manager, GenerateSnapshot()).WillOnce(Return(default_pt_snapshot_)); + EXPECT_CALL(*cache_manager, GenerateSnapshot()) + .WillOnce(Return(default_pt_snapshot_)); manager->ForcePTExchange(); manager->OnUpdateStarted(); Json::Value table = CreatePTforLoad(); @@ -1063,7 +1065,8 @@ TEST_F(PolicyManagerImplTest, LoadPT_FunctionalGroup_removeRPC_SendUpdate) { TEST_F(PolicyManagerImplTest, LoadPT_FunctionalGroup_removeRPCParams_SendUpdate) { // Arrange - EXPECT_CALL(*cache_manager, GenerateSnapshot()).WillOnce(Return(default_pt_snapshot_)); + EXPECT_CALL(*cache_manager, GenerateSnapshot()) + .WillOnce(Return(default_pt_snapshot_)); manager->ForcePTExchange(); manager->OnUpdateStarted(); Json::Value table = CreatePTforLoad(); @@ -1101,7 +1104,8 @@ TEST_F(PolicyManagerImplTest, TEST_F(PolicyManagerImplTest, LoadPT_FunctionalGroup_removeRPC_HMILevels_SendUpdate) { // Arrange - EXPECT_CALL(*cache_manager, GenerateSnapshot()).WillOnce(Return(default_pt_snapshot_)); + EXPECT_CALL(*cache_manager, GenerateSnapshot()) + .WillOnce(Return(default_pt_snapshot_)); manager->ForcePTExchange(); manager->OnUpdateStarted(); Json::Value table = CreatePTforLoad(); @@ -1139,7 +1143,8 @@ TEST_F(PolicyManagerImplTest, TEST_F(PolicyManagerImplTest, LoadPT_FunctionalGroup_addRPC_HMILevels_SendUpdate) { // Arrange - EXPECT_CALL(*cache_manager, GenerateSnapshot()).WillOnce(Return(default_pt_snapshot_)); + EXPECT_CALL(*cache_manager, GenerateSnapshot()) + .WillOnce(Return(default_pt_snapshot_)); manager->ForcePTExchange(); manager->OnUpdateStarted(); Json::Value table = CreatePTforLoad(); @@ -1178,7 +1183,8 @@ TEST_F(PolicyManagerImplTest, TEST_F(PolicyManagerImplTest, LoadPT_FunctionalGroup_addRPCParams_SendUpdate) { using namespace application_manager; // Arrange - EXPECT_CALL(*cache_manager, GenerateSnapshot()).WillOnce(Return(default_pt_snapshot_)); + EXPECT_CALL(*cache_manager, GenerateSnapshot()) + .WillOnce(Return(default_pt_snapshot_)); manager->ForcePTExchange(); manager->OnUpdateStarted(); Json::Value table = CreatePTforLoad(); @@ -1215,7 +1221,8 @@ TEST_F(PolicyManagerImplTest, LoadPT_FunctionalGroup_addRPCParams_SendUpdate) { TEST_F(PolicyManagerImplTest, LoadPT_FunctionalGroup_NoUpdate_DONT_SendUpdate) { // Arrange - EXPECT_CALL(*cache_manager, GenerateSnapshot()).WillOnce(Return(default_pt_snapshot_)); + EXPECT_CALL(*cache_manager, GenerateSnapshot()) + .WillOnce(Return(default_pt_snapshot_)); manager->ForcePTExchange(); manager->OnUpdateStarted(); Json::Value table = CreatePTforLoad(); @@ -1246,7 +1253,8 @@ TEST_F(PolicyManagerImplTest, LoadPT_FunctionalGroup_NoUpdate_DONT_SendUpdate) { TEST_F(PolicyManagerImplTest, LoadPT_SetInvalidUpdatePT_PTIsNotLoaded) { // Arrange Json::Value table(Json::objectValue); - EXPECT_CALL(*cache_manager, GenerateSnapshot()).WillOnce(Return(default_pt_snapshot_)); + EXPECT_CALL(*cache_manager, GenerateSnapshot()) + .WillOnce(Return(default_pt_snapshot_)); manager->ForcePTExchange(); manager->OnUpdateStarted(); -- cgit v1.2.1