From 7c00db4f84e4609bbf6925ce754255270b29c569 Mon Sep 17 00:00:00 2001 From: lanzongjun Date: Mon, 9 May 2022 11:32:38 +0800 Subject: [PATCH 1/3] * unit test job --- test/class/job.class.php | 305 ++++++++++++++++++++++++++ test/job/create.php | 37 ++++ test/job/exec.php | 20 ++ test/job/execgitlabpipeline.php.bak | 20 ++ test/job/execjenkinspipeline.php.bak | 24 ++ test/job/getbyid.php | 26 +++ test/job/getjobbysonarqubeproject.php | 22 ++ test/job/getlasttagbyrepo.php | 20 ++ test/job/getlist.php | 23 ++ test/job/getlistbyrepoid.php | 23 ++ test/job/getlistbytriggertype.php | 24 ++ test/job/getparis.php | 22 ++ test/job/getsonarqubebyrepo.php | 21 ++ test/job/gettriggerconfig.php | 23 ++ test/job/gettriggergroup.php | 24 ++ test/job/update.php | 27 +++ test/ztest | 12 +- 17 files changed, 671 insertions(+), 2 deletions(-) create mode 100644 test/class/job.class.php create mode 100755 test/job/create.php create mode 100755 test/job/exec.php create mode 100755 test/job/execgitlabpipeline.php.bak create mode 100755 test/job/execjenkinspipeline.php.bak create mode 100755 test/job/getbyid.php create mode 100755 test/job/getjobbysonarqubeproject.php create mode 100755 test/job/getlasttagbyrepo.php create mode 100755 test/job/getlist.php create mode 100755 test/job/getlistbyrepoid.php create mode 100755 test/job/getlistbytriggertype.php create mode 100755 test/job/getparis.php create mode 100755 test/job/getsonarqubebyrepo.php create mode 100755 test/job/gettriggerconfig.php create mode 100755 test/job/gettriggergroup.php create mode 100755 test/job/update.php diff --git a/test/class/job.class.php b/test/class/job.class.php new file mode 100644 index 0000000000..b7636392f5 --- /dev/null +++ b/test/class/job.class.php @@ -0,0 +1,305 @@ +objectModel = $tester->loadModel('job'); + } + + /** + * Test get job by id. + * + * @param int $id + * @access public + * @return object + */ + public function getByIdTest($id) + { + $object = $this->objectModel->getById($id); + + if(dao::isError()) return dao::getError(); + + return $object; + } + + /** + * Test get job list. + * + * @param string $orderBy + * @param int $pager + * @access public + * @return object + */ + public function getListTest($orderBy = 'id_desc', $pager = null) + { + $objects = $this->objectModel->getList($orderBy, $pager); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + /** + * Test get list by repo id. + * + * @param int $repoID + * @access public + * @return object + */ + public function getListByRepoIDTest($repoID) + { + return $this->objectModel->getListByRepoID($repoID); + } + + /** + * Test get job pairs. + * + * @param int $repoID + * @param string $engine + * @access public + * @return object + */ + public function getPairsTest($repoID, $engine = '') + { + $objects = $this->objectModel->getPairs($repoID, $engine); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + /** + * Test get job list by trigger type. + * + * @param string $triggerType + * @param array $repoIdList + * @access public + * @return object + */ + public function getListByTriggerTypeTest($triggerType, $repoIdList = array()) + { + $objects = $this->objectModel->getListByTriggerType($triggerType, $repoIdList); + + if(dao::isError()) return dao::getError(); + + return $objects; + } + + /** + * Test get trigger config. + * + * @param int $id + * @access public + * @return object + */ + public function getTriggerConfigTest($id) + { + + $job = $this->objectModel->getById($id); + + $object = $this->objectModel->getTriggerConfig($job); + + if(dao::isError()) return dao::getError(); + + return $object; + } + + /** + * Test get trigger group. + * + * @param string $triggerType + * @param array $repoIdList + * @access public + * @return array + */ + public function getTriggerGroupTest($triggerType, $repoIdList) + { + $array = $this->objectModel->getTriggerGroup($triggerType, $repoIdList); + + if(dao::isError()) return dao::getError(); + + $group = array(); + if($triggerType == 'tag') $group = isset($array[1]) ? $array[1] : array(); + if($triggerType == 'commit') $group = isset($array[2]) ? $array[2] : array(); + + return $group; + } + + /** + * Test create object. + * + * @param array $params + * @access public + * @return object + */ + public function createObject($params) + { + $createFields['name'] = '这是一个JOB3'; + $createFields['engine'] = 'gitlab'; + $createFields['repo'] = '1'; + $createFields['reference'] = 'test_case'; + $createFields['product'] = '1'; + $createFields['frame'] = 'phpunit'; + $createFields['triggerType'] = 'commit'; + + foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue; + + foreach($params as $key => $value) $_POST[$key] = $value; + + $objectID = $this->objectModel->create(); + unset($_POST); + if(dao::isError()) return dao::getError(); + + $object = $this->objectModel->getByID($objectID); + return $object; + } + + /** + * Test update object. + * + * @param int $jobId + * @param array $params + * @access public + * @return string + */ + public function updateObject($jobId, $params = array()) + { + global $tester; + $object = $tester->dbh->query("SELECT * FROM " . TABLE_JOB ." WHERE id = $jobId")->fetch(); + + foreach($object as $field => $value) + { + if(in_array($field, array_keys($params))) + { + $_POST[$field] = $params[$field]; + } + else + { + $_POST[$field] = $value; + } + } + $_POST['jkServer'] = 3; + $_POST['jkTask'] = 'dave'; + + $result = $this->objectModel->update($jobId); + unset($_POST); + if(dao::isError()) return dao::getError()[0]; + + return $result ? 'Job更新成功' : 'Job更新失败'; + } + + /** + * Test exec job. + * + * @param int $id + * @param array $extraParam + * @access public + * @return object + */ + public function execTest($id, $extraParam = array()) + { + $object = $this->objectModel->exec($id, $extraParam); + + if(dao::isError()) return dao::getError(); + + return $object; + } + + /** + * Test exec jenkins pipeline. + * + * @param int $jobID + * @param object $repo + * @param int $compileID + * @param array $extraParam + * @access public + * @return object + */ + public function execJenkinsPipelineTest($jobID, $repo, $compileID, $extraParam = array()) + { + $job = $this->objectModel->getById($jobID); + + $object = $this->objectModel->execJenkinsPipeline($job, $repo, $compileID, $extraParam); + + if(dao::isError()) return dao::getError(); + + return $object; + } + + /** + * Test exec gitlab pipeline. + * + * @param int $jobID + * @access public + * @return object + */ + public function execGitlabPipelineTest($jobID) + { + $job = $this->objectModel->getById($jobID); + + $object = $this->objectModel->execGitlabPipeline($job); + + if(dao::isError()) return dao::getError(); + + return $object; + } + + /** + * Test get last tag by repo. + * + * @param int $repoId + * @param int $jobId + * @access public + * @return string + */ + public function getLastTagByRepoTest($jobId) + { + global $tester; + $job = $this->objectModel->getById($jobId); + $repo = $tester->loadModel('repo')->getRepoById($job->repo); + $object = $this->objectModel->getLastTagByRepo($repo, $job); + + if(dao::isError()) return dao::getError(); + + return $object; + } + + /** + * Test get sonarqube by RepoID. + * + * @param array $repoIDList + * @param int $jobID + * @param bool $showDeleted + * @access public + * @return array + */ + public function getSonarqubeByRepoTest($repoIDList, $jobID = 0, $showDeleted = false) + { + $array = $this->objectModel->getSonarqubeByRepo($repoIDList, $jobID, $showDeleted); + + if(dao::isError()) return dao::getError(); + + return $array; + } + + /** + * Test get job pairs by sonarqube projectkeys. + * + * @param int $sonarqubeID + * @param array $projectKeys + * @param bool $emptyShowAll + * @param bool $showDeleted + * @access public + * @return array + */ + public function getJobBySonarqubeProjectTest($sonarqubeID, $projectKeys = array(), $emptyShowAll = false, $showDeleted = false) + { + $array = $this->objectModel->getJobBySonarqubeProject($sonarqubeID, $projectKeys, $emptyShowAll, $showDeleted); + + if(dao::isError()) return dao::getError(); + + return $array; + } + +} diff --git a/test/job/create.php b/test/job/create.php new file mode 100755 index 0000000000..9258f6d373 --- /dev/null +++ b/test/job/create.php @@ -0,0 +1,37 @@ +#!/usr/bin/env php +create(); +cid=1 +pid=1 + +测试创建job name为空的情况 >> 『名称』不能为空。 +测试创建job engine为空的情况 >> 『构建引擎』不能为空。 +测试创建job triggerType为空的情况 >> 『触发方式』不能为空 +测试创建job name为《这是一个job007》的情况 >> 这是一个job007 +测试创建job engine为gitlab的情况 >> gitlab +测试创建job triggerType为tag的情况 >> tag + +*/ + +$job_name = array('name' => '这是一个job007'); +$job_engine = array('engine' => 'gitlab'); +$job_triggerType = array('triggerType' => 'tag'); +$job_name_blank = array('name' => ''); +$job_engine_blank = array('engine' => ''); +$job_triggerType_blank = array('triggerType' => ''); + +$job = new jobTest(); + +r($job->createObject($job_name_blank)) && p('name:0') && e('『名称』不能为空。'); // 测试创建job name为空的情况 +r($job->createObject($job_engine_blank)) && p('engine:0') && e('『构建引擎』不能为空。'); // 测试创建job engine为空的情况 +r($job->createObject($job_triggerType_blank)) && p('triggerType:0') && e('『触发方式』不能为空'); // 测试创建job triggerType为空的情况 +r($job->createObject($job_name)) && p('name') && e('这是一个job007'); // 测试创建job name为《这是一个job007》的情况 +r($job->createObject($job_engine)) && p('engine') && e('gitlab'); // 测试创建job engine为gitlab的情况 +r($job->createObject($job_triggerType)) && p('triggerType') && e('tag'); // 测试创建job triggerType为tag的情况 +system("./ztest init"); diff --git a/test/job/exec.php b/test/job/exec.php new file mode 100755 index 0000000000..fff8ad9842 --- /dev/null +++ b/test/job/exec.php @@ -0,0 +1,20 @@ +#!/usr/bin/env php +create(); +cid=1 +pid=1 + +测试执行job id为1的情况 >> 1 + +*/ + +$jobID = 1; +$job = new jobTest(); +r($job->execTest($jobID)) && p('id')&& e('1'); // 测试执行job id为1的情况 +system("./ztest init"); diff --git a/test/job/execgitlabpipeline.php.bak b/test/job/execgitlabpipeline.php.bak new file mode 100755 index 0000000000..184b655465 --- /dev/null +++ b/test/job/execgitlabpipeline.php.bak @@ -0,0 +1,20 @@ +#!/usr/bin/env php +execGitlabPipeline(); +cid=1 +pid=1 + + +*/ + +$jobID = 2; + +$job = new jobTest(); +r($job->execGitlabPipelineTest($jobID)) && p('status')&& e('create_fail'); // 测试执行jekins pipeline情况 +//system("./ztest init"); diff --git a/test/job/execjenkinspipeline.php.bak b/test/job/execjenkinspipeline.php.bak new file mode 100755 index 0000000000..b3fe1101ee --- /dev/null +++ b/test/job/execjenkinspipeline.php.bak @@ -0,0 +1,24 @@ +#!/usr/bin/env php +execJenkinsPipeline(); +cid=1 +pid=1 + +测试执行jekins pipeline情况 >> 1 + +*/ + +$jobID = 1; +$repo = 1; +$complileID = 1; + +$job = new jobTest(); +$job->execTest($jobID); +r($job->execJenkinsPipelineTest($jobID, $repo, $complileID)) && p('id')&& e('1'); // 测试执行jekins pipeline情况 +//system("./ztest init"); diff --git a/test/job/getbyid.php b/test/job/getbyid.php new file mode 100755 index 0000000000..5a682810a1 --- /dev/null +++ b/test/job/getbyid.php @@ -0,0 +1,26 @@ +#!/usr/bin/env php +getById(); +cid=1 +pid=1 + +查询id为1的job的engine >> jenkins +查询id为1的job的frame >> sonarqube + +*/ + +$jobIDList = array('1', '1000001'); + +$job = new jobTest(); + +r($job->getByIdTest($jobIDList[0])) && p('engine') && e('jenkins'); // 查询id为1的job的engine +r($job->getByIdTest($jobIDList[0])) && p('frame') && e('sonarqube'); // 查询id为1的job的frame +r($job->getByIdTest($jobIDList[1])) && p('engine') && e(NULL); // 查询id为1000001的job的name +r($job->getByIdTest($jobIDList[1])) && p('frame') && e(NULL); // 查询id为1000001的job的account +system("./ztest init"); diff --git a/test/job/getjobbysonarqubeproject.php b/test/job/getjobbysonarqubeproject.php new file mode 100755 index 0000000000..2f3facafaa --- /dev/null +++ b/test/job/getjobbysonarqubeproject.php @@ -0,0 +1,22 @@ +#!/usr/bin/env php +getJobBySonarqubeProject(); +cid=1 +pid=1 + +根据sonarqube project查询job >> 1 + +*/ + +$sonarqubeID = 2; +$projectKeys = array('zentaopms'); + +$job = new jobTest(); +r($job->getJobBySonarqubeProjectTest($sonarqubeID, $projectKeys)) && p('zentaopms') && e('1'); // 根据sonarqube project查询job +system("./ztest init"); diff --git a/test/job/getlasttagbyrepo.php b/test/job/getlasttagbyrepo.php new file mode 100755 index 0000000000..7aed4ed56a --- /dev/null +++ b/test/job/getlasttagbyrepo.php @@ -0,0 +1,20 @@ +#!/usr/bin/env php +getLastTagByRepo(); +cid=1 +pid=1 + +查询id为1的job的last tag >> tag_test1 + +*/ + +$jobID = 1; +$job = new jobTest(); +r($job->getLastTagByRepoTest($jobID)) && p() && e('tag_test1'); // 查询id为1的job的last tag +system("./ztest init"); diff --git a/test/job/getlist.php b/test/job/getlist.php new file mode 100755 index 0000000000..221953729a --- /dev/null +++ b/test/job/getlist.php @@ -0,0 +1,23 @@ +#!/usr/bin/env php +getList(); +cid=1 +pid=1 + +测试获取列表的个数，目前只有两个 >> 2 +测试获取列表某个job的名称信息 >> 这是一个Job1 + +*/ + +$job = new jobTest(); +$list = $job->getListTest(); + +r(count($list)) && p() && e('2'); //测试获取列表的个数，目前只有两个 +r($list) && p('1:name') && e('这是一个Job1'); //测试获取列表某个job的名称信息 +system("./ztest init"); diff --git a/test/job/getlistbyrepoid.php b/test/job/getlistbyrepoid.php new file mode 100755 index 0000000000..8dbb0edd89 --- /dev/null +++ b/test/job/getlistbyrepoid.php @@ -0,0 +1,23 @@ +#!/usr/bin/env php +> 这是一个Job1 +获取repo为100001的name >> 0 + +*/ +$job = new jobTest(); + +$repoIdList = array('1', '100001'); + +r($job->getListByRepoIDTest($repoIdList[0])) && p('1:name') && e('这是一个Job1'); // 获取repo为1的name +r($job->getListByRepoIDTest($repoIdList[1])) && p('100001:name') && e('0'); // 获取repo为100001的name +system("./ztest init"); diff --git a/test/job/getlistbytriggertype.php b/test/job/getlistbytriggertype.php new file mode 100755 index 0000000000..f4122503e2 --- /dev/null +++ b/test/job/getlistbytriggertype.php @@ -0,0 +1,24 @@ +#!/usr/bin/env php +> 这是一个Job1 +获取trigger type为commit的repo为2的name >> 这是一个Job2 + +*/ +$job = new jobTest(); + +$triggerType = array('tag', 'commit'); +$repoIdList = array('1', '2', '100001'); + +r($job->getListByTriggerTypeTest($triggerType[0], $repoIdList)) && p('1:name') && e('这是一个Job1'); // 获取trigger type为tag的repo为1的name +r($job->getListByTriggerTypeTest($triggerType[1], $repoIdList)) && p('2:name') && e('这是一个Job2'); // 获取trigger type为commit的repo为2的name +system("./ztest init"); diff --git a/test/job/getparis.php b/test/job/getparis.php new file mode 100755 index 0000000000..70b3a3436b --- /dev/null +++ b/test/job/getparis.php @@ -0,0 +1,22 @@ +#!/usr/bin/env php +> 这是一个Job1 + +*/ +$job = new jobTest(); + +$repoID = '1'; +$engine = 'jenkins'; + +r($job->getPairsTest($repoID, $engine)) && p('1') && e('这是一个Job1'); // 获取repo为1且engine为jenkins的name +system("./ztest init"); diff --git a/test/job/getsonarqubebyrepo.php b/test/job/getsonarqubebyrepo.php new file mode 100755 index 0000000000..d04a50a16a --- /dev/null +++ b/test/job/getsonarqubebyrepo.php @@ -0,0 +1,21 @@ +#!/usr/bin/env php +getSonarqubeByRepo(); +cid=1 +pid=1 + +根据repo查询sonarqube >> 这是一个Job1 + +*/ + +$repoIDList = array('1', '2'); + +$job = new jobTest(); +r($job->getSonarqubeByRepoTest($repoIDList)) && p('1:name') && e('这是一个Job1'); // 根据repo查询sonarqube +system("./ztest init"); diff --git a/test/job/gettriggerconfig.php b/test/job/gettriggerconfig.php new file mode 100755 index 0000000000..4f4c2dbf3f --- /dev/null +++ b/test/job/gettriggerconfig.php @@ -0,0 +1,23 @@ +#!/usr/bin/env php +> 目录改动(/module/caselib) +获取job为100001的trigger config >> 0 + +*/ +$job = new jobTest(); + +$jobIdList = array('1', '100001'); + +r($job->getTriggerConfigTest($jobIdList[0])) && p() && e('目录改动(/module/caselib)'); // 获取job为1的trigger config +r($job->getTriggerConfigTest($jobIdList[1])) && p() && e('0'); // 获取job为100001的trigger config +system("./ztest init"); diff --git a/test/job/gettriggergroup.php b/test/job/gettriggergroup.php new file mode 100755 index 0000000000..4693b34ac9 --- /dev/null +++ b/test/job/gettriggergroup.php @@ -0,0 +1,24 @@ +#!/usr/bin/env php +> 这是一个Job1 +获取trigger type为commit且repo id为2的name >> 这是一个Job2 + +*/ +$job = new jobTest(); + +$triggerTypeList = array('tag', 'commit'); +$repoIdList = array('1', '2'); + +r($job->getTriggerGroupTest($triggerTypeList['0'], $repoIdList)) && p('1:name') && e('这是一个Job1'); // 获取trigger type为tag且repo id为1的name +r($job->getTriggerGroupTest($triggerTypeList['1'], $repoIdList)) && p('2:name') && e('这是一个Job2'); // 获取trigger type为commit且repo id为2的name +system("./ztest init"); diff --git a/test/job/update.php b/test/job/update.php new file mode 100755 index 0000000000..69a6746e14 --- /dev/null +++ b/test/job/update.php @@ -0,0 +1,27 @@ +#!/usr/bin/env php +update(); +cid=1 +pid=1 + +测试更新job名称 >> Job更新成功 +测试更新job引擎异常 >> SonarQube工具/框架仅在构建引擎为JenKins的情况下使用 + +*/ + +$jobID = 1; + +$job_upName = array('name' => '这是一个job11'); +$job_upEngine = array('engine' => 'gitlab'); + +$job = new jobTest(); + +r($job->updateObject($jobID, $job_upName)) && p() && e('Job更新成功'); //测试更新job名称 +r($job->updateObject($jobID, $job_upEngine)) && p() && e('SonarQube工具/框架仅在构建引擎为JenKins的情况下使用'); //测试更新job引擎异常 +system("./ztest init"); diff --git a/test/ztest b/test/ztest index 868edfaf13..7d5bb6b817 100755 --- a/test/ztest +++ b/test/ztest @@ -64,9 +64,15 @@ switch($argv[1]) case 'group': ztfRun('model/group'); break; + case 'job': + ztfRun('model/job'); + break; case 'kanban': ztfRun('model/kanban'); break; + case 'message': + ztfRun('model/message'); + break; case 'model': ztfRun('model'); break; @@ -100,6 +106,8 @@ switch($argv[1]) case 'report': ztfRun('model/report'); break; + case 'sso': + ztfRun('model/sso'); case 'setting': ztfRun('model/setting'); break; @@ -121,8 +129,8 @@ switch($argv[1]) case 'todo': ztfRun('model/todo'); break; - case 'message': - ztfRun('model/message'); + case 'tutorial': + ztfRun('model/tutorial'); break; case 'tree': ztfRun('model/tree'); From 0405e1de213645e948928cf3b4e09edbe6d9cf88 Mon Sep 17 00:00:00 2001 From: lanzongjun Date: Mon, 9 May 2022 13:39:08 +0800 Subject: [PATCH 2/3] * unit test job --- test/{ => model}/job/create.php | 0 test/{ => model}/job/exec.php | 0 test/{ => model}/job/execgitlabpipeline.php.bak | 0 test/{ => model}/job/execjenkinspipeline.php.bak | 0 test/{ => model}/job/getbyid.php | 0 test/{ => model}/job/getjobbysonarqubeproject.php | 0 test/{ => model}/job/getlasttagbyrepo.php | 0 test/{ => model}/job/getlist.php | 0 test/{ => model}/job/getlistbyrepoid.php | 0 test/{ => model}/job/getlistbytriggertype.php | 0 test/{ => model}/job/getparis.php | 0 test/{ => model}/job/getsonarqubebyrepo.php | 0 test/{ => model}/job/gettriggerconfig.php | 0 test/{ => model}/job/gettriggergroup.php | 0 test/{ => model}/job/update.php | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename test/{ => model}/job/create.php (100%) rename test/{ => model}/job/exec.php (100%) rename test/{ => model}/job/execgitlabpipeline.php.bak (100%) rename test/{ => model}/job/execjenkinspipeline.php.bak (100%) rename test/{ => model}/job/getbyid.php (100%) rename test/{ => model}/job/getjobbysonarqubeproject.php (100%) rename test/{ => model}/job/getlasttagbyrepo.php (100%) rename test/{ => model}/job/getlist.php (100%) rename test/{ => model}/job/getlistbyrepoid.php (100%) rename test/{ => model}/job/getlistbytriggertype.php (100%) rename test/{ => model}/job/getparis.php (100%) rename test/{ => model}/job/getsonarqubebyrepo.php (100%) rename test/{ => model}/job/gettriggerconfig.php (100%) rename test/{ => model}/job/gettriggergroup.php (100%) rename test/{ => model}/job/update.php (100%) diff --git a/test/job/create.php b/test/model/job/create.php similarity index 100% rename from test/job/create.php rename to test/model/job/create.php diff --git a/test/job/exec.php b/test/model/job/exec.php similarity index 100% rename from test/job/exec.php rename to test/model/job/exec.php diff --git a/test/job/execgitlabpipeline.php.bak b/test/model/job/execgitlabpipeline.php.bak similarity index 100% rename from test/job/execgitlabpipeline.php.bak rename to test/model/job/execgitlabpipeline.php.bak diff --git a/test/job/execjenkinspipeline.php.bak b/test/model/job/execjenkinspipeline.php.bak similarity index 100% rename from test/job/execjenkinspipeline.php.bak rename to test/model/job/execjenkinspipeline.php.bak diff --git a/test/job/getbyid.php b/test/model/job/getbyid.php similarity index 100% rename from test/job/getbyid.php rename to test/model/job/getbyid.php diff --git a/test/job/getjobbysonarqubeproject.php b/test/model/job/getjobbysonarqubeproject.php similarity index 100% rename from test/job/getjobbysonarqubeproject.php rename to test/model/job/getjobbysonarqubeproject.php diff --git a/test/job/getlasttagbyrepo.php b/test/model/job/getlasttagbyrepo.php similarity index 100% rename from test/job/getlasttagbyrepo.php rename to test/model/job/getlasttagbyrepo.php diff --git a/test/job/getlist.php b/test/model/job/getlist.php similarity index 100% rename from test/job/getlist.php rename to test/model/job/getlist.php diff --git a/test/job/getlistbyrepoid.php b/test/model/job/getlistbyrepoid.php similarity index 100% rename from test/job/getlistbyrepoid.php rename to test/model/job/getlistbyrepoid.php diff --git a/test/job/getlistbytriggertype.php b/test/model/job/getlistbytriggertype.php similarity index 100% rename from test/job/getlistbytriggertype.php rename to test/model/job/getlistbytriggertype.php diff --git a/test/job/getparis.php b/test/model/job/getparis.php similarity index 100% rename from test/job/getparis.php rename to test/model/job/getparis.php diff --git a/test/job/getsonarqubebyrepo.php b/test/model/job/getsonarqubebyrepo.php similarity index 100% rename from test/job/getsonarqubebyrepo.php rename to test/model/job/getsonarqubebyrepo.php diff --git a/test/job/gettriggerconfig.php b/test/model/job/gettriggerconfig.php similarity index 100% rename from test/job/gettriggerconfig.php rename to test/model/job/gettriggerconfig.php diff --git a/test/job/gettriggergroup.php b/test/model/job/gettriggergroup.php similarity index 100% rename from test/job/gettriggergroup.php rename to test/model/job/gettriggergroup.php diff --git a/test/job/update.php b/test/model/job/update.php similarity index 100% rename from test/job/update.php rename to test/model/job/update.php From 87164335b8fe676609e859ef84108eea791ac063 Mon Sep 17 00:00:00 2001 From: lanzongjun Date: Mon, 9 May 2022 16:12:46 +0800 Subject: [PATCH 3/3] * delete unit test job --- test/model/job/execgitlabpipeline.php.bak | 20 ------------------ test/model/job/execjenkinspipeline.php.bak | 24 ---------------------- 2 files changed, 44 deletions(-) delete mode 100755 test/model/job/execgitlabpipeline.php.bak delete mode 100755 test/model/job/execjenkinspipeline.php.bak diff --git a/test/model/job/execgitlabpipeline.php.bak b/test/model/job/execgitlabpipeline.php.bak deleted file mode 100755 index 184b655465..0000000000 --- a/test/model/job/execgitlabpipeline.php.bak +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env php -execGitlabPipeline(); -cid=1 -pid=1 - - -*/ - -$jobID = 2; - -$job = new jobTest(); -r($job->execGitlabPipelineTest($jobID)) && p('status')&& e('create_fail'); // 测试执行jekins pipeline情况 -//system("./ztest init"); diff --git a/test/model/job/execjenkinspipeline.php.bak b/test/model/job/execjenkinspipeline.php.bak deleted file mode 100755 index b3fe1101ee..0000000000 --- a/test/model/job/execjenkinspipeline.php.bak +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env php -execJenkinsPipeline(); -cid=1 -pid=1 - -测试执行jekins pipeline情况 >> 1 - -*/ - -$jobID = 1; -$repo = 1; -$complileID = 1; - -$job = new jobTest(); -$job->execTest($jobID); -r($job->execJenkinsPipelineTest($jobID, $repo, $complileID)) && p('id')&& e('1'); // 测试执行jekins pipeline情况 -//system("./ztest init");