* [task#144843,doing,0.1h,4h] Optimize task activate unit test script.
This commit is contained in:
@@ -294,23 +294,21 @@ class taskTest
|
||||
* 激活任务。
|
||||
* Activate a task.
|
||||
*
|
||||
* @param int $taskID
|
||||
* @param string $comment
|
||||
* @param object $teamData
|
||||
* @param array $drag
|
||||
* @param int $taskID
|
||||
* @param string $comment
|
||||
* @param object $teamData
|
||||
* @param array $drag
|
||||
* @access public
|
||||
* @return array
|
||||
* @return object|bool
|
||||
*/
|
||||
public function activateTest(int $taskID, string $comment = '', object $teamData = null, array $drag = array()): array
|
||||
public function activateTest(int $taskID, string $comment = '', object $teamData = null, array $drag = array()): object|bool
|
||||
{
|
||||
$task = new stdclass();
|
||||
$activateFields = array('id' => $taskID, 'status' => 'doing','assignedTo' => '', 'left' => '3');
|
||||
foreach($activateFields as $field => $defaultValue) $task->{$field} = $defaultValue;
|
||||
|
||||
$changes = $this->objectModel->activate($task, $comment, $teamData, $drag);
|
||||
|
||||
if(dao::isError()) return dao::getError();
|
||||
return $changes;
|
||||
$this->objectModel->activate($task, $comment, $teamData, $drag);
|
||||
return $this->objectModel->fetchByID($taskID);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -4,8 +4,24 @@
|
||||
/**
|
||||
|
||||
title=taskModel->activate();
|
||||
timeout=0
|
||||
cid=0
|
||||
|
||||
- wait状态任务激活属性status @doing
|
||||
- doing状态任务激活属性status @doing
|
||||
- done状态任务激活属性status @doing
|
||||
- cancel状态任务激活属性status @doing
|
||||
- closed状态任务激活属性status @doing
|
||||
- wait状态串行任务激活属性status @doing
|
||||
- doing状态并行任务激活属性status @doing
|
||||
- wait状态任务激活属性status @doing
|
||||
- doing状态任务激活属性status @doing
|
||||
- done状态任务激活属性status @doing
|
||||
- cancel状态任务激活属性status @doing
|
||||
- closed状态任务激活属性status @doing
|
||||
- wait状态串行任务激活属性status @doing
|
||||
- doing状态并行任务激活属性status @doing
|
||||
|
||||
*/
|
||||
include dirname(__FILE__, 5) . '/test/lib/init.php';
|
||||
include dirname(__FILE__, 2) . '/lib/task.unittest.class.php';
|
||||
@@ -42,23 +58,23 @@ $drag = array('fromColID' => 1, 'toColID' => 2, 'fromLaneID' => 1, 'toLaneID' =>
|
||||
$taskIDList = range(1, 9);
|
||||
|
||||
$task = new taskTest();
|
||||
r($task->activateTest($taskIDList[0], '', $emptyTeamData)) && p('0:field,old,new') && e('status,wait,doing'); // wait状态任务激活
|
||||
r($task->activateTest($taskIDList[1], '', $emptyTeamData)) && p('0:field,old,new') && e('left,1,3'); // doing状态任务激活
|
||||
r($task->activateTest($taskIDList[2], '', $emptyTeamData)) && p('0:field,old,new') && e('status,done,doing'); // done状态任务激活
|
||||
r($task->activateTest($taskIDList[3], '', $emptyTeamData)) && p('0:field,old,new') && e('status,cancel,doing'); // cancel状态任务激活
|
||||
r($task->activateTest($taskIDList[4], '', $emptyTeamData)) && p('0:field,old,new') && e('status,closed,doing'); // closed状态任务激活
|
||||
r($task->activateTest($taskIDList[7], '', $teamData)) && p('0:field,old,new') && e('status,wait,doing'); // wait状态串行任务激活
|
||||
r($task->activateTest($taskIDList[8], '', $teamData)) && p('0:field,old,new') && e('left,8,4'); // doing状态并行任务激活
|
||||
r($task->activateTest($taskIDList[0], '', $emptyTeamData)) && p('status') && e('doing'); // wait状态任务激活
|
||||
r($task->activateTest($taskIDList[1], '', $emptyTeamData)) && p('status') && e('doing'); // doing状态任务激活
|
||||
r($task->activateTest($taskIDList[2], '', $emptyTeamData)) && p('status') && e('doing'); // done状态任务激活
|
||||
r($task->activateTest($taskIDList[3], '', $emptyTeamData)) && p('status') && e('doing'); // cancel状态任务激活
|
||||
r($task->activateTest($taskIDList[4], '', $emptyTeamData)) && p('status') && e('doing'); // closed状态任务激活
|
||||
r($task->activateTest($taskIDList[7], '', $teamData)) && p('status') && e('doing'); // wait状态串行任务激活
|
||||
r($task->activateTest($taskIDList[8], '', $teamData)) && p('status') && e('doing'); // doing状态并行任务激活
|
||||
|
||||
zenData('task')->loadYaml('task')->gen(9);
|
||||
zenData('taskteam')->loadYaml('taskteam')->gen(6);
|
||||
|
||||
r($task->activateTest($taskIDList[0], '', $emptyTeamData, $drag)) && p('0:field,old,new') && e('status,wait,doing'); // wait状态任务激活
|
||||
r($task->activateTest($taskIDList[1], '', $emptyTeamData, $drag)) && p('0:field,old,new') && e('left,1,3'); // doing状态任务激活
|
||||
r($task->activateTest($taskIDList[2], '', $emptyTeamData, $drag)) && p('0:field,old,new') && e('status,done,doing'); // done状态任务激活
|
||||
r($task->activateTest($taskIDList[3], '', $emptyTeamData, $drag)) && p('0:field,old,new') && e('status,cancel,doing'); // cancel状态任务激活
|
||||
r($task->activateTest($taskIDList[4], '', $emptyTeamData, $drag)) && p('0:field,old,new') && e('status,closed,doing'); // closed状态任务激活
|
||||
r($task->activateTest($taskIDList[7], '', $teamData, $drag)) && p('0:field,old,new') && e('status,wait,doing'); // wait状态串行任务激活
|
||||
r($task->activateTest($taskIDList[8], '', $teamData, $drag)) && p('0:field,old,new') && e('left,8,4'); // doing状态并行任务激活
|
||||
r($task->activateTest($taskIDList[0], '', $emptyTeamData, $drag)) && p('status') && e('doing'); // wait状态任务激活
|
||||
r($task->activateTest($taskIDList[1], '', $emptyTeamData, $drag)) && p('status') && e('doing'); // doing状态任务激活
|
||||
r($task->activateTest($taskIDList[2], '', $emptyTeamData, $drag)) && p('status') && e('doing'); // done状态任务激活
|
||||
r($task->activateTest($taskIDList[3], '', $emptyTeamData, $drag)) && p('status') && e('doing'); // cancel状态任务激活
|
||||
r($task->activateTest($taskIDList[4], '', $emptyTeamData, $drag)) && p('status') && e('doing'); // closed状态任务激活
|
||||
r($task->activateTest($taskIDList[7], '', $teamData, $drag)) && p('status') && e('doing'); // wait状态串行任务激活
|
||||
r($task->activateTest($taskIDList[8], '', $teamData, $drag)) && p('status') && e('doing'); // doing状态并行任务激活
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user