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

Merge pull request #52 from gfleury/ParseError

Browse Source 
Adding error parser
This commit is contained in:
George Fleury 2020-03-17 11:25:09 -03:00 committed by GitHub
commit 672adbf0aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 458 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api_response.go
View File

@ -6,6 +6,7 @@ package bitbucketv1
import (
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"strings"
@ -492,9 +493,14 @@ func NewAPIResponse(r *http.Response) *APIResponse {
}
// NewAPIResponseWithError create new erroneous API response from http.response and error
func NewAPIResponseWithError(r *http.Response, err error) (*APIResponse, error) {
func NewAPIResponseWithError(r *http.Response, bodyBytes []byte, err error) (*APIResponse, error) {
response := &APIResponse{Response: r, Message: strings.Replace(err.Error(), "\"", "", -1)}
if bodyBytes != nil {
parseErr := json.Unmarshal(bodyBytes, &response.Values)
if parseErr != nil {
err = fmt.Errorf("%s ParseError: %v", err.Error(), parseErr)
}
}
return response, err
}

3
api_response_test.go
View File

@ -826,6 +826,7 @@ func TestNewAPIResponse(t *testing.T) {
func TestNewAPIResponseWithError(t *testing.T) {
type args struct {
r *http.Response
b []byte
err error
}
tests := []struct {
@ -838,7 +839,7 @@ func TestNewAPIResponseWithError(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := NewAPIResponseWithError(tt.args.r, tt.args.err)
got, err := NewAPIResponseWithError(tt.args.r, tt.args.b, tt.args.err)
if (err != nil) != tt.wantErr {
t.Errorf("NewAPIResponseWithError() error = %v, wantErr %v", err, tt.wantErr)
return

804
default_api.go
View File

File diff suppressed because it is too large Load Diff

48
default_api_test.go
View File

@ -436,7 +436,17 @@ func TestDefaultApiService_Create(t *testing.T) {
repositorySlug: "repo1",
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 , Body: {errors:[{context:null,message:title must be supplied for this request,exceptionName:null}]}",
Values: map[string]interface{}{
"errors": []interface{}{
map[string]interface{}{
"context": nil,
"message": "title must be supplied for this request",
"exceptionName": nil,
},
},
},
},
true, true},
{"ValidRequestNoBranch", fields{client: generateConfigRealLocalServer()},
args{projectKey: "PROJ",
@ -469,7 +479,17 @@ 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 , Body: {errors:[{context:null,message:Repository \repo1\ of project with key \PROJ\ has no branch \refs/heads/feature\,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException}]}`,
Values: 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",
},
},
},
},
true, true},
}
for _, tt := range tests {
@ -516,7 +536,17 @@ func TestDefaultApiService_CreatePullRequest(t *testing.T) {
localVarOptionals: PullRequest{},
},
&APIResponse{
Message: "Status: 400 , Body: {errors:[{context:null,message:title must be supplied for this request,exceptionName:null}]}"},
Message: "Status: 400 , Body: {errors:[{context:null,message:title must be supplied for this request,exceptionName:null}]}",
Values: map[string]interface{}{
"errors": []interface{}{
map[string]interface{}{
"context": nil,
"message": "title must be supplied for this request",
"exceptionName": nil,
},
},
},
},
true, true},
{"ValidRequestNoBranch", fields{client: generateConfigRealLocalServer()},
args{projectKey: "PROJ",
@ -548,7 +578,17 @@ 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 , Body: {errors:[{context:null,message:Repository \repo1\ of project with key \PROJ\ has no branch \refs/heads/feature\,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException}]}`,
Values: 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",
},
},
},
},
true, true},
}
for _, tt := range tests {