Skip to content

v1.2.2 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 10, 2025
Merged

v1.2.2 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2846162
replace lvan100/go-assert with go-spring/gs-assert
lvan100 Aug 1, 2025
73d1495
replace uber-go/mock with go-spring/gs-mock
lvan100 Aug 1, 2025
e4f5575
refactor(log): update log tag
lvan100 Aug 8, 2025
ab02a57
refactor(gs_app): wait job exiting
lvan100 Aug 9, 2025
e2d5581
refactor(gs_app): add log destroy
lvan100 Aug 10, 2025
0184eb7
build: update Go-Spring version
lvan100 Aug 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions conf/bind_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"testing"
"time"

"github.com/go-spring/gs-assert/assert"
"github.com/go-spring/spring-core/conf"
"github.com/lvan100/go-assert"
"github.com/spf13/cast"
)

Expand Down Expand Up @@ -71,7 +71,7 @@ func TestConverter(t *testing.T) {

t.Run("success", func(t *testing.T) {
err := conf.New().Bind(&s)
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, s.Time).Equal(time.Date(2025, 2, 1, 0, 0, 0, 0, time.UTC))
assert.That(t, s.Duration).Equal(10 * time.Second)
})
Expand All @@ -90,7 +90,7 @@ func TestSplitter(t *testing.T) {
t.Run("success", func(t *testing.T) {
var points []image.Point
err := conf.New().Bind(&points, "${:=(1,2)(3,4)}>>PointSplitter")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, points).Equal([]image.Point{{X: 1, Y: 2}, {X: 3, Y: 4}})
})

Expand All @@ -111,19 +111,19 @@ func TestParseTag(t *testing.T) {

t.Run("normal", func(t *testing.T) {
tag, err := conf.ParseTag("${a}")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, tag.String()).Equal("${a}")
})

t.Run("default", func(t *testing.T) {
tag, err := conf.ParseTag("${a:=123}")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, tag.String()).Equal("${a:=123}")
})

t.Run("splitter", func(t *testing.T) {
tag, err := conf.ParseTag("${a:=1,2,3}>>splitter")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, tag.String()).Equal("${a:=1,2,3}>>splitter")
})

Expand All @@ -148,14 +148,14 @@ func TestBindParam(t *testing.T) {
t.Run("root", func(t *testing.T) {
var param conf.BindParam
err := param.BindTag("${ROOT}", "")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, param).Equal(conf.BindParam{})
})

t.Run("normal", func(t *testing.T) {
var param conf.BindParam
err := param.BindTag("${a:=1,2,3}>>splitter", "")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, param).Equal(conf.BindParam{
Key: "a",
Path: "",
Expand All @@ -175,7 +175,7 @@ func TestBindParam(t *testing.T) {
Path: "Struct",
}
err := param.BindTag("${a:=1,2,3}>>splitter", "")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, param).Equal(conf.BindParam{
Key: "s.a",
Path: "Struct",
Expand All @@ -192,7 +192,7 @@ func TestBindParam(t *testing.T) {
t.Run("default", func(t *testing.T) {
var param conf.BindParam
err := param.BindTag("${:=1,2,3}>>splitter", "")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, param).Equal(conf.BindParam{
Key: "",
Path: "",
Expand Down Expand Up @@ -276,7 +276,7 @@ func TestProperties_Bind(t *testing.T) {
t.Run("unnamed default", func(t *testing.T) {
var s UnnamedDefault
err := conf.New().Bind(&s)
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, s).Equal(UnnamedDefault{
Strs: []string{"1", "2", "3"},
Ints: []int{},
Expand Down Expand Up @@ -440,7 +440,7 @@ func TestProperties_Bind(t *testing.T) {
err := conf.Map(map[string]any{
"v": "123",
}).Bind(&s)
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, s.int).Equal(0)
})

Expand All @@ -457,14 +457,14 @@ func TestProperties_Bind(t *testing.T) {
io.Reader
}
err := conf.New().Bind(&s)
assert.Nil(t, err)
assert.That(t, err).Nil()
})

t.Run("reflect.Value", func(t *testing.T) {
var i int
v := reflect.ValueOf(&i).Elem()
err := conf.New().Bind(v, "${:=3}")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, i).Equal(3)
})

Expand Down Expand Up @@ -535,38 +535,38 @@ func TestProperties_Bind(t *testing.T) {
}

p, err := conf.Load("./testdata/config/app.yaml")
assert.Nil(t, err)
assert.That(t, err).Nil()

err = p.Set("extra.intsV0", "")
assert.Nil(t, err)
assert.That(t, err).Nil()
err = p.Set("extra.intsV2", "1,2,3")
assert.Nil(t, err)
assert.That(t, err).Nil()
err = p.Set("prefix.extra.intsV2", "1,2,3")
assert.Nil(t, err)
assert.That(t, err).Nil()

err = p.Set("extra.mapV2.a", "1")
assert.Nil(t, err)
assert.That(t, err).Nil()
err = p.Set("extra.mapV2.b", "2")
assert.Nil(t, err)
assert.That(t, err).Nil()
err = p.Set("prefix.extra.mapV2.a", "1")
assert.Nil(t, err)
assert.That(t, err).Nil()
err = p.Set("prefix.extra.mapV2.b", "2")
assert.Nil(t, err)
assert.That(t, err).Nil()

var c DBConfig
err = p.Bind(&c)
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, c).Equal(expect)

err = p.Bind(&c, "${prefix}")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, c).Equal(expect)
})

t.Run("filter false", func(t *testing.T) {
var param conf.BindParam
err := param.BindTag("${ROOT}", "")
assert.Nil(t, err)
assert.That(t, err).Nil()

var s struct {
Value int `value:"${v:=3}"`
Expand All @@ -577,14 +577,14 @@ func TestProperties_Bind(t *testing.T) {
funcFilter(func(i any, param conf.BindParam) (bool, error) {
return false, nil
}))
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, s.Value).Equal(3)
})

t.Run("filter true", func(t *testing.T) {
var param conf.BindParam
err := param.BindTag("${ROOT}", "")
assert.Nil(t, err)
assert.That(t, err).Nil()

var s struct {
Value int `value:"${v:=3}"`
Expand All @@ -595,14 +595,14 @@ func TestProperties_Bind(t *testing.T) {
funcFilter(func(i any, param conf.BindParam) (bool, error) {
return true, nil
}))
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, s.Value).Equal(0)
})

t.Run("filter error", func(t *testing.T) {
var param conf.BindParam
err := param.BindTag("${ROOT}", "")
assert.Nil(t, err)
assert.That(t, err).Nil()

var s struct {
Value int `value:"${v:=3}"`
Expand Down
22 changes: 11 additions & 11 deletions conf/conf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ import (
"strings"
"testing"

"github.com/go-spring/gs-assert/assert"
"github.com/go-spring/spring-core/conf"
"github.com/lvan100/go-assert"
)

func TestProperties_Load(t *testing.T) {

t.Run("success", func(t *testing.T) {
p, err := conf.Load("./testdata/config/app.properties")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, p.Data()).Equal(map[string]string{
"properties.list[0]": "1",
"properties.list[1]": "2",
Expand Down Expand Up @@ -63,7 +63,7 @@ func TestProperties_Resolve(t *testing.T) {
"a.b.c": []string{"3"},
})
s, err := p.Resolve("${a.b.c[0]}")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, s).Equal("3")
})

Expand All @@ -72,14 +72,14 @@ func TestProperties_Resolve(t *testing.T) {
"a.b.c": []string{"3"},
})
s, err := p.Resolve("${x:=${a.b.c[0]}}")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, s).Equal("3")
})

t.Run("default", func(t *testing.T) {
p := conf.New()
s, err := p.Resolve("${a.b.c:=123}")
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, s).Equal("123")
})

Expand Down Expand Up @@ -124,8 +124,8 @@ func TestProperties_CopyTo(t *testing.T) {
"a.b.c[0]",
})

