* Refactor hasUnfinished method.

This commit is contained in:
tianshujie
2023-09-14 11:01:04 +08:00
parent 27867472ab
commit 91e26c2ba0
3 changed files with 13 additions and 21 deletions
+7 -17
View File
@@ -2,31 +2,21 @@
<?php
include dirname(__FILE__, 5) . '/test/lib/init.php';
include dirname(__FILE__, 2) . '/program.class.php';
zdTable('user')->gen(5);
zdTable('project')->config('program')->gen(20)->fixpath();
su('admin');
$program = zdTable('project');
$program->id->range('1-5');
$program->name->range('项目集1,项目集2');
$program->type->range('program');
$program->status->range('wait');
$program->parent->range('0,0,1,1,2');
$program->path->range('1,2,`1,3`,`1,4`,`2,5`')->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(5);
/**
title=测试 programModel::hasUnfinished();
timeout=0
cid=1
pid=1
获取项目集1下未完成的项目和项目集数量 >> 2
获取项目集2下未完成的项目和项目集数量 >> 1
*/
$programIdList = array(1, 2, 3);
$programTester = new programTest();
r($programTester->hasUnfinishedTest(1)) && p() && e('2'); // 获取项目集1下未完成的项目和项目集数量
r($programTester->hasUnfinishedTest(2)) && p() && e('1'); // 获取项目集2下未完成的项目和项目集数量
r($programTester->hasUnfinishedTest($programIdList[0])) && p() && e('4'); // 获取项目集1下未完成的项目和项目集数量
r($programTester->hasUnfinishedTest($programIdList[1])) && p() && e('2'); // 获取项目集2下未完成的项目和项目集数量
r($programTester->hasUnfinishedTest($programIdList[2])) && p() && e('1'); // 获取项目集3下未完成的项目和项目集数量
+3 -2
View File
@@ -275,13 +275,14 @@ class programTest
}
/**
* Has unfinished.
* 该项目集下未关闭的子项目集或项目的数量。
* Judge whether there is an unclosed programs or projects.
*
* @param int $programID
* @access public
* @return int
*/
public function hasUnfinishedTest($programID)
public function hasUnfinishedTest(int $programID): int
{
$program = $this->program->getByID($programID);
return $this->program->hasUnfinished($program);