add test (#39)

Author: davidji99

bitbucket/bitbucket.go

@@ -475,12 +475,6 @@ func addQueryParams(s string, opts ...interface{}) (string, error) {
 
 	fulQS := url.Values{}
 	for _, opt := range opts {
-		//// Handle scenario when no opts are passed which means opts is a slice containing one empty slice.
-		//v := reflect.ValueOf(opt)
-		//if v.Kind() == reflect.Slice && v.IsNil() {
-		//	return s, nil
-		//}
-
 		qs, err := query.Values(opt)
 		if err != nil {
 			return s, err

bitbucket/bitbucket_test.go

@@ -6,15 +6,15 @@ import (
 	"testing"
 )
 
-func TestAddOptions_NoOpts(t *testing.T) {
+func TestAddQueryParams_NoOpts(t *testing.T) {
 	urlStr := fmt.Sprintf("/repositories/%s/%s", "bOrg", "bRepo")
 	urlStr, addOptErr := addQueryParams(urlStr)
 
 	assert.Nil(t, addOptErr)
 	assert.Equal(t, "/repositories/bOrg/bRepo", urlStr)
 }
 
-func TestAddOptionsRedux_OneOpt(t *testing.T) {
+func TestAddQueryParams_OneOpt(t *testing.T) {
 	opt := &ListOpts{
 		Page:    int64(2),
 		Pagelen: int64(5),
@@ -26,7 +26,7 @@ func TestAddOptionsRedux_OneOpt(t *testing.T) {
 	assert.Equal(t, "/repositories/bOrg/bRepo?page=2&pagelen=5", urlStr)
 }
 
-func TestAddOptionsRedux_MultipleOpts(t *testing.T) {
+func TestAddQueryParams_MultipleOpts(t *testing.T) {
 	opt1 := &ListOpts{
 		Page:    int64(2),
 		Pagelen: int64(5),

bitbucket/gen-accessors.go

@@ -47,7 +47,7 @@ var (
 	}
 	// blacklistStruct lists structs to skip.
 	blacklistStruct = map[string]bool{
-		"Client": true,
+		"Client":        true,
 		"AcceptedError": true,
 	}
 )

bitbucket/helper_test.go

@@ -0,0 +1,22 @@
+package bitbucket
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestParseForResourceId_Valid(t *testing.T) {
+	regexExpression := `http[sS]?:\/\/.*\/2.0\/repositories\/.*\/.*\/versions/(\d+)`
+	expected := int64(354035)
+	result := parseForResourceID(regexExpression, "https://api.bitbucket.org/2.0/repositories/user/repo/versions/354035")
+
+	assert.Equal(t, &expected, result)
+}
+
+func TestParseForResourceId_Invalid(t *testing.T) {
+	regexExpression := `http[sS]?:\/\/.*\/2.0\/reposi1tories\/.*\/.*\/versions/(\d+)`
+	expected := int64(0)
+	result := parseForResourceID(regexExpression, "https://api.bitbucket.org/2.0/repositories/user/repo/versions/354035")
+
+	assert.Equal(t, &expected, result)
+}