From 678253cda20969a8497a740bc921bff83efdd7e9 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 9 Mar 2022 17:15:05 +0800 Subject: [PATCH] * Add auto test for task. --- test/class/task.class.php | 24 ++++++++++++++++------ test/model/task/computeBeginAndEnd.php | 25 +++++++++++++++++++++++ test/model/task/computeHours4Multiple.php | 0 test/model/task/computeWorkingHours.php | 12 ++++++----- test/model/task/getExecutionTasks.php | 6 +++--- test/model/task/getProjectID.php | 0 test/model/task/getStoryComments.php | 8 +++++--- test/model/task/getTasksByModule.php | 8 ++++---- 8 files changed, 62 insertions(+), 21 deletions(-) create mode 100755 test/model/task/computeBeginAndEnd.php create mode 100644 test/model/task/computeHours4Multiple.php mode change 100644 => 100755 test/model/task/computeWorkingHours.php mode change 100644 => 100755 test/model/task/getProjectID.php mode change 100644 => 100755 test/model/task/getStoryComments.php diff --git a/test/class/task.class.php b/test/class/task.class.php index 8373e17752..6c40451c51 100644 --- a/test/class/task.class.php +++ b/test/class/task.class.php @@ -537,7 +537,6 @@ class taskTest { $objectID = $this->objectModel->createTaskFromGitlabIssue($task, $executionID); - unset($_POST); if(dao::isError()) { return dao::getError(); @@ -553,7 +552,6 @@ class taskTest { $object = $this->objectModel->getProjectID($executionID); - unset($_POST); if(dao::isError()) { return dao::getError(); @@ -564,11 +562,10 @@ class taskTest } } - public function getStoryComments($storyID) + public function getStoryCommentsTest($storyID) { $object = $this->objectModel->getStoryComments($storyID); - unset($_POST); if(dao::isError()) { return dao::getError(); @@ -583,7 +580,6 @@ class taskTest { $result = $this->objectModel->computeWorkingHours($taskID); - unset($_POST); if(dao::isError()) { return dao::getError(); @@ -591,7 +587,23 @@ class taskTest else { $object = $this->objectModel->getById($taskID); - if($object->parent) $parentObject = $this->objectModel->getById($object->parent); + if(!empty($object) and $object->parent > 0) $parentObject = $this->objectModel->getById($object->parent); + return isset($parentObject) ? $parentObject : $object; + } + } + + public function computeBeginAndEndTest($taskID) + { + $result = $this->objectModel->computeBeginAndEnd($taskID); + + if(dao::isError()) + { + return dao::getError(); + } + else + { + $object = $this->objectModel->getById($taskID); + if(!empty($object) and $object->parent > 0) $parentObject = $this->objectModel->getById($object->parent); return isset($parentObject) ? $parentObject : $object; } } diff --git a/test/model/task/computeBeginAndEnd.php b/test/model/task/computeBeginAndEnd.php new file mode 100755 index 0000000000..83c60602c0 --- /dev/null +++ b/test/model/task/computeBeginAndEnd.php @@ -0,0 +1,25 @@ +#!/usr/bin/env php +computeBeginAndEnd(); +cid=1 +pid=1 + +根据taskID计算没有父计划的开始结束时间 >> 1,2022-03-09,0000-00-00 00:00:00,2022-03-16 +根据taskID计算有父计划的父开始结束时间 >> 601,,0000-00-00 00:00:00,2022-03-02 +根据不存在的taskID计划开始结束时间 >> 0 + +*/ + +$taskIDList = array('1', '901', '100001'); + +$task = new taskTest(); +r($task->computeBeginAndEndTest($taskIDList[0])) && p('id,estStarted,realStarted,deadline') && e('1,2022-03-09,0000-00-00 00:00:00,2022-03-16'); //根据taskID计算没有父计划的开始结束时间 +r($task->computeBeginAndEndTest($taskIDList[1])) && p('id,estStarted,realStarted,deadline') && e('601,,0000-00-00 00:00:00,2022-03-02'); //根据taskID计算有父计划的父开始结束时间 +r($task->computeBeginAndEndTest($taskIDList[2])) && p('id,estStarted,realStarted,deadline') && e('0'); //根据不存在的taskID计算开始结束时间 +system("./ztest init"); diff --git a/test/model/task/computeHours4Multiple.php b/test/model/task/computeHours4Multiple.php new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/model/task/computeWorkingHours.php b/test/model/task/computeWorkingHours.php old mode 100644 new mode 100755 index d466bf4870..e057f61eba --- a/test/model/task/computeWorkingHours.php +++ b/test/model/task/computeWorkingHours.php @@ -10,14 +10,16 @@ title=taskModel->computeWorkingHours(); cid=1 pid=1 -根据taskID计算没有父计划的计划工时 >> 1,0,3,0 -根据taskID计算有父计划的父计划工时 >> 601,18,30,18 +根据taskID计算没有子任务的计划工时 >> 1,0,3,0 +根据taskID计算有子任务的父任务工时 >> 601,18,30,18 +根据不存在的taskID计算工时 >> 0 */ -$taskIDList = array('1', '601'); +$taskIDList = array('1', '601', '100001'); $task = new taskTest(); -r($task->computeWorkingHoursTest($taskIDList[0])) && p('id,estimate,consumed,left') && e('1,0,3,0'); //根据taskid计算没有父计划的计划工时 -r($task->computeWorkingHoursTest($taskIDList[1])) && p('id,estimate,consumed,left') && e('601,18,31,13'); //根据taskID计算有父计划的父计划工时 +r($task->computeWorkingHoursTest($taskIDList[0])) && p('id,estimate,consumed,left') && e('1,0,3,0'); //根据taskID计算没有子任务的计划工时 +r($task->computeWorkingHoursTest($taskIDList[1])) && p('id,estimate,consumed,left') && e('601,18,31,13'); //根据taskID计算有父任务的子任务工时 +r($task->computeWorkingHoursTest($taskIDList[2])) && p('id,estimate,consumed,left') && e('0'); //根据不存在的taskID计算工时 system("./ztest init"); diff --git a/test/model/task/getExecutionTasks.php b/test/model/task/getExecutionTasks.php index 5fa3332f73..ce7dd5ffaf 100755 --- a/test/model/task/getExecutionTasks.php +++ b/test/model/task/getExecutionTasks.php @@ -11,7 +11,7 @@ cid=1 pid=1 根据执行id获取任务列表 >> 开发任务11 -根据执行id获取任务数量 >> 1 +根据执行id获取任务数量 >> 4 */ @@ -20,5 +20,5 @@ $count = array('0','1'); $task = new taskTest(); r($task->getExecutionTasksTest($executionID,$count[0])) && p('1:name') && e('开发任务11'); //根据执行id获取任务列表 -r($task->getExecutionTasksTest($executionID,$count[1])) && p() && e('1'); //根据执行id获取任务数量 -system("./ztest init"); \ No newline at end of file +r($task->getExecutionTasksTest($executionID,$count[1])) && p() && e('4'); //根据执行id获取任务数量 +system("./ztest init"); diff --git a/test/model/task/getProjectID.php b/test/model/task/getProjectID.php old mode 100644 new mode 100755 diff --git a/test/model/task/getStoryComments.php b/test/model/task/getStoryComments.php old mode 100644 new mode 100755 index bb9bac556f..97780986c5 --- a/test/model/task/getStoryComments.php +++ b/test/model/task/getStoryComments.php @@ -10,12 +10,14 @@ title=taskModel->getStoryComments(); cid=1 pid=1 -根据executionID查找projectID >> 11 +根据storyID查找comment >> 这是一个系统日志测试备注2 +根据storyID查找comment >> 0 */ -$storyID = '2'; +$storyIDList = array(2, 1000001); $task = new taskTest(); -r($task->getStoryCommentsTest($storyID)) && p('comment') && e('这是一个系统日志测试备注' . $storyID); //根据executionID查找projectID +r($task->getStoryCommentsTest($storyIDList[0])) && p('0:comment') && e('这是一个系统日志测试备注2'); //根据storyID查找comment +r($task->getStoryCommentsTest($storyIDList[1])) && p('0:comment') && e('0'); //根据不存在的storyID查找comment system("./ztest init"); diff --git a/test/model/task/getTasksByModule.php b/test/model/task/getTasksByModule.php index 6541590f09..1ed54d1fa9 100755 --- a/test/model/task/getTasksByModule.php +++ b/test/model/task/getTasksByModule.php @@ -10,7 +10,7 @@ title=taskModel->getTasksByModule(); cid=1 pid=1 -根据模块获取任务列表 >> 开发任务11 +根据模块获取任务列表 >> 子任务10 根据模块获取任务数量 >> 1 */ @@ -21,6 +21,6 @@ $moduleIdList = '21'; $count = array('0','1'); $task = new taskTest(); -r($task->getTasksByModuleTest($executionID,$moduleIdList,$count[0])) && p('0:name') && e('开发任务11'); //根据模块获取任务列表 -r($task->getTasksByModuleTest($executionID,$moduleIdList,$count[1])) && p() && e('1'); //根据模块获取任务数量 -system("./ztest init"); \ No newline at end of file +r($task->getTasksByModuleTest($executionID,$moduleIdList,$count[0])) && p('0:name') && e('子任务10'); //根据模块获取任务列表 +r($task->getTasksByModuleTest($executionID,$moduleIdList,$count[1])) && p() && e('1'); //根据模块获取任务数量 +system("./ztest init");