Skip to content

Commit

Permalink
removing testify
Browse files Browse the repository at this point in the history
Signed-off-by: Alan Protasio <alanprot@gmail.com>
  • Loading branch information
alanprot committed Jun 13, 2023
1 parent 3d8a6b5 commit 7baa9c3
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 13 deletions.
31 changes: 23 additions & 8 deletions api-put-object_test.go
Expand Up @@ -20,10 +20,10 @@ import (
"context"
"encoding/base64"
"net/http"
"reflect"
"testing"

"github.com/minio/minio-go/v7/pkg/encrypt"
"github.com/stretchr/testify/require"
)

func TestPutObjectOptionsValidate(t *testing.T) {
Expand Down Expand Up @@ -82,7 +82,10 @@ func Test_SSEHeaders(t *testing.T) {
c, err := New("s3.amazonaws.com", &Options{
Transport: rt,
})
require.NoError(t, err)

if err != nil {
t.Error(err)
}

testCases := map[string]struct {
sse func() encrypt.ServerSide
Expand All @@ -96,7 +99,9 @@ func Test_SSEHeaders(t *testing.T) {
"sse": {
sse: func() encrypt.ServerSide {
s, err := encrypt.NewSSEKMS("keyId", nil)
require.NoError(t, err)
if err != nil {
t.Error(err)
}
return s
},
initiateMultipartUploadHeaders: http.Header{
Expand All @@ -108,7 +113,9 @@ func Test_SSEHeaders(t *testing.T) {
"sse with context": {
sse: func() encrypt.ServerSide {
s, err := encrypt.NewSSEKMS("keyId", "context")
require.NoError(t, err)
if err != nil {
t.Error(err)
}
return s
},
initiateMultipartUploadHeaders: http.Header{
Expand All @@ -128,7 +135,9 @@ func Test_SSEHeaders(t *testing.T) {
c.bucketLocCache.Set("test", "region")
c.initiateMultipartUpload(context.Background(), "test", "test", opts)
for s, vls := range tc.initiateMultipartUploadHeaders {
require.Equal(t, rt.request.Header[s], vls, "Header not match %v", s)
if !reflect.DeepEqual(rt.request.Header[s], vls) {
t.Errorf("Header %v are not equal, want: %v got %v", s, vls, rt.request.Header[s])
}
}

_, err := c.uploadPart(context.Background(), uploadPartParams{
Expand All @@ -139,16 +148,22 @@ func Test_SSEHeaders(t *testing.T) {
sse: opts.ServerSideEncryption,
})

require.NoError(t, err)
if err != nil {
t.Error(err)
}

for _, k := range tc.headerNotAllowedAfterInit {
require.Empty(t, rt.request.Header.Get(k), "header set %v", k)
if rt.request.Header.Get(k) != "" {
t.Errorf("header %v should not be set", k)
}
}

c.completeMultipartUpload(context.Background(), "test", "test", "upId", completeMultipartUpload{}, opts)

for _, k := range tc.headerNotAllowedAfterInit {
require.Empty(t, rt.request.Header.Get(k), "header set %v", k)
if rt.request.Header.Get(k) != "" {
t.Errorf("header %v should not be set", k)
}
}
})
}
Expand Down
4 changes: 0 additions & 4 deletions go.mod
Expand Up @@ -11,19 +11,15 @@ require (
github.com/minio/sha256-simd v1.0.1
github.com/rs/xid v1.5.0
github.com/sirupsen/logrus v1.9.2
github.com/stretchr/testify v1.7.0
golang.org/x/crypto v0.9.0
golang.org/x/net v0.10.0
gopkg.in/ini.v1 v1.67.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)
1 change: 0 additions & 1 deletion go.sum
Expand Up @@ -74,7 +74,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
Expand Down

0 comments on commit 7baa9c3

Please sign in to comment.