diff --git a/test/class/program.class.php b/test/class/program.class.php index 79380e1b3d..8e5592024d 100644 --- a/test/class/program.class.php +++ b/test/class/program.class.php @@ -361,4 +361,17 @@ class programTest { return $this->program->getProgressList(); } + + /** + * Get stakeholders. + * + * @param int $programID + * @param string $orderBy + * @access public + * @return array + */ + public function getStakeholdersTest($programID, $orderBy = 'id_desc') + { + return $this->program->getStakeholders($programID, $orderBy); + } } diff --git a/test/model/program/getbudgetleft.php b/test/model/program/getbudgetleft.php index 4db0a00893..3998bd1e71 100755 --- a/test/model/program/getbudgetleft.php +++ b/test/model/program/getbudgetleft.php @@ -26,8 +26,8 @@ pid=1 */ $programTester = new programTest(); -$result1 = $programTester->getBudgetLeftTest(1); -$result2 = $programTester->getBudgetLeftTest(2); +$result1 = $programTester->getBudgetLeftTest(1); +$result2 = $programTester->getBudgetLeftTest(2); r($result1) && p() && e('900000'); // 查看项目集1的所有父项目集的预算剩余 r($result2) && p() && e('899900'); // 查看项目集2的所有父项目集的预算剩余 diff --git a/test/model/program/getstakeholders.php b/test/model/program/getstakeholders.php index 9b2b9dbf91..2a769ee78c 100755 --- a/test/model/program/getstakeholders.php +++ b/test/model/program/getstakeholders.php @@ -1,27 +1,46 @@ #!/usr/bin/env php id->range('1,2'); +$program->name->range('父项目集1,父项目集2'); +$program->type->range('program'); +$program->budget->range('900000,899900'); +$program->path->range('1,2')->prefix(',')->postfix(','); +$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD'); +$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD'); +$program->gen(2); + +zdTable('user')->gen(5); + +$stakeholder = zdTable('stakeholder'); +$stakeholder->objectID->range('1,2'); +$stakeholder->objectType->range('program'); +$stakeholder->type->range('inside'); +$stakeholder->user->range('admin,user1,user2'); +$stakeholder->gen(3); + +su('admin'); /** title=测试 programModel::getStakeholders(); cid=1 pid=1 -获取干系人数量 >> 3 -获取干系人数量 >> 3 -id倒序排,获取第一个干系人真实姓名 >> 测试17 -id正序排,获取第一个干系人真实姓名 >> 测试19 +获取干系人数量 >> 2 +获取干系人数量 >> 1 +id倒序排,获取第一个干系人真实姓名 >> 测试2 +id正序排,获取第一个干系人真实姓名 >> 用户1 */ -global $tester; -$tester->loadModel('program'); -$stakeholders1 = $tester->program->getStakeholders(2, 'id_desc'); -$stakeholders2 = $tester->program->getStakeholders(2, 'id_asc'); +$programTester = new programTest(); +$stakeholders1 = $programTester->getStakeholdersTest(1, 'id_desc'); +$stakeholders2 = $programTester->getStakeholdersTest(2, 'id_asc'); -r(count($stakeholders1)) && p() && e('3'); // 获取干系人数量 -r(count($stakeholders2)) && p() && e('3'); // 获取干系人数量 -r($stakeholders1) && p('0:realname') && e('测试17'); // id倒序排,获取第一个干系人真实姓名 -r($stakeholders2) && p('0:realname') && e('测试19'); // id正序排,获取第一个干系人真实姓名 \ No newline at end of file +r(count($stakeholders1)) && p() && e('2'); // 获取干系人数量 +r(count($stakeholders2)) && p() && e('1'); // 获取干系人数量 +r($stakeholders1) && p('0:realname') && e('测试2'); // id倒序排,获取第一个干系人真实姓名 +r($stakeholders2) && p('0:realname') && e('用户1'); // id正序排,获取第一个干系人真实姓名 diff --git a/test/model/program/getstakeholdersbyprograms.php b/test/model/program/getstakeholdersbyprograms.php index 44c4fd3bee..9c0a2eb2ed 100755 --- a/test/model/program/getstakeholdersbyprograms.php +++ b/test/model/program/getstakeholdersbyprograms.php @@ -1,6 +1,27 @@ #!/usr/bin/env php id->range('1,2'); +$program->name->range('父项目集1,父项目集2'); +$program->type->range('program'); +$program->budget->range('900000,899900'); +$program->path->range('1,2')->prefix(',')->postfix(','); +$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD'); +$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD'); +$program->gen(2); + +zdTable('user')->gen(5); + +$stakeholder = zdTable('stakeholder'); +$stakeholder->objectID->range('1,2'); +$stakeholder->objectType->range('program'); +$stakeholder->type->range('inside'); +$stakeholder->user->range('admin,user1,user2'); +$stakeholder->gen(3); + su('admin'); /** @@ -9,25 +30,19 @@ title=测试 programModel::getStakeholdersByPrograms(); cid=1 pid=1 -获取项目集2的干系人名单 >> user19 -获取项目集2的干系人名单 >> user18 -获取项目集2的干系人名单 >> user17 -获取项目集2和项目集3的干系人名单 >> user19 -获取项目集2和项目集3的干系人名单 >> user18 -获取项目集2和项目集3的干系人名单 >> user17 -获取项目集2的干系人个数 >> 3 -获取项目集2、3的干系人个数 >> 6 +获取项目集1的干系人名单 >> admin +获取项目集2的干系人名单 >> user1 +获取项目集1和项目集2的干系人名单 >> admin +获取项目集1的干系人个数 >> 2 +获取项目集1、2的干系人个数 >> 3 */ global $tester; $tester->loadModel('program'); -r($tester->program->getStakeholdersByPrograms('2')) && p('0:account') && e('user19'); // 获取项目集2的干系人名单 -r($tester->program->getStakeholdersByPrograms('2')) && p('1:account') && e('user18'); // 获取项目集2的干系人名单 -r($tester->program->getStakeholdersByPrograms('2')) && p('2:account') && e('user17'); // 获取项目集2的干系人名单 -r($tester->program->getStakeholdersByPrograms('2,3')) && p('0:account') && e('user19'); // 获取项目集2和项目集3的干系人名单 -r($tester->program->getStakeholdersByPrograms('2,3')) && p('1:account') && e('user18'); // 获取项目集2和项目集3的干系人名单 -r($tester->program->getStakeholdersByPrograms('2,3')) && p('2:account') && e('user17'); // 获取项目集2和项目集3的干系人名单 -r(count($tester->program->getStakeholdersByPrograms('2'))) && p('') && e('3'); // 获取项目集2的干系人个数 -r(count($tester->program->getStakeholdersByPrograms('2,3'))) && p('') && e('6'); // 获取项目集2、3的干系人个数 \ No newline at end of file +r($tester->program->getStakeholdersByPrograms('1')) && p('0:account') && e('admin'); // 获取项目集1的干系人名单 +r($tester->program->getStakeholdersByPrograms('2')) && p('0:account') && e('user1'); // 获取项目集2的干系人名单 +r($tester->program->getStakeholdersByPrograms('1,2')) && p('0:account') && e('admin'); // 获取项目集1和项目集2的干系人名单 +r(count($tester->program->getStakeholdersByPrograms('1'))) && p('') && e('2'); // 获取项目集1的干系人个数 +r(count($tester->program->getStakeholdersByPrograms('1,2'))) && p('') && e('3'); // 获取项目集1、2的干系人个数 diff --git a/test/model/program/getteammemberpairs.php b/test/model/program/getteammemberpairs.php index 99a50ca717..020ec104e8 100755 --- a/test/model/program/getteammemberpairs.php +++ b/test/model/program/getteammemberpairs.php @@ -2,7 +2,6 @@ id->range('1-5'); @@ -22,11 +21,15 @@ $team->root->range('3-5'); $team->type->range('project'); $team->account->range('admin'); $team->account->setFields(array( - array('field' => 'account1', 'range' => 'admin,test{4}'), + array('field' => 'account1', 'range' => 'admin,user{4}'), array('field' => 'account2', 'range' => '[],1-4'), )); $team->gen(5); +zdTable('user')->gen(5); + +su('admin'); + /** title=测试 programModel::getTeamMemberPairs(); @@ -36,7 +39,7 @@ pid=1 获取项目集1下所有团队成员数量 >> 5 获取项目集2下所有团队成员数量 >> 2 获取项目集1下所有团队成员真实姓名 >> A:admin -获取项目集2下所有团队成员真实姓名 >> T:测试2 +获取项目集2下所有团队成员真实姓名 >> U:测试2 */ @@ -47,4 +50,4 @@ $teams2 = $programTester->getTeamMemberPairsTest(2); r(count($teams1)) && p() && e('5'); // 获取项目集1下所有团队成员数量 r(count($teams2)) && p() && e('2'); // 获取项目集2下所有团队成员数量 r($teams1) && p('admin') && e('A:admin'); // 获取项目集1下所有团队成员真实姓名 -r($teams2) && p('test2') && e('T:测试2'); // 获取项目集2下所有团队成员真实姓名 +r($teams2) && p('user2') && e('U:测试2'); // 获取项目集2下所有团队成员真实姓名