diff --git a/test/class/story.class.php b/test/class/story.class.php index 5613c1d5e0..653a8e7013 100644 --- a/test/class/story.class.php +++ b/test/class/story.class.php @@ -501,276 +501,6 @@ class storyTest return $this->objectModel->getByList($storyIdList); } - public function getTeamMembersTest($storyID, $actionType) - { - $objects = $this->objectModel->getTeamMembers($storyID, $actionType); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getVersionTest($storyID) - { - $objects = $this->objectModel->getVersion($storyID); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getVersionsTest($storyID) - { - $objects = $this->objectModel->getVersions($storyID); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getZeroCaseTest($productID, $branchID = 0, $orderBy = 'id_desc') - { - $objects = $this->objectModel->getZeroCase($productID, $branchID = 0, $orderBy = 'id_desc'); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getChangedStoriesTest($story) - { - $objects = $this->objectModel->getChangedStories($story); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getAllStorySortTest($planID, $planOrder) - { - $objects = $this->objectModel->getAllStorySort($planID, $planOrder); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function batchGetStoryStageTest($stories) - { - $objects = $this->objectModel->batchGetStoryStage($stories); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function checkNeedConfirmTest($dataList) - { - $objects = $this->objectModel->checkNeedConfirm($dataList); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function formatStoriesTest($stories, $type = 'full', $limit = 0) - { - $objects = $this->objectModel->formatStories($stories, $type = 'full', $limit = 0); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function extractAccountsFromListTest($stories) - { - $objects = $this->objectModel->extractAccountsFromList($stories); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function extractAccountsFromSingleTest($story) - { - $objects = $this->objectModel->extractAccountsFromSingle($story); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function mergeChartOptionTest($chartType) - { - $objects = $this->objectModel->mergeChartOption($chartType); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerProductTest() - { - $objects = $this->objectModel->getDataOfStorysPerProduct(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerModuleTest() - { - $objects = $this->objectModel->getDataOfStorysPerModule(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerSourceTest() - { - $objects = $this->objectModel->getDataOfStorysPerSource(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerPlanTest() - { - $objects = $this->objectModel->getDataOfStorysPerPlan(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerStatusTest() - { - $objects = $this->objectModel->getDataOfStorysPerStatus(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerStageTest() - { - $objects = $this->objectModel->getDataOfStorysPerStage(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerPriTest() - { - $objects = $this->objectModel->getDataOfStorysPerPri(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerEstimateTest() - { - $objects = $this->objectModel->getDataOfStorysPerEstimate(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerOpenedByTest() - { - $objects = $this->objectModel->getDataOfStorysPerOpenedBy(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerAssignedToTest() - { - $objects = $this->objectModel->getDataOfStorysPerAssignedTo(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerClosedReasonTest() - { - $objects = $this->objectModel->getDataOfStorysPerClosedReason(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getDataOfStorysPerChangeTest() - { - $objects = $this->objectModel->getDataOfStorysPerChange(); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getKanbanGroupDataTest($stories) - { - $objects = $this->objectModel->getKanbanGroupData($stories); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getToAndCcListTest($story, $actionType) - { - $objects = $this->objectModel->getToAndCcList($story, $actionType); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function mergePlanTitleTest($productID, $stories, $branch = 0, $type = 'story') - { - $objects = $this->objectModel->mergePlanTitle($productID, $stories, $branch = 0, $type = 'story'); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function mergeReviewerTest($stories, $isObject = false) - { - $objects = $this->objectModel->mergeReviewer($stories, $isObject = false); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function printCellTest($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story') - { - $objects = $this->objectModel->printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story'); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function printAssignedHtmlTest($story, $users) - { - $objects = $this->objectModel->printAssignedHtml($story, $users); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - public function reportConditionTest() { $objects = $this->objectModel->reportCondition(); diff --git a/test/model/story/checkforcereview.php b/test/model/story/checkforcereview.php deleted file mode 100644 index c503ed2491..0000000000 --- a/test/model/story/checkforcereview.php +++ /dev/null @@ -1,18 +0,0 @@ -checkForceReview(); -cid=1 -pid=1 - - - -*/ - -$story = new storyTest(); - -r() && p() && e(); \ No newline at end of file diff --git a/test/model/story/extractaccountsfromlist.php b/test/model/story/extractaccountsfromlist.php index a7659e68f0..4ae2644069 100644 --- a/test/model/story/extractaccountsfromlist.php +++ b/test/model/story/extractaccountsfromlist.php @@ -1,6 +1,5 @@ loadModel('story'); +$stories1 = $tester->story->getProductStories(1); +$stories2 = $tester->story->getProductStories(2); -r() && p() && e(); \ No newline at end of file +$accounts1 = $tester->story->extractAccountsFromList($stories1); +$accounts2 = $tester->story->extractAccountsFromList($stories2); + +r(count($accounts1)) && p() && e('2'); // 根据产品1的需求列表获取的accounts数量 +r(count($accounts2)) && p() && e('2'); // 根据产品2的需求列表获取的accounts数量 +r($accounts1) && p('2') && e('user2'); // 根据产品1的需求列表获取的account详情 +r($accounts2) && p('2') && e('user2'); // 根据产品2的需求列表获取的account详情 diff --git a/test/model/story/extractaccountsfromsingle.php b/test/model/story/extractaccountsfromsingle.php index 0daa327213..8cdb3c39f5 100644 --- a/test/model/story/extractaccountsfromsingle.php +++ b/test/model/story/extractaccountsfromsingle.php @@ -1,6 +1,5 @@ loadModel('story'); +$story1 = $tester->story->getById(2); +$story2 = $tester->story->getById(4); -r() && p() && e(); \ No newline at end of file +$accounts1 = $tester->story->extractAccountsFromSingle($story1); +$accounts2 = $tester->story->extractAccountsFromSingle($story2); + +r(count($accounts1)) && p() && e('1'); // 根据需求2获取的accounts数量 +r(count($accounts2)) && p() && e('1'); // 根据需求4获取的accounts数量 +r($accounts1[0]) && p('0') && e('user2'); // 根据需求2获取的account详情 +r($accounts2[0]) && p('0') && e('dev4'); // 根据需求4获取的account详情 diff --git a/test/model/story/formatstories.php b/test/model/story/formatstories.php index 91c9fc8a4c..8758336128 100644 --- a/test/model/story/formatstories.php +++ b/test/model/story/formatstories.php @@ -1,6 +1,5 @@ loadModel('story'); +$stories1 = $tester->story->getProductStories(1); +$stories2 = $tester->story->getProductStories(2); -r() && p() && e(); \ No newline at end of file +$formatStories1 = $tester->story->formatStories($stories1); +$formatStories2 = $tester->story->formatStories($stories2); + +r(count($stories1)) && p() && e('2'); // 获取处理title之前的需求列表数量 +r(count($stories2)) && p() && e('2'); // 获取处理title之前的需求列表数量 +r($stories1) && p('2:title') && e('软件需求2'); // 获取处理title之前的需求title +r($stories2) && p('6:title') && e('软件需求6'); // 获取处理title之前的需求title +r(count($formatStories1)) && p() && e('3'); // 获取处理title之后的需求列表数量 +r(count($formatStories2)) && p() && e('3'); // 获取处理title之后的需求列表数量 +r($formatStories1) && p('2') && e('2:软件需求2 (优先级:2,预计工时:20)'); // 获取处理title之后的需求title +r($formatStories2) && p('6') && e('6:软件需求6 (优先级:2,预计工时:17)'); // 获取处理title之后的需求title diff --git a/test/model/story/getchangedstories.php b/test/model/story/getchangedstories.php index 6aad668e27..366e136e4e 100644 --- a/test/model/story/getchangedstories.php +++ b/test/model/story/getchangedstories.php @@ -1,6 +1,5 @@ loadModel('story'); +$story = $tester->story->getById(26); +$requirements = $tester->story->getChangedStories($story); -r() && p() && e(); \ No newline at end of file +r(count($requirements)) && p() && e('1'); // 获取需求26关联的用户需求数量 +r($requirements) && p('25:title,status,type') && e('用户需求25,draft,requirement'); // 获取需求26关联的用户需求详情 diff --git a/test/model/story/getdataofstorysperassignedto.php b/test/model/story/getdataofstorysperassignedto.php index 9ff0354d84..5f3bcfd6cb 100644 --- a/test/model/story/getdataofstorysperassignedto.php +++ b/test/model/story/getdataofstorysperassignedto.php @@ -1,6 +1,5 @@ loadModel('story'); +$tester->loadModel('report'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerAssignedTo(); + +r(count($data)) && p() && e('5'); // 按照需求指派人分组，获取分组后的需求数量 +r($data) && p('admin:name,value') && e('admin,100'); // 按照需求指派人分组，获取各个指派人名下的需求数量，查看admin下的数据 diff --git a/test/model/story/getdataofstorysperchange.php b/test/model/story/getdataofstorysperchange.php index 0877ad1e9a..70e472ed96 100644 --- a/test/model/story/getdataofstorysperchange.php +++ b/test/model/story/getdataofstorysperchange.php @@ -1,6 +1,5 @@ loadModel('story'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerChange(); + +r(count($data)) && p() && e('3'); // 按照需求版本号分组，获取分组后的需求数量 +r($data) && p('1:name,value') && e('1,80'); // 按照需求版本号分组，获取各个版本号下的需求数量，查看admin下的数据 +r($data) && p('2:name,value') && e('0,350'); // 按照需求版本号分组，获取各个版本号下的需求数量，查看admin下的数据 diff --git a/test/model/story/getdataofstorysperclosedreason.php b/test/model/story/getdataofstorysperclosedreason.php index c03891864b..30f6123188 100644 --- a/test/model/story/getdataofstorysperclosedreason.php +++ b/test/model/story/getdataofstorysperclosedreason.php @@ -1,6 +1,5 @@ loadModel('story'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerClosedReason(); + +r(count($data)) && p() && e('3'); // 按照需求关闭原因分组，获取分组后的需求数量 +r($data) && p('1:name,value') && e('1,80'); // 按照需求关闭原因分组，获取各个关闭原因下的需求数量，查看admin下的数据 +r($data) && p('2:name,value') && e('0,350'); // 按照需求关闭原因分组，获取各个关闭原因下的需求数量，查看admin下的数据 diff --git a/test/model/story/getdataofstorysperestimate.php b/test/model/story/getdataofstorysperestimate.php index 4ab4952612..b89c6c83eb 100644 --- a/test/model/story/getdataofstorysperestimate.php +++ b/test/model/story/getdataofstorysperestimate.php @@ -1,6 +1,5 @@ loadModel('story'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerEstimate(); + +r(count($data)) && p() && e('21'); // 按照需求预计工时分组，获取分组后的需求数量 +r($data) && p('19:name,value') && e('17,28'); // 按照需求预计工时分组，获取各个工时的需求数量，查看工时为19的数据 +r($data) && p('20:name,value') && e('1,28'); // 按照需求预计工时分组，获取各个工时的需求数量，查看工时为20的数据 diff --git a/test/model/story/getdataofstoryspermodule.php b/test/model/story/getdataofstoryspermodule.php index 76fb7e4350..51c339ae9a 100644 --- a/test/model/story/getdataofstoryspermodule.php +++ b/test/model/story/getdataofstoryspermodule.php @@ -13,6 +13,11 @@ pid=1 */ -$story = new storyTest(); +global $tester; +$tester->loadModel('story'); +$tester->loadModel('report'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerModule(); + +r(count($data)) && p() && e('100'); // 按照模块分组，获取分组后的需求数量 +r($data) && p('2150:name,value,product') && e('/产品模块330,1,83'); // 按照模块分组，获取各个模块下的需求数量，查看模块2150下的数据 diff --git a/test/model/story/getdataofstorysperopenedby.php b/test/model/story/getdataofstorysperopenedby.php index 61ca2f3a85..d190e9d740 100644 --- a/test/model/story/getdataofstorysperopenedby.php +++ b/test/model/story/getdataofstorysperopenedby.php @@ -1,6 +1,5 @@ loadModel('story'); +$tester->loadModel('report'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerOpenedBy(); + +r(count($data)) && p() && e('5'); // 按照创建人分组，获取分组后的需求数量 +r($data) && p('test3:name,value') && e('开发3,100'); // 按照创建人分组，获取各个创建人的需求数量，查看用户test3下的数据 diff --git a/test/model/story/getdataofstorysperplan.php b/test/model/story/getdataofstorysperplan.php index ef81c463d8..ccf147cd00 100644 --- a/test/model/story/getdataofstorysperplan.php +++ b/test/model/story/getdataofstorysperplan.php @@ -1,6 +1,5 @@ loadModel('story'); +$tester->loadModel('report'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerPlan(); + +r(count($data)) && p() && e('25'); // 按照计划分组，获取分组后的需求数量 +r($data) && p('1:name,value') && e('1.0,18'); // 按照计划分组，获取各个计划的需求数量，查看1下的数据 +r($data) && p('70:name,value') && e('1.0,15'); // 按照计划分组，获取各个计划的需求数量，查看70下的数据 diff --git a/test/model/story/getdataofstorysperpri.php b/test/model/story/getdataofstorysperpri.php index ce115c463a..29c56a228b 100644 --- a/test/model/story/getdataofstorysperpri.php +++ b/test/model/story/getdataofstorysperpri.php @@ -13,6 +13,12 @@ pid=1 */ -$story = new storyTest(); +global $tester; +$tester->loadModel('story'); +$tester->loadModel('report'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerPri(); + +r(count($data)) && p() && e('4'); // 按照优先级分组，获取分组后的需求数量 +r($data) && p('1:name,value') && e('1,113'); // 按照优先级分组，获取各个优先级的需求数量，查看优先级1下的数据 +r($data) && p('4:name,value') && e('1,112'); // 按照优先级分组，获取各个优先级的需求数量，查看优先级4下的数据 diff --git a/test/model/story/getdataofstorysperproduct.php b/test/model/story/getdataofstorysperproduct.php index 82f18c9d2e..fc04e43e8b 100644 --- a/test/model/story/getdataofstorysperproduct.php +++ b/test/model/story/getdataofstorysperproduct.php @@ -1,6 +1,5 @@ loadModel('story'); +$tester->loadModel('report'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerProduct(); + +r(count($data)) && p() && e('100'); // 按照产品分组，获取分组后的需求数量 +r($data) && p('79:name,value') && e('已关闭的多分支产品79,4'); // 按照产品分组，获取各个产品下的需求数量，查看产品79下的数据 diff --git a/test/model/story/getdataofstoryspersource.php b/test/model/story/getdataofstoryspersource.php index 50578e1116..c29da3800a 100644 --- a/test/model/story/getdataofstoryspersource.php +++ b/test/model/story/getdataofstoryspersource.php @@ -13,6 +13,12 @@ pid=1 */ -$story = new storyTest(); +global $tester; +$tester->loadModel('story'); +$tester->loadModel('report'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerSource(); + +r(count($data)) && p() && e('14'); // 按照需求来源分组，获取分组后的需求数量 +r($data) && p('support:name,value') && e('技术支持,33'); // 按照需求来源分组，获取各个需求来源的需求数量，查看support下的数据 +r($data) && p('market:name,value') && e('市场,33'); // 按照需求来源分组，获取各个需求来源的需求数量，查看market下的数据 diff --git a/test/model/story/getdataofstorysperstage.php b/test/model/story/getdataofstorysperstage.php index ef4b4b398b..950cdcaca8 100644 --- a/test/model/story/getdataofstorysperstage.php +++ b/test/model/story/getdataofstorysperstage.php @@ -1,6 +1,5 @@ loadModel('story'); +$tester->loadModel('report'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerStage(); + +r(count($data)) && p() && e('11'); // 按照需求阶段分组，获取分组后的需求数量 +r($data) && p('wait:name,value') && e('未开始,25'); // 按照需求阶段分组，获取各个需求阶段的需求数量，查看wait下的数据 +r($data) && p('planned:name,value') && e('已计划,25'); // 按照需求阶段分组，获取各个需求阶段的需求数量，查看planned下的数据 +r($data) && p('released:name,value') && e('已发布,25'); // 按照需求阶段分组，获取各个需求阶段的需求数量，查看released下的数据 diff --git a/test/model/story/getdataofstorysperstatus.php b/test/model/story/getdataofstorysperstatus.php index 7d1a626f96..db4c6d24bb 100644 --- a/test/model/story/getdataofstorysperstatus.php +++ b/test/model/story/getdataofstorysperstatus.php @@ -13,6 +13,13 @@ pid=1 */ -$story = new storyTest(); +global $tester; +$tester->loadModel('story'); +$tester->loadModel('report'); -r() && p() && e(); \ No newline at end of file +$data = $tester->story->getDataOfStorysPerStatus(); + +r(count($data)) && p() && e('4'); // 按照需求状态分组，获取分组后的需求数量 +r($data) && p('draft:name,value') && e('草稿,184'); // 按照需求状态分组，获取各个需求状态的需求数量，查看draft下的数据 +r($data) && p('active:name,value') && e('激活,103'); // 按照需求状态分组，获取各个需求状态的需求数量，查看active下的数据 +r($data) && p('closed:name,value') && e('已关闭,82'); // 按照需求状态分组，获取各个需求状态的需求数量，查看closed下的数据 diff --git a/test/model/story/getkanbangroupdata.php b/test/model/story/getkanbangroupdata.php index a218209992..de40ed868a 100644 --- a/test/model/story/getkanbangroupdata.php +++ b/test/model/story/getkanbangroupdata.php @@ -1,6 +1,5 @@ loadModel('story'); +$stories1 = $tester->story->getProductStories(1); +$stories2 = $tester->story->getProductStories(2); -r() && p() && e(); \ No newline at end of file +$storyGroup1 = $tester->story->getKanbanGroupData($stories1); +$storyGroup2 = $tester->story->getKanbanGroupData($stories2); + +r(count($storyGroup1)) && p() && e('2'); //传入stories数据，获取按照stage分组后的结果数量 +r(count($storyGroup2)) && p() && e('2'); //传入stories数据，获取按照stage分组后的结果数量 +r($storyGroup1['wait']) && p('2:title,type,stage') && e('软件需求2,story,wait'); //传入stories数据，获取按照stage分组后的结果详情 +r($storyGroup2['projected']) && p('6:title,type,stage') && e('软件需求6,story,projected'); //传入stories数据，获取按照stage分组后的结果详情 diff --git a/test/model/story/getteammembers.php b/test/model/story/getteammembers.php index 56e5ed6136..2c6b7fdb7e 100644 --- a/test/model/story/getteammembers.php +++ b/test/model/story/getteammembers.php @@ -15,7 +15,11 @@ pid=1 global $tester; $tester->loadModel('story'); -$members1 = $tester->story->getTeamMembers(20, ''); -$members2 = $tester->story->getTeamMembers(21, 'changed'); +$story20Members = $tester->story->getTeamMembers(20, ''); +$story21Members = $tester->story->getTeamMembers(21, 'changed'); +$story0Members = $tester->story->getTeamMembers(0, ''); -r() && p() && e(); +r(count($story20Members)) && p() && e('2'); // 查找需求20的相关团队成员数量 +r(count($story21Members)) && p() && e('3'); // 查找需求21的变更时影响的团队成员数量 +r($story21Members) && p('po87,user97,test97') && e('po87,user97,test97'); // 查找需求21的变更时影响的团队成员数量 +r(count($story0Members)) && p() && e('0'); // 查找需求0的相关团队成员数量 diff --git a/test/model/story/gettoandcclist.php b/test/model/story/gettoandcclist.php index f723bebb83..a76fd0342e 100644 --- a/test/model/story/gettoandcclist.php +++ b/test/model/story/gettoandcclist.php @@ -1,6 +1,5 @@ loadModel('story'); +$story1 = $tester->story->getByID(1); -r() && p() && e(); \ No newline at end of file +$dataList1 = $tester->story->getToAndCcList($story1, 'opened'); +$dataList2 = $tester->story->getToAndCcList($story1, 'reviewed'); +$dataList3 = $tester->story->getToAndCcList($story1, 'changed'); + +r(count($dataList1)) && p() && e('2'); //获取创建需求1时的通知人数量 +r(count($dataList2)) && p() && e('2'); //获取评审需求1时的通知人数量 +r(count($dataList3)) && p() && e('2'); //获取变更需求1时的通知人数量 +r($dataList1[0]) && p() && e('admin'); //获取创建需求1时的通知人详情 +r($dataList2[0]) && p() && e('admin'); //获取评审需求1时的通知人详情 +r($dataList3[1]) && p() && e('po82,user92,'); //获取变更需求1时的通知人详情 diff --git a/test/model/story/gettrackbyid.php b/test/model/story/gettrackbyid.php index b53bdf81b0..2d391ce9b0 100644 --- a/test/model/story/gettrackbyid.php +++ b/test/model/story/gettrackbyid.php @@ -13,6 +13,10 @@ pid=1 */ -$story = new storyTest(); +global $tester; +$story1Tracks = $tester->loadModel('story')->getByID(1); -r() && p() && e(); \ No newline at end of file +r(count($story1Tracks->tasks)) && p() && e('6'); //获取用户需求1下面的所有任务数量 +r($story1Tracks->tasks[601]) && p('0:name') && e('开发任务511'); //获取用户需求1下面的任务601的名字 +r($story1Tracks->tasks[501]) && p('0:name') && e('开发任务411'); //获取用户需求1下面的任务501的名字 +r($story1Tracks) && p('title,type,status') && e('软件需求版本一551,requirement,active'); //获取用户需求的信息 diff --git a/test/model/story/gettracks.php b/test/model/story/gettracks.php index 4d03548095..0f096f8783 100644 --- a/test/model/story/gettracks.php +++ b/test/model/story/gettracks.php @@ -1,6 +1,5 @@ loadModel('story'); -r() && p() && e(); \ No newline at end of file +$tester->app->loadClass('pager', $static = true); +$pager = new pager(0, 100, 1); + +$tracks = $tester->story->getTracks(1, 0, 0, $pager); + +r(count($tracks['noRequirement'])) && p() && e('2'); // 获取产品1的跟踪矩阵的数量 +r(count($tracks['noRequirement'][2]->bugs)) && p() && e('4'); // 获取产品1的需求2的关联bug数量 +r(count($tracks['noRequirement'][2]->cases)) && p() && e('4'); // 获取产品1的需求2的关联用例数量 +r($tracks['noRequirement'][2]->bugs) && p('1:title') && e('BUG1'); // 获取产品1的需求2的关联Bug名称 +r($tracks['noRequirement'][2]->bugs) && p('101:title') && e('BUG101'); // 获取产品1的需求2的关联Bug名称 +r($tracks['noRequirement'][2]->cases) && p('1:title') && e('这个是测试用例1'); // 获取产品1的需求2的关联Case名称 +r($tracks['noRequirement'][2]->cases) && p('2:title') && e('这个是测试用例2'); // 获取产品1的需求2的关联Case名称 diff --git a/test/model/story/getzerocase.php b/test/model/story/getzerocase.php index bae0b0e2c9..ed0484a1af 100644 --- a/test/model/story/getzerocase.php +++ b/test/model/story/getzerocase.php @@ -1,6 +1,5 @@ loadModel('story'); +$zeroCaseStory1 = $tester->story->getZeroCase(1); +$zeroCaseStory2 = $tester->story->getZeroCase(2); +$zeroCaseStory3 = $tester->story->getZeroCase(0); -r() && p() && e(); \ No newline at end of file +r(count($zeroCaseStory1)) && p() && e('1'); // 获取产品1下的零用例需求数量 +r(count($zeroCaseStory2)) && p() && e('1'); // 获取产品2下的零用例需求数量 +r(count($zeroCaseStory3)) && p() && e('0'); // 获取产品0下的零用例需求数量 +r($zeroCaseStory1) && p('4:title,status,type,stage') && e('软件需求4,active,story,planned'); // 获取产品1下的零用例需求详情 +r($zeroCaseStory2) && p('8:title,status,type,stage') && e('软件需求8,active,story,developing'); // 获取产品2下的零用例需求详情 diff --git a/test/model/story/isclickable.php b/test/model/story/isclickable.php new file mode 100644 index 0000000000..27f65c98c4 --- /dev/null +++ b/test/model/story/isclickable.php @@ -0,0 +1,23 @@ +recall(); +cid=1 +pid=1 + +*/ + +global $tester; +$storyModel = $tester->loadModel('story'); +$story = $storyModel->getById(2); + +r($storyModel::isClickable($story, 'change')) && p() && e('1'); // 判断需求2是否有变更按钮操作权限 +r($storyModel::isClickable($story, 'review')) && p() && e('0'); // 判断需求2是否有评审按钮操作权限 +r($storyModel::isClickable($story, 'close')) && p() && e('1'); // 判断需求2是否有关闭按钮操作权限 +r($storyModel::isClickable($story, 'activate')) && p() && e('0'); // 判断需求2是否有激活按钮操作权限 +r($storyModel::isClickable($story, 'assignto')) && p() && e('1'); // 判断需求2是否有指派按钮操作权限 +r($storyModel::isClickable($story, 'createcase')) && p() && e('1'); // 判断需求2是否有创建用例按钮操作权限 +r($storyModel::isClickable($story, 'batchcreate')) && p() && e('0'); // 判断需求2是否有批量创建按钮操作权限 diff --git a/test/model/story/mergeplantitle.php b/test/model/story/mergeplantitle.php deleted file mode 100644 index 5fbafe6821..0000000000 --- a/test/model/story/mergeplantitle.php +++ /dev/null @@ -1,18 +0,0 @@ -mergePlanTitle(); -cid=1 -pid=1 - - - -*/ - -$story = new storyTest(); - -r() && p() && e(); \ No newline at end of file diff --git a/test/model/story/mergereviewer.php b/test/model/story/mergereviewer.php index fb4193b468..8cc045ec9e 100644 --- a/test/model/story/mergereviewer.php +++ b/test/model/story/mergereviewer.php @@ -13,6 +13,16 @@ pid=1 */ -$story = new storyTest(); +global $tester; +$story = $tester->loadModel('story')->getById(301); +$story = $tester->story->mergeReviewer($story, true); -r() && p() && e(); \ No newline at end of file +$stories = $tester->story->getProductStories(76); +$stories = $tester->story->mergeReviewer($stories); + +r($story) && p('reviewer:0') && e('admin'); // 获取需求301的评审人 +r($story) && p('notReview:0') && e('admin'); // 获取需求301的待评审人 +r($stories[302]->reviewer[0]) && p() && e('admin'); // 获取产品76下的需求评审人 +r($stories[302]->notReview[0]) && p() && e('admin'); // 获取产品76下的需求待评审人 +r($stories[304]->reviewer[0]) && p() && e('admin'); // 获取产品76下的需求评审人 +r($stories[304]->notReview[0]) && p() && e('admin'); // 获取产品76下的需求待评审人 diff --git a/test/model/story/printcell.php b/test/model/story/printcell.php deleted file mode 100644 index 9dd002b0a2..0000000000 --- a/test/model/story/printcell.php +++ /dev/null @@ -1,18 +0,0 @@ -printCell(); -cid=1 -pid=1 - - - -*/ - -$story = new storyTest(); - -r() && p() && e(); \ No newline at end of file diff --git a/test/model/story/reportcondition.php b/test/model/story/reportcondition.php deleted file mode 100644 index 4d097835f0..0000000000 --- a/test/model/story/reportcondition.php +++ /dev/null @@ -1,18 +0,0 @@ -reportCondition(); -cid=1 -pid=1 - - - -*/ - -$story = new storyTest(); - -r() && p() && e(); \ No newline at end of file