diff --git a/module/todo/test/model/create.php b/module/todo/test/model/create.php index 9ad2c7b3ec..951ec5ca21 100755 --- a/module/todo/test/model/create.php +++ b/module/todo/test/model/create.php @@ -11,13 +11,13 @@ title=测试 todoModel->create(); timeout=0 cid=1 -- 执行todoTest模块的createTest方法,参数是$todoWithoutName, $formData @0 +- 执行todoTest模块的createTest方法,参数是$todoWithoutName @0 -- 执行todoTest模块的createTest方法,参数是$todoInvalidEnd, $formData @0 +- 执行todoTest模块的createTest方法,参数是$todoInvalidObjectID @0 -- 执行todoTest模块的createTest方法,参数是$todo, $formData @2 +- 执行todoTest模块的createTest方法,参数是$todo @6 -- 执行todoTest模块的createTest方法,参数是$todoWithCycle, $formData @3 +- 执行todoTest模块的createTest方法,参数是$todoWithCycle @7 */ @@ -27,10 +27,6 @@ $tester->loadModel('todo'); zdTable('todo')->config('create')->gen(5); $today = date('Y-m-d'); -$formData = new stdClass; -$formData->rawdata = new stdclass; -$formData->rawdata->uid = ''; - $todo = new stdclass; $todo->name = 'TODO Create Test'; $todo->account = 'admin'; @@ -45,19 +41,20 @@ $todo->assignedDate = $today; $todoWithoutName = clone $todo; $todoWithoutName->name = ''; -$todoInvalidEnd = clone $todo; -$todoInvalidEnd->name = 'todoInvalidDate'; -$todoInvalidEnd->begin = '1000'; -$todoInvalidEnd->end = '0800'; +$todoInvalidObjectID = clone $todo; +$randModuleKey = array_rand($tester->config->todo->moduleList, 1); +$todoInvalidObjectID->name = 'todoInvalidObjectID'; +$todoInvalidObjectID->type = $tester->config->todo->moduleList[$randModuleKey]; +$todoInvalidObjectID->objectID = 0; $todoWithCycle = clone $todo; $todoWithCycle->type = 'cycle'; $todoWithCycle->cycle = 1; -$todoWithCycle->config = array('day' => 1, 'specify' => array('month' => 0, 'day' => 1), 'type' => 'day', 'beforeDays' => 1, 'end' => ''); +$todoWithCycle->config = json_encode(array('day' => 1, 'specify' => array('month' => 0, 'day' => 1), 'type' => 'day', 'beforeDays' => 1, 'end' => '')); $todoWithCycle->objectID = 0; $todoTest = new todoTest(); -r($todoTest->createTest($todoWithoutName, $formData)) && p() && e('0'); -r($todoTest->createTest($todoInvalidEnd, $formData)) && p() && e('0'); -r($todoTest->createTest($todo, $formData)) && p() && e('6'); -r($todoTest->createTest($todoWithCycle, $formData)) && p() && e('7'); +r($todoTest->createTest($todoWithoutName)) && p() && e('0'); +r($todoTest->createTest($todoInvalidObjectID)) && p() && e('0'); +r($todoTest->createTest($todo)) && p() && e('6'); +r($todoTest->createTest($todoWithCycle)) && p() && e('7'); diff --git a/module/todo/test/todo.class.php b/module/todo/test/todo.class.php index b8c3bf39f6..fd14258ae8 100755 --- a/module/todo/test/todo.class.php +++ b/module/todo/test/todo.class.php @@ -13,13 +13,12 @@ class todoTest * Test create a todo. * * @param object $todoData - * @param object $formData * @access public * @return int */ - public function createTest($todoData, $formData) + public function createTest($todoData) { - $objectID = $this->objectModel->create($todoData, $formData); + $objectID = $this->objectModel->create($todoData); return $objectID ?: 0; }