diff --git a/services/test/src/work_policy_manager_test.cpp b/services/test/src/work_policy_manager_test.cpp index 1eea7a5f4313c2efbab99e35bc599c11470707c0..72b314504cfd3252a6dab5b543223c08ee69260b 100644 --- a/services/test/src/work_policy_manager_test.cpp +++ b/services/test/src/work_policy_manager_test.cpp @@ -43,9 +43,18 @@ class MockPolicyFilter : public IPolicyFilter { public: explicit MockPolicyFilter(std::shared_ptr workPolicyManager){}; ~MockPolicyFilter(){}; + int32_t maxRunningCount; + std::string policyName; + + int32_t GetPolicyMaxRunning() override + { + return maxRunningCount; + } - MOCK_METHOD(int32_t, GetPolicyMaxRunning, (), (override)); - MOCK_METHOD(std::string, GetPolicyName, (), (override)); + std::string GetPolicyName() override + { + return policyName; + } }; std::shared_ptr WorkPolicyManagerTest::workPolicyManager_ = nullptr; @@ -806,13 +815,13 @@ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_002, TestSize.Level1) */ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_003, TestSize.Level1) { - workPolicyManager_->policyFilters_.clear(); std::string policyName; workPolicyManager_->SetMaxRunningCountByDump(5); int32_t result = workPolicyManager_->GetMaxRunningCount(policyName); EXPECT_EQ(5, result); EXPECT_TRUE(policyName.empty()); + workPolicyManager_->policyFilters_.clear(); } /** @@ -823,17 +832,16 @@ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_003, TestSize.Level1) */ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_004, TestSize.Level1) { - workPolicyManager_->policyFilters_.clear(); std::string policyName; workPolicyManager_->SetMaxRunningCountByDump(0); auto filter1 = std::make_shared(workPolicyManager_); - EXPECT_CALL(*filter1, GetPolicyMaxRunning()).WillRepeatedly(Return(2)); - EXPECT_CALL(*filter1, GetPolicyName()).WillRepeatedly(Return("policyA")); + filter1->maxRunningCount = 2; + filter1->policyName = "policyA"; auto filter2 = std::make_shared(workPolicyManager_); - EXPECT_CALL(*filter2, GetPolicyMaxRunning()).WillRepeatedly(Return(4)); - EXPECT_CALL(*filter2, GetPolicyName()).WillRepeatedly(Return("policyB")); + filter2->maxRunningCount = 4; + filter2->policyName = "policyB"; workPolicyManager_->AddPolicyFilter(filter1); workPolicyManager_->AddPolicyFilter(filter2); @@ -842,6 +850,7 @@ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_004, TestSize.Level1) EXPECT_EQ(2, result); EXPECT_EQ("policyA", policyName); + workPolicyManager_->policyFilters_.clear(); } /** @@ -852,21 +861,20 @@ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_004, TestSize.Level1) */ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_005, TestSize.Level1) { - workPolicyManager_->policyFilters_.clear(); std::string policyName; workPolicyManager_->SetMaxRunningCountByDump(0); auto filter1 = std::make_shared(workPolicyManager_); - EXPECT_CALL(*filter1, GetPolicyMaxRunning()).WillRepeatedly(Return(5)); - EXPECT_CALL(*filter1, GetPolicyName()).WillRepeatedly(Return("policyX")); + filter1->maxRunningCount = 5; + filter1->policyName = "policyX"; auto filter2 = std::make_shared(workPolicyManager_); - EXPECT_CALL(*filter2, GetPolicyMaxRunning()).WillRepeatedly(Return(3)); - EXPECT_CALL(*filter2, GetPolicyName()).WillRepeatedly(Return("policyY")); + filter2->maxRunningCount = 3; + filter2->policyName = "policyY"; auto filter3 = std::make_shared(workPolicyManager_); - EXPECT_CALL(*filter3, GetPolicyMaxRunning()).WillRepeatedly(Return(7)); - EXPECT_CALL(*filter3, GetPolicyName()).WillRepeatedly(Return("policyZ")); + filter3->maxRunningCount = 7; + filter3->policyName = "policyZ"; workPolicyManager_->AddPolicyFilter(filter1); workPolicyManager_->AddPolicyFilter(filter2); @@ -876,6 +884,7 @@ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_005, TestSize.Level1) EXPECT_EQ(3, result); EXPECT_TRUE(policyName.empty()); + workPolicyManager_->policyFilters_.clear(); } /** @@ -886,7 +895,6 @@ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_005, TestSize.Level1) */ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_006, TestSize.Level1) { - workPolicyManager_->policyFilters_.clear(); std::string policyName; workPolicyManager_->SetMaxRunningCountByDump(0); @@ -894,6 +902,7 @@ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_006, TestSize.Level1) EXPECT_EQ(3, result); EXPECT_TRUE(policyName.empty()); + workPolicyManager_->policyFilters_.clear(); } /** @@ -904,25 +913,24 @@ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_006, TestSize.Level1) */ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_007, TestSize.Level1) { - workPolicyManager_->policyFilters_.clear(); std::string policyName; workPolicyManager_->SetMaxRunningCountByDump(0); auto filter1 = std::make_shared(workPolicyManager_); - EXPECT_CALL(*filter1, GetPolicyMaxRunning()).WillRepeatedly(Return(10)); - EXPECT_CALL(*filter1, GetPolicyName()).WillRepeatedly(Return("policy1")); + filter1->maxRunningCount = 10; + filter1->policyName = "policy1"; auto filter2 = std::make_shared(workPolicyManager_); - EXPECT_CALL(*filter2, GetPolicyMaxRunning()).WillRepeatedly(Return(5)); - EXPECT_CALL(*filter2, GetPolicyName()).WillRepeatedly(Return("policy2")); + filter2->maxRunningCount = 5; + filter2->policyName = "policy2"; auto filter3 = std::make_shared(workPolicyManager_); - EXPECT_CALL(*filter3, GetPolicyMaxRunning()).WillRepeatedly(Return(8)); - EXPECT_CALL(*filter3, GetPolicyName()).WillRepeatedly(Return("policy3")); + filter3->maxRunningCount = 8; + filter3->policyName = "policy3"; auto filter4 = std::make_shared(workPolicyManager_); - EXPECT_CALL(*filter4, GetPolicyMaxRunning()).WillRepeatedly(Return(3)); - EXPECT_CALL(*filter4, GetPolicyName()).WillRepeatedly(Return("policy4")); + filter4->maxRunningCount = 3; + filter4->policyName = "policy4"; workPolicyManager_->AddPolicyFilter(filter1); workPolicyManager_->AddPolicyFilter(filter2); @@ -933,6 +941,7 @@ HWTEST_F(WorkPolicyManagerTest, GetMaxRunningCount_007, TestSize.Level1) EXPECT_EQ(3, result); EXPECT_TRUE(policyName.empty()); + workPolicyManager_->policyFilters_.clear(); } /** @@ -1054,7 +1063,7 @@ HWTEST_F(WorkPolicyManagerTest, GetDeepIdleWorks_001, TestSize.Level1) * @tc.name: DumpTriggerWork_001 * @tc.desc: Test WorkPolicyManagerTest DumpTriggerWork. * @tc.type: FUNC - * @tc.require: I9J0A7 + * @tc.require: IC5H77 */ HWTEST_F(WorkPolicyManagerTest, DumpTriggerWork_001, TestSize.Level1) { @@ -1069,7 +1078,7 @@ HWTEST_F(WorkPolicyManagerTest, DumpTriggerWork_001, TestSize.Level1) * @tc.name: DumpTriggerWork_002 * @tc.desc: Test WorkPolicyManagerTest DumpTriggerWork. * @tc.type: FUNC - * @tc.require: I9J0A7 + * @tc.require: IC5H77 */ HWTEST_F(WorkPolicyManagerTest, DumpTriggerWork_002, TestSize.Level1) { @@ -1092,7 +1101,7 @@ HWTEST_F(WorkPolicyManagerTest, DumpTriggerWork_002, TestSize.Level1) * @tc.name: DumpTriggerWork_003 * @tc.desc: Test WorkPolicyManagerTest DumpTriggerWork. * @tc.type: FUNC - * @tc.require: I9J0A7 + * @tc.require: IC5H77 */ HWTEST_F(WorkPolicyManagerTest, DumpTriggerWork_003, TestSize.Level1) { diff --git a/services/test/src/workschedulerservice_test.cpp b/services/test/src/workschedulerservice_test.cpp index e566183bcbc93a4cf49529c2b8392ad625289728..312e912e846a4995cd29988979a6f7f01d1007f2 100644 --- a/services/test/src/workschedulerservice_test.cpp +++ b/services/test/src/workschedulerservice_test.cpp @@ -1214,7 +1214,7 @@ HWTEST_F(WorkSchedulerServiceTest, LoadMinRepeatTimeFromFile_002, TestSize.Level * @tc.name: DumpTriggerWork_001 * @tc.desc: Test WorkSchedulerService DumpTriggerWork. * @tc.type: FUNC - * @tc.require: IBB60P + * @tc.require: I9J0A7 */ HWTEST_F(WorkSchedulerServiceTest, DumpTriggerWork_001, TestSize.Level1) { @@ -1229,7 +1229,7 @@ HWTEST_F(WorkSchedulerServiceTest, DumpTriggerWork_001, TestSize.Level1) * @tc.name: DumpTriggerWork_002 * @tc.desc: Test WorkSchedulerService DumpTriggerWork. * @tc.type: FUNC - * @tc.require: IBB60P + * @tc.require: IC5H77 */ HWTEST_F(WorkSchedulerServiceTest, DumpTriggerWork_002, TestSize.Level1) { @@ -1244,7 +1244,7 @@ HWTEST_F(WorkSchedulerServiceTest, DumpTriggerWork_002, TestSize.Level1) * @tc.name: DumpTriggerWork_003 * @tc.desc: Test WorkSchedulerService DumpTriggerWork. * @tc.type: FUNC - * @tc.require: IBB60P + * @tc.require: IC5H77 */ HWTEST_F(WorkSchedulerServiceTest, DumpTriggerWork_003, TestSize.Level1) { @@ -1259,7 +1259,7 @@ HWTEST_F(WorkSchedulerServiceTest, DumpTriggerWork_003, TestSize.Level1) * @tc.name: DumpTriggerWork_004 * @tc.desc: Test WorkSchedulerService DumpTriggerWork. * @tc.type: FUNC - * @tc.require: IBB60P + * @tc.require: IC5H77 */ HWTEST_F(WorkSchedulerServiceTest, DumpTriggerWork_004, TestSize.Level1) {