nhyatt/go-bitbucket-v1
1
0
Fork 0
mirror of https://github.com/gfleury/go-bitbucket-v1.git synced 2025-04-04 08:50:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixing integration tests

Browse Source
This commit is contained in:
George Fleury 2023-08-30 12:21:48 +02:00
parent 12fd8cfe8b
commit 5d0b8f4baf
14 changed files with 391 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/pr.yaml vendored
View File

@ -25,3 +25,6 @@ jobs:
- name: Test
run: go test -v ./...
- name: Test Integration
run: INTEGRATION=TRUE go test -v ./...

2
api_response.go
View File

@ -717,7 +717,7 @@ func NewBitbucketAPIResponse(r *http.Response) (*APIResponse, error) {
// NewRawAPIResponse create new API response from http.response with raw data
func NewRawAPIResponse(r *http.Response) (*APIResponse, error) {
response := &APIResponse{Response: r}
raw, err := ioutil.ReadAll(r.Body)
raw, err := io.ReadAll(r.Body)
if err != nil {
return nil, err
}

424
default_api.go
View File

File diff suppressed because it is too large Load Diff

47
default_api_test.go
View File

@ -6,6 +6,7 @@ package bitbucketv1
import (
"io"
"log"
"net/http"
"net/http/httptest"
"os"
@ -14,12 +15,21 @@ import (
"time"
"golang.org/x/net/context"
sw "github.com/gfleury/go-bitbucket-v1/test/bb-mock-server/go"
)
var runIntegrationTests bool
func TestAAAAA(t *testing.T) {
runIntegrationTests = os.Getenv("INTEGRATION") == "TRUE"
if runIntegrationTests {
go func() {
log.Fatal(sw.RunServer(7990))
}()
time.Sleep(2 * time.Second)
}
}
func generateContextCanceled() context.Context {
@ -437,10 +447,10 @@ func TestDefaultApiService_Create(t *testing.T) {
{"networkErrorContextExceeded", fields{client: generateConfigFake()}, args{}, &APIResponse{Message: "Post https://stash.domain.com/rest/api/1.0/projects//repos//pull-requests: context canceled"}, true, false},
{"InvalidRequest", fields{client: generateConfigRealLocalServer()},
args{projectKey: "PROJ",
repositorySlug: "repo1",
repositorySlug: "repo1_test1",
localVarOptionals: map[string]interface{}{"values": "values"}},
&APIResponse{
Message: "Status: 400 , Body: {errors:[{context:null,message:title must be supplied for this request,exceptionName:null}]}",
Message: "Status: 400 Bad Request, Body: {errors:[{context:null,exceptionName:null,message:title must be supplied for this request}]}",
Values: map[string]interface{}{
"errors": []interface{}{
map[string]interface{}{
@ -454,7 +464,7 @@ func TestDefaultApiService_Create(t *testing.T) {
true, true},
{"ValidRequestNoBranch", fields{client: generateConfigRealLocalServer()},
args{projectKey: "PROJ",
repositorySlug: "repo1",
repositorySlug: "repo1_test2",
localVarOptionals: map[string]interface{}{
"title": "test PR",
"description": "test Desc",
@ -483,7 +493,7 @@ func TestDefaultApiService_Create(t *testing.T) {
},
},
&APIResponse{
Message: `Status: 404 , Body: {errors:[{context:null,message:Repository \repo1\ of project with key \PROJ\ has no branch \refs/heads/feature\,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException}]}`,
Message: `Status: 404 Not Found, Body: {errors:[{context:null,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException,message:Repository \repo1\ of project with key \PROJ\ has no branch \refs/heads/feature\}]}`,
Values: map[string]interface{}{
"errors": []interface{}{
map[string]interface{}{
@ -538,11 +548,11 @@ func TestDefaultApiService_CreatePullRequest(t *testing.T) {
{"networkErrorContextExceeded", fields{client: generateConfigFake()}, args{}, &APIResponse{Message: "Post https://stash.domain.com/rest/api/1.0/projects//repos//pull-requests: context canceled"}, true, false},
{"InvalidRequest", fields{client: generateConfigRealLocalServer()},
args{projectKey: "PROJ",
repositorySlug: "repo1",
repositorySlug: "repo1_test1",
localVarOptionals: PullRequest{},
},
&APIResponse{
Message: "Status: 400 , Body: {errors:[{context:null,message:title must be supplied for this request,exceptionName:null}]}",
Message: "Status: 400 Bad Request, Body: {errors:[{context:null,exceptionName:null,message:title must be supplied for this request}]}",
Values: map[string]interface{}{
"errors": []interface{}{
map[string]interface{}{
@ -556,7 +566,7 @@ func TestDefaultApiService_CreatePullRequest(t *testing.T) {
true, true},
{"ValidRequestNoBranch", fields{client: generateConfigRealLocalServer()},
args{projectKey: "PROJ",
repositorySlug: "repo1",
repositorySlug: "repo1_test2",
localVarOptionals: PullRequest{
Title: "test PR",
Description: "test Desc",
@ -584,7 +594,7 @@ func TestDefaultApiService_CreatePullRequest(t *testing.T) {
Locked: false,
},
},
&APIResponse{Message: `Status: 404 , Body: {errors:[{context:null,message:Repository \repo1\ of project with key \PROJ\ has no branch \refs/heads/feature\,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException}]}`,
&APIResponse{Message: `Status: 404 Not Found, Body: {errors:[{context:null,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException,message:Repository \repo1\ of project with key \PROJ\ has no branch \refs/heads/feature\}]}`,
Values: map[string]interface{}{
"errors": []interface{}{
map[string]interface{}{
@ -763,7 +773,7 @@ func TestDefaultApiService_CreateCommentWithComment(t *testing.T) {
commitId: "657f55ce41710f9bfde15c374837136728fae9d9e0eca0b97cb7bfea5095af30",
comment: Comment{Text: "Simple comment"},
},
&APIResponse{Message: `Status: 404 , Body: {errors:[{context:null,message:Commit '657f55ce41710f9bfde15c374837136728fae9d9e0eca0b97cb7bfea5095af30' does not exist in repository 'repo1'.,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException}]}`,
&APIResponse{Message: `Status: 404 Not Found, Body: {errors:[{context:null,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException,message:Commit '657f55ce41710f9bfde15c374837136728fae9d9e0eca0b97cb7bfea5095af30' does not exist in repository 'repo1'.}]}`,
Values: map[string]interface{}{
"errors": []interface{}{
map[string]interface{}{
@ -826,7 +836,7 @@ func TestDefaultApiService_CreatePullRequestComment(t *testing.T) {
comment: Comment{Text: "Simple comment"},
localVarHTTPContentTypes: []string{"application/json"},
},
&APIResponse{Message: `Status: 404 , Body: {errors:[{context:null,message:Pull request 1 does not exist in PROJ/repo1.,exceptionName:com.atlassian.bitbucket.pull.NoSuchPullRequestException}]}`,
&APIResponse{Message: `Status: 404 Not Found, Body: {errors:[{context:null,exceptionName:com.atlassian.bitbucket.pull.NoSuchPullRequestException,message:Pull request 1 does not exist in PROJ/repo1.}]}`,
Values: map[string]interface{}{
"errors": []interface{}{
map[string]interface{}{
@ -1260,7 +1270,7 @@ func TestDefaultApiService_Delete(t *testing.T) {
pullRequestID: -1,
},
&APIResponse{
Message: "Status: 404 , Body: {errors:[{context:null,message:No pull request exists with ID -1 for this repository 1,exceptionName:com.atlassian.bitbucket.pull.NoSuchPullRequestException}]}",
Message: "Status: 404 Not Found, Body: {errors:[{context:null,exceptionName:com.atlassian.bitbucket.pull.NoSuchPullRequestException,message:No pull request exists with ID -1 for this repository 1}]}",
Values: map[string]interface{}{
"errors": []interface{}{
map[string]interface{}{
@ -4907,11 +4917,17 @@ func TestDefaultApiService_GetSSHKeys(t *testing.T) {
{"networkErrorContextExceeded", fields{client: generateConfigFake()}, args{}, &APIResponse{Message: "Get https://stash.domain.com/rest/ssh/1.0/keys: context canceled"}, true, false},
{"realLocalServer", fields{client: generateConfigRealLocalServer()}, args{},
&APIResponse{Values: map[string]interface{}{
"size": float64(0),
"size": float64(1),
"limit": float64(25),
"isLastPage": true,
"values": []interface{}{},
"start": float64(0),
"values": []interface{}{
map[string]interface{}{
"id": float64(1),
"text": "ssh-rsa AAAAB3... me@127.0.0.1",
"label": "me@127.0.0.1",
},
},
"start": float64(0),
}},
false, true},
}
@ -6077,6 +6093,7 @@ func TestDefaultApiService_SetDefaultBranch(t *testing.T) {
type args struct {
projectKey string
repositorySlug string
branchRef string
}
tests := []struct {
name string
@ -6095,7 +6112,7 @@ func TestDefaultApiService_SetDefaultBranch(t *testing.T) {
a := &DefaultApiService{
client: tt.fields.client,
}
got, err := a.SetDefaultBranch(tt.args.projectKey, tt.args.repositorySlug)
got, err := a.SetDefaultBranch(tt.args.projectKey, tt.args.repositorySlug, tt.args.branchRef)
if (err != nil) != tt.wantErr {
t.Errorf("DefaultApiService.SetDefaultBranch() error = %v, wantErr %v", err, tt.wantErr)
return

3
go.mod
View File

@ -2,7 +2,10 @@ module github.com/gfleury/go-bitbucket-v1
go 1.14
replace github.com/gfleury/go-bitbucket-v1/test/bb-mock-server => ./test/bb-mock-server
require (
github.com/gfleury/go-bitbucket-v1/test/bb-mock-server v0.0.0-20230825095122-9bc1711434ab
github.com/mitchellh/mapstructure v1.1.2
golang.org/x/net v0.7.0
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45

2
go.sum
View File

@ -1,6 +1,8 @@
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=

80
test/bb-mock-server/go/api_default.go
View File

@ -10,7 +10,12 @@
package swagger
import (
"encoding/json"
"net/http"
"strconv"
"strings"
"github.com/gorilla/mux"
)
func AddGroupToUser(w http.ResponseWriter, r *http.Request) {
@ -54,6 +59,27 @@ func CountPullRequestTasks(w http.ResponseWriter, r *http.Request) {
}
func Create(w http.ResponseWriter, r *http.Request) {
repositorySlug := mux.Vars(r)["repositorySlug"]
if strings.Compare(repositorySlug, "repo1_test1") == 0 {
HandleError(w, http.StatusBadRequest, map[string]interface{}{"errors": []interface{}{
map[string]interface{}{
"context": nil,
"message": "title must be supplied for this request",
"exceptionName": nil,
},
}})
return
} else if strings.Compare(repositorySlug, "repo1_test2") == 0 {
HandleError(w, http.StatusNotFound, map[string]interface{}{"errors": []interface{}{
map[string]interface{}{
"context": nil,
"message": "Repository \"repo1\" of project with key \"PROJ\" has no branch \"refs/heads/feature\"",
"exceptionName": "com.atlassian.bitbucket.commit.NoSuchCommitException",
},
}})
return
}
HandleRequest(w, r)
}
@ -62,10 +88,37 @@ func CreateBranch(w http.ResponseWriter, r *http.Request) {
}
func CreateComment(w http.ResponseWriter, r *http.Request) {
commit_id := mux.Vars(r)["commitId"]
if strings.Compare(commit_id, "657f55ce41710f9bfde15c374837136728fae9d9e0eca0b97cb7bfea5095af30") == 0 {
HandleError(w, http.StatusNotFound, map[string]interface{}{"errors": []interface{}{
map[string]interface{}{
"context": nil,
"message": "Commit '657f55ce41710f9bfde15c374837136728fae9d9e0eca0b97cb7bfea5095af30' does not exist in repository 'repo1'.",
"exceptionName": "com.atlassian.bitbucket.commit.NoSuchCommitException",
},
}})
return
}
HandleRequest(w, r)
}
func CreateCommentCommit(w http.ResponseWriter, r *http.Request) {
pr_id := mux.Vars(r)["pullRequestId"]
if id, err := strconv.Atoi(pr_id); err != nil {
w.WriteHeader(http.StatusBadRequest)
return
} else if id == 1 {
HandleError(w, http.StatusNotFound, map[string]interface{}{"errors": []interface{}{
map[string]interface{}{
"context": nil,
"message": "Pull request 1 does not exist in PROJ/repo1.",
"exceptionName": "com.atlassian.bitbucket.pull.NoSuchPullRequestException",
},
}})
return
}
HandleRequest(w, r)
}
@ -102,9 +155,32 @@ func Decline(w http.ResponseWriter, r *http.Request) {
}
func Delete(w http.ResponseWriter, r *http.Request) {
pr_id := mux.Vars(r)["pullRequestId"]
if id, err := strconv.Atoi(pr_id); err != nil {
w.WriteHeader(http.StatusBadRequest)
return
} else if id < 0 {
HandleError(w, http.StatusNotFound, map[string]interface{}{"errors": []interface{}{
map[string]interface{}{
"context": nil,
"message": "No pull request exists with ID -1 for this repository 1",
"exceptionName": "com.atlassian.bitbucket.pull.NoSuchPullRequestException",
},
}})
return
}
HandleRequest(w, r)
}
func HandleError(w http.ResponseWriter, httpStatus int, body interface{}) {
w.WriteHeader(httpStatus)
bodyData, err := json.Marshal(body)
if err == nil {
w.Write(bodyData)
}
}
func DeleteAvatar(w http.ResponseWriter, r *http.Request) {
HandleRequest(w, r)
}
@ -798,3 +874,7 @@ func SetCommitStatus(w http.ResponseWriter, r *http.Request) {
func SearchCode(w http.ResponseWriter, r *http.Request) {
HandleRequest(w, r)
}
func GetSSHKeys(w http.ResponseWriter, r *http.Request) {
HandleRequest(w, r)
}

7
test/bb-mock-server/go/routers.go
View File

@ -1426,4 +1426,11 @@ var routes = Routes{
"/rest/search/latest/search",
SearchCode,
},
Route{
"GetSSHKeys",
strings.ToUpper("Get"),
"/rest/ssh/1.0/keys",
GetSSHKeys,
},
}

10
test/bb-mock-server/go/util.go
View File

@ -2,7 +2,6 @@ package swagger
import (
"fmt"
"io/ioutil"
"log"
"net/http"
"os"
@ -19,14 +18,9 @@ func HandleRequest(w http.ResponseWriter, r *http.Request) {
if routeName != "" {
handlerName = routeName
}
path, err := route.GetPathTemplate()
if err == nil {
fmt.Println(path)
}
}
fmt.Println(handlerName)
fileName := fmt.Sprintf("mocked_responses/%s.json", handlerName)
response, err := ioutil.ReadFile(fileName)
fileName := fmt.Sprintf("test/bb-mock-server/mocked_responses/%s.json", handlerName)
response, err := os.ReadFile(fileName)
if err == nil {
w.Write(response)
} else {

1
test/bb-mock-server/mocked_responses/CreateComment.json Normal file
View File

@ -0,0 +1 @@
{}

1
test/bb-mock-server/mocked_responses/CreateCommentCommit.json Normal file
View File

@ -0,0 +1 @@
{}

13
test/bb-mock-server/mocked_responses/GetSSHKeys.json Normal file
View File

@ -0,0 +1,13 @@
{
"size": 1,
"limit": 25,
"isLastPage": true,
"values": [
{
"id": 1,
"text": "ssh-rsa AAAAB3... me@127.0.0.1",
"label": "me@127.0.0.1"
}
],
"start": 0
}

17
test/bb-mock-server/mocked_responses/GetUser.json
View File

@ -1 +1,16 @@
{}
{
"name": "admin",
"emailAddress": "admin@example.com",
"id": 1,
"displayName": "admin",
"active": true,
"slug": "admin",
"type": "NORMAL",
"links": {
"self": [
{
"href": "http://localhost:7990/users/admin"
}
]
}
}

16
test/bb-mock-server/mocked_responses/SearchCode.json Normal file
View File

@ -0,0 +1,16 @@
{
"query": {
"substituted": false
},
"code": {
"category": "primary",
"count": 0,
"isLastPage": true,
"nextStart": 10,
"start": 0,
"values": []
},
"scope": {
"type": "GLOBAL"
}
}