diff --git a/test/class/execution.class.php b/test/class/execution.class.php index 5b9c4944bb..91c0c9bea5 100644 --- a/test/class/execution.class.php +++ b/test/class/execution.class.php @@ -814,7 +814,7 @@ class executionTest } } - public function getTeamSkipTest($taskID, $begin, $end, $count) + 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'); @@ -824,13 +824,127 @@ class executionTest $error = dao::getError(); return $error; } + else + { + if(empty($object)) + { + return '无跳转数据'; + } + else + { + return $object; + } + } + } + + public function getTeams2ImportTest($account, $currentExecution, $count) + { + $object = $this->objectModel->getTeams2Import($account, $currentExecution); + if(dao::isError()) + { + $error = dao::getError(); + return $error; + } elseif($count == "1") { return count($object); } else { - return $object; + if(empty($object)) + { + return '无数据'; + } + else + { + return $object; + } + } + } + + public function getMembers2ImportTest($execution, $currentMembers, $count) + { + $object = $this->objectModel->getMembers2Import($execution, $currentMembers); + if(dao::isError()) + { + $error = dao::getError(); + return $error; + } + elseif($count == "1") + { + return count($object); + } + else + { + if(empty($object)) + { + return '无数据'; + } + else + { + return $object; + } + } + } + + public function getCanCopyObjectsTest($projectID = 0, $count) + { + $object = $this->objectModel->getCanCopyObjects($projectID); + if(dao::isError()) + { + $error = dao::getError(); + return $error; + } + elseif($count == "1") + { + return count($object); + } + else + { + if(empty($object)) + { + return '无数据'; + } + else + { + return $object; + } + } + } + + public function manageMembersTest($executionID, $count, $param = array()) + { + $realnames = array(); + $roles = array(); + $days = array(); + $hours = array(); + $accounts = array(); + $limited = array(); + $createFields = array('realnames' => $realnames, 'roles' => $roles, 'hours' => $hours, 'accounts' => $accounts, + 'limited' => $limited, 'days' => $days); + foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue; + foreach($param as $key => $value) $_POST[$key] = $value; + $object = $this->objectModel->manageMembers($executionID); + unset($_POST); + if(dao::isError()) + { + $error = dao::getError(); + return $error; + } + elseif($count == "1") + { + return count($object); + } + else + { + if(empty($object)) + { + return '无数据'; + } + else + { + return $object; + } } } } diff --git a/test/data/teamtask.yaml b/test/data/teamtask.yaml index 613b5f2963..d22bba8e50 100644 --- a/test/data/teamtask.yaml +++ b/test/data/teamtask.yaml @@ -28,9 +28,9 @@ fields: note: "用户账号" fields: - field: account1 - range: po,user,admin + range: po,user,user,po - field: account2 - range: 82,92,'' + range: 82,92,92,82 prefix: "" postfix: "" loop: 0 diff --git a/test/model/execution/getCanCopyObjects.php b/test/model/execution/getCanCopyObjects.php new file mode 100755 index 0000000000..31dcf6b954 --- /dev/null +++ b/test/model/execution/getCanCopyObjects.php @@ -0,0 +1,31 @@ +#!/usr/bin/env php +getCanCopyObjectsTest(); +cid=1 +pid=1 + +敏捷执行关联用例 >> 101,1,1 +瀑布执行关联用例 >> 131,43,169 +看板执行关联用例 >> 161,68,269 +敏捷执行关联用例统计 >> 4 +瀑布执行关联用例统计 >> 4 +看板执行关联用例统计 >> 4 + +*/ + +$projectIDList = array('11', '45', '71'); +$count = array('0','1'); + +$execution = new executionTest(); +r($execution->getCanCopyObjectsTest($projectIDList[0], $count[0])) && p('101') && e('迭代1'); // 敏捷项目数据查询 +r($execution->getCanCopyObjectsTest($projectIDList[1], $count[0])) && p('135') && e('阶段35'); // 瀑布项目数据查询 +r($execution->getCanCopyObjectsTest($projectIDList[2], $count[0])) && p('161') && e('看板61'); // 看板项目数据查询 +r($execution->getCanCopyObjectsTest($projectIDList[0], $count[1])) && p() && e('8'); // 敏捷项目数据统计 +r($execution->getCanCopyObjectsTest($projectIDList[1], $count[1])) && p() && e('9'); // 瀑布项目数据统计 +r($execution->getCanCopyObjectsTest($projectIDList[2], $count[1])) && p() && e('7'); // 看板项目数据统计 diff --git a/test/model/execution/getMembers2Import.php b/test/model/execution/getMembers2Import.php new file mode 100755 index 0000000000..004296bb7c --- /dev/null +++ b/test/model/execution/getMembers2Import.php @@ -0,0 +1,30 @@ +#!/usr/bin/env php +getMembers2ImportTest(); +cid=1 +pid=1 + +敏捷执行关联用例 >> 101,1,1 +瀑布执行关联用例 >> 131,43,169 +看板执行关联用例 >> 161,68,269 +敏捷执行关联用例统计 >> 4 +瀑布执行关联用例统计 >> 4 +看板执行关联用例统计 >> 4 + +*/ + +$executionID = '101'; +$accountList = array('test7', 'test82'); +$allAccountList = array('test82', 'po82', 'user92'); +$count = array('0','1'); + +$execution = new executionTest(); +r($execution->getMembers2ImportTest($executionID, $accountList, $count[0])) && p('po82:account,role') && e('po82,研发'); // 正常数据查询 +r($execution->getMembers2ImportTest($executionID, $allAccountList, $count[0])) && p() && e('无数据'); // 无效数据查询 +r($execution->getMembers2ImportTest($executionID, $accountList, $count[1])) && p() && e('2'); // 正常数据查询统计 diff --git a/test/model/execution/getTeamSkip.php b/test/model/execution/getTeamSkip.php index 2b89192da2..1dab128545 100755 --- a/test/model/execution/getTeamSkip.php +++ b/test/model/execution/getTeamSkip.php @@ -19,14 +19,11 @@ pid=1 */ -$teamList = array('test2', 'test12', 'test15'); -$begin = 'test2'; -$end = 'test17'; -$count = array('0','1'); +$taskID = 901; +$begin = 'admin'; +$end = 'user92'; $execution = new executionTest(); -var_dump($execution->getTeamSkipTest($teamList, $teamList[0], $end, $count[0]));die; -r($execution->getTeamSkipTest($teamList, $begin, $end, $count[0])) && p('0:root,account,realname') && e('101,po82,研发主管82');// 批量查询敏捷执行team -r($execution->getTeamSkipTest($executionIDList, $count[0])[$executionIDList[1]]) && p('0:root,account,realname') && e('131,test22,开发22'); // 批量查询瀑布执行team -r($execution->getTeamSkipTest($executionIDList, $count[0])[$executionIDList[2]]) && p('0:root,account,realname') && e('161,test52,开发52'); // 批量查询看板执行team -r($execution->getTeamSkipTest($executionIDList, $count[1])) && p() && e('3'); // 批量查询执行team统计 +r($execution->getTeamSkipTest($taskID, $begin, $end)) && p('admin:root,account,role') && e('901,admin,研发'); // 正常跳过 +r($execution->getTeamSkipTest($taskID, $begin, $begin)) && p() && e('无跳转数据'); // begin与end一致 +r($execution->getTeamSkipTest($taskID, $end, $end)) && p() && e('无跳转数据'); // end与begin一致 diff --git a/test/model/execution/getTeams2Import.php b/test/model/execution/getTeams2Import.php new file mode 100755 index 0000000000..f5c43c61ab --- /dev/null +++ b/test/model/execution/getTeams2Import.php @@ -0,0 +1,29 @@ +#!/usr/bin/env php +getTeams2ImportTest(); +cid=1 +pid=1 + +敏捷执行关联用例 >> 101,1,1 +瀑布执行关联用例 >> 131,43,169 +看板执行关联用例 >> 161,68,269 +敏捷执行关联用例统计 >> 4 +瀑布执行关联用例统计 >> 4 +看板执行关联用例统计 >> 4 + +*/ + +$executionID = '101'; +$accountList = array('test7', 'test82'); +$count = array('0','1'); + +$execution = new executionTest(); +r($execution->getTeams2ImportTest($accountList[0], $executionID, $count[0])) && p() && e('无数据'); // 无效数据查询 +r($execution->getTeams2ImportTest($accountList[1], $executionID, $count[0])) && p('191') && e('迭代91'); // 正常数据查询 +r($execution->getTeams2ImportTest($accountList[1], $executionID, $count[1])) && p() && e('1'); // 正常数据查询统计