diff --git a/test/class/execution.class.php b/test/class/execution.class.php index 5d0bf300b6..1e98fa3d1e 100644 --- a/test/class/execution.class.php +++ b/test/class/execution.class.php @@ -2234,7 +2234,7 @@ class executionTest else { if(count((array)$object['closed']) == 0 and count((array)$object['nokey']) == 0) return 'empty'; - return $object; + return count($object['nokey']->tasks); } } diff --git a/test/model/execution/getkanbangroupdata.php b/test/model/execution/getkanbangroupdata.php index d2e95793c2..2d75070529 100755 --- a/test/model/execution/getkanbangroupdata.php +++ b/test/model/execution/getkanbangroupdata.php @@ -2,25 +2,80 @@ gen(5); su('admin'); +$execution = zdTable('project'); +$execution->id->range('1-5'); +$execution->name->range('项目集1,项目1,迭代1,阶段1,看板1'); +$execution->type->range('program,project,sprint,stage,kanban'); +$execution->parent->range('0,1,2{3}'); +$execution->status->range('wait{3},suspended,closed,doing'); +$execution->openedBy->range('admin,user1'); +$execution->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD'); +$execution->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD'); +$execution->gen(5); + +$task = zdTable('task'); +$task->id->range('1-10'); +$task->execution->range('3'); +$task->name->range('1-10')->prefix('任务'); +$task->type->range('design,devel,test,study,discuss,ui,affair,misc'); +$task->status->range('wait,doing,done,closed'); +$task->gen(10); + +$product = zdTable('product'); +$product->id->range('1-3'); +$product->name->range('1-3')->prefix('产品'); +$product->code->range('1-3')->prefix('product'); +$product->type->range('normal'); +$product->status->range('normal'); +$product->PO->range('admin'); +$product->QD->range('user1'); +$product->RD->range('user2'); +$product->gen(3); + +$story = zdTable('story'); +$story->id->range('1-10'); +$story->name->range('1-10')->prefix('需求'); +$story->type->range('story'); +$story->product->range('1'); +$story->status->range('active'); +$story->staged->range('projected'); +$story->version->range('1'); +$story->gen(10); + +$projectStory = zdTable('projectstory'); +$projectStory->project->range('3'); +$projectStory->product->range('1'); +$projectStory->story->range('1-10'); +$projectStory->version->range('1'); +$projectStory->gen(10); + +$bug = zdTable('bug'); +$bug->id->range('1-10'); +$bug->execution->range('3'); +$bug->name->range('1-10')->prefix('Bug'); +$bug->status->range('active'); +$bug->gen(10); + /** title=测试executionModel->getKanbanGroupData(); cid=1 pid=1 -空数据查询 >> empty -查询执行162需求 >> 软件需求246 +空数据查询 >> empty +获取id=3执行的任务数 >> 4 */ -$execution = new executionTest(); +$executionTester = new executionTest(); -$executionID = 162; +$executionID = 3; $stories = $tester->loadModel('story')->getExecutionStories($executionID); -$tasks = $execution->getKanbanTasksTest($executionID, false); +$tasks = $executionTester->getKanbanTasksTest($executionID, false); $bugs = $tester->loadModel('bug')->getExecutionBugs($executionID); -r($execution->getKanbanGroupDataTest(array(), array(), array(), 'story')) && p('') && e('empty'); //空数据查询 -r($execution->getKanbanGroupDataTest($stories, $tasks, $bugs, 'story')) && p('246:title') && e('软件需求246'); // 查询执行162需求 +r($executionTester->getKanbanGroupDataTest(array(), array(), array(), 'story')) && p('') && e('empty'); // 空数据查询 +r($executionTester->getKanbanGroupDataTest($stories, $tasks, $bugs, 'story')) && p('') && e('1'); // 获取id=3执行的任务数