diff --git a/test/class/task.class.php b/test/class/task.class.php index 5f653813bb..aeb9ab0b64 100644 --- a/test/class/task.class.php +++ b/test/class/task.class.php @@ -958,6 +958,7 @@ class taskTest return $object ? 1 : 2; } } + public function addTaskEstimateTest($data) { $data->date = date("Y-m-d"); @@ -976,4 +977,56 @@ class taskTest return $object; } } + + public function getToAndCcListTest($taskID, $skipMailto = false) + { + $task = $this->objectModel->getByID($taskID); + if(empty($task)) return 0; + if($skipMailto) $task->mailto = ''; + + $object = $this->objectModel->getToAndCcList($task); + + if(dao::isError()) + { + return dao::getError(); + } + else + { + if(isset($object[0])) $object[2] = $object[0]; + if(isset($object[1]) and $object[1] == '') $object[1] = 0; + return $object; + } + } + + public function getNextUserTest($users, $current) + { + $object = $this->objectModel->getNextUser($users, $current); + + if(dao::isError()) + { + return dao::getError(); + } + else + { + return $object; + } + } + + public function getMemberPairsTest($taskID) + { + $task = $this->objectModel->getByID($taskID); + if(empty($task)) return 0; + + $object = $this->objectModel->getMemberPairs($task); + $object['count'] = count($object); + + if(dao::isError()) + { + return dao::getError(); + } + else + { + return $object; + } + } } diff --git a/test/data/zentao/processor.php b/test/data/zentao/processor.php index a443dbc1ba..b6117543f9 100644 --- a/test/data/zentao/processor.php +++ b/test/data/zentao/processor.php @@ -154,7 +154,7 @@ class Processor $parentID = implode(',', $parentIDList); $this->dao->update(TABLE_TASK)->set('parent')->eq(-1)->where('id')->in($parentID)->andWhere('deleted')->eq(0)->exec(); - $this->dao->update(TABLE_TASK)->set('assignedTo')->eq('po82')->where('id')->eq(1)->andWhere('deleted')->eq(0)->exec(); + $this->dao->update(TABLE_TASK)->set('assignedTo')->eq('po82')->set('mailto')->eq('user1,user2,user3')->where('id')->eq(1)->andWhere('deleted')->eq(0)->exec(); } /** diff --git a/test/model/task/getmemberpairs.php b/test/model/task/getmemberpairs.php new file mode 100755 index 0000000000..ab49f37c54 --- /dev/null +++ b/test/model/task/getmemberpairs.php @@ -0,0 +1,28 @@ +#!/usr/bin/env php +getDataOfTasksPerEstimate(); +cid=1 +pid=1 + +获取taskid为1的团队人员 po82 >> P:研发主管82 +获取taskid为1的团队人员 user92 >> U:测试92 +获取taskid为1的团队人员数量 >> 3 +获取taskid为601的团队人员数量 >> 1 +获取taskid为不存在的100001的团队人员 >> 0 + +*/ + +$taskIDList = array('1', '601', '100001'); + +$task = new taskTest(); +r($task->getMemberPairsTest($taskIDList[0])) && p('po82') && e('P:研发主管82'); //获取taskid为1的团队人员 po82 +r($task->getMemberPairsTest($taskIDList[0])) && p('user92') && e('U:测试92'); //获取taskid为1的团队人员 user92 +r($task->getMemberPairsTest($taskIDList[0])) && p('count') && e('3'); //获取taskid为1的团队人员数量 +r($task->getMemberPairsTest($taskIDList[1])) && p('count') && e('1'); //获取taskid为601的团队人员数量 +r($task->getMemberPairsTest($taskIDList[2])) && p() && e('0'); //获取taskid为不存在的100001的团队人员 diff --git a/test/model/task/getnextuser.php b/test/model/task/getnextuser.php new file mode 100755 index 0000000000..345257b8e4 --- /dev/null +++ b/test/model/task/getnextuser.php @@ -0,0 +1,33 @@ +#!/usr/bin/env php +getDataOfTasksPerEstimate(); +cid=1 +pid=1 + +计算current为0的下一个用户 >> user1 +计算current为1的下一个用户 >> user2 +计算current为2的下一个用户 >> po1 +计算current为3的下一个用户 >> po2 +计算current为4的下一个用户 >> pm1 +计算current为5的下一个用户 >> pm2 +计算current为6的下一个用户 >> admin + +*/ + +$users = array('admin', 'user1', 'user2', 'po1', 'po2', 'pm1', 'pm2'); + + +$task = new taskTest(); +r($task->getNextUserTest($users, $users[0])) && p() && e('user1'); //计算current为0的下一个用户 +r($task->getNextUserTest($users, $users[1])) && p() && e('user2'); //计算current为1的下一个用户 +r($task->getNextUserTest($users, $users[2])) && p() && e('po1'); //计算current为2的下一个用户 +r($task->getNextUserTest($users, $users[3])) && p() && e('po2'); //计算current为3的下一个用户 +r($task->getNextUserTest($users, $users[4])) && p() && e('pm1'); //计算current为4的下一个用户 +r($task->getNextUserTest($users, $users[5])) && p() && e('pm2'); //计算current为5的下一个用户 +r($task->getNextUserTest($users, $users[6])) && p() && e('admin'); //计算current为6的下一个用户 diff --git a/test/model/task/gettoandcclist.php b/test/model/task/gettoandcclist.php new file mode 100755 index 0000000000..f0519686c8 --- /dev/null +++ b/test/model/task/gettoandcclist.php @@ -0,0 +1,30 @@ +#!/usr/bin/env php +getToAndCcList(); +cid=1 +pid=1 + +计算有assignedto 有mailto的发信列表2 >> po82 +计算有assignedto 有mailto的发信列表1 >> user1,user2,user3 +计算有assignedto 无mailto的发信列表2 >> po82 +计算有assignedto 无mailto的发信列表1 >> 0 +计算无assignedto 无mailto的发信列表 >> 0 +计算不存在的task的发信列表 >> 0 + +*/ +$taskIDList = array('1', '601', '100001'); + + +$task = new taskTest(); +r($task->getToAndCcListTest($taskIDList[0])) && p('2') && e('po82'); //计算有assignedto 有mailto的发信列表2 +r($task->getToAndCcListTest($taskIDList[0])) && p('1') && e('user1,user2,user3'); //计算有assignedto 有mailto的发信列表1 +r($task->getToAndCcListTest($taskIDList[0], true)) && p('2') && e('po82'); //计算有assignedto 无mailto的发信列表2 +r($task->getToAndCcListTest($taskIDList[0], true)) && p('1') && e('0'); //计算有assignedto 无mailto的发信列表1 +r($task->getToAndCcListTest($taskIDList[1])) && p() && e('0'); //计算无assignedto 无mailto的发信列表 +r($task->getToAndCcListTest($taskIDList[2])) && p() && e('0'); //计算不存在的task的发信列表