Skip to content

Commit

Permalink
up: use goutil/testutil/assert instead of stretchr/testify
Browse files Browse the repository at this point in the history
  • Loading branch information
@inhere
inhere committed Aug 9, 2022
1 parent 8a0ce50 commit 11e00e7
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go_version: [1.14, 1.15, 1.16, 1.17]
go_version: [1.15, 1.16, 1.17, 1.18]
os: [ubuntu-latest]

steps:
Expand Down
7 changes: 2 additions & 5 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
module github.com/gookit/greq

go 1.15
go 1.16

require (
github.com/gookit/goutil v0.5.7
github.com/stretchr/testify v1.8.0
)
require github.com/gookit/goutil v0.5.7
1 change: 0 additions & 1 deletion go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXR
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
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/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
Expand Down
20 changes: 10 additions & 10 deletions hireq_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/gookit/goutil/dump"
"github.com/gookit/goutil/fsutil"
"github.com/gookit/goutil/netutil/httpreq"
"github.com/gookit/goutil/testutil/assert"
"github.com/gookit/greq"
"github.com/stretchr/testify/assert"
)

var testBaseURL = "https://httpbin.org"
Expand Down Expand Up @@ -49,11 +49,11 @@ func TestHReq_Doer(t *testing.T) {
UserAgent("custom-client/1.0").
Do("/get", "GET")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())

err = resp.Write(buf)
assert.NoError(t, err)
assert.NoErr(t, err)
dump.P(buf.String())
}

Expand All @@ -62,34 +62,34 @@ func TestHReq_Send(t *testing.T) {
UserAgent("custom-client/1.0").
Send("/get")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.False(t, resp.IsFail())

retMp := make(map[string]interface{})
err = resp.Decode(&retMp)
assert.NoError(t, err)
assert.NoErr(t, err)
dump.P(retMp)

assert.Contains(t, retMp, "headers")

headers := retMp["headers"].(map[string]interface{})
assert.Contains(t, headers, "User-Agent")
assert.Equal(t, "custom-client/1.0", headers["User-Agent"])
assert.Eq(t, "custom-client/1.0", headers["User-Agent"])
}

func TestHReq_GetDo(t *testing.T) {
resp, err := greq.New(testBaseURL).
JSONType().
GetDo("/get")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.True(t, resp.IsSuccessful())

retMp := make(map[string]interface{})
err = resp.Decode(&retMp)
assert.NoError(t, err)
assert.NoErr(t, err)
dump.P(retMp)
}

Expand All @@ -98,13 +98,13 @@ func TestHReq_PostDo(t *testing.T) {
JSONType().
PostDo("/post")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.True(t, resp.IsSuccessful())

retMp := make(map[string]interface{})
err = resp.Decode(&retMp)
assert.NoError(t, err)
assert.NoErr(t, err)
dump.P(retMp)
}

Expand Down
10 changes: 5 additions & 5 deletions middle_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/gookit/goutil/dump"
"github.com/gookit/goutil/netutil/httpreq"
"github.com/gookit/goutil/testutil/assert"
"github.com/gookit/greq"
"github.com/stretchr/testify/assert"
)

