diff --git a/test/data/job.yaml b/test/data/job.yaml index 6489d78c76..08c13e0738 100644 --- a/test/data/job.yaml +++ b/test/data/job.yaml @@ -33,7 +33,7 @@ fields: format: "" - field: frame note: "工具/框架" - range: junit,testng,phpunit,pytest,jtest,cppunit,gtest,qtest + range: sonarqube,junit,testng,phpunit,pytest,jtest,cppunit,gtest,qtest prefix: "" postfix: "" loop: 0 @@ -48,6 +48,20 @@ fields: postfix: "" loop: 0 format: "" + - field: sonarqubeServer + note: "Sonarqube服务器" + range: 2,0{8} + prefix: "" + postfix: "" + loop: 0 + format: "" + - field: projectKey + note: "Sonarqube项目" + range: zentaopms + prefix: "" + postfix: "" + loop: 0 + format: "" - field: svnDir note: "SVN监控路径" range: caselib,effort,git,mail,output diff --git a/test/model/gitlab/getversion.php b/test/model/gitlab/getversion.php index f893f6c9fe..789d1ddf02 100644 --- a/test/model/gitlab/getversion.php +++ b/test/model/gitlab/getversion.php @@ -27,6 +27,6 @@ $result = $gitlab->getVersion($gitlabServer->url, $gitlabServer->token . 'a'); if(!isset($result->version)) $result = 'return false'; r($result) && p() && e('return false'); //通过正确的host,错误的token获取api权限 -$result = $gitlab->getVersion($gitlabServer->url . 'a', $gitlabServer->token); +$result = $gitlab->getVersion($gitlabServer->url . '1', $gitlabServer->token); if(!isset($result->version)) $result = 'return false'; r($result) && p() && e('return false'); //通过错误或低版本的的host,token获取api权限 diff --git a/test/model/sonarqube/getlinkedproducts.php b/test/model/sonarqube/getlinkedproducts.php new file mode 100644 index 0000000000..627189cf97 --- /dev/null +++ b/test/model/sonarqube/getlinkedproducts.php @@ -0,0 +1,24 @@ +#!/usr/bin/env php +loadModel('sonarqube'); + +$sonarqubeID = 0; +$projectKey = ''; +$result = $sonarqube->getLinkedProducts($sonarqubeID, $projectKey); +if(empty($result)) $result = 'return false'; +r($result) && p() && e('return false'); //通过错误的sonarqubeID和projectKey获取关联产品ID + +$sonarqubeID = 2; +$projectKey = 'zentaopms'; +$result = $sonarqube->getLinkedProducts($sonarqubeID, $projectKey); +r($result) && p() && e('1'); //通过正确的sonarqubeID和projectKey获取关联产品ID