From 72d551598b66ed2aea9fa0dba2d2e1ff5360ac07 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Tue, 18 Jan 2022 09:03:24 +0800
Subject: [PATCH]  * Adjsut unit case.

---
 test/model/gitlab/createbranch.php        |  8 ++++-
 test/model/gitlab/createtag.php           |  7 +++-
 test/model/mr/apicreate.php               |  4 +--
 test/model/sonarqube/apideleteproject.php | 42 +++++++++++++++++++++++
 4 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 test/model/sonarqube/apideleteproject.php

diff --git a/test/model/gitlab/createbranch.php b/test/model/gitlab/createbranch.php
index b89f6dab69..e12aabab11 100755
--- a/test/model/gitlab/createbranch.php
+++ b/test/model/gitlab/createbranch.php
@@ -40,7 +40,13 @@ r($result) && p() && e('return false'); //使用正确的gitlabID、分支信息
 
 dao::$errors = array();
 $projectID   = 1555;
-$result      = $gitlab->createBranch($gitlabID, $projectID);
+
+/* Delete branches with the same name. */
+$apiRoot = $gitlab->getApiRoot($gitlabID);
+$url     = sprintf($apiRoot, "/projects/{$projectID}/repository/branches/{$_POST['branch']}");
+commonModel::http($url, array(), $options = array(CURLOPT_CUSTOMREQUEST => 'DELETE'));
+
+$result = $gitlab->createBranch($gitlabID, $projectID);
 if($result === true) $result = 'return true';
 r($result) && p() && e('return true');  //通过gitlabID,projectID,分支对象正确创建GitLab分支
 
diff --git a/test/model/gitlab/createtag.php b/test/model/gitlab/createtag.php
index 756dcdfa0a..eecadec592 100755
--- a/test/model/gitlab/createtag.php
+++ b/test/model/gitlab/createtag.php
@@ -40,7 +40,12 @@ r($result) && p() && e('return false'); //使用正确的gitlabID、标签信息
 
 dao::$errors = array();
 $projectID   = 1555;
-$result      = $gitlab->createTag($gitlabID, $projectID);
+
+/* Delete branches with the same name. */
+$gitlab->apiDeleteTagPriv($gitlabID, $projectID, $_POST['tag_name']);
+$gitlab->apiDeleteTag($gitlabID, $projectID, $_POST['tag_name']);
+
+$result = $gitlab->createTag($gitlabID, $projectID);
 if($result === true) $result = 'return true';
 r($result) && p() && e('return true');  //通过gitlabID,projectID,标签对象正确创建GitLab标签
 
diff --git a/test/model/mr/apicreate.php b/test/model/mr/apicreate.php
index 2a775f0a84..129f749a6d 100644
--- a/test/model/mr/apicreate.php
+++ b/test/model/mr/apicreate.php
@@ -10,7 +10,7 @@ pid=0
 
 使用空的RepoUrl数据创建                    >> fail
 使用正确的RepoUrl,错误的分支数据创建mr请求 >> fail
-使用源分支和目标分支一样的数据创建mr请求   >> success 
+使用源分支和目标分支一样的数据创建mr请求   >> success
 使用正确的数据创建mr请求                   >> success
 
 */
@@ -28,7 +28,7 @@ r($result) && p() && e('fail'); //使用空的RepoUrl数据创建
 
 dao::$errors = array();
 $_POST['data']['RepoUrl']        = 'http://192.168.1.161:51080/root/azalea723test.git';
-$_POST['data']['DiffMsg']  = '';
+$_POST['data']['DiffMsg']        = '';
 $_POST['data']['RepoSrcBranch']  = '';
 $_POST['data']['RepoDistBranch'] = '';
 $_POST['data']['MergeStatus']    = '1';
diff --git a/test/model/sonarqube/apideleteproject.php b/test/model/sonarqube/apideleteproject.php
new file mode 100644
index 0000000000..ddf5835ff4
--- /dev/null
+++ b/test/model/sonarqube/apideleteproject.php
@@ -0,0 +1,42 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+
+/**
+
+title=测试 sonarqubeModel::apiDeleteProject();
+cid=1
+pid=1
+
+通过不正确的sonarqubeID、projectKey,删除SonarQube项目  >> return false
+正确的sonarqubeID,空的projectKey,删除SonarQube项目     >> The 'project' parameter is missing
+正确的sonarqubeID,不存在的projectKey,删除SonarQube项目 >> Project 'no_project' not found
+正确的sonarqubeID、projectKey,删除SonarQube项目        >> return true
+
+*/
+
+$sonarqube = $tester->loadModel('sonarqube');
+
+$sonarqubeID = 0;
+$projectKey  = '';
+$result      = $sonarqube->apiDeleteProject($sonarqubeID, $projectKey);
+if($result === false) $result = 'return false';
+r($result) && p() && e('return false');    //通过不正确的sonarqubeID、projectKey,删除SonarQube项目
+
+$sonarqubeID = 2;
+$projectKey  = '';
+$result      = $sonarqube->apiDeleteProject($sonarqubeID, $projectKey);
+r($result->errors) && p('0:msg') && e("The 'project' parameter is missing"); //正确的sonarqubeID,空的projectKey,删除SonarQube项目
+
+$projectKey = 'no_project';
+$result     = $sonarqube->apiDeleteProject($sonarqubeID, $projectKey);
+r($result->errors) && p('0:msg') && e("Project 'no_project' not found"); //正确的sonarqubeID,不存在的projectKey,删除SonarQube项目
+
+$projectKey = 'new_project';
+list($apiRoot, $header) = $sonarqube->getApiBase($sonarqubeID);
+$url    = sprintf($apiRoot, "projects/create?name=$projectKey&project=$projectKey");
+commonModel::http($url, null, array(CURLOPT_CUSTOMREQUEST => 'POST'), $header);
+
+$result = $sonarqube->apiDeleteProject($sonarqubeID, $projectKey);
+if($result === null) $result = 'return true';
+r($result) && p() && e("return true"); //正确的sonarqubeID、projectKey,删除SonarQube项目