type mid1 struct {
Expand Down Expand Up @@ -38,11 +38,11 @@ func TestHReq_Use_Middleware(t *testing.T) {
Uses(&mid1{}, greq.MiddleFunc(mid2)).
GetDo("/get")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())

err = resp.Write(buf)
assert.NoError(t, err)
assert.NoErr(t, err)

dump.P(buf.String())
}
Expand All @@ -60,7 +60,7 @@ func TestHReq_Use_MiddleFunc(t *testing.T) {
Middleware(mid0).
PutDo("/get")

assert.NoError(t, err)
assert.NoErr(t, err)
sc := resp.StatusCode
assert.True(t, httpreq.IsOK(sc))

Expand Down Expand Up @@ -98,7 +98,7 @@ func TestHReq_Use_Multi_MiddleFunc(t *testing.T) {
Middleware(mid0, mid1, mid2).
PatchDo("/get")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())

fmt.Println(buf.String())
Expand Down
4 changes: 2 additions & 2 deletions resp_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import (
"fmt"
"testing"

"github.com/gookit/goutil/testutil/assert"
"github.com/gookit/greq"
"github.com/stretchr/testify/assert"
)

func TestResponse_String(t *testing.T) {
resp, err := greq.New(testBaseURL).
UserAgent("custom-client/1.0").
GetDo("/get")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.False(t, resp.IsFail())

Expand Down
34 changes: 17 additions & 17 deletions std_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"

"github.com/gookit/goutil/dump"
"github.com/gookit/goutil/testutil/assert"
"github.com/gookit/greq"
"github.com/stretchr/testify/assert"
)

func init() {
Expand All @@ -16,13 +16,13 @@ func init() {
func TestGetDo(t *testing.T) {
resp, err := greq.GetDo("/get")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.True(t, resp.IsSuccessful())

retMp := make(map[string]interface{})
err = resp.Decode(&retMp)
assert.NoError(t, err)
assert.NoErr(t, err)
dump.P(retMp)
}

Expand All @@ -34,74 +34,74 @@ func TestGetDo_with_QueryParams(t *testing.T) {
}).
GetDo("/get")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.True(t, resp.IsSuccessful())
assert.True(t, resp.IsJSONType())

retMp := make(map[string]interface{})
err = resp.Decode(&retMp)
assert.NoError(t, err)
assert.NoErr(t, err)
dump.P(retMp)
}

func TestPostDo(t *testing.T) {
resp, err := greq.PostDo("/post")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.True(t, resp.IsSuccessful())

retMp := make(map[string]interface{})
err = resp.Decode(&retMp)
assert.NoError(t, err)
assert.NoErr(t, err)
dump.P(retMp)
}

func TestPutDo(t *testing.T) {
resp, err := greq.PutDo("/put")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.True(t, resp.IsSuccessful())

retMp := make(map[string]interface{})
err = resp.Decode(&retMp)
assert.NoError(t, err)
assert.NoErr(t, err)
dump.P(retMp)
}

func TestPatchDo(t *testing.T) {
resp, err := greq.PatchDo("/patch")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.True(t, resp.IsSuccessful())

retMp := make(map[string]interface{})
err = resp.Decode(&retMp)
assert.NoError(t, err)
assert.NoErr(t, err)
dump.P(retMp)
}

func TestDeleteDo(t *testing.T) {
resp, err := greq.DeleteDo("/delete")

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.True(t, resp.IsSuccessful())

retMp := make(map[string]interface{})
err = resp.Decode(&retMp)
assert.NoError(t, err)
assert.NoErr(t, err)
dump.P(retMp)
}

func TestHeadDo(t *testing.T) {
resp, err := greq.Reset().HeadDo("/")
fmt.Println(resp.String())

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.True(t, resp.IsSuccessful())
assert.False(t, resp.IsEmptyBody())
Expand All @@ -113,7 +113,7 @@ func TestOptionsDo(t *testing.T) {
resp, err := greq.OptionsDo("/")
fmt.Println(resp.String())

assert.NoError(t, err)
assert.NoErr(t, err)
assert.True(t, resp.IsOK())
assert.True(t, resp.IsEmptyBody())
assert.True(t, resp.IsSuccessful())
Expand All @@ -126,13 +126,13 @@ func TestTraceDo(t *testing.T) {
resp, err := greq.TraceDo("/")
fmt.Println(resp.String())

assert.NoError(t, err)
assert.NoErr(t, err)
// assert.True(t, resp.IsNoBody())
}

func TestConnectDo(t *testing.T) {
resp, err := greq.ConnectDo("/")
fmt.Println(resp.String())

assert.NoError(t, err)
assert.NoErr(t, err)
}

0 comments on commit 11e00e7

Please sign in to comment.