diff --git a/test/class/story.class.php b/test/class/story.class.php index 235ac7a3f7..5613c1d5e0 100644 --- a/test/class/story.class.php +++ b/test/class/story.class.php @@ -501,123 +501,6 @@ class storyTest return $this->objectModel->getByList($storyIdList); } - public function getByFieldTest($productID, $branch, $modules, $fieldName, $fieldValue, $type = 'story', $orderBy = '', $pager = null, $operator = 'equal') - { - $objects = $this->objectModel->getByField($productID, $branch, $modules, $fieldName, $fieldValue, $type = 'story', $orderBy = '', $pager = null, $operator = 'equal'); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function get2BeClosedTest($productID, $branch, $modules, $type = 'story', $orderBy = '', $pager = null) - { - $objects = $this->objectModel->get2BeClosed($productID, $branch, $modules, $type = 'story', $orderBy = '', $pager = null); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getBySearchTest($productID, $branch = '', $queryID = 0, $orderBy = '', $executionID = '', $type = 'story', $excludeStories = '', $pager = null) - { - $objects = $this->objectModel->getBySearch($productID, $branch = '', $queryID = 0, $orderBy = '', $executionID = '', $type = 'story', $excludeStories = '', $pager = null); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getBySQLTest($productID, $sql, $orderBy, $pager = null, $type = 'story') - { - $objects = $this->objectModel->getBySQL($productID, $sql, $orderBy, $pager = null, $type = 'story'); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getExecutionStoriesTest($executionID = 0, $productID = 0, $branch = 0, $orderBy = 't1.`order`_desc', $type = 'byModule', $param = 0, $storyType = 'story', $excludeStories = '', $pager = null) - { - $objects = $this->objectModel->getExecutionStories($executionID = 0, $productID = 0, $branch = 0, $orderBy = 't1.`order`_desc', $type = 'byModule', $param = 0, $storyType = 'story', $excludeStories = '', $pager = null); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getExecutionStoryPairsTest($executionID = 0, $productID = 0, $branch = 'all', $moduleIdList = 0, $type = 'full', $status = 'all') - { - $objects = $this->objectModel->getExecutionStoryPairs($executionID = 0, $productID = 0, $branch = 'all', $moduleIdList = 0, $type = 'full', $status = 'all'); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getPlanStoriesTest($planID, $status = 'all', $orderBy = 'id_desc', $pager = null) - { - $objects = $this->objectModel->getPlanStories($planID, $status = 'all', $orderBy = 'id_desc', $pager = null); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getPlanStoryPairsTest($planID, $status = 'all', $orderBy = 'id_desc', $pager = null) - { - $objects = $this->objectModel->getPlanStoryPairs($planID, $status = 'all', $orderBy = 'id_desc', $pager = null); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getStoriesByPlanIdListTest($planIdList = '') - { - $objects = $this->objectModel->getStoriesByPlanIdList($planIdList = ''); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getParentStoryPairsTest($productID, $append = '') - { - $objects = $this->objectModel->getParentStoryPairs($productID, $append = ''); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getUserStoriesTest($account, $type = 'assignedTo', $orderBy = 'id_desc', $pager = null, $storyType = 'story', $includeLibStories = true) - { - $objects = $this->objectModel->getUserStories($account, $type = 'assignedTo', $orderBy = 'id_desc', $pager = null, $storyType = 'story', $includeLibStories = true); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getUserStoryPairsTest($account, $limit = 10, $type = 'story', $skipProductIDList = array()) - { - $objects = $this->objectModel->getUserStoryPairs($account, $limit = 10, $type = 'story', $skipProductIDList = array()); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getIdListWithTaskTest($executionID) - { - $objects = $this->objectModel->getIdListWithTask($executionID); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - public function getTeamMembersTest($storyID, $actionType) { $objects = $this->objectModel->getTeamMembers($storyID, $actionType); diff --git a/test/model/story/activate.php b/test/model/story/activate.php index c60a1cdd47..ffed4ca7be 100644 --- a/test/model/story/activate.php +++ b/test/model/story/activate.php @@ -8,6 +8,15 @@ title=测试 storyModel->activate(); cid=1 pid=1 +查看激活之前的需求状态 >> active +查看激活之前的需求状态 >> closed +查看激活之前的需求状态 >> changed +查看激活之前的需求状态 >> draft +查看激活之后的需求状态 >> active +查看激活之后的需求状态 >> active +查看激活之后的需求状态 >> active +查看激活之后的需求状态 >> active + */ global $tester; @@ -38,4 +47,4 @@ r($afterActivate63) && p('status') && e('active'); //查看激活之后的需 r($afterActivate100) && p('status') && e('active'); //查看激活之后的需求状态 r($afterActivate301) && p('status') && e('active'); //查看激活之后的需求状态 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/assign.php b/test/model/story/assign.php index 0593a7746e..9dcfe14244 100644 --- a/test/model/story/assign.php +++ b/test/model/story/assign.php @@ -9,6 +9,13 @@ title=测试 storyModel->assign(); cid=1 pid=1 +指派需求,查看返回的指派人信息 >> 2,test2 +指派需求,查看返回的指派人信息 >> 4, +指派需求,查看返回的指派人信息 >> 5,user10 +指派需求,查看返回的指派人信息 >> 10,admin +指派需求,查看返回的指派人信息 >> 100,user50 +指派需求,查看返回的指派人信息 >> 101,pm1 + */ $story = new storyTest(); @@ -20,4 +27,4 @@ r($story->assignTest(10, 'admin')) && p('id,assignedTo') && e('10,admin'); / r($story->assignTest(100, 'user50')) && p('id,assignedTo') && e('100,user50'); //指派需求,查看返回的指派人信息 r($story->assignTest(101, 'pm1')) && p('id,assignedTo') && e('101,pm1'); //指派需求,查看返回的指派人信息 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/batchassignto.php b/test/model/story/batchassignto.php index 3bab2976c7..243ce9a9df 100644 --- a/test/model/story/batchassignto.php +++ b/test/model/story/batchassignto.php @@ -9,6 +9,14 @@ title=测试 storyModel->batchAssignTo(); cid=1 pid=1 +批量指派6个需求,查看修改成功的需求数量 >> 6 +批量指派6个需求,查看修改成功的需求指派人 >> test20 +批量指派6个需求,查看修改成功的需求指派人 >> test20 +批量指派6个需求,查看修改成功的需求指派人 >> test20 +批量指派6个需求,查看修改成功的需求指派人 >> test20 +批量指派6个需求,查看修改成功的需求指派人 >> test20 +批量指派6个需求,查看修改成功的需求指派人 >> test20 + */ $story = new storyTest(); @@ -26,4 +34,4 @@ r($stories) && p('4:assignedTo') && e('test20'); // 批量指派6个需 r($stories) && p('5:assignedTo') && e('test20'); // 批量指派6个需求,查看修改成功的需求指派人 r($stories) && p('6:assignedTo') && e('test20'); // 批量指派6个需求,查看修改成功的需求指派人 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/batchchangebranch.php b/test/model/story/batchchangebranch.php index 4e3649eb12..bdbb1db489 100644 --- a/test/model/story/batchchangebranch.php +++ b/test/model/story/batchchangebranch.php @@ -9,6 +9,11 @@ title=测试 storyModel->batchChangeBranch(); cid=1 pid=1 +批量修改需求的所属分支,判断被修改分支需求的数量 >> 3 +批量修改需求的所属分支,判断需求2修改后的分支ID >> 2 +批量修改需求的所属分支,判断需求4修改后的分支ID >> 2 +批量修改需求的所属分支,判断需求6修改后的分支ID >> 2 + */ $story = new storyTest(); @@ -20,4 +25,4 @@ r(count($stories)) && p() && e('3'); // 批量修改需求的所属分 r($stories) && p('2:branch') && e('2'); // 批量修改需求的所属分支,判断需求2修改后的分支ID r($stories) && p('4:branch') && e('2'); // 批量修改需求的所属分支,判断需求4修改后的分支ID r($stories) && p('6:branch') && e('2'); // 批量修改需求的所属分支,判断需求6修改后的分支ID -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/batchchangemodule.php b/test/model/story/batchchangemodule.php index fa9b72b7b6..7381812184 100644 --- a/test/model/story/batchchangemodule.php +++ b/test/model/story/batchchangemodule.php @@ -9,6 +9,14 @@ title=测试 storyModel->batchChangeModule(); cid=1 pid=1 +批量修改6个需求的模块,查看被修改模块的需求数量 >> 6 +批量修改6个需求的模块,查看需求1修改后的模块ID >> 1366 +批量修改6个需求的模块,查看需求2修改后的模块ID >> 1366 +批量修改6个需求的模块,查看需求3修改后的模块ID >> 1366 +批量修改6个需求的模块,查看需求4修改后的模块ID >> 1366 +批量修改6个需求的模块,查看需求5修改后的模块ID >> 1366 +批量修改6个需求的模块,查看需求6修改后的模块ID >> 1366 + */ $story = new storyTest(); @@ -22,4 +30,4 @@ r($stories) && p('3:module') && e('1366'); // 批量修改6个需求的 r($stories) && p('4:module') && e('1366'); // 批量修改6个需求的模块,查看需求4修改后的模块ID r($stories) && p('5:module') && e('1366'); // 批量修改6个需求的模块,查看需求5修改后的模块ID r($stories) && p('6:module') && e('1366'); // 批量修改6个需求的模块,查看需求6修改后的模块ID -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/batchchangeplan.php b/test/model/story/batchchangeplan.php index 895ebacd51..d8f2875bcf 100644 --- a/test/model/story/batchchangeplan.php +++ b/test/model/story/batchchangeplan.php @@ -9,6 +9,21 @@ title=测试 storyModel->batchChangePlan(); cid=1 pid=1 +批量修改6个需求的计划,查看被修改计划的需求数量 >> 6 +批量修改6个需求的计划,查看被修改计划的需求数量 >> 6 +批量修改6个需求的计划,查看需求1修改后的计划ID >> ,1366 +批量修改6个需求的计划,查看需求2修改后的计划ID >> ,1366 +批量修改6个需求的计划,查看需求3修改后的计划ID >> ,1366 +批量修改6个需求的计划,查看需求4修改后的计划ID >> ,1366 +批量修改6个需求的计划,查看需求5修改后的计划ID >> ,1366 +批量修改6个需求的计划,查看需求6修改后的计划ID >> ,1366 +批量修改6个需求的计划,查看需求1修改后的计划ID >> ,1366,1400 +批量修改6个需求的计划,查看需求2修改后的计划ID >> ,1366,1400 +批量修改6个需求的计划,查看需求3修改后的计划ID >> ,1366,1400 +批量修改6个需求的计划,查看需求4修改后的计划ID >> ,1366,1400 +批量修改6个需求的计划,查看需求5修改后的计划ID >> ,1366,1400 +批量修改6个需求的计划,查看需求6修改后的计划ID >> ,1366,1400 + */ $story = new storyTest(); @@ -30,4 +45,4 @@ r($stories2) && p('3:plan') && e(',1366,1400'); // 批量修改6个需 r($stories2) && p('4:plan') && e(',1366,1400'); // 批量修改6个需求的计划,查看需求4修改后的计划ID r($stories2) && p('5:plan') && e(',1366,1400'); // 批量修改6个需求的计划,查看需求5修改后的计划ID r($stories2) && p('6:plan') && e(',1366,1400'); // 批量修改6个需求的计划,查看需求6修改后的计划ID -system("../../ztest init"); +system("../../ztest init"); \ No newline at end of file diff --git a/test/model/story/batchchangestage.php b/test/model/story/batchchangestage.php index 00513a499a..bd0414073d 100644 --- a/test/model/story/batchchangestage.php +++ b/test/model/story/batchchangestage.php @@ -9,6 +9,13 @@ title=测试 storyModel->batchChangeStage(); cid=1 pid=1 +批量修改6个需求的阶段,查看被修改阶段的需求数量 >> 5 +批量修改6个需求的阶段,查看需求101修改后的阶段 >> developing +批量修改6个需求的阶段,查看需求102修改后的阶段 >> developing +批量修改6个需求的阶段,查看需求104修改后的阶段 >> developing +批量修改6个需求的阶段,查看需求110修改后的阶段 >> developing +批量修改6个需求的阶段,查看需求114修改后的阶段 >> developing + */ $story = new storyTest(); @@ -21,4 +28,4 @@ r($result) && p('102:stage') && e('developing'); // 批量修改6个需 r($result) && p('106:stage') && e('developing'); // 批量修改6个需求的阶段,查看需求104修改后的阶段 r($result) && p('110:stage') && e('developing'); // 批量修改6个需求的阶段,查看需求110修改后的阶段 r($result) && p('114:stage') && e('developing'); // 批量修改6个需求的阶段,查看需求114修改后的阶段 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/batchclose.php b/test/model/story/batchclose.php index 60d9b06107..fd8edeedc4 100644 --- a/test/model/story/batchclose.php +++ b/test/model/story/batchclose.php @@ -9,6 +9,14 @@ title=测试 storyModel->batchClose(); cid=1 pid=1 +批量关闭6个需求,查看被关闭的需求数量 >> 6 +批量关闭需求,查看需求1被关闭后的字段 >> closed,closed,done,0 +批量关闭需求,查看需求2被关闭后的字段 >> closed,closed,willnotdo,0 +批量关闭需求,查看需求3被关闭后的字段 >> closed,closed,putoff,0 +批量关闭需求,查看需求4被关闭后的字段 >> closed,closed,duplicate,8 +批量关闭需求,查看需求5被关闭后的字段 >> closed,closed,cancel,0 +批量关闭需求,查看需求6被关闭后的字段 >> closed,closed,bydesign,0 + */ $story = new storyTest(); @@ -30,4 +38,4 @@ r($stories) && p('3:status,stage,closedReason,duplicateStory') && e('clos r($stories) && p('4:status,stage,closedReason,duplicateStory') && e('closed,closed,duplicate,8'); // 批量关闭需求,查看需求4被关闭后的字段 r($stories) && p('5:status,stage,closedReason,duplicateStory') && e('closed,closed,cancel,0'); // 批量关闭需求,查看需求5被关闭后的字段 r($stories) && p('6:status,stage,closedReason,duplicateStory') && e('closed,closed,bydesign,0'); // 批量关闭需求,查看需求6被关闭后的字段 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/batchcreate.php b/test/model/story/batchcreate.php index 633c729310..0bfa157b19 100644 --- a/test/model/story/batchcreate.php +++ b/test/model/story/batchcreate.php @@ -9,6 +9,11 @@ title=测试 storyModel->batchCreate(); cid=1 pid=1 +插入两条软件需求,判断返回的需求总量 >> 2 +插入两条用户需求,判断返回的需求总量 >> 2 +插入两条软件需求,判断返回的title、type等信息 >> 测试需求1,story,1,测试需求描述1,1,planned,2221 +插入两条用户需求,判断返回的title、type等信息 >> 测试需求2,requirement,2,测试需求描述2,2,planned,2222 + */ $story = new storyTest(); @@ -28,4 +33,4 @@ r(count($result1)) && p() && e('2'); // 插入两条软件需求,判断返回 r(count($result2)) && p() && e('2'); // 插入两条用户需求,判断返回的需求总量 r($result1) && p('401:title,type,pri,spec,estimate,stage,module') && e('测试需求1,story,1,测试需求描述1,1,planned,2221'); // 插入两条软件需求,判断返回的title、type等信息 r($result2) && p('404:title,type,pri,spec,estimate,stage,module') && e('测试需求2,requirement,2,测试需求描述2,2,planned,2222'); // 插入两条用户需求,判断返回的title、type等信息 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/batchgetstorystage.php b/test/model/story/batchgetstorystage.php index cc8f431280..0cffffe34c 100644 --- a/test/model/story/batchgetstorystage.php +++ b/test/model/story/batchgetstorystage.php @@ -9,6 +9,8 @@ title=测试 storyModel->batchGetStoryStage(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/batchreview.php b/test/model/story/batchreview.php index 00bf0d52cb..6c76e18835 100644 --- a/test/model/story/batchreview.php +++ b/test/model/story/batchreview.php @@ -9,6 +9,13 @@ title=测试 storyModel->batchReview(); cid=1 pid=1 +批量评审传入三个ID,查看被评审的需求数量 >> 2 +批量评审需求,查看被评审后的需求状态、阶段等信息 >> active,projected,done +批量评审传入三个ID,查看被评审的需求数量 >> 2 +批量评审需求,查看被评审后的需求状态、阶段等信息 >> closed,closed,bydesign +批量评审传入三个ID,查看被评审的需求数量 >> 2 +批量评审需求,查看被评审后的需求状态、阶段等信息 >> active,projected,cancel + */ $story = new storyTest(); @@ -27,4 +34,4 @@ r(count($review2)) && p() && e('2'); r($review2) && p('308:status,stage,closedReason') && e('closed,closed,bydesign'); // 批量评审需求,查看被评审后的需求状态、阶段等信息 r(count($review3)) && p() && e('2'); // 批量评审传入三个ID,查看被评审的需求数量 r($review3) && p('314:status,stage,closedReason') && e('active,projected,cancel'); // 批量评审需求,查看被评审后的需求状态、阶段等信息 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/batchtotask.php b/test/model/story/batchtotask.php index 0750f21da0..1ab5111a4e 100644 --- a/test/model/story/batchtotask.php +++ b/test/model/story/batchtotask.php @@ -9,6 +9,13 @@ title=测试 storyModel->batchToTask(); cid=1 pid=1 +6个需求批量转任务,查看转化后的数量 >> 5 +查看从需求转化过来的任务的名称、状态、优先级等字段 >> 11,101,软件需求66,wait,0,test, +查看从需求转化过来的任务的名称、状态、优先级等字段 >> 11,101,软件需求68,wait,0,test, +查看从需求转化过来的任务的名称、状态、优先级等字段 >> 11,101,软件需求70,wait,0,test, +查看从需求转化过来的任务的名称、状态、优先级等字段 >> 11,101,软件需求102,wait,0,test, +查看从需求转化过来的任务的名称、状态、优先级等字段 >> 11,101,软件需求220,wait,0,test, + */ $story = new storyTest(); @@ -25,4 +32,4 @@ r($tasks) && p('912:project,execution,name,status,pri,type,assignedTo') r($tasks) && p('913:project,execution,name,status,pri,type,assignedTo') && e('11,101,软件需求70,wait,0,test,'); //查看从需求转化过来的任务的名称、状态、优先级等字段 r($tasks) && p('914:project,execution,name,status,pri,type,assignedTo') && e('11,101,软件需求102,wait,0,test,'); //查看从需求转化过来的任务的名称、状态、优先级等字段 r($tasks) && p('915:project,execution,name,status,pri,type,assignedTo') && e('11,101,软件需求220,wait,0,test,'); //查看从需求转化过来的任务的名称、状态、优先级等字段 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/batchupdate.php b/test/model/story/batchupdate.php index 682280afcc..071ad5d2b1 100644 --- a/test/model/story/batchupdate.php +++ b/test/model/story/batchupdate.php @@ -9,6 +9,11 @@ title=测试 storyModel->batchUpdate(); cid=1 pid=1 +更新两条软件需求,判断返回的需求总量 >> 2 +更新两条用户需求,判断返回的需求总量 >> 2 +更新两条软件需求,判断返回的title、type等信息 >> 测试软件需求2,story,3,测试来源备注2,3,2223 +更新两条用户需求,判断返回的title、type等信息 >> 测试用户需求2,requirement,3,测试来源备注2,3,2221 + */ $story = new storyTest(); @@ -46,4 +51,4 @@ r(count($result1)) && p() && e('2'); // 更新两条软件需求,判断返回 r(count($result2)) && p() && e('2'); // 更新两条用户需求,判断返回的需求总量 r($result1) && p('14:title,type,pri,sourceNote,estimate,module') && e('测试软件需求2,story,3,测试来源备注2,3,2223'); // 更新两条软件需求,判断返回的title、type等信息 r($result2) && p('15:title,type,pri,sourceNote,estimate,module') && e('测试用户需求2,requirement,3,测试来源备注2,3,2221'); // 更新两条用户需求,判断返回的title、type等信息 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/change.php b/test/model/story/change.php index b26bfd786d..7b56a383d6 100644 --- a/test/model/story/change.php +++ b/test/model/story/change.php @@ -9,6 +9,10 @@ title=测试 storyModel->change(); cid=1 pid=1 +不勾选【不需要评审】,不传入由谁评审时的变更,给出提示 >> 『由谁评审』不能为空。 +变更时不填写需求名称,给出提示 >> 『研发需求名称』不能为空。 +正常变更需求,判断返回的status、title等信息 >> changed,测试需求1变更标题,测试需求1的变更描述,测试需求1的变更验收标准,1,admin,3 + */ $story = new storyTest(); @@ -31,4 +35,4 @@ $result3 = $story->changeTest(26, $story3); r($result1[0]) && p() && e('『由谁评审』不能为空。'); // 不勾选【不需要评审】,不传入由谁评审时的变更,给出提示 r($result2) && p('title:0') && e('『研发需求名称』不能为空。'); // 变更时不填写需求名称,给出提示 r($result3) && p('status,title,spec,verify,estimate,lastEditedBy,version') && e('changed,测试需求1变更标题,测试需求1的变更描述,测试需求1的变更验收标准,1,admin,3'); // 正常变更需求,判断返回的status、title等信息 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/checkforcereview.php b/test/model/story/checkforcereview.php index 2def98fca9..c503ed2491 100644 --- a/test/model/story/checkforcereview.php +++ b/test/model/story/checkforcereview.php @@ -9,6 +9,8 @@ title=测试 storyModel->checkForceReview(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/checkneedconfirm.php b/test/model/story/checkneedconfirm.php index ce4b52bad0..81437fc2c7 100644 --- a/test/model/story/checkneedconfirm.php +++ b/test/model/story/checkneedconfirm.php @@ -9,6 +9,8 @@ title=测试 storyModel->checkNeedConfirm(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/close.php b/test/model/story/close.php index 70b83d73a0..da6343aa35 100644 --- a/test/model/story/close.php +++ b/test/model/story/close.php @@ -9,6 +9,13 @@ title=测试 storyModel->close(); cid=1 pid=1 +关闭一个用户需求,查看变更的字段1 >> assigedTo,,closed +关闭一个用户需求,查看变更的字段2 >> status,active,closed +关闭一个用户需求,查看变更的字段3 >> stage,wait,closed +关闭一个软件需求,查看变更的字段1 >> closedReason,subdivided,willnotdo +关闭一个软件需求,查看变更的字段2 >> assignedTo,,closed +关闭一个软件需求,查看变更的字段3 >> status,active,closed + */ $story = new storyTest(); @@ -21,4 +28,4 @@ r($changes1) && p('2:field,old,new') && e('stage,wait,closed'); // 关闭一 r($changes2) && p('0:field,old,new') && e('closedReason,subdivided,willnotdo'); // 关闭一个软件需求,查看变更的字段1 r($changes2) && p('1:field,old,new') && e('assignedTo,,closed'); // 关闭一个软件需求,查看变更的字段2 r($changes2) && p('2:field,old,new') && e('status,active,closed'); // 关闭一个软件需求,查看变更的字段3 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/computeestimate.php b/test/model/story/computeestimate.php index 21bb1cfd17..a7ca97edb3 100644 --- a/test/model/story/computeestimate.php +++ b/test/model/story/computeestimate.php @@ -9,6 +9,8 @@ title=测试 storyModel->computeEstimate(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/create.php b/test/model/story/create.php index ef7c8cf0cd..1b176b11a7 100644 --- a/test/model/story/create.php +++ b/test/model/story/create.php @@ -9,6 +9,11 @@ title=测试 storyModel->create(); cid=1 pid=1 +不勾选由谁评审并且不传入评审人的情况,报错 >> 『由谁评审』不能为空。 +不勾选由谁评审传入评审人的情况,正常插入 >> 0,projected,1 +勾选由谁评审,不传入executionID的情况,阶段为wait >> 测试需求3,2,wait +勾选由谁评审,传入executionID和fromBug的情况,阶段为projected >> 『研发需求名称』不能为空。 + */ $story = new storyTest(); @@ -42,4 +47,4 @@ r($result1[0]) && p() && e('『由谁评审』不能为 r($result2) && p('fromBug,stage,product') && e('0,projected,1'); //不勾选由谁评审传入评审人的情况,正常插入 r($result3) && p('title,fromBug,stage') && e('测试需求3,2,wait'); //勾选由谁评审,不传入executionID的情况,阶段为wait r($result4) && p('title:0') && e('『研发需求名称』不能为空。'); //勾选由谁评审,传入executionID和fromBug的情况,阶段为projected -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/createstoryfromgitlabissue.php b/test/model/story/createstoryfromgitlabissue.php index 81b1450f96..ac92588e0b 100644 --- a/test/model/story/createstoryfromgitlabissue.php +++ b/test/model/story/createstoryfromgitlabissue.php @@ -9,6 +9,10 @@ title=测试 storyModel->createStoryFromGitlabIssue(); cid=1 pid=1 +创建正常的需求,获取创建后的id、title、stage、product >> 401,测试需求1,projected,1 +需求名称为空,给出提示 >> 『研发需求名称』不能为空。 +创建正常的需求,获取创建后的id、title、stage、product >> 402,测试需求3,projected,2 + */ $story = new storyTest(); @@ -34,4 +38,4 @@ $result3 = $story->createStoryFromGitlabIssueTest($story3, 0); r($result1) && p('id,title,stage,product') && e('401,测试需求1,projected,1'); //创建正常的需求,获取创建后的id、title、stage、product r($result2) && p('title:0') && e('『研发需求名称』不能为空。'); //需求名称为空,给出提示 r($result3) && p('id,title,stage,product') && e('402,测试需求3,projected,2'); //创建正常的需求,获取创建后的id、title、stage、product -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/extractaccountsfromlist.php b/test/model/story/extractaccountsfromlist.php index 4f43eed8e5..a7659e68f0 100644 --- a/test/model/story/extractaccountsfromlist.php +++ b/test/model/story/extractaccountsfromlist.php @@ -9,6 +9,8 @@ title=测试 storyModel->extractAccountsFromList(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/extractaccountsfromsingle.php b/test/model/story/extractaccountsfromsingle.php index 26dfa41f0a..0daa327213 100644 --- a/test/model/story/extractaccountsfromsingle.php +++ b/test/model/story/extractaccountsfromsingle.php @@ -9,6 +9,8 @@ title=测试 storyModel->extractAccountsFromSingle(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/formatstories.php b/test/model/story/formatstories.php index b242833025..91c9fc8a4c 100644 --- a/test/model/story/formatstories.php +++ b/test/model/story/formatstories.php @@ -9,6 +9,8 @@ title=测试 storyModel->formatStories(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/get2beclosed.php b/test/model/story/get2beclosed.php index fdfab9b528..aa41ecd023 100644 --- a/test/model/story/get2beclosed.php +++ b/test/model/story/get2beclosed.php @@ -8,11 +8,19 @@ title=测试 storyModel->get2BeClosed(); cid=1 pid=1 +获取产品3下需要关闭的软件需求数量 >> 1 +获取产品3下需要关闭的软件需求详情 >> 软件需求10,story,developed +获取产品10下需要关闭的软件需求数量 >> 1 +获取产品10下需要关闭的软件需求详情 >> 软件需求38,story,released + */ global $tester; $tester->loadModel('story'); -$toBeClosed1 = $tester->story->get2BeClosed(1, 0, array(), 'story', 'id_desc'); -$toBeClosed2 = $tester->story->get2BeClosed(2, 0, array(), 'story', 'id_asc'); +$toBeClosed1 = $tester->story->get2BeClosed(3, 0, array(), 'story', 'id_desc'); +$toBeClosed2 = $tester->story->get2BeClosed(10, 0, array(), 'story', 'id_asc'); -r() && p() && e(); +r(count($toBeClosed1)) && p() && e('1'); //获取产品3下需要关闭的软件需求数量 +r($toBeClosed1) && p('10:title,type,stage') && e('软件需求10,story,developed'); //获取产品3下需要关闭的软件需求详情 +r(count($toBeClosed2)) && p() && e('1'); //获取产品10下需要关闭的软件需求数量 +r($toBeClosed2) && p('38:title,type,stage') && e('软件需求38,story,released'); //获取产品10下需要关闭的软件需求详情 \ No newline at end of file diff --git a/test/model/story/getaffectedscope.php b/test/model/story/getaffectedscope.php index 86766c35dd..6706685895 100644 --- a/test/model/story/getaffectedscope.php +++ b/test/model/story/getaffectedscope.php @@ -9,6 +9,12 @@ title=测试 storyModel->getAffectedScope(); cid=1 pid=1 +获取需求1影响任务的数量 >> 6 +获取需求15影响任务的数量 >> 0 +查看返回的需求1的title >> 用户需求版本三41 +查看返回的需求15的title >> 软件需求版本三55 +查看需求100的影响的迭代的名字 >> 迭代25 + */ $story = new storyTest(); @@ -20,4 +26,4 @@ r(count($affectedScope1->tasks)) && p() && e('6'); // r(count($affectedScope2->tasks)) && p() && e('0'); //获取需求15影响任务的数量 r($affectedScope1) && p('title') && e('用户需求版本三41'); //查看返回的需求1的title r($affectedScope2) && p('title') && e('软件需求版本三55'); //查看返回的需求15的title -r($affectedScope3->executions) && p('125:name') && e('迭代25'); //查看需求100的影响的迭代的名字 +r($affectedScope3->executions) && p('125:name') && e('迭代25'); //查看需求100的影响的迭代的名字 \ No newline at end of file diff --git a/test/model/story/getallstorysort.php b/test/model/story/getallstorysort.php index d2851c631e..9d56df097d 100644 --- a/test/model/story/getallstorysort.php +++ b/test/model/story/getallstorysort.php @@ -9,6 +9,8 @@ title=测试 storyModel->getAllStorySort(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getbyfield.php b/test/model/story/getbyfield.php index 10766d0e85..e00cb3bbbf 100644 --- a/test/model/story/getbyfield.php +++ b/test/model/story/getbyfield.php @@ -8,22 +8,34 @@ title=测试 storyModel->getByField(); cid=1 pid=1 +根据指派给获取软件需求 >> 用户需求1,requirement,admin +根据创建人获取软件需求 >> 软件需求6,user2 +根据由谁评审获取软件需求 >> 软件需求12,admin +根据由谁评审获取软件需求数量 >> 2 +根据由谁评审获取软件需求 >> 软件需求306,story +根据由谁关闭获取软件需求 >> 用户需求23,requirement,test3,关闭原因23 +根据状态获取软件需求 >> 软件需求22,active,story +根据计划获取软件需求 >> 软件需求26,projected,7,19 +根据计划获取软件需求数量 >> 2 + */ global $tester; $tester->loadModel('story'); -$byAssignedTo = $tester->story->getByField(1, 0, array(), 'assignedTo', 'admin', 'story', 'id_desc'); -$byOpenedBy = $tester->story->getByField(2, 0, array(), 'openedBy', 'admin', 'story', 'id_asc'); -$byReviewedBy = $tester->story->getByField(3, 0, array(), 'reviewedBy', 'admin', 'story', 'id_desc'); -$byReviewBy = $tester->story->getByField(4, 0, array(), 'reviewBy', 'admin', 'story', 'id_desc'); -$byClosedBy = $tester->story->getByField(5, 0, array(), 'closedBy', 'admin', 'story', 'id_desc'); -$byStatus = $tester->story->getByField(6, 0, array(), 'status', 'active', 'story', 'id_desc'); -$byPlan = $tester->story->getByField(7, 0, array(), 'plan', '0', 'story', 'id_desc'); +$byAssignedTo = $tester->story->getByField(1, 0, array(), 'assignedTo', 'admin', 'requirement', 'id_desc'); +$byOpenedBy = $tester->story->getByField(2, 0, array(), 'openedBy', 'user2', 'story', 'id_asc'); +$byReviewedBy = $tester->story->getByField(3, 0, array(), 'reviewedBy', 'admin', 'story', 'id_desc'); +$byReviewBy = $tester->story->getByField(77, 0, array(), 'reviewBy', 'admin', 'story', 'id_desc'); +$byClosedBy = $tester->story->getByField(6, 0, array(), 'closedBy', 'test3', 'requirement', 'id_desc'); +$byStatus = $tester->story->getByField(6, 0, array(), 'status', 'active', 'story', 'id_desc'); +$byPlan = $tester->story->getByField(7, 0, array(), 'plan', '19', 'story', 'id_desc'); -r($byAssignedTo) && p() && e(); -r($byOpenedBy) && p() && e(); -r($byReviewedBy) && p() && e(); -r($byReviewBy) && p() && e(); -r($byClosedBy) && p() && e(); -r($byStatus) && p() && e(); -r($byPlan) && p() && e(); +r($byAssignedTo) && p('1:title,type,assignedTo') && e('用户需求1,requirement,admin'); // 根据指派给获取软件需求 +r($byOpenedBy) && p('6:title,openedBy') && e('软件需求6,user2'); // 根据创建人获取软件需求 +r($byReviewedBy) && p('12:title,reviewedBy') && e('软件需求12,admin'); // 根据由谁评审获取软件需求 +r(count($byReviewBy)) && p() && e('2'); // 根据由谁评审获取软件需求数量 +r($byReviewBy) && p('306:title,type') && e('软件需求306,story'); // 根据由谁评审获取软件需求 +r($byClosedBy) && p('23:title,type,closedBy,closedReason') && e('用户需求23,requirement,test3,关闭原因23'); // 根据由谁关闭获取软件需求 +r($byStatus) && p('22:title,status,type') && e('软件需求22,active,story'); // 根据状态获取软件需求 +r($byPlan) && p('26:title,stage,product,plan') && e('软件需求26,projected,7,19'); // 根据计划获取软件需求 +r(count($byPlan)) && p() && e('2'); // 根据计划获取软件需求数量 \ No newline at end of file diff --git a/test/model/story/getbyid.php b/test/model/story/getbyid.php index c46710757d..ce068abc62 100644 --- a/test/model/story/getbyid.php +++ b/test/model/story/getbyid.php @@ -9,6 +9,12 @@ title=测试 storyModel->getById(); cid=1 pid=1 + >> 6 +获取ID为1、版本号为1的需求的名称 >> 用户需求版本一1 +获取ID为1、版本号为2的需求的名称 >> 用户需求版本二21 +获取ID为2、版本号为3的需求的名称 >> 用户需求版本三43 +获取ID为20、版本号为2的需求的名称 >> 这是一个软件需求描述40 + */ $story = new storyTest(); @@ -21,4 +27,4 @@ r(count($story1Version1->tasks)) && p() && e('6'); r($story1Version1) && p('title') && e('用户需求版本一1'); //获取ID为1、版本号为1的需求的名称 r($story1Version2) && p('title') && e('用户需求版本二21'); //获取ID为1、版本号为2的需求的名称 r($story2Version3) && p('title') && e('用户需求版本三43'); //获取ID为2、版本号为3的需求的名称 -r($story20Version2) && p('spec') && e('这是一个软件需求描述40'); //获取ID为20、版本号为2的需求的名称 +r($story20Version2) && p('spec') && e('这是一个软件需求描述40'); //获取ID为20、版本号为2的需求的名称 \ No newline at end of file diff --git a/test/model/story/getbylist.php b/test/model/story/getbylist.php index c6d5c27b19..faed563de3 100644 --- a/test/model/story/getbylist.php +++ b/test/model/story/getbylist.php @@ -9,6 +9,14 @@ title=测试 storyModel->getByList(); cid=1 pid=1 +根据指定的ID列表,获取需求数量 >> 5 +获取软件需求数量 >> 10 +获取用户需求数量 >> 10 +根据指定的ID列表,获取第一个需求的名称 >> 用户需求1 +获取第一个软件需求的名称 >> 软件需求2 +获取第一个用户需求的名称 >> 用户需求1 +传入空类型,返回空列表 >> 0 + */ $story = new storyTest(); @@ -25,4 +33,4 @@ r(count($reqiurements)) && p() && e('10'); //获取用户需 r($storyInIdList) && p('1:title') && e('用户需求1'); //根据指定的ID列表,获取第一个需求的名称 r($stories) && p('2:title') && e('软件需求2'); //获取第一个软件需求的名称 r($reqiurements) && p('1:title') && e('用户需求1'); //获取第一个用户需求的名称 -r($emptyStories) && p('') && e('0'); //传入空类型,返回空列表 +r($emptyStories) && p('') && e('0'); //传入空类型,返回空列表 \ No newline at end of file diff --git a/test/model/story/getbyreviewby.php b/test/model/story/getbyreviewby.php index 1a4cc09878..1ce8295e98 100644 --- a/test/model/story/getbyreviewby.php +++ b/test/model/story/getbyreviewby.php @@ -9,6 +9,8 @@ title=测试 storyModel->getByReviewBy(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getbysearch.php b/test/model/story/getbysearch.php index e7b4b8753c..79035388ee 100644 --- a/test/model/story/getbysearch.php +++ b/test/model/story/getbysearch.php @@ -9,8 +9,14 @@ title=测试 storyModel->getBySearch(); cid=1 pid=1 +根据第二个query获取需求数量 >> 1 +根据第二个query获取需求 >> 软件需求362,story,55,91 + */ -$story = new storyTest(); +global $tester; +$tester->loadModel('story'); +$stories1 = $tester->story->getBySearch(91, '', 2); -r() && p() && e(); \ No newline at end of file +r(count($stories1)) && p() && e('1'); // 根据第二个query获取需求数量 +r($stories1) && p('362:title,type,plan,product') && e('软件需求362,story,55,91'); // 根据第二个query获取需求 \ No newline at end of file diff --git a/test/model/story/getbysql.php b/test/model/story/getbysql.php index 5883c2320b..2cd3c84608 100644 --- a/test/model/story/getbysql.php +++ b/test/model/story/getbysql.php @@ -9,6 +9,8 @@ title=测试 storyModel->getBySQL(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getchangedstories.php b/test/model/story/getchangedstories.php index 7444ca7c20..6aad668e27 100644 --- a/test/model/story/getchangedstories.php +++ b/test/model/story/getchangedstories.php @@ -9,6 +9,8 @@ title=测试 storyModel->getChangedStories(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstorysperassignedto.php b/test/model/story/getdataofstorysperassignedto.php index 9b7d362ae4..9ff0354d84 100644 --- a/test/model/story/getdataofstorysperassignedto.php +++ b/test/model/story/getdataofstorysperassignedto.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerAssignedTo(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstorysperchange.php b/test/model/story/getdataofstorysperchange.php index 6b3f065e3e..0877ad1e9a 100644 --- a/test/model/story/getdataofstorysperchange.php +++ b/test/model/story/getdataofstorysperchange.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerChange(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstorysperclosedreason.php b/test/model/story/getdataofstorysperclosedreason.php index 12bfb89d2c..c03891864b 100644 --- a/test/model/story/getdataofstorysperclosedreason.php +++ b/test/model/story/getdataofstorysperclosedreason.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerClosedReason(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstorysperestimate.php b/test/model/story/getdataofstorysperestimate.php index f190c24eaa..4ab4952612 100644 --- a/test/model/story/getdataofstorysperestimate.php +++ b/test/model/story/getdataofstorysperestimate.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerEstimate(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstoryspermodule.php b/test/model/story/getdataofstoryspermodule.php index 3dc5fe224a..76fb7e4350 100644 --- a/test/model/story/getdataofstoryspermodule.php +++ b/test/model/story/getdataofstoryspermodule.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerModule(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstorysperopenedby.php b/test/model/story/getdataofstorysperopenedby.php index 755a28978e..61ca2f3a85 100644 --- a/test/model/story/getdataofstorysperopenedby.php +++ b/test/model/story/getdataofstorysperopenedby.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerOpenedBy(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstorysperplan.php b/test/model/story/getdataofstorysperplan.php index 515a6f74f3..ef81c463d8 100644 --- a/test/model/story/getdataofstorysperplan.php +++ b/test/model/story/getdataofstorysperplan.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerPlan(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstorysperpri.php b/test/model/story/getdataofstorysperpri.php index 3f955785aa..ce115c463a 100644 --- a/test/model/story/getdataofstorysperpri.php +++ b/test/model/story/getdataofstorysperpri.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerPri(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstorysperproduct.php b/test/model/story/getdataofstorysperproduct.php index 5cd0dd41b0..82f18c9d2e 100644 --- a/test/model/story/getdataofstorysperproduct.php +++ b/test/model/story/getdataofstorysperproduct.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerProduct(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstoryspersource.php b/test/model/story/getdataofstoryspersource.php index dcecb5c859..50578e1116 100644 --- a/test/model/story/getdataofstoryspersource.php +++ b/test/model/story/getdataofstoryspersource.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerSource(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstorysperstage.php b/test/model/story/getdataofstorysperstage.php index 2570f3bb13..ef4b4b398b 100644 --- a/test/model/story/getdataofstorysperstage.php +++ b/test/model/story/getdataofstorysperstage.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerStage(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getdataofstorysperstatus.php b/test/model/story/getdataofstorysperstatus.php index d68e16eeb9..7d1a626f96 100644 --- a/test/model/story/getdataofstorysperstatus.php +++ b/test/model/story/getdataofstorysperstatus.php @@ -9,6 +9,8 @@ title=测试 storyModel->getDataOfStorysPerStatus(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getestimateinfo.php b/test/model/story/getestimateinfo.php index 99766d0c9e..c1e5cd7d5d 100644 --- a/test/model/story/getestimateinfo.php +++ b/test/model/story/getestimateinfo.php @@ -9,6 +9,8 @@ title=测试 storyModel->getEstimateInfo(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getestimaterounds.php b/test/model/story/getestimaterounds.php index c16a5986ae..8c7105ec82 100644 --- a/test/model/story/getestimaterounds.php +++ b/test/model/story/getestimaterounds.php @@ -9,6 +9,8 @@ title=测试 storyModel->getEstimateRounds(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getexecutionstories.php b/test/model/story/getexecutionstories.php index 1e2fc87662..454157e2ad 100644 --- a/test/model/story/getexecutionstories.php +++ b/test/model/story/getexecutionstories.php @@ -9,8 +9,24 @@ title=测试 storyModel->getExecutionStories(); cid=1 pid=1 +获取执行11下的需求数量 >> 4 +获取执行11下的需求详情 >> 软件需求364,story,draft,developing +获取执行11、产品91下的需求数量 >> 2 +获取执行11、产品91下的需求详情 >> 软件需求362,story,draft,planned +获取执行11、产品1下的需求数量 >> 2 +获取执行11、产品1下的需求详情 >> 软件需求2,story,active,wait + */ -$story = new storyTest(); +global $tester; +$tester->loadModel('story'); +$stories1 = $tester->story->getExecutionStories(11); +$stories2 = $tester->story->getExecutionStories(11, 91); +$stories3 = $tester->story->getExecutionStories(11, 1); -r() && p() && e(); \ No newline at end of file +r(count($stories1)) && p() && e('4'); // 获取执行11下的需求数量 +r($stories1) && p('364:title,type,status,stage') && e('软件需求364,story,draft,developing'); // 获取执行11下的需求详情 +r(count($stories2)) && p() && e('2'); // 获取执行11、产品91下的需求数量 +r($stories2) && p('362:title,type,status,stage') && e('软件需求362,story,draft,planned'); // 获取执行11、产品91下的需求详情 +r(count($stories3)) && p() && e('2'); // 获取执行11、产品1下的需求数量 +r($stories3) && p('2:title,type,status,stage') && e('软件需求2,story,active,wait'); // 获取执行11、产品1下的需求详情 \ No newline at end of file diff --git a/test/model/story/getexecutionstorypairs.php b/test/model/story/getexecutionstorypairs.php index 6535b3daf7..6c7d768e58 100644 --- a/test/model/story/getexecutionstorypairs.php +++ b/test/model/story/getexecutionstorypairs.php @@ -9,8 +9,24 @@ title=测试 storyModel->getExecutionStoryPairs(); cid=1 pid=1 +获取执行11下的需求数量 >> 5 +获取执行11下的需求详情 >> 364:软件需求364 (优先级:4,预计工时:7) +获取执行11、产品91下的需求数量 >> 3 +获取执行11、产品91下的需求详情 >> 362:软件需求362 (优先级:2,预计工时:3) +获取执行11、产品1下的需求数量 >> 3 +获取执行11、产品1下的需求详情 >> 2:软件需求2 (优先级:2,预计工时:19) + */ -$story = new storyTest(); +global $tester; +$tester->loadModel('story'); +$stories1 = $tester->story->getExecutionStoryPairs(11); +$stories2 = $tester->story->getExecutionStoryPairs(11, 91); +$stories3 = $tester->story->getExecutionStoryPairs(11, 1); -r() && p() && e(); \ No newline at end of file +r(count($stories1)) && p() && e('5'); // 获取执行11下的需求数量 +r($stories1) && p('364') && e('364:软件需求364 (优先级:4,预计工时:7)'); // 获取执行11下的需求详情 +r(count($stories2)) && p() && e('3'); // 获取执行11、产品91下的需求数量 +r($stories2) && p('362') && e('362:软件需求362 (优先级:2,预计工时:3)'); // 获取执行11、产品91下的需求详情 +r(count($stories3)) && p() && e('3'); // 获取执行11、产品1下的需求数量 +r($stories3) && p('2') && e('2:软件需求2 (优先级:2,预计工时:19)'); // 获取执行11、产品1下的需求详情 \ No newline at end of file diff --git a/test/model/story/getidlistwithtask.php b/test/model/story/getidlistwithtask.php index fd24ec465c..2f8c4494a8 100644 --- a/test/model/story/getidlistwithtask.php +++ b/test/model/story/getidlistwithtask.php @@ -9,6 +9,8 @@ title=测试 storyModel->getIdListWithTask(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getkanbangroupdata.php b/test/model/story/getkanbangroupdata.php index ac7c30358b..a218209992 100644 --- a/test/model/story/getkanbangroupdata.php +++ b/test/model/story/getkanbangroupdata.php @@ -9,6 +9,8 @@ title=测试 storyModel->getKanbanGroupData(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getparentstorypairs.php b/test/model/story/getparentstorypairs.php index 59145b60cf..28dd5432bc 100644 --- a/test/model/story/getparentstorypairs.php +++ b/test/model/story/getparentstorypairs.php @@ -1,6 +1,5 @@ getParentStoryPairs(); cid=1 pid=1 + + */ -$story = new storyTest(); +global $tester; +$tester->loadModel('story'); +$stories = $tester->story->getParentStoryPairs(91); +//a($stories);die; -r() && p() && e(); \ No newline at end of file +r() && p() && e(); diff --git a/test/model/story/getplanstories.php b/test/model/story/getplanstories.php index a11833cd8b..1337fcc694 100644 --- a/test/model/story/getplanstories.php +++ b/test/model/story/getplanstories.php @@ -1,6 +1,5 @@ getPlanStories(); cid=1 pid=1 +获取计划1下的需求列表,每页10条 >> 软件需求290,active,story +获取计划1下的需求列表,不分页 >> 软件需求290,active,story + */ -$story = new storyTest(); +global $tester; +$tester->loadModel('story'); +$tester->app->loadClass('pager', $static = true); +$pager = new pager(0, 10, 1); -r() && p() && e(); \ No newline at end of file +$plan1Stories = $tester->story->getPlanStories(1, 'all', 'id_desc', $pager); +$plan2Stories = $tester->story->getPlanStories(1, 'all', 'id_desc'); + +r(count($plan1Stories)) && p() && e('10'); //获取计划1下的需求数量,每页10条 +r(count($plan2Stories)) && p() && e('20'); //获取计划1下的需求数量,不分页 +r($plan1Stories) && p('290:title,status,type') && e('软件需求290,active,story'); //获取计划1下的需求列表,每页10条 +r($plan2Stories) && p('2:title,status,type') && e('软件需求2,active,story'); //获取计划1下的需求列表,不分页 diff --git a/test/model/story/getplanstorypairs.php b/test/model/story/getplanstorypairs.php deleted file mode 100644 index 308606bc62..0000000000 --- a/test/model/story/getplanstorypairs.php +++ /dev/null @@ -1,16 +0,0 @@ -getPlanStoryPairs(); -cid=1 -pid=1 - -*/ - -$story = new storyTest(); - -r() && p() && e(); \ No newline at end of file diff --git a/test/model/story/getproductstories.php b/test/model/story/getproductstories.php index 62615aa9d3..0b3bf21020 100644 --- a/test/model/story/getproductstories.php +++ b/test/model/story/getproductstories.php @@ -8,6 +8,13 @@ title=测试 storyModel->getProductStories(); cid=1 pid=1 +获取产品1下的所有软件需求数量 >> 2 +获取产品1下的所有用户需求数量 >> 2 +获取产品2可关联的需求数量 >> 1 +查看通过产品1获取的软件需求的type、product、module字段 >> story,1,1822 +查看通过产品1获取的用户需求的type、product、module字段 >> requirement,1,1821 +查看通过产品3获取的软件需求的type、product、module字段 >> story,3,1830 + */ global $tester; @@ -21,4 +28,4 @@ r(count($stories2)) && p() && e('2'); / r(count($stories3)) && p() && e('1'); // 获取产品2可关联的需求数量 r($stories1) && p('2:type,product,module') && e('story,1,1822'); // 查看通过产品1获取的软件需求的type、product、module字段 r($stories2) && p('1:type,product,module') && e('requirement,1,1821'); // 查看通过产品1获取的用户需求的type、product、module字段 -r($stories3) && p('10:type,product,module') && e('story,3,1830'); // 查看通过产品3获取的软件需求的type、product、module字段 +r($stories3) && p('10:type,product,module') && e('story,3,1830'); // 查看通过产品3获取的软件需求的type、product、module字段 \ No newline at end of file diff --git a/test/model/story/getproductstorypairs.php b/test/model/story/getproductstorypairs.php index d6800c2180..ddeb96c100 100644 --- a/test/model/story/getproductstorypairs.php +++ b/test/model/story/getproductstorypairs.php @@ -8,6 +8,13 @@ title=测试 storyModel->getProductStoryPairs(); cid=1 pid=1 +获取产品1下的所有软件需求数量 >> 3 +获取产品1下的所有用户需求数量 >> 4 +获取产品2可关联的需求数量 >> 2 +查看通过产品1获取的软件需求的名称字段 >> 4:软件需求4 (优先级:4,预计工时:0),2:软件需求2 (优先级:2,预计工时:20) +查看通过产品1获取的用户需求的键值对详情 >> 1:用户需求1,2:用户需求2,更多... +查看通过产品3获取的软件需求的键值对详情 >> 10:软件需求10 (优先级:2,预计工时:9) + */ global $tester; @@ -21,4 +28,4 @@ r(count($stories2)) && p() && e('4'); // 获取产品1下的所有 r(count($stories3)) && p() && e('2'); // 获取产品2可关联的需求数量 r($stories1) && p('4,2') && e('4:软件需求4 (优先级:4,预计工时:0),2:软件需求2 (优先级:2,预计工时:20)'); // 查看通过产品1获取的软件需求的名称字段 r($stories2) && p('1,3,showmore') && e('1:用户需求1,2:用户需求2,更多...'); // 查看通过产品1获取的用户需求的键值对详情 -r($stories3) && p('10') && e('10:软件需求10 (优先级:2,预计工时:9)'); // 查看通过产品3获取的软件需求的键值对详情 +r($stories3) && p('10') && e('10:软件需求10 (优先级:2,预计工时:9)'); // 查看通过产品3获取的软件需求的键值对详情 \ No newline at end of file diff --git a/test/model/story/getrelation.php b/test/model/story/getrelation.php index 5d69af4bcc..5898c342b9 100644 --- a/test/model/story/getrelation.php +++ b/test/model/story/getrelation.php @@ -9,6 +9,8 @@ title=测试 storyModel->getRelation(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getrequierements.php b/test/model/story/getrequierements.php index bcf8ae2048..f74586741a 100644 --- a/test/model/story/getrequierements.php +++ b/test/model/story/getrequierements.php @@ -9,6 +9,12 @@ title=测试 storyModel->getRequierements(); cid=1 pid=1 +获取产品1下的第一个用户需求名称 >> 用户需求1 +获取产品1下的所有用户需求数量 >> 2 +获取产品5下的第一个用户需求名称 >> 用户需求17 +获取产品5下的所有用户需求数量 >> 2 +获取产品ID为Null的用户需求数量 >> 0 + */ $story = new storyTest(); @@ -20,4 +26,4 @@ r($requirements1) && p('1') && e('用户需求1'); //获取产品1下 r(count($requirements1)) && p() && e('2'); //获取产品1下的所有用户需求数量 r($requirements2) && p('17') && e('用户需求17'); //获取产品5下的第一个用户需求名称 r(count($requirements2)) && p() && e('2'); //获取产品5下的所有用户需求数量 -r(count($requirements3)) && p() && e('0'); //获取产品ID为Null的用户需求数量 +r(count($requirements3)) && p() && e('0'); //获取产品ID为Null的用户需求数量 \ No newline at end of file diff --git a/test/model/story/getreviewerpairs.php b/test/model/story/getreviewerpairs.php index 6ac3c7e888..7e6597104e 100644 --- a/test/model/story/getreviewerpairs.php +++ b/test/model/story/getreviewerpairs.php @@ -9,6 +9,8 @@ title=测试 storyModel->getReviewerPairs(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getstories2link.php b/test/model/story/getstories2link.php index 782e76833b..1cb3106901 100644 --- a/test/model/story/getstories2link.php +++ b/test/model/story/getstories2link.php @@ -8,6 +8,11 @@ title=测试 storyModel->getStories2Link(); cid=1 pid=1 +获取需求1可关联的需求数量 >> 2 +获取需求2可关联的需求数量 >> 2 +获取需求1可关联的需求id、product >> story,1 +获取需求2可关联的需求id、product >> requirement,1 + */ global $tester; @@ -17,4 +22,4 @@ $stories2 = $tester->loadModel('story')->getStories2Link(2); r(count($stories1)) && p() && e('2'); // 获取需求1可关联的需求数量 r(count($stories2)) && p() && e('2'); // 获取需求2可关联的需求数量 r($stories1) && p('2:type,product') && e('story,1'); // 获取需求1可关联的需求id、product -r($stories2) && p('1:type,product') && e('requirement,1'); // 获取需求2可关联的需求id、product +r($stories2) && p('1:type,product') && e('requirement,1'); // 获取需求2可关联的需求id、product \ No newline at end of file diff --git a/test/model/story/getstoriesbyplanidlist.php b/test/model/story/getstoriesbyplanidlist.php index 35730d640e..b5f1c01bfb 100644 --- a/test/model/story/getstoriesbyplanidlist.php +++ b/test/model/story/getstoriesbyplanidlist.php @@ -1,6 +1,5 @@ getStoriesByPlanIdList(); cid=1 pid=1 + + */ -$story = new storyTest(); +global $tester; +$tester->loadModel('story'); -r() && p() && e(); \ No newline at end of file +$planIdList1 = array(1, 2, 3); +$planIdList2 = array(4, 5, 6); +$planIdList3 = array(); +$stories1 = $tester->story->getStoriesByPlanIdList($planIdList1); +$stories2 = $tester->story->getStoriesByPlanIdList($planIdList2); +$stories3 = $tester->story->getStoriesByPlanIdList($planIdList3); + +r(count($stories1[1])) && p() && e('20'); //传入计划ID列表,获取其下面的需求数量 +r($stories1[1]) && p('388:title,type,status') && e('软件需求388,story,draft'); //传入计划ID列表,查看其下面的需求详情 +r(count($stories2[4])) && p() && e('20'); //传入计划ID列表,获取其下面的需求数量 +r($stories2[4]) && p('392:title,type,status') && e('软件需求392,story,draft'); //传入计划ID列表,查看其下面的需求详情 +r(count($stories3, true)) && p() && e('424'); //传入空的计划ID列表,获取系统中所有需求数量 diff --git a/test/model/story/getstoryrelation.php b/test/model/story/getstoryrelation.php index e028ce702b..928685fd7d 100644 --- a/test/model/story/getstoryrelation.php +++ b/test/model/story/getstoryrelation.php @@ -9,6 +9,8 @@ title=测试 storyModel->getStoryRelation(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getstoryrelationcounts.php b/test/model/story/getstoryrelationcounts.php index 8525bc364e..417adef12d 100644 --- a/test/model/story/getstoryrelationcounts.php +++ b/test/model/story/getstoryrelationcounts.php @@ -9,6 +9,8 @@ title=测试 storyModel->getStoryRelationCounts(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getstoryspecs.php b/test/model/story/getstoryspecs.php index 0be79e5d5e..db964d5b53 100644 --- a/test/model/story/getstoryspecs.php +++ b/test/model/story/getstoryspecs.php @@ -9,6 +9,10 @@ title=测试 storyModel->getStorySpecs(); cid=1 pid=1 +根据传入的需求ID列表,获取最新版本的需求描述信息 >> 这是一个软件需求描述41 +根据传入的需求ID列表,获取最新版本的验收标准信息 >> 这是一个需求验收55 +传入三个需求ID,判断获取到的需求描述信息数量 >> 2 + */ $story = new storyTest(); @@ -16,4 +20,4 @@ $storyIdList = array(1, 15, 100); r($story->getStorySpecsTest($storyIdList)) && p('1:spec') && e('这是一个软件需求描述41'); //根据传入的需求ID列表,获取最新版本的需求描述信息 r($story->getStorySpecsTest($storyIdList)) && p('15:verify') && e('这是一个需求验收55'); //根据传入的需求ID列表,获取最新版本的验收标准信息 -r(count($story->getStorySpecsTest($storyIdList))) && p() && e('2'); //传入三个需求ID,判断获取到的需求描述信息数量 +r(count($story->getStorySpecsTest($storyIdList))) && p() && e('2'); //传入三个需求ID,判断获取到的需求描述信息数量 \ No newline at end of file diff --git a/test/model/story/getteammembers.php b/test/model/story/getteammembers.php index 5751ef3b82..634f507aeb 100644 --- a/test/model/story/getteammembers.php +++ b/test/model/story/getteammembers.php @@ -9,6 +9,8 @@ title=测试 storyModel->getTeamMembers(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getteststories.php b/test/model/story/getteststories.php index 3d7f468484..39ac11c243 100644 --- a/test/model/story/getteststories.php +++ b/test/model/story/getteststories.php @@ -9,6 +9,10 @@ title=测试 storyModel->getTestStories(); cid=1 pid=1 +获取和执行103关联的ID为9的测试类型的需求 >> 9 +获取和执行111关联的ID为41的测试类型的需求 >> 41 +获取和执行103关联的测试类型的需求,为空 >> 0 + */ $story = new storyTest(); @@ -17,4 +21,4 @@ $storyIdList2 = array(1, 2, 3); r($story->getTestStoriesTest($storyIdList1, 103)) && p('9') && e('9'); //获取和执行103关联的ID为9的测试类型的需求 r($story->getTestStoriesTest($storyIdList1, 111)) && p('41') && e('41'); //获取和执行111关联的ID为41的测试类型的需求 -r($story->getTestStoriesTest($storyIdList2, 103)) && p() && e('0'); //获取和执行103关联的测试类型的需求,为空 +r($story->getTestStoriesTest($storyIdList2, 103)) && p() && e('0'); //获取和执行103关联的测试类型的需求,为空 \ No newline at end of file diff --git a/test/model/story/gettoandcclist.php b/test/model/story/gettoandcclist.php index 8f8cf2ba5f..f723bebb83 100644 --- a/test/model/story/gettoandcclist.php +++ b/test/model/story/gettoandcclist.php @@ -9,6 +9,8 @@ title=测试 storyModel->getToAndCcList(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/gettrackbyid.php b/test/model/story/gettrackbyid.php index 96f134695c..b53bdf81b0 100644 --- a/test/model/story/gettrackbyid.php +++ b/test/model/story/gettrackbyid.php @@ -9,6 +9,8 @@ title=测试 storyModel->getTrackByID(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/gettracks.php b/test/model/story/gettracks.php index bc54a34b97..4d03548095 100644 --- a/test/model/story/gettracks.php +++ b/test/model/story/gettracks.php @@ -9,6 +9,8 @@ title=测试 storyModel->getTracks(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getuserstories.php b/test/model/story/getuserstories.php index cbd60150f2..28c1084a88 100644 --- a/test/model/story/getuserstories.php +++ b/test/model/story/getuserstories.php @@ -1,6 +1,5 @@ loadModel('story'); +$tester->app->loadClass('pager', $static = true); +$pager = new pager(0, 10, 1); -r() && p() && e(); \ No newline at end of file +$assignUser2Stories = $tester->story->getUserStories('user2', 'assignedTo'); +$openedByUser2Stories = $tester->story->getUserStories('user2', 'openedBy', 'id_asc', $pager, 'story', true); +$closedByTest3Stories = $tester->story->getUserStories('test3', 'closedBy', 'id_asc', null, 'requirement', true); +$emptyReviewedByStories = $tester->story->getUserStories('', 'reviewedBy'); + +r(count($assignUser2Stories)) && p() && e('100'); //获取指派给User2的所有需求数量 +r($assignUser2Stories) && p('6:title,type,assignedTo,stage') && e('软件需求6,story,user2,projected'); //获取指派给User2的ID为6的需求详情 +r(count($openedByUser2Stories)) && p() && e('10'); //获取由User2创建的需求数量,每页10条 +r($openedByUser2Stories) && p('38:title,type,openedBy,stage') && e('软件需求38,story,user2,released'); //获取由User2创建的ID为38的需求详情 +r(count($closedByTest3Stories)) && p() && e('14'); //获取由Test3关闭的所有需求数量 +r($closedByTest3Stories) && p('203:title,type,closedBy,stage') && e('用户需求203,requirement,test3,'); //获取由Test3关闭的ID为203的需求详情 +r(count($emptyReviewedByStories)) && p() && e('25'); //获取无评审人的需求数量 +r($emptyReviewedByStories) && p('402:title,type,reviewedBy,stage') && e('软件子需求2,story,,planned'); //获取无评审人的ID为402的需求详情 diff --git a/test/model/story/getuserstorypairs.php b/test/model/story/getuserstorypairs.php index 76438e556a..579107c9b7 100644 --- a/test/model/story/getuserstorypairs.php +++ b/test/model/story/getuserstorypairs.php @@ -9,8 +9,22 @@ title=测试 storyModel->getUserStoryPairs(); cid=1 pid=1 + + */ -$story = new storyTest(); +global $tester; +$tester->loadModel('story'); -r() && p() && e(); \ No newline at end of file +$skipProductIDList = array(1, 2, 3, 4, 5); +$user2Stories = $tester->story->getUserStoryPairs('user2', '10'); +$adminRequirements = $tester->story->getUserStoryPairs('admin', '50', 'requirement'); +$user2Stories = $tester->story->getUserStoryPairs('user2', '10', 'story', $skipProductIDList); +a($user2Stories);die; + +$openedByUser2Stories = $tester->story->getUserStories('user2', 'openedBy', 'id_asc', $pager, 'story', true); +$closedByTest3Stories = $tester->story->getUserStories('test3', 'closedBy', 'id_asc', null, 'requirement', true); +$emptyReviewedByStories = $tester->story->getUserStories('', 'reviewedBy'); + +r(count($user2Stories)) && p() && e('10'); //获取指派给User2的需求数量,每页10条 +r(count($adminRequirements)) && p() && e('50'); //获取指派给admin的用户需求,每页50条 diff --git a/test/model/story/getversion.php b/test/model/story/getversion.php index 75d6da68f1..2f8f36c89e 100644 --- a/test/model/story/getversion.php +++ b/test/model/story/getversion.php @@ -9,6 +9,8 @@ title=测试 storyModel->getVersion(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getversions.php b/test/model/story/getversions.php index d8a928b9b5..60cf75e33f 100644 --- a/test/model/story/getversions.php +++ b/test/model/story/getversions.php @@ -9,6 +9,8 @@ title=测试 storyModel->getVersions(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/getzerocase.php b/test/model/story/getzerocase.php index 7c2b68f75a..bae0b0e2c9 100644 --- a/test/model/story/getzerocase.php +++ b/test/model/story/getzerocase.php @@ -9,6 +9,8 @@ title=测试 storyModel->getZeroCase(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/linkstories.php b/test/model/story/linkstories.php index 0c9db15553..fa1cd65fb2 100644 --- a/test/model/story/linkstories.php +++ b/test/model/story/linkstories.php @@ -9,6 +9,8 @@ title=测试 storyModel->linkStories(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/linkstory.php b/test/model/story/linkstory.php index 0e543f95ca..b42c70e4f5 100644 --- a/test/model/story/linkstory.php +++ b/test/model/story/linkstory.php @@ -9,6 +9,8 @@ title=测试 storyModel->linkStory(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/mergechartoption.php b/test/model/story/mergechartoption.php index 52d078e1ee..bcb5e464af 100644 --- a/test/model/story/mergechartoption.php +++ b/test/model/story/mergechartoption.php @@ -9,6 +9,8 @@ title=测试 storyModel->mergeChartOption(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/mergeplantitle.php b/test/model/story/mergeplantitle.php index c663b6684d..5fbafe6821 100644 --- a/test/model/story/mergeplantitle.php +++ b/test/model/story/mergeplantitle.php @@ -9,6 +9,8 @@ title=测试 storyModel->mergePlanTitle(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/mergereviewer.php b/test/model/story/mergereviewer.php index 5ce946a6b0..fb4193b468 100644 --- a/test/model/story/mergereviewer.php +++ b/test/model/story/mergereviewer.php @@ -9,6 +9,8 @@ title=测试 storyModel->mergeReviewer(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/printassignedhtml.php b/test/model/story/printassignedhtml.php index 076f9a8c54..e077ac311f 100644 --- a/test/model/story/printassignedhtml.php +++ b/test/model/story/printassignedhtml.php @@ -9,6 +9,8 @@ title=测试 storyModel->printAssignedHtml(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/printcell.php b/test/model/story/printcell.php index eeae42c1b1..9dd002b0a2 100644 --- a/test/model/story/printcell.php +++ b/test/model/story/printcell.php @@ -9,6 +9,8 @@ title=测试 storyModel->printCell(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/recall.php b/test/model/story/recall.php index 53901f440c..6e6fcab3e8 100644 --- a/test/model/story/recall.php +++ b/test/model/story/recall.php @@ -8,6 +8,9 @@ title=测试 storyModel->recall(); cid=1 pid=1 +撤回评审之前的状态信息 >> 2,用户需求版本一62,active +撤回评审之后的状态信息 >> 2,用户需求版本一62,draft + */ global $tester; @@ -18,4 +21,4 @@ $afterRecall = $tester->story->getByID(2); r($beforeRecall) && p('id,title,status') && e('2,用户需求版本一62,active'); // 撤回评审之前的状态信息 r($afterRecall) && p('id,title,status') && e('2,用户需求版本一62,draft'); // 撤回评审之后的状态信息 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/recordreviewaction.php b/test/model/story/recordreviewaction.php index 65fce48127..c29bd9581f 100644 --- a/test/model/story/recordreviewaction.php +++ b/test/model/story/recordreviewaction.php @@ -9,6 +9,8 @@ title=测试 storyModel->recordReviewAction(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/replaceurlang.php b/test/model/story/replaceurlang.php index 68e2fa9590..8a242392a8 100644 --- a/test/model/story/replaceurlang.php +++ b/test/model/story/replaceurlang.php @@ -9,6 +9,8 @@ title=测试 storyModel->replaceURLang(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/reportcondition.php b/test/model/story/reportcondition.php index 642ec70516..4d097835f0 100644 --- a/test/model/story/reportcondition.php +++ b/test/model/story/reportcondition.php @@ -9,6 +9,8 @@ title=测试 storyModel->reportCondition(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/review.php b/test/model/story/review.php index 05be4f4c90..689aca7bb7 100644 --- a/test/model/story/review.php +++ b/test/model/story/review.php @@ -9,6 +9,10 @@ title=测试 storyModel->review(); cid=1 pid=1 +评审ID为2的需求,不传入评审意见,给出没有选择评审意见的提示 >> 必须选择评审意见 +评审一个草稿的需求,传入评审意见为通过,状态变为激活 >> active +评审一个草稿的需求,传入评审意见为拒绝,状态变为关闭 >> closed + */ $story = new storyTest(); @@ -22,4 +26,4 @@ $review3 = $story->reviewTest(304, $reject); r($review1[0]) && p() && e('必须选择评审意见'); // 评审ID为2的需求,不传入评审意见,给出没有选择评审意见的提示 r($review2) && p('status') && e('active'); // 评审一个草稿的需求,传入评审意见为通过,状态变为激活 r($review3) && p('status') && e('closed'); // 评审一个草稿的需求,传入评审意见为拒绝,状态变为关闭 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/saveestimateinfo.php b/test/model/story/saveestimateinfo.php index a7d430fe90..650780822d 100644 --- a/test/model/story/saveestimateinfo.php +++ b/test/model/story/saveestimateinfo.php @@ -9,6 +9,8 @@ title=测试 storyModel->saveEstimateInfo(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/setstage.php b/test/model/story/setstage.php index 2517cabda7..7d3f8b6594 100644 --- a/test/model/story/setstage.php +++ b/test/model/story/setstage.php @@ -9,6 +9,12 @@ title=测试 storyModel->setStage(); cid=1 pid=1 +为需求2拆分几个任务. >> execution +把需求2下面的任务都完成. >> story +查看设置之后的需求状态 >> projected +查看设置之后的需求状态 >> testing +查看设置之后的需求状态 >> tested + */ $story = new storyTest(); @@ -30,4 +36,4 @@ $after2 = $tester->story->getById(2); r($before) && p('stage') && e('projected'); //查看设置之后的需求状态 r($after1) && p('stage') && e('testing'); //查看设置之后的需求状态 r($after2) && p('stage') && e('tested'); //查看设置之后的需求状态 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/setstatusbyreviewrules.php b/test/model/story/setstatusbyreviewrules.php index 903855d365..a58d5ff350 100644 --- a/test/model/story/setstatusbyreviewrules.php +++ b/test/model/story/setstatusbyreviewrules.php @@ -9,6 +9,8 @@ title=测试 storyModel->setStatusByReviewRules(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/sortstoriesofplan.php b/test/model/story/sortstoriesofplan.php index 3a94e758af..d99b898e41 100644 --- a/test/model/story/sortstoriesofplan.php +++ b/test/model/story/sortstoriesofplan.php @@ -9,6 +9,8 @@ title=测试 storyModel->sortStoriesOfPlan(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/subdivide.php b/test/model/story/subdivide.php index d6864e04f4..8e09bd9bb0 100644 --- a/test/model/story/subdivide.php +++ b/test/model/story/subdivide.php @@ -9,6 +9,13 @@ title=测试 storyModel->subdivide(); cid=1 pid=1 +将用户需求1拆分三个软件需求,查看relation表记录的数量 >> 3 +将用户需求1拆分三个软件需求,查看relation表记录的关系 >> 1,2,subdivideinto +将用户需求1拆分三个软件需求,查看relation表记录的关系 >> 1,6,subdivideinto +将软件需求2拆分三个子需求,查看子需求的数量 >> 3 +将软件需求2拆分三个子需求,查看子需求8的parent、title等字段 >> 2,这里是需求来源备注8,8 +将软件需求2拆分三个子需求,查看子需求12的parent、title等字段 >> 2,这里是需求来源备注12,12 + */ $story = new storyTest(); @@ -24,4 +31,4 @@ r($result1) && p('2:AID,BID,relation') && e('1,6,subdivideinto' r(count($result2->children)) && p() && e('3'); // 将软件需求2拆分三个子需求,查看子需求的数量 r($result2->children) && p('8:parent,title,id') && e('2,这里是需求来源备注8,8'); // 将软件需求2拆分三个子需求,查看子需求8的parent、title等字段 r($result2->children) && p('12:parent,title,id') && e('2,这里是需求来源备注12,12'); // 将软件需求2拆分三个子需求,查看子需求12的parent、title等字段 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/superreview.php b/test/model/story/superreview.php index 9f645acb03..c351eff7b4 100644 --- a/test/model/story/superreview.php +++ b/test/model/story/superreview.php @@ -9,6 +9,8 @@ title=测试 storyModel->superReview(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/unlinkstory.php b/test/model/story/unlinkstory.php index a9efd54b17..4ee546fe14 100644 --- a/test/model/story/unlinkstory.php +++ b/test/model/story/unlinkstory.php @@ -9,6 +9,8 @@ title=测试 storyModel->unlinkStory(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/update.php b/test/model/story/update.php index e6fa694de6..07f614dbe0 100644 --- a/test/model/story/update.php +++ b/test/model/story/update.php @@ -9,6 +9,9 @@ title=测试 storyModel->update(); cid=1 pid=1 +编辑用户需求,判断返回的信息,stage为空 >> 2,4,1,测试来源备注1,2 +编辑软件需求,判断返回的信息,stage为wait,parent为2 >> 2,4,1,测试来源备注1,2 + */ $story = new storyTest(); @@ -23,4 +26,4 @@ $result2 = $story->updateTest(3, $story1); r($result1) && p('parent,pri,estimate,sourceNote,product') && e('2,4,1,测试来源备注1,2'); // 编辑用户需求,判断返回的信息,stage为空 r($result2) && p('parent,pri,estimate,sourceNote,product') && e('2,4,1,测试来源备注1,2'); // 编辑软件需求,判断返回的信息,stage为wait,parent为2 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/updatestorybyreview.php b/test/model/story/updatestorybyreview.php index 0e6e870dcf..8e6762365a 100644 --- a/test/model/story/updatestorybyreview.php +++ b/test/model/story/updatestorybyreview.php @@ -9,6 +9,8 @@ title=测试 storyModel->updateStoryByReview(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/model/story/updatestoryorderofplan.php b/test/model/story/updatestoryorderofplan.php index 5d671358f8..d2a81a4416 100644 --- a/test/model/story/updatestoryorderofplan.php +++ b/test/model/story/updatestoryorderofplan.php @@ -9,6 +9,11 @@ title=测试 storyModel->updateStoryOrderOfPlan(); cid=1 pid=1 +把需求1迁移到计划1下,获取更新后的planstory >> 1,1,21 +把需求1迁移到计划1下,获取更新后的planstory数量 >> 4 +把需求1迁移到计划2下,获取更新后的planstory >> 2,1,1 +把需求1迁移到计划2下,获取更新后的planstory数量 >> 1 + */ $story = new storyTest(); @@ -19,4 +24,4 @@ r($planStories1) && p("0:plan,story,order") && e('1,1,21'); // 把需求1 r(count($planStories1)) && p() && e('4'); // 把需求1迁移到计划1下,获取更新后的planstory数量 r($planStories2) && p("0:plan,story,order") && e('2,1,1'); // 把需求1迁移到计划2下,获取更新后的planstory r(count($planStories2)) && p() && e('1'); // 把需求1迁移到计划2下,获取更新后的planstory数量 -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/updatestoryproduct.php b/test/model/story/updatestoryproduct.php index b1c3b16ecf..b7835419bf 100644 --- a/test/model/story/updatestoryproduct.php +++ b/test/model/story/updatestoryproduct.php @@ -9,6 +9,9 @@ title=测试 storyModel->updateStoryProduct(); cid=1 pid=1 +判断需求变更所属产品之前的产品ID >> 1 +判断需求变更所属产品之后的产品ID >> 2 + */ $story = new storyTest(); @@ -20,4 +23,4 @@ $newStory = $tester->story->getByID(1); r($oldStory) && p('product') && e('1'); // 判断需求变更所属产品之前的产品ID r($newStory) && p('product') && e('2'); // 判断需求变更所属产品之后的产品ID -system("./ztest init"); +system("./ztest init"); \ No newline at end of file diff --git a/test/model/story/updatestoryversion.php b/test/model/story/updatestoryversion.php index a0a3b030dc..ff5fa73b4d 100644 --- a/test/model/story/updatestoryversion.php +++ b/test/model/story/updatestoryversion.php @@ -9,6 +9,8 @@ title=测试 storyModel->updateStoryVersion(); cid=1 pid=1 + + */ $story = new storyTest(); diff --git a/test/ztest b/test/ztest index 8358ed1aaa..27878d30e9 100755 --- a/test/ztest +++ b/test/ztest @@ -31,6 +31,9 @@ switch($argv[1]) case 'task': ztfRun('model/task'); break; + case 'story': + ztfRun('model/story'); + break; case 'execution': ztfRun('model/execution'); break;