From 6b295805b9fe3bf21715cb8c4331a018f8148a03 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Fri, 10 Dec 2021 08:24:49 +0800
Subject: [PATCH]  * Finish task #45675.

---
 test/model/gitlab/apicreatebranch.php | 28 ++++++++++++---
 test/model/gitlab/createbranch.php    | 49 +++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100755 test/model/gitlab/createbranch.php

diff --git a/test/model/gitlab/apicreatebranch.php b/test/model/gitlab/apicreatebranch.php
index 0ebfc93308..3d42a3d7a0 100755
--- a/test/model/gitlab/apicreatebranch.php
+++ b/test/model/gitlab/apicreatebranch.php
@@ -8,15 +8,33 @@ title=测试 gitlabModel::apiCreateBranch();
 cid=1
 pid=1
 
-通过gitlabID,projectID,分支对象创建GitLab分支 >> test_branch5
+使用空的gitlabID、projectID、分支对象创建GitLab分支       >> return false
+使用空的gitlabID、projectID，正确的分支对象创建GitLab分支 >> return null
+使用正确的gitlabID、分支信息，错误的projectID创建分支     >> 404 Project Not Found
+使用正确的gitlabID,projectID，分支对象创建GitLab分支      >> test_branch17
+使用重复的分支信息创建分支                                >> Branch already exists
 
 */
 
 $gitlab = $tester->loadModel('gitlab');
 
-$gitlabID  = 1;
-$projectID = 1555;
+$gitlabID  = 0;
+$projectID = 0;
 $branch    = new stdclass();
-$branch->branch = 'test_branch5';
+
+$result = $gitlab->apiCreateBranch($gitlabID, $projectID, $branch);
+if($result === false) $result = 'return false';
+r($result) && p() && e('return false'); //使用空的gitlabID,projectID,分支对象创建GitLab分支
+
+$branch->branch = 'test_branch17';
 $branch->ref    = 'master';
-r($gitlab->apiCreateBranch($gitlabID, $projectID, $branch)) && p('name') && e($branch->branch); //通过gitlabID,projectID,分支对象创建GitLab分支
+$result = $gitlab->apiCreateBranch($gitlabID, $projectID, $branch);
+if($result === null) $result = 'return null';
+r($result) && p() && e('return false'); //使用空的gitlabID、projectID,正确的分支对象创建GitLab分支
+
+$gitlabID = 1;
+r($gitlab->apiCreateBranch($gitlabID, $projectID, $branch)) && p('message') && e('404 Project Not Found'); //使用正确的gitlabID、分支信息，错误的projectID创建分支
+
+$projectID = 1555;
+r($gitlab->apiCreateBranch($gitlabID, $projectID, $branch)) && p('name')    && e($branch->branch);         //通过gitlabID,projectID,分支对象正确创建GitLab分支
+r($gitlab->apiCreateBranch($gitlabID, $projectID, $branch)) && p('message') && e('Branch already exists'); //使用重复的分支信息创建分支
diff --git a/test/model/gitlab/createbranch.php b/test/model/gitlab/createbranch.php
new file mode 100755
index 0000000000..b89f6dab69
--- /dev/null
+++ b/test/model/gitlab/createbranch.php
@@ -0,0 +1,49 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+
+/**
+
+title=测试 gitlabModel::createBranch();
+cid=1
+pid=1
+
+使用空的gitlabID、projectID、分支创建GitLab分支       >> return false
+使用空的gitlabID、projectID，正确的分支创建GitLab分支 >> return false
+使用正确的gitlabID、分支信息，错误的projectID创建分支 >> return false
+使用正确的gitlabID,projectID，分支创建GitLab分支      >> return true
+使用重复的分支信息创建分支                            >> return false
+
+*/
+
+$gitlab = $tester->loadModel('gitlab');
+
+$gitlabID  = 0;
+$projectID = 0;
+
+$result = $gitlab->createBranch($gitlabID, $projectID);
+if($result === false) $result = 'return false';
+r($result) && p() && e('return false'); //使用空的gitlabID,projectID,分支对象创建GitLab分支
+
+dao::$errors = array();
+$_POST['branch'] = 'test_branch17';
+$_POST['ref']    = 'master';
+$result = $gitlab->createBranch($gitlabID, $projectID);
+if($result === false) $result = 'return false';
+r($result) && p() && e('return false'); //使用空的gitlabID、projectID,正确的分支对象创建GitLab分支
+
+dao::$errors = array();
+$gitlabID    = 1;
+$result      = $gitlab->createBranch($gitlabID, $projectID);
+if($result === false) $result = 'return false';
+r($result) && p() && e('return false'); //使用正确的gitlabID、分支信息，错误的projectID创建分支
+
+dao::$errors = array();
+$projectID   = 1555;
+$result      = $gitlab->createBranch($gitlabID, $projectID);
+if($result === true) $result = 'return true';
+r($result) && p() && e('return true');  //通过gitlabID,projectID,分支对象正确创建GitLab分支
+
+$result = $gitlab->createBranch($gitlabID, $projectID);
+if($result === false) $result = 'return false';
+r($result) && p() && e('return false'); //使用重复的分支信息创建分支