diff --git a/module/project/test/model/gettotalbugbyproject.php b/module/project/test/model/gettotalbugbyproject.php deleted file mode 100755 index afa2ad47f2..0000000000 --- a/module/project/test/model/gettotalbugbyproject.php +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env php -getTotalBugByProject(); -cid=1 -pid=1 - -获取id为11的项目下激活的bug数量 >> 4 -获取id为27的项目下激活的bug数量 >> 1 - -*/ - -global $tester; -$tester->loadModel('project'); - -$projectIdList = array(11, 12, 13, 14, 15, 16, 27); -$result = $tester->project->getTotalBugByProject($projectIdList, 'active'); - -r($result[11]) && p('allBugs') && e('4'); //获取id为11的项目下激活的bug数量 -r($result[27]) && p('allBugs') && e('1'); //获取id为27的项目下激活的bug数量 diff --git a/module/project/test/model/gettotalstoriesbyproject.php b/module/project/test/model/gettotalstoriesbyproject.php deleted file mode 100755 index ab928b35dc..0000000000 --- a/module/project/test/model/gettotalstoriesbyproject.php +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env php -> 4 -传入产品ID列表，获取项目11下的所有需求数量 >> 4;4 -*/ - -global $tester; -$tester->loadModel('project'); - -$projectIdList = array(12,13); -$stories1 = $tester->project->getTotalStoriesByProject(11); -$stories2 = $tester->project->getTotalStoriesByProject($projectIdList); - -r($stories1[11]) && p('allStories') && e('4'); // 不传入产品ID列表，获取项目11下的所有需求数量 -r($stories2) && p('12:allStories;13:allStories') && e('4;4'); // 传入产品ID列表，获取项目11下的所有需求数量 diff --git a/module/project/test/model/gettotaltaskbyproject.php b/module/project/test/model/gettotaltaskbyproject.php deleted file mode 100755 index e7dd6cb4c9..0000000000 --- a/module/project/test/model/gettotaltaskbyproject.php +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env php -getTotalTaskByProject(); -cid=1 -pid=1 - -获取id为11的项目下进行中的task数量 >> 4 -获取id为15的项目下完成的task数量 >> 2 -获取id为27的项目下激活的task数量 >> 8 - -*/ - -global $tester; -$tester->loadModel('project'); - -$projectIdList = array(11, 12, 13, 14, 15, 16, 27); -$result = $tester->project->getTotalTaskByProject($projectIdList); - -r($result[11]) && p('doingTasks') && e('4'); // 获取id为11的项目下进行中的task数量 -r($result[15]) && p('doneTasks') && e('2'); // 获取id为15的项目下完成的task数量 -r($result[27]) && p('leftTasks') && e('8'); // 获取id为27的项目下激活的task数量 diff --git a/module/project/test/tao/gettotalbugbyproject.php b/module/project/test/tao/gettotalbugbyproject.php new file mode 100755 index 0000000000..30fa1d3045 --- /dev/null +++ b/module/project/test/tao/gettotalbugbyproject.php @@ -0,0 +1,49 @@ +#!/usr/bin/env php +id->range('11-19'); + $project->project->range('11-19'); + $project->name->prefix("项目")->range('11-19'); + $project->code->prefix("project")->range('11-19'); + $project->model->range("scrum"); + $project->auth->range("[]"); + $project->path->range("[]"); + $project->type->range("project"); + $project->grade->range("1"); + $project->days->range("1"); + $project->status->range("wait,doing,suspended,closed"); + $project->desc->range("[]"); + $project->budget->range("100000,200000"); + $project->budgetUnit->range("CNY"); + $project->percent->range("0-0"); + $project->openedDate->range("`2023-05-01 10:00:10`"); + $project->gen(9); + + zdTable('bug')->gen(50); +} + +initData(); + +/** + +title=测试 projectModel->getTotalBugByProject(); +cid=1 + +*/ + +global $tester; +$tester->loadModel('project'); + + +$projectIdList = array(11, 12, 13, 14, 15, 16, 27); +$result = $tester->project->getTotalBugByProject($projectIdList); +$result2 = $tester->project->getTotalBugByProject(array()); + +r($result) && p('11:allBugs') && e('3'); //获取id为11的项目下bug数量 +r($result) && p('27:allBugs') && e('Error: Cannot get index 27.'); //获取id为27的项目下bug数量 +r($result2) && p() && e('0'); //获取项目为空时的bug数量 diff --git a/module/project/test/tao/gettotalstoriesbyproject.php b/module/project/test/tao/gettotalstoriesbyproject.php new file mode 100755 index 0000000000..6e822cb4c1 --- /dev/null +++ b/module/project/test/tao/gettotalstoriesbyproject.php @@ -0,0 +1,49 @@ +#!/usr/bin/env php +id->range('11-19'); + $project->project->range('11-19'); + $project->name->prefix("项目")->range('11-19'); + $project->code->prefix("project")->range('11-19'); + $project->model->range("scrum"); + $project->auth->range("[]"); + $project->path->range("[]"); + $project->type->range("project"); + $project->grade->range("1"); + $project->days->range("1"); + $project->status->range("wait,doing,suspended,closed"); + $project->desc->range("[]"); + $project->budget->range("100000,200000"); + $project->budgetUnit->range("CNY"); + $project->percent->range("0-0"); + $project->openedDate->range("`2023-05-01 10:00:10`"); + $project->gen(9); + + zdTable('story')->gen(50); + zdTable('projectstory')->gen(10); +} + +initData(); + +/** + +title=测试 projectModel::getTotalStoriesByProject; +cid=1 + +*/ + +global $tester; +$projectTester = $tester->loadModel('project'); + +$noneIdList = array(); +$notExistsIdList = array(1); +$realIdList = array(12, 13); + +r($projectTester->getTotalStoriesByProject($noneIdList)) && p() && e('0'); // 不传入项目ID列表，获取需求数量 +r($projectTester->getTotalStoriesByProject($notExistsIdList)) && p() && e('0'); // 传入错误的ID列表，获取需求数量 +r($projectTester->getTotalStoriesByProject($realIdList)) && p('12:allStories;13:allStories') && e('2,2'); // 传入正确的ID列表，获取需求数量 diff --git a/module/project/test/tao/gettotaltaskbyproject.php b/module/project/test/tao/gettotaltaskbyproject.php new file mode 100755 index 0000000000..67040f98e7 --- /dev/null +++ b/module/project/test/tao/gettotaltaskbyproject.php @@ -0,0 +1,55 @@ +#!/usr/bin/env php +id->range('11-19,101-109'); + $project->project->range('11-19'); + $project->name->setFields(array( + array('field' => 'name1', 'range' => '项目{9},迭代{9}'), + array('field' => 'name2', 'range' => '11-19,101-109') + )); + $project->code->setFields(array( + array('field' => 'name1', 'range' => 'project{9},execution{9}'), + array('field' => 'name2', 'range' => '11-19,101-109') + )); + $project->model->range("scrum{9},[]{9}"); + $project->auth->range("[]"); + $project->path->range("[]"); + $project->type->range("project{9},sprint{9}"); + $project->grade->range("1"); + $project->days->range("1"); + $project->status->range("wait,doing,suspended,closed"); + $project->desc->range("[]"); + $project->budget->range("100000,200000"); + $project->budgetUnit->range("CNY"); + $project->percent->range("0-0"); + $project->openedDate->range("`2023-05-01 10:00:10`"); + $project->gen(18); + + zdTable('task')->gen(10); +} + +initData(); + +/** + +title=测试 projectModel->getTotalTaskByProject(); +cid=1 + +*/ + +global $tester; +$tester->loadModel('project'); + +$projectIdList = array(11, 12, 13, 14, 15, 16, 27); +$result1 = $tester->project->getTotalTaskByProject($projectIdList); +$result2 = $tester->project->getTotalTaskByProject(array()); + +r($result1) && p('11:waitTasks') && e('1'); // 获取id为11的项目下未开始的task数量 +r($result1) && p('15:allTasks') && e('1'); // 获取id为15的项目下所有的task数量 +r($result1) && p('27:waitTasks') && e('Error: Cannot get index 27.'); // 获取id为27的项目下未开始的task数量 +r($result2) && p() && e('0'); // 获取项目为空的task数量 diff --git a/test/data/story.yaml b/test/data/story.yaml index 5bad0a6f55..d0d5bb9e06 100644 --- a/test/data/story.yaml +++ b/test/data/story.yaml @@ -63,7 +63,7 @@ fields: note: "需求名称" fields: - field: field1 - range: [用户需求,软件需求] + range: "[用户需求,软件需求]" - field: field2 range: 1-10000 prefix: "" @@ -146,7 +146,7 @@ fields: - field: openedBy1 range: admin,user,test,dev - field: openedBy2 - range: [],2-4 + range: "[],2-4" prefix: "" postfix: "" loop: 0 @@ -155,7 +155,6 @@ fields: note: "创建日期" range: "(M)-(w)" type: timestamp - prefix: "DateTime" postfix: "" format: "YY/MM/DD" - field: assignedTo @@ -164,7 +163,7 @@ fields: - field: openedBy1 range: admin,user,test,dev - field: openedBy2 - range: [],2-4 + range: "[],2-4" prefix: "" postfix: "" loop: 0 @@ -173,7 +172,6 @@ fields: note: "指派日期" range: "(M)-(w)" type: timestamp - prefix: "DateTime" postfix: "" format: "YY/MM/DD" - field: lastEditedBy