diff --git a/test/class/task.class.php b/test/class/task.class.php index 4fe7fc6b82..d85a181b55 100644 --- a/test/class/task.class.php +++ b/test/class/task.class.php @@ -532,4 +532,35 @@ class taskTest return $object; } } + + public function createTaskFromGitlabIssueTest($task, $executionID) + { + $objectID = $this->objectModel->createTaskFromGitlabIssue($task, $executionID); + + unset($_POST); + if(dao::isError()) + { + return dao::getError(); + } + else + { + $object = $this->objectModel->getById($objectID); + return $object; + } + } + + public function getProjectIDTest($executionID) + { + $object = $this->objectModel->getProjectID($executionID); + + unset($_POST); + if(dao::isError()) + { + return dao::getError(); + } + else + { + return $object; + } + } } diff --git a/test/model/task/createTaskFromGitlabIssue.php b/test/model/task/createTaskFromGitlabIssue.php new file mode 100755 index 0000000000..fa73b7a9d1 --- /dev/null +++ b/test/model/task/createTaskFromGitlabIssue.php @@ -0,0 +1,49 @@ +#!/usr/bin/env php +createTaskFromGitlabIssue(); +cid=1 +pid=1 + +测试正常的创建开发任务 >> gitlab中新建的问题01 +测试正常的创建开发任务 >> 101 +测试正常的创建开发任务 >> 11 +测试不输入执行创建开务 >> 『所属执行』不能为空。 +测试不输入名称创建任务 >> 『任务名称』不能为空。 + + */ + +$executionID = 101; + +$task1 = new stdclass(); +$task1->name = 'gitlab中新建的问题01'; +$task1->execution = $executionID; + +$task2 = new stdclass(); +$task2->name = 'gitlab中新建的问题02'; +$task2->execution = $executionID; + +$task3 = new stdclass(); +$task3->name = 'gitlab中新建的问题03'; +$task3->execution = $executionID; + +$task4 = new stdclass(); +$task4->name = 'gitlab中新建的问题04'; +$task4->execution = ''; + +$task5 = new stdclass(); +$task5->name = ''; +$task5->execution = $executionID; + +$task = new taskTest(); +r($task->createTaskFromGitlabIssueTest($task1, $executionID)) && p('name') && e('gitlab中新建的问题01'); // 测试正常的创建开发任务 +r($task->createTaskFromGitlabIssueTest($task2, $executionID)) && p('execution') && e('101'); // 测试正常的创建开发任务 +r($task->createTaskFromGitlabIssueTest($task3, $executionID)) && p('project') && e('11'); // 测试正常的创建开发任务 +r($task->createTaskFromGitlabIssueTest($task4, $executionID)) && p('execution:0') && e('『所属执行』不能为空。'); // 测试不输入执行创建任务 +r($task->createTaskFromGitlabIssueTest($task5, $executionID)) && p('name:0') && e('『任务名称』不能为空。'); // 测试不输入名称创建任务 +system("./ztest init"); diff --git a/test/model/task/getProjectID.php b/test/model/task/getProjectID.php new file mode 100644 index 0000000000..76b806d0c1 --- /dev/null +++ b/test/model/task/getProjectID.php @@ -0,0 +1,21 @@ +#!/usr/bin/env php +getByList(); +cid=1 +pid=1 + +根据executionID查找projectID >> 11 + +*/ + +$executionID = '101'; + +$task = new taskTest(); +r($task->getProjectIDTest($executionID)) && p('project') && e('11'); //根据executionID查找projectID +system("./ztest init"); diff --git a/test/ztest b/test/ztest index 8a30767bef..09ae67a348 100755 --- a/test/ztest +++ b/test/ztest @@ -24,6 +24,7 @@ switch($argv[1]) break; case 'task': ztfRun('model/task'); + break; case 'execution': ztfRun('model/execution'); break;