Refactor tests

mercadopago · Feb 9, 2024 · 16c25a2 · 16c25a2
1 parent 5bce1d7
commit 16c25a2
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 63 deletions.
diff --git a/pkg/payment/payment.go b/pkg/payment/payment.go
@@ -8,9 +8,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mercadopago/sdk-go/pkg/credential"
+	"github.com/mercadopago/sdk-go/pkg/config"
 	"github.com/mercadopago/sdk-go/pkg/internal/httpclient"
-	"github.com/mercadopago/sdk-go/pkg/option"
 )
 
 const (
@@ -52,17 +51,13 @@ type Client interface {
 
 // client is the implementation of Client.
 type client struct {
-	credential *credential.Credential
-	config     *option.ClientOptions
+	config *config.Config
 }
 
 // NewClient returns a new Payments API Client.
-func NewClient(cdt *credential.Credential, opts ...option.ClientOption) Client {
-	c := option.ApplyClientOptions(opts...)
-
+func NewClient(c *config.Config) Client {
 	return &client{
-		credential: cdt,
-		config:     c,
+		config: c,
 	}
 }
 
@@ -77,7 +72,7 @@ func (c *client) Create(ctx context.Context, dto Request) (*Response, error) {
 		return nil, fmt.Errorf("error creating request: %w", err)
 	}
 
-	res, err := httpclient.Send(ctx, c.credential, c.config.Requester, req)
+	res, err := httpclient.Send(ctx, c.config, req)
 	if err != nil {
 		return nil, err
 	}
@@ -97,7 +92,7 @@ func (c *client) Search(ctx context.Context, dto SearchRequest) (*SearchResponse
 		return nil, fmt.Errorf("error creating request: %w", err)
 	}
 
-	res, err := httpclient.Send(ctx, c.credential, c.config.Requester, req)
+	res, err := httpclient.Send(ctx, c.config, req)
 	if err != nil {
 		return nil, err
 	}
@@ -118,7 +113,7 @@ func (c *client) Get(ctx context.Context, id int64) (*Response, error) {
 		return nil, fmt.Errorf("error creating request: %w", err)
 	}
 
-	res, err := httpclient.Send(ctx, c.credential, c.config.Requester, req)
+	res, err := httpclient.Send(ctx, c.config, req)
 	if err != nil {
 		return nil, err
 	}
@@ -144,7 +139,7 @@ func (c *client) Cancel(ctx context.Context, id int64) (*Response, error) {
 		return nil, fmt.Errorf("error creating request: %w", err)
 	}
 
-	res, err := httpclient.Send(ctx, c.credential, c.config.Requester, req)
+	res, err := httpclient.Send(ctx, c.config, req)
 	if err != nil {
 		return nil, err
 	}
@@ -170,7 +165,7 @@ func (c *client) Capture(ctx context.Context, id int64) (*Response, error) {
 		return nil, fmt.Errorf("error creating request: %w", err)
 	}
 
-	res, err := httpclient.Send(ctx, c.credential, c.config.Requester, req)
+	res, err := httpclient.Send(ctx, c.config, req)
 	if err != nil {
 		return nil, err
 	}
@@ -196,7 +191,7 @@ func (c *client) CaptureAmount(ctx context.Context, id int64, amount float64) (*
 		return nil, fmt.Errorf("error creating request: %w", err)
 	}
 
-	res, err := httpclient.Send(ctx, c.credential, c.config.Requester, req)
+	res, err := httpclient.Send(ctx, c.config, req)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/payment/payment_test.go b/pkg/payment/payment_test.go
@@ -11,22 +11,18 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mercadopago/sdk-go/pkg/credential"
+	"github.com/mercadopago/sdk-go/pkg/config"
 	"github.com/mercadopago/sdk-go/pkg/internal/httpclient"
-	"github.com/mercadopago/sdk-go/pkg/option"
 )
 
 var (
-	cred, _ = credential.New("")
-
 	createResponseJSON, _ = os.Open("../../resources/mocks/payment/create_response.json")
 	createResponse, _     = io.ReadAll(createResponseJSON)
 )
 
 func TestCreate(t *testing.T) {
 	type fields struct {
-		credential *credential.Credential
-		config     *option.ClientOptions
+		config *config.Config
 	}
 	type args struct {
 		ctx context.Context
@@ -42,8 +38,7 @@ func TestCreate(t *testing.T) {
 		{
 			name: "should_fail_to_marshal_dto",
 			fields: fields{
-				credential: cred,
-				config:     nil,
+				config: nil,
 			},
 			args: args{
 				ctx: nil,
@@ -59,8 +54,7 @@ func TestCreate(t *testing.T) {
 		{
 			name: "should_fail_to_create_request",
 			fields: fields{
-				credential: cred,
-				config:     nil,
+				config: nil,
 			},
 			args: args{
 				ctx: nil,
@@ -71,16 +65,13 @@ func TestCreate(t *testing.T) {
 		{
 			name: "should_fail_to_send_request",
 			fields: fields{
-				credential: cred,
-				config: option.ApplyClientOptions(
-					option.WithCustomClient(
-						&httpclient.Mock{
-							DoMock: func(req *http.Request) (*http.Response, error) {
-								return nil, fmt.Errorf("some error")
-							},
+				config: &config.Config{
+					HTTPClient: &httpclient.Mock{
+						DoMock: func(req *http.Request) (*http.Response, error) {
+							return nil, fmt.Errorf("some error")
 						},
-					),
-				),
+					},
+				},
 			},
 			args: args{
 				ctx: context.Background(),
@@ -91,20 +82,17 @@ func TestCreate(t *testing.T) {
 		{
 			name: "should_fail_to_unmarshaling_response",
 			fields: fields{
-				credential: cred,
-				config: option.ApplyClientOptions(
-					option.WithCustomClient(
-						&httpclient.Mock{
-							DoMock: func(req *http.Request) (*http.Response, error) {
-								stringReader := strings.NewReader("invalid json")
-								stringReadCloser := io.NopCloser(stringReader)
-								return &http.Response{
-									Body: stringReadCloser,
-								}, nil
-							},
+				config: &config.Config{
+					HTTPClient: &httpclient.Mock{
+						DoMock: func(req *http.Request) (*http.Response, error) {
+							stringReader := strings.NewReader("invalid json")
+							stringReadCloser := io.NopCloser(stringReader)
+							return &http.Response{
+								Body: stringReadCloser,
+							}, nil
 						},
-					),
-				),
+					},
+				},
 			},
 			args: args{
 				ctx: context.Background(),
@@ -115,20 +103,17 @@ func TestCreate(t *testing.T) {
 		{
 			name: "should_return_formatted_response",
 			fields: fields{
-				credential: cred,
-				config: option.ApplyClientOptions(
-					option.WithCustomClient(
-						&httpclient.Mock{
-							DoMock: func(req *http.Request) (*http.Response, error) {
-								stringReader := strings.NewReader(string(createResponse))
-								stringReadCloser := io.NopCloser(stringReader)
-								return &http.Response{
-									Body: stringReadCloser,
-								}, nil
-							},
+				config: &config.Config{
+					HTTPClient: &httpclient.Mock{
+						DoMock: func(req *http.Request) (*http.Response, error) {
+							stringReader := strings.NewReader(string(createResponse))
+							stringReadCloser := io.NopCloser(stringReader)
+							return &http.Response{
+								Body: stringReadCloser,
+							}, nil
 						},
-					),
-				),
+					},
+				},
 			},
 			args: args{
 				ctx: context.Background(),
@@ -174,8 +159,7 @@ func TestCreate(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			c := &client{
-				credential: tt.fields.credential,
-				config:     tt.fields.config,
+				config: tt.fields.config,
 			}
 			got, err := c.Create(tt.args.ctx, tt.args.dto)
 			gotErr := ""

diff --git a/pkg/paymentmethod/client_test.go b/pkg/paymentmethod/client_test.go
@@ -80,7 +80,7 @@ func TestList(t *testing.T) {
 				ctx: context.Background(),
 			},
 			want:    nil,
-			wantErr: "invalid character 'i' looking for beginning of value",
+			wantErr: "error unmarshaling response: invalid character 'i' looking for beginning of value",
 		},
 		{
 			name: "should_return_formatted_response",