assert.True(t, p.Has("a.b.c"))
assert.True(t, p.Has("a.b.c[0]"))
assert.That(t, p.Has("a.b.c")).True()
assert.That(t, p.Has("a.b.c[0]")).True()
assert.That(t, p.Get("a.b.c[0]")).Equal("3")
assert.That(t, p.Data()).Equal(map[string]string{
"a.b.c[0]": "3",
Expand All @@ -139,16 +139,16 @@ func TestProperties_CopyTo(t *testing.T) {
"a.b.c[1]",
})

assert.True(t, s.Has("a.b.c"))
assert.True(t, s.Has("a.b.c[0]"))
assert.True(t, s.Has("a.b.c[1]"))
assert.That(t, s.Has("a.b.c")).True()
assert.That(t, s.Has("a.b.c[0]")).True()
assert.That(t, s.Has("a.b.c[1]")).True()
assert.That(t, s.Data()).Equal(map[string]string{
"a.b.c[0]": "4",
"a.b.c[1]": "5",
})

err := p.CopyTo(s)
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, s.Data()).Equal(map[string]string{
"a.b.c[0]": "3",
"a.b.c[1]": "5",
Expand Down
4 changes: 2 additions & 2 deletions conf/expr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package conf_test
import (
"testing"

"github.com/go-spring/gs-assert/assert"
"github.com/go-spring/spring-core/conf"
"github.com/lvan100/go-assert"
)

func TestExpr(t *testing.T) {
Expand All @@ -36,7 +36,7 @@ func TestExpr(t *testing.T) {
"a": 4,
})
err := p.Bind(&v)
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, 4).Equal(v.A)
})

Expand Down
4 changes: 2 additions & 2 deletions conf/reader/json/json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package json
import (
"testing"

"github.com/lvan100/go-assert"
"github.com/go-spring/gs-assert/assert"
)

func TestRead(t *testing.T) {
Expand All @@ -39,7 +39,7 @@ func TestRead(t *testing.T) {
"date": "2018-02-17",
"time": "2018-02-17T15:02:31+08:00"
}`))
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, r).Equal(map[string]any{
"empty": "",
"bool": false,
Expand Down
10 changes: 5 additions & 5 deletions conf/reader/prop/prop_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package prop
import (
"testing"

"github.com/lvan100/go-assert"
"github.com/go-spring/gs-assert/assert"
)

func TestRead(t *testing.T) {
Expand All @@ -34,7 +34,7 @@ func TestRead(t *testing.T) {
date=2018-02-17
time=2018-02-17T15:02:31+08:00
`))
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, r).Equal(map[string]any{
"empty": "",
"bool": "false",
Expand All @@ -53,7 +53,7 @@ func TestRead(t *testing.T) {
map.float=3.0
map.string=hello
`))
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, r).Equal(map[string]any{
"map.bool": "false",
"map.int": "3",
Expand All @@ -73,7 +73,7 @@ func TestRead(t *testing.T) {
array[1].float=0.2
array[1].string=hello
`))
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, r).Equal(map[string]any{
"array[0].bool": "false",
"array[0].int": "3",
Expand All @@ -98,7 +98,7 @@ func TestRead(t *testing.T) {
map.k2.float=0.2
map.k2.string=hello
`))
assert.Nil(t, err)
assert.That(t, err).Nil()
assert.That(t, r).Equal(map[string]any{
"map.k1.bool": "false",
"map.k1.int": "3",
Expand Down
Loading
Loading