From f15b266dc1814bc0f3203f3f25bba3bde8c61f9e Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 5 Sep 2022 15:43:24 +0800 Subject: [PATCH] * Add and modify test case of execution module. --- test/class/execution.class.php | 157 +++--------------- test/model/execution/checkbeginandenddate.php | 30 ---- test/model/execution/checkworkload.php | 71 -------- test/model/execution/getburndata.php | 26 --- test/model/execution/getkanbangroupdata.php | 0 test/model/execution/getlifetimebyidlist.php | 0 test/model/execution/getprevkanban.php | 0 test/model/execution/getsearchbugs.php | 0 test/model/execution/getsearchtasks.php | 56 +++---- .../execution/gettaskgroupbyexecution.php | 3 +- test/model/execution/getteamskip.php | 26 --- test/model/execution/linkstories.php | 29 ++++ test/model/execution/savekanbandata.php | 0 test/model/execution/updateuserview.php | 0 14 files changed, 78 insertions(+), 320 deletions(-) delete mode 100755 test/model/execution/checkbeginandenddate.php delete mode 100755 test/model/execution/checkworkload.php delete mode 100755 test/model/execution/getburndata.php mode change 100644 => 100755 test/model/execution/getkanbangroupdata.php mode change 100644 => 100755 test/model/execution/getlifetimebyidlist.php mode change 100644 => 100755 test/model/execution/getprevkanban.php mode change 100644 => 100755 test/model/execution/getsearchbugs.php delete mode 100755 test/model/execution/getteamskip.php create mode 100755 test/model/execution/linkstories.php mode change 100644 => 100755 test/model/execution/savekanbandata.php mode change 100644 => 100755 test/model/execution/updateuserview.php diff --git a/test/class/execution.class.php b/test/class/execution.class.php index ccfadf135b..7e7284d0e2 100644 --- a/test/class/execution.class.php +++ b/test/class/execution.class.php @@ -363,76 +363,6 @@ class executionTest } } - /** - * Check the workload format and total. - * - * @param int $executionID - * @param string $type - * @param int $percent - * @access public - * @return bool - */ - public function checkWorkloadTest($executionID = 0, $type = '', $percent = 0) - { - global $tester; - $tester->app->loadLang('programplan'); - $_POST['products'] = array(1, 81, 91); - $_POST['percent'] = $percent; - $_POST['parent'] = 0; - - $oldExecution = $executionID ? $this->objectModel->getByID($executionID) : ''; - if(!empty($oldExecution->parent)) $_POST['parent'] = $oldExecution->parent; - - $result = $this->objectModel->checkWorkload($type, $percent, $oldExecution); - if(dao::isError()) return dao::getError(true); - - return $result; - } - - /** - * Check begin and end date. - * - * @param int $projectID - * @param string $checkType empty|normal|gt|lt|eq - * @access public - * @return bool - */ - public function checkBeginAndEndDateTest($projectID, $checkType) - { - if($projectID) $project = $this->objectModel->getByID($projectID); - switch($checkType) - { - case 'empty': - $_POST['begin'] = ''; - $_POST['end'] = ''; - break; - case 'normal': - $_POST['begin'] = empty($project->begin) ? '' : date("Y-m-d",strtotime("+1 days",strtotime($project->begin))); - $_POST['end'] = empty($project->end) ? '' : date("Y-m-d",strtotime("-1 days",strtotime($project->end))); - break; - case 'lt': - $_POST['begin'] = empty($project->begin) ? '' : date("Y-m-d",strtotime("-1 days",strtotime($project->begin))); - $_POST['end'] = empty($project->end) ? '' : date("Y-m-d",strtotime("-1 days",strtotime($project->end))); - break; - case 'gt': - $_POST['begin'] = empty($project->begin) ? '' : date("Y-m-d",strtotime("+1 days",strtotime($project->begin))); - $_POST['end'] = empty($project->end) ? '' : date("Y-m-d",strtotime("+1 days",strtotime($project->end))); - break; - case 'eq': - $_POST['begin'] = empty($project->begin) ? '' : $project->begin; - $_POST['end'] = empty($project->end) ? '' : $project->end; - break; - } - - $begin = $_POST['begin']; - $end = $_POST['end']; - - $this->objectModel->checkBeginAndEndDate($projectID, $begin, $end); - if(dao::isError()) return dao::getError(true); - - return true; - } - /** * function getPairs test by execution * @@ -1225,6 +1155,25 @@ class executionTest } } + /** + * Link all stories by execution. + * + * @param int $executionID + * @param int $productID + * @param int $planID + * @access public + * @return int + */ + public function linkStoriesTest($executionID, $productID = 0, $planID = 0) + { + global $tester; + if($planID) $tester->dao->update(TABLE_PROJECTPRODUCT)->set('plan')->eq($planID)->where('project')->eq($executionID)->andWhere('product')->eq($productID)->exec(); + + $this->objectModel->linkStories($executionID); + $objects = $tester->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($executionID)->andWhere('product')->eq($productID)->fetchAll(); + return count($objects); + } + /** * function linkCases test by execution * @@ -1398,41 +1347,6 @@ class executionTest } } - /** - * function getTeamSkip test by execution - * - * @param string $taskID - * @param string $begin - * @param string $end - * @access public - * @return array - */ - public function getTeamSkipTest($taskID, $begin, $end) - { - global $tester; - - $teams = $tester->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($taskID)->andWhere('type')->eq('task')->orderBy('order')->fetchAll('account'); - - $object = $this->objectModel->getTeamSkip($teams, $begin, $end); - - if(dao::isError()) - { - $error = dao::getError(); - return $error; - } - else - { - if(empty($object)) - { - return '无跳转数据'; - } - else - { - return $object; - } - } - } - /** * function getTeams2Import test by execution * @@ -2208,39 +2122,6 @@ class executionTest } } - /** - * Test get execution burn data. - * - * @param array $executionIDList - * @access public - * @return array - */ - public function getBurnDataTest($executionIDList) - { - global $tester; - - $executions = $this->objectModel->getByIdList($executionIDList); - $objects = $this->objectModel->getBurnData($executions); - - $returns = array(); - foreach($objects as $executionID => $burnData) - { - $returns[$executionID] = ''; - foreach($burnData as $data) $returns[$executionID] .= ",$data->value"; - $returns[$executionID] = trim($returns[$executionID], ','); - } - - if(dao::isError()) - { - $error = dao::getError(); - return $error; - } - else - { - return $returns; - } - } - /** * Test get begin and end for CFD. * diff --git a/test/model/execution/checkbeginandenddate.php b/test/model/execution/checkbeginandenddate.php deleted file mode 100755 index d1b7e0dd41..0000000000 --- a/test/model/execution/checkbeginandenddate.php +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env php -checkBeginAndEndDate(); -cid=1 -pid=1 - -测试传入空值 >> 1 -测试检查正常的日期 >> 1 -测试检查小于开始的日期 >> 迭代开始日期应大于等于项目的开始日期：2022-05-26。\n -测试检查大于开始的日期 >> 迭代截止日期应小于等于项目的截止日期：2022-09-30。\n -测试检查等于开始跟结束的日期 >> 1 - -*/ - -$projectIdList = array(0, 11); -$checkType = array('empty', 'normal', 'lt', 'gt', 'eq'); - -$execution = new executionTest(); - -r($execution->checkBeginAndEndDateTest($projectIdList[0], $checkType[0])) && p() && e('1'); // 测试传入空值 -r($execution->checkBeginAndEndDateTest($projectIdList[1], $checkType[1])) && p() && e('1'); // 测试检查正常的日期 -r($execution->checkBeginAndEndDateTest($projectIdList[1], $checkType[2])) && p() && e('迭代开始日期应大于等于项目的开始日期：2022-05-26。\n'); // 测试检查小于开始的日期 -r($execution->checkBeginAndEndDateTest($projectIdList[1], $checkType[3])) && p() && e('迭代截止日期应小于等于项目的截止日期：2022-09-30。\n'); // 测试检查大于开始的日期 -r($execution->checkBeginAndEndDateTest($projectIdList[1], $checkType[4])) && p() && e('1'); // 测试检查等于开始跟结束的日期 diff --git a/test/model/execution/checkworkload.php b/test/model/execution/checkworkload.php deleted file mode 100755 index 2745a6f65b..0000000000 --- a/test/model/execution/checkworkload.php +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env php -checkWorkload(); -cid=1 -pid=1 - -测试传入空数据 >> 0 -测试创建迭代的工作量 >> 0 -测试创建迭代的工作量 >> 工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n -测试创建迭代的工作量 >> "工作量比例"必须为数字\n -测试创建迭代的工作量 >> 0 -测试更新迭代的工作量 >> 0 -测试更新迭代的工作量 >> 工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n -测试更新迭代的工作量 >> "工作量比例"必须为数字\n -测试更新迭代的工作量 >> 0 -测试创建阶段的工作量 >> 0 -测试创建阶段的工作量 >> 工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n -测试创建阶段的工作量 >> "工作量比例"必须为数字\n -测试创建阶段的工作量 >> 0 -测试更新阶段的工作量 >> 0 -测试更新阶段的工作量 >> 工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n -测试更新阶段的工作量 >> "工作量比例"必须为数字\n -测试更新阶段的工作量 >> 0 -测试创建看板的工作量 >> 0 -测试创建看板的工作量 >> 工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n -测试创建看板的工作量 >> "工作量比例"必须为数字\n -测试创建看板的工作量 >> 0 -测试更新看板的工作量 >> 0 -测试更新看板的工作量 >> 工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n -测试更新看板的工作量 >> "工作量比例"必须为数字\n -测试更新看板的工作量 >> 0 - -*/ - -$executionIdList = array(0, 101, 131, 161); -$typeList = array('', 'create', 'update'); -$percentList = array('0', '123', 'all', '10'); - -$execution = new executionTest(); - -r($execution->checkWorkloadTest($executionIdList[0], $typeList[0], $percentList[0])) && p() && e('0'); // 测试传入空数据 -r($execution->checkWorkloadTest($executionIdList[1], $typeList[1], $percentList[0])) && p() && e('0'); // 测试创建迭代的工作量 -r($execution->checkWorkloadTest($executionIdList[1], $typeList[1], $percentList[1])) && p() && e('工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n'); // 测试创建迭代的工作量 -r($execution->checkWorkloadTest($executionIdList[1], $typeList[1], $percentList[2])) && p() && e('"工作量比例"必须为数字\n'); // 测试创建迭代的工作量 -r($execution->checkWorkloadTest($executionIdList[1], $typeList[1], $percentList[3])) && p() && e('0'); // 测试创建迭代的工作量 -r($execution->checkWorkloadTest($executionIdList[1], $typeList[2], $percentList[0])) && p() && e('0'); // 测试更新迭代的工作量 -r($execution->checkWorkloadTest($executionIdList[1], $typeList[2], $percentList[1])) && p() && e('工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n'); // 测试更新迭代的工作量 -r($execution->checkWorkloadTest($executionIdList[1], $typeList[2], $percentList[2])) && p() && e('"工作量比例"必须为数字\n'); // 测试更新迭代的工作量 -r($execution->checkWorkloadTest($executionIdList[1], $typeList[2], $percentList[3])) && p() && e('0'); // 测试更新迭代的工作量 -r($execution->checkWorkloadTest($executionIdList[2], $typeList[1], $percentList[0])) && p() && e('0'); // 测试创建阶段的工作量 -r($execution->checkWorkloadTest($executionIdList[2], $typeList[1], $percentList[1])) && p() && e('工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n'); // 测试创建阶段的工作量 -r($execution->checkWorkloadTest($executionIdList[2], $typeList[1], $percentList[2])) && p() && e('"工作量比例"必须为数字\n'); // 测试创建阶段的工作量 -r($execution->checkWorkloadTest($executionIdList[2], $typeList[1], $percentList[3])) && p() && e('0'); // 测试创建阶段的工作量 -r($execution->checkWorkloadTest($executionIdList[2], $typeList[2], $percentList[0])) && p() && e('0'); // 测试更新阶段的工作量 -r($execution->checkWorkloadTest($executionIdList[2], $typeList[2], $percentList[1])) && p() && e('工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n'); // 测试更新阶段的工作量 -r($execution->checkWorkloadTest($executionIdList[2], $typeList[2], $percentList[2])) && p() && e('"工作量比例"必须为数字\n'); // 测试更新阶段的工作量 -r($execution->checkWorkloadTest($executionIdList[2], $typeList[2], $percentList[3])) && p() && e('0'); // 测试更新阶段的工作量 -r($execution->checkWorkloadTest($executionIdList[3], $typeList[1], $percentList[0])) && p() && e('0'); // 测试创建看板的工作量 -r($execution->checkWorkloadTest($executionIdList[3], $typeList[1], $percentList[1])) && p() && e('工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n'); // 测试创建看板的工作量 -r($execution->checkWorkloadTest($executionIdList[3], $typeList[1], $percentList[2])) && p() && e('"工作量比例"必须为数字\n'); // 测试创建看板的工作量 -r($execution->checkWorkloadTest($executionIdList[3], $typeList[1], $percentList[3])) && p() && e('0'); // 测试创建看板的工作量 -r($execution->checkWorkloadTest($executionIdList[3], $typeList[2], $percentList[0])) && p() && e('0'); // 测试更新看板的工作量 -r($execution->checkWorkloadTest($executionIdList[3], $typeList[2], $percentList[1])) && p() && e('工作量占比累计不应当超过100, 当前产品下的工作量之和为%\n'); // 测试更新看板的工作量 -r($execution->checkWorkloadTest($executionIdList[3], $typeList[2], $percentList[2])) && p() && e('"工作量比例"必须为数字\n'); // 测试更新看板的工作量 -r($execution->checkWorkloadTest($executionIdList[3], $typeList[2], $percentList[3])) && p() && e('0'); // 测试更新看板的工作量 diff --git a/test/model/execution/getburndata.php b/test/model/execution/getburndata.php deleted file mode 100755 index 4428a2b2f1..0000000000 --- a/test/model/execution/getburndata.php +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env php -getBurnData(); -cid=1 -pid=1 - -测试获取 执行ID 101 102 的燃尽图 >> 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,36,36,36,36,36,36,36,36,36,36,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,null -测试获取 执行ID 101 103 111 的燃尽图 >> 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,36,36,36,36,36,36,36,36,36,36,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,23,23,23,23,23,23,23,23,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,27,27,null -测试获取 执行ID 111 121 131 的燃尽图 >> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,27,27,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,27,27,null;17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,null -测试获取 执行ID 101 102 103 111 121 131 的燃尽图 >> 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,36,36,36,36,36,36,36,36,36,36,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,23,23,23,23,23,23,23,23,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,27,27,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,27,27,null;17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,null - -*/ - -$executionIDList = array(array(101, 102), array(101, 103, 111), array(111, 121, 131), array(101, 102, 103, 111, 121, 131)); - -$execution = new executionTest(); -r($execution->getBurnDataTest($executionIDList[0])) && p('101;102') && e('21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,36,36,36,36,36,36,36,36,36,36,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,null'); // 测试获取 执行ID 101 102 的燃尽图 -r($execution->getBurnDataTest($executionIDList[1])) && p('101;103;111') && e('21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,36,36,36,36,36,36,36,36,36,36,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,23,23,23,23,23,23,23,23,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,27,27,null'); // 测试获取 执行ID 101 103 111 的燃尽图 -r($execution->getBurnDataTest($executionIDList[2])) && p('111;121;131') && e('0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,27,27,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,27,27,null;17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,null'); // 测试获取 执行ID 111 121 131 的燃尽图 -r($execution->getBurnDataTest($executionIDList[3])) && p('101;102;103;111;121;131') && e('21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,36,36,36,36,36,36,36,36,36,36,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,4,4,4,4,4,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,23,23,23,23,23,23,23,23,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,27,27,null;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,27,27,null;17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,null'); // 测试获取 执行ID 101 102 103 111 121 131 的燃尽图 diff --git a/test/model/execution/getkanbangroupdata.php b/test/model/execution/getkanbangroupdata.php old mode 100644 new mode 100755 diff --git a/test/model/execution/getlifetimebyidlist.php b/test/model/execution/getlifetimebyidlist.php old mode 100644 new mode 100755 diff --git a/test/model/execution/getprevkanban.php b/test/model/execution/getprevkanban.php old mode 100644 new mode 100755 diff --git a/test/model/execution/getsearchbugs.php b/test/model/execution/getsearchbugs.php old mode 100644 new mode 100755 diff --git a/test/model/execution/getsearchtasks.php b/test/model/execution/getsearchtasks.php index c3cfb3e0e8..8a7ca48f61 100755 --- a/test/model/execution/getsearchtasks.php +++ b/test/model/execution/getsearchtasks.php @@ -10,22 +10,22 @@ title=executionModel->getSearchTasks(); cid=1 pid=1 -测试通过sql语句获取3个任务 id 倒序 execution = '101' and deleted = '0' and parent >= 0 >> 910:name:子任务10;909:name:子任务9,team:[930,920];908:name:子任务8,team:[919,929]; -测试通过sql语句获取3个任务 id 正序 execution = '101' and deleted = '0' and parent >= 0 >> 1:name:开发任务11,team:[911,921];901:name:子任务1,team:[922,912];902:name:子任务2,team:[923,913]; -测试通过sql语句获取5个任务 id 倒序 execution = '101' and deleted = '0' and parent >= 0 >> 910:name:子任务10;909:name:子任务9,team:[930,920];908:name:子任务8,team:[919,929];907:name:子任务7,team:[918,928];906:name:子任务6,team:[927,917]; -测试通过sql语句获取5个任务 id 正序 execution = '101' and deleted = '0' and parent >= 0 >> 1:name:开发任务11,team:[911,921];901:name:子任务1,team:[922,912];902:name:子任务2,team:[923,913];903:name:子任务3,team:[914,924];904:name:子任务4,team:[915,925]; +测试通过sql语句获取3个任务 id 倒序 execution = '101' and deleted = '0' and parent >= 0 >> 910:name:子任务10;909:name:子任务9;908:name:子任务8; +测试通过sql语句获取3个任务 id 正序 execution = '101' and deleted = '0' and parent >= 0 >> 1:name:开发任务11;901:name:子任务1;902:name:子任务2; +测试通过sql语句获取5个任务 id 倒序 execution = '101' and deleted = '0' and parent >= 0 >> 910:name:子任务10;909:name:子任务9;908:name:子任务8;907:name:子任务7;906:name:子任务6; +测试通过sql语句获取5个任务 id 正序 execution = '101' and deleted = '0' and parent >= 0 >> 1:name:开发任务11;901:name:子任务1;902:name:子任务2;903:name:子任务3;904:name:子任务4; 测试通过sql语句获取3个任务 id 倒序 type = 'devel' and fromBug != '0' and parent >= 0 >> 0 测试通过sql语句获取3个任务 id 正序 type = 'devel' and fromBug != '0' and parent >= 0 >> 0 测试通过sql语句获取5个任务 id 倒序 type = 'devel' and fromBug != '0' and parent >= 0 >> 0 测试通过sql语句获取5个任务 id 正序 type = 'devel' and fromBug != '0' and parent >= 0 >> 0 -测试通过sql语句获取3个任务 id 倒序 execution = '101' and story != '0' and parent >= 0 >> 1:name:开发任务11,team:[911,921]; -测试通过sql语句获取3个任务 id 正序 execution = '101' and story != '0' and parent >= 0 >> 1:name:开发任务11,team:[911,921]; -测试通过sql语句获取5个任务 id 倒序 execution = '101' and story != '0' and parent >= 0 >> 1:name:开发任务11,team:[911,921]; -测试通过sql语句获取5个任务 id 正序 execution = '101' and story != '0' and parent >= 0 >> 1:name:开发任务11,team:[911,921]; -测试通过sql语句获取3个任务 id 倒序 module like '%2%' and type = 'design' and parent >= 0 >> 909:name:子任务9,team:[930,920];901:name:子任务1,team:[922,912];801:name:更多任务201; -测试通过sql语句获取3个任务 id 正序 module like '%2%' and type = 'design' and parent >= 0 >> 1:name:开发任务11,team:[911,921];65:name:开发任务75;73:name:开发任务83; -测试通过sql语句获取5个任务 id 倒序 module like '%2%' and type = 'design' and parent >= 0 >> 909:name:子任务9,team:[930,920];901:name:子任务1,team:[922,912];801:name:更多任务201;769:name:更多任务169;737:name:更多任务137; -测试通过sql语句获取5个任务 id 正序 module like '%2%' and type = 'design' and parent >= 0 >> 1:name:开发任务11,team:[911,921];65:name:开发任务75;73:name:开发任务83;81:name:开发任务91;89:name:开发任务99; +测试通过sql语句获取3个任务 id 倒序 execution = '101' and story != '0' and parent >= 0 >> 1:name:开发任务11; +测试通过sql语句获取3个任务 id 正序 execution = '101' and story != '0' and parent >= 0 >> 1:name:开发任务11; +测试通过sql语句获取5个任务 id 倒序 execution = '101' and story != '0' and parent >= 0 >> 1:name:开发任务11; +测试通过sql语句获取5个任务 id 正序 execution = '101' and story != '0' and parent >= 0 >> 1:name:开发任务11; +测试通过sql语句获取3个任务 id 倒序 module like '%2%' and type = 'design' and parent >= 0 >> 909:name:子任务9;901:name:子任务1;801:name:更多任务201; +测试通过sql语句获取3个任务 id 正序 module like '%2%' and type = 'design' and parent >= 0 >> 1:name:开发任务11;65:name:开发任务75;73:name:开发任务83; +测试通过sql语句获取5个任务 id 倒序 module like '%2%' and type = 'design' and parent >= 0 >> 909:name:子任务9;901:name:子任务1;801:name:更多任务201;769:name:更多任务169;737:name:更多任务137; +测试通过sql语句获取5个任务 id 正序 module like '%2%' and type = 'design' and parent >= 0 >> 1:name:开发任务11;65:name:开发任务75;73:name:开发任务83;81:name:开发任务91;89:name:开发任务99; */ @@ -40,19 +40,19 @@ $orderBy = array('id_desc', 'id_asc'); $execution = new executionTest(); -r($execution->getSearchTasksTest($condition[0], $recPerPage[0], $orderBy[0])) && p() && e('910:name:子任务10;909:name:子任务9,team:[930,920];908:name:子任务8,team:[919,929];'); // 测试通过sql语句获取3个任务 id 倒序 execution = '101' and deleted = '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[0], $recPerPage[0], $orderBy[1])) && p() && e('1:name:开发任务11,team:[911,921];901:name:子任务1,team:[922,912];902:name:子任务2,team:[923,913];'); // 测试通过sql语句获取3个任务 id 正序 execution = '101' and deleted = '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[0], $recPerPage[1], $orderBy[0])) && p() && e('910:name:子任务10;909:name:子任务9,team:[930,920];908:name:子任务8,team:[919,929];907:name:子任务7,team:[918,928];906:name:子任务6,team:[927,917];'); // 测试通过sql语句获取5个任务 id 倒序 execution = '101' and deleted = '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[0], $recPerPage[1], $orderBy[1])) && p() && e('1:name:开发任务11,team:[911,921];901:name:子任务1,team:[922,912];902:name:子任务2,team:[923,913];903:name:子任务3,team:[914,924];904:name:子任务4,team:[915,925];'); // 测试通过sql语句获取5个任务 id 正序 execution = '101' and deleted = '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[1], $recPerPage[0], $orderBy[0])) && p() && e('0'); // 测试通过sql语句获取3个任务 id 倒序 type = 'devel' and fromBug != '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[1], $recPerPage[0], $orderBy[1])) && p() && e('0'); // 测试通过sql语句获取3个任务 id 正序 type = 'devel' and fromBug != '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[1], $recPerPage[1], $orderBy[0])) && p() && e('0'); // 测试通过sql语句获取5个任务 id 倒序 type = 'devel' and fromBug != '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[1], $recPerPage[1], $orderBy[1])) && p() && e('0'); // 测试通过sql语句获取5个任务 id 正序 type = 'devel' and fromBug != '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[2], $recPerPage[0], $orderBy[0])) && p() && e('1:name:开发任务11,team:[911,921];'); // 测试通过sql语句获取3个任务 id 倒序 execution = '101' and story != '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[2], $recPerPage[0], $orderBy[1])) && p() && e('1:name:开发任务11,team:[911,921];'); // 测试通过sql语句获取3个任务 id 正序 execution = '101' and story != '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[2], $recPerPage[1], $orderBy[0])) && p() && e('1:name:开发任务11,team:[911,921];'); // 测试通过sql语句获取5个任务 id 倒序 execution = '101' and story != '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[2], $recPerPage[1], $orderBy[1])) && p() && e('1:name:开发任务11,team:[911,921];'); // 测试通过sql语句获取5个任务 id 正序 execution = '101' and story != '0' and parent >= 0 -r($execution->getSearchTasksTest($condition[3], $recPerPage[0], $orderBy[0])) && p() && e('909:name:子任务9,team:[930,920];901:name:子任务1,team:[922,912];801:name:更多任务201;'); // 测试通过sql语句获取3个任务 id 倒序 module like '%2%' and type = 'design' and parent >= 0 -r($execution->getSearchTasksTest($condition[3], $recPerPage[0], $orderBy[1])) && p() && e('1:name:开发任务11,team:[911,921];65:name:开发任务75;73:name:开发任务83;'); // 测试通过sql语句获取3个任务 id 正序 module like '%2%' and type = 'design' and parent >= 0 -r($execution->getSearchTasksTest($condition[3], $recPerPage[1], $orderBy[0])) && p() && e('909:name:子任务9,team:[930,920];901:name:子任务1,team:[922,912];801:name:更多任务201;769:name:更多任务169;737:name:更多任务137;'); // 测试通过sql语句获取5个任务 id 倒序 module like '%2%' and type = 'design' and parent >= 0 -r($execution->getSearchTasksTest($condition[3], $recPerPage[1], $orderBy[1])) && p() && e('1:name:开发任务11,team:[911,921];65:name:开发任务75;73:name:开发任务83;81:name:开发任务91;89:name:开发任务99;'); // 测试通过sql语句获取5个任务 id 正序 module like '%2%' and type = 'design' and parent >= 0 +r($execution->getSearchTasksTest($condition[0], $recPerPage[0], $orderBy[0])) && p() && e('910:name:子任务10;909:name:子任务9;908:name:子任务8;'); // 测试通过sql语句获取3个任务 id 倒序 execution = '101' and deleted = '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[0], $recPerPage[0], $orderBy[1])) && p() && e('1:name:开发任务11;901:name:子任务1;902:name:子任务2;'); // 测试通过sql语句获取3个任务 id 正序 execution = '101' and deleted = '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[0], $recPerPage[1], $orderBy[0])) && p() && e('910:name:子任务10;909:name:子任务9;908:name:子任务8;907:name:子任务7;906:name:子任务6;'); // 测试通过sql语句获取5个任务 id 倒序 execution = '101' and deleted = '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[0], $recPerPage[1], $orderBy[1])) && p() && e('1:name:开发任务11;901:name:子任务1;902:name:子任务2;903:name:子任务3;904:name:子任务4;'); // 测试通过sql语句获取5个任务 id 正序 execution = '101' and deleted = '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[1], $recPerPage[0], $orderBy[0])) && p() && e('0'); // 测试通过sql语句获取3个任务 id 倒序 type = 'devel' and fromBug != '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[1], $recPerPage[0], $orderBy[1])) && p() && e('0'); // 测试通过sql语句获取3个任务 id 正序 type = 'devel' and fromBug != '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[1], $recPerPage[1], $orderBy[0])) && p() && e('0'); // 测试通过sql语句获取5个任务 id 倒序 type = 'devel' and fromBug != '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[1], $recPerPage[1], $orderBy[1])) && p() && e('0'); // 测试通过sql语句获取5个任务 id 正序 type = 'devel' and fromBug != '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[2], $recPerPage[0], $orderBy[0])) && p() && e('1:name:开发任务11;'); // 测试通过sql语句获取3个任务 id 倒序 execution = '101' and story != '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[2], $recPerPage[0], $orderBy[1])) && p() && e('1:name:开发任务11;'); // 测试通过sql语句获取3个任务 id 正序 execution = '101' and story != '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[2], $recPerPage[1], $orderBy[0])) && p() && e('1:name:开发任务11;'); // 测试通过sql语句获取5个任务 id 倒序 execution = '101' and story != '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[2], $recPerPage[1], $orderBy[1])) && p() && e('1:name:开发任务11;'); // 测试通过sql语句获取5个任务 id 正序 execution = '101' and story != '0' and parent >= 0 +r($execution->getSearchTasksTest($condition[3], $recPerPage[0], $orderBy[0])) && p() && e('909:name:子任务9;901:name:子任务1;801:name:更多任务201;'); // 测试通过sql语句获取3个任务 id 倒序 module like '%2%' and type = 'design' and parent >= 0 +r($execution->getSearchTasksTest($condition[3], $recPerPage[0], $orderBy[1])) && p() && e('1:name:开发任务11;65:name:开发任务75;73:name:开发任务83;'); // 测试通过sql语句获取3个任务 id 正序 module like '%2%' and type = 'design' and parent >= 0 +r($execution->getSearchTasksTest($condition[3], $recPerPage[1], $orderBy[0])) && p() && e('909:name:子任务9;901:name:子任务1;801:name:更多任务201;769:name:更多任务169;737:name:更多任务137;'); // 测试通过sql语句获取5个任务 id 倒序 module like '%2%' and type = 'design' and parent >= 0 +r($execution->getSearchTasksTest($condition[3], $recPerPage[1], $orderBy[1])) && p() && e('1:name:开发任务11;65:name:开发任务75;73:name:开发任务83;81:name:开发任务91;89:name:开发任务99;'); // 测试通过sql语句获取5个任务 id 正序 module like '%2%' and type = 'design' and parent >= 0 diff --git a/test/model/execution/gettaskgroupbyexecution.php b/test/model/execution/gettaskgroupbyexecution.php index 009da48eb8..c585057bdd 100755 --- a/test/model/execution/gettaskgroupbyexecution.php +++ b/test/model/execution/gettaskgroupbyexecution.php @@ -10,7 +10,8 @@ title=测试 executionModel->getTaskGroupByExecution(); cid=1 pid=1 -获取所有受限制的执行ID >> 1 +测试空数据 >> 0 +测试获取执行的任务 >> 3 */ diff --git a/test/model/execution/getteamskip.php b/test/model/execution/getteamskip.php deleted file mode 100755 index 68daeb456a..0000000000 --- a/test/model/execution/getteamskip.php +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env php -getTeamSkipTest(); -cid=1 -pid=1 - -正常跳过 >> 901,user92,研发 -begin与end一致 >> 无跳转数据 -end与begin一致 >> 无跳转数据 - -*/ - -$taskID = 901; -$begin = 'user92'; -$end = 'user93'; - -$execution = new executionTest(); -r($execution->getTeamSkipTest($taskID, $begin, $end)) && p('user92:root,account,role') && e('901,user92,研发'); // 正常跳过 -r($execution->getTeamSkipTest($taskID, $begin, $begin)) && p() && e('无跳转数据'); // begin与end一致 -r($execution->getTeamSkipTest($taskID, $end, $end)) && p() && e('无跳转数据'); // end与begin一致 \ No newline at end of file diff --git a/test/model/execution/linkstories.php b/test/model/execution/linkstories.php new file mode 100755 index 0000000000..7763cdc34a --- /dev/null +++ b/test/model/execution/linkstories.php @@ -0,0 +1,29 @@ +#!/usr/bin/env php +switchDB(); +su('admin'); + +/** + +title=测试executionModel->linkStoryTest(); +cid=1 +pid=1 + +敏捷执行关联需求 >> 2 +瀑布执行关联需求 >> 0 +看板执行关联需求 >> 0 + +*/ + +$executionIDList = array('101', '131', '161'); +$productIDList = array('1', '0', '51'); +$planIDList = array('100', '0', '52'); + +$execution = new executionTest(); +r($execution->linkStoriesTest($executionIDList[0], $productIDList[0], $planIDList[0])) && p() && e('2'); // 敏捷执行关联需求 +r($execution->linkStoriesTest($executionIDList[1], $productIDList[1], $planIDList[1])) && p() && e('0'); // 瀑布执行关联需求 +r($execution->linkStoriesTest($executionIDList[2], $productIDList[2], $planIDList[2])) && p() && e('0'); // 看板执行关联需求 + +$db->restoreDB(); diff --git a/test/model/execution/savekanbandata.php b/test/model/execution/savekanbandata.php old mode 100644 new mode 100755 diff --git a/test/model/execution/updateuserview.php b/test/model/execution/updateuserview.php old mode 100644 new mode 100755