diff --git a/module/productplan/test/lib/productplan.unittest.class.php b/module/productplan/test/lib/productplan.unittest.class.php index 72a8ee5a25..fbf8a8db68 100644 --- a/module/productplan/test/lib/productplan.unittest.class.php +++ b/module/productplan/test/lib/productplan.unittest.class.php @@ -159,7 +159,7 @@ class productPlan { $productplans = $this->productplan->updateStatus($planID, $status, $action); if(dao::isError()) return dao::getError(); - return $productplans; + return $this->productplan->fetchByID($planID); } /** diff --git a/module/productplan/test/model/updatestatus.php b/module/productplan/test/model/updatestatus.php index 60c63b70c9..bd9e7a6fa6 100755 --- a/module/productplan/test/model/updatestatus.php +++ b/module/productplan/test/model/updatestatus.php @@ -1,10 +1,33 @@ #!/usr/bin/env php updateStatus(); +timeout=0 cid=1 +- 修改状态为doing + - 属性id @1 + - 属性title @计划1 + - 属性status @doing +- 修改状态为done + - 属性id @2 + - 属性title @计划2 + - 属性status @done +- 修改状态为closed + - 属性id @3 + - 属性title @计划3 + - 属性status @closed +- 修改状态为wait + - 属性id @4 + - 属性title @计划4 + - 属性status @wait +- 修改状态为doing + - 属性id @5 + - 属性title @计划5 + - 属性status @doing + */ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/lib/productplan.unittest.class.php'; @@ -12,17 +35,8 @@ include dirname(__FILE__, 2) . '/lib/productplan.unittest.class.php'; zenData('productplan')->loadYaml('productplan')->gen(10); $plan = new productPlan('admin'); -$planId = array(); -$planId[0] = 5; -$planId[1] = 'doing'; -$planId[2] = 'done'; -$planId[3] = 'closed'; -$planId[4] = 'started'; -$planId[5] = 'finished'; -$planId[6] = 'closed'; -$planId[7] = 'activated'; - -r($plan->updateStatus($planId[0], $planId[1], $planId[4])) && p() && e('1'); //修改id=5的状态为doing -r($plan->updateStatus($planId[0], $planId[2], $planId[5])) && p() && e('1'); //修改状态为done -r($plan->updateStatus($planId[0], $planId[3], $planId[6])) && p() && e('1'); //修改状态为closed -?> +r($plan->updateStatus(1, 'doing')) && p('id,title,status') && e('1,计划1,doing'); //修改状态为doing +r($plan->updateStatus(2, 'done')) && p('id,title,status') && e('2,计划2,done'); //修改状态为done +r($plan->updateStatus(3, 'closed')) && p('id,title,status') && e('3,计划3,closed'); //修改状态为closed +r($plan->updateStatus(4, 'wait')) && p('id,title,status') && e('4,计划4,wait'); //修改状态为wait +r($plan->updateStatus(5, 'doing')) && p('id,title,status') && e('5,计划5,doing'); //修改状态为doing