diff --git a/module/program/test/model/getkanbanstatisticdata.php b/module/program/test/model/getkanbanstatisticdata.php index d92e2033e0..363063eddf 100644 --- a/module/program/test/model/getkanbanstatisticdata.php +++ b/module/program/test/model/getkanbanstatisticdata.php @@ -1,5 +1,13 @@ #!/usr/bin/env php gen(5); @@ -13,13 +21,8 @@ zdTable('productplan')->gen(0); zdTable('release')->gen(0); zdTable('team')->gen(0); -/** - -title=测试 programModel::getKanbanStatisticData(); -timeout=0 -cid=1 - -*/ +global $app; +$app->rawModule = 'program'; $programTester = new programTest(); $statistic = $programTester->getKanbanStatisticDataTest(); @@ -29,5 +32,3 @@ r(count($statistic[1])) && p() && e('0'); // 获取项目集的计划数量 r(count($statistic[2])) && p() && e('0'); // 获取项目集的发布数量 r(count($statistic[3])) && p() && e('0'); // 获取项目集的项目数量 r(count($statistic[4])) && p() && e('2'); // 获取项目集的进行中的执行数量 -r(count($statistic[5])) && p() && e('0'); // 获取项目集的工时的数量 -r(count($statistic[6])) && p() && e('14'); // 获取项目集的项目进度的数量 diff --git a/module/program/test/model/processproductsforkanban.php b/module/program/test/model/processproductsforkanban.php index 352b9929ea..de67d5a766 100644 --- a/module/program/test/model/processproductsforkanban.php +++ b/module/program/test/model/processproductsforkanban.php @@ -1,5 +1,13 @@ #!/usr/bin/env php gen(5); @@ -13,13 +21,8 @@ zdTable('productplan')->gen(0); zdTable('release')->gen(0); zdTable('team')->gen(0); -/** - -title=测试 programModel::processProductsForKanban(); -timeout=0 -cid=1 - -*/ +global $app; +$app->rawModule = 'program'; $programTester = new programTest(); $productGroup = $programTester->processProductsForKanbanTest(); diff --git a/module/program/test/program.class.php b/module/program/test/program.class.php index e7768283ef..096beec678 100644 --- a/module/program/test/program.class.php +++ b/module/program/test/program.class.php @@ -379,8 +379,8 @@ class programTest public function processProductsForKanbanTest(): array { $programs = $this->program->getTopPairs('noclosed'); - list($productGroup, $planGroup, $releaseGroup, $projectGroup, $doingExecutions, $hours, $projectHours) = $this->program->getKanbanStatisticData($programs); - return $this->program->processProductsForKanban($productGroup, $planGroup, $releaseGroup, $projectGroup, $doingExecutions, $hours, $projectHours); + list($productGroup, $planGroup, $releaseGroup, $projectGroup, $doingExecutions, ) = $this->program->getKanbanStatisticData($programs); + return $this->program->processProductsForKanban($productGroup, $planGroup, $releaseGroup, $projectGroup, $doingExecutions); } /**