Skip to content

Commit 13189a9

Browse files
lvan100lvan100
authored
Merge pull request #32 from lvan100/main
v1.2.2
2 parents ebf56fc + 0184eb7 commit 13189a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1097
-2502
lines changed

‎conf/bind_test.go‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"testing"
2626
"time"
2727

28+
"github.com/go-spring/gs-assert/assert"
2829
"github.com/go-spring/spring-core/conf"
29-
"github.com/lvan100/go-assert"
3030
"github.com/spf13/cast"
3131
)
3232

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

7272
t.Run("success", func(t *testing.T) {
7373
err := conf.New().Bind(&s)
74-
assert.Nil(t, err)
74+
assert.That(t, err).Nil()
7575
assert.That(t, s.Time).Equal(time.Date(2025, 2, 1, 0, 0, 0, 0, time.UTC))
7676
assert.That(t, s.Duration).Equal(10 * time.Second)
7777
})
@@ -90,7 +90,7 @@ func TestSplitter(t *testing.T) {
9090
t.Run("success", func(t *testing.T) {
9191
var points []image.Point
9292
err := conf.New().Bind(&points, "${:=(1,2)(3,4)}>>PointSplitter")
93-
assert.Nil(t, err)
93+
assert.That(t, err).Nil()
9494
assert.That(t, points).Equal([]image.Point{{X: 1, Y: 2}, {X: 3, Y: 4}})
9595
})
9696

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

112112
t.Run("normal", func(t *testing.T) {
113113
tag, err := conf.ParseTag("${a}")
114-
assert.Nil(t, err)
114+
assert.That(t, err).Nil()
115115
assert.That(t, tag.String()).Equal("${a}")
116116
})
117117

118118
t.Run("default", func(t *testing.T) {
119119
tag, err := conf.ParseTag("${a:=123}")
120-
assert.Nil(t, err)
120+
assert.That(t, err).Nil()
121121
assert.That(t, tag.String()).Equal("${a:=123}")
122122
})
123123

124124
t.Run("splitter", func(t *testing.T) {
125125
tag, err := conf.ParseTag("${a:=1,2,3}>>splitter")
126-
assert.Nil(t, err)
126+
assert.That(t, err).Nil()
127127
assert.That(t, tag.String()).Equal("${a:=1,2,3}>>splitter")
128128
})
129129

@@ -148,14 +148,14 @@ func TestBindParam(t *testing.T) {
148148
t.Run("root", func(t *testing.T) {
149149
var param conf.BindParam
150150
err := param.BindTag("${ROOT}", "")
151-
assert.Nil(t, err)
151+
assert.That(t, err).Nil()
152152
assert.That(t, param).Equal(conf.BindParam{})
153153
})
154154

155155
t.Run("normal", func(t *testing.T) {
156156
var param conf.BindParam
157157
err := param.BindTag("${a:=1,2,3}>>splitter", "")
158-
assert.Nil(t, err)
158+
assert.That(t, err).Nil()
159159
assert.That(t, param).Equal(conf.BindParam{
160160
Key: "a",
161161
Path: "",
@@ -175,7 +175,7 @@ func TestBindParam(t *testing.T) {
175175
Path: "Struct",
176176
}
177177
err := param.BindTag("${a:=1,2,3}>>splitter", "")
178-
assert.Nil(t, err)
178+
assert.That(t, err).Nil()
179179
assert.That(t, param).Equal(conf.BindParam{
180180
Key: "s.a",
181181
Path: "Struct",
@@ -192,7 +192,7 @@ func TestBindParam(t *testing.T) {
192192
t.Run("default", func(t *testing.T) {
193193
var param conf.BindParam
194194
err := param.BindTag("${:=1,2,3}>>splitter", "")
195-
assert.Nil(t, err)
195+
assert.That(t, err).Nil()
196196
assert.That(t, param).Equal(conf.BindParam{
197197
Key: "",
198198
Path: "",
@@ -276,7 +276,7 @@ func TestProperties_Bind(t *testing.T) {
276276
t.Run("unnamed default", func(t *testing.T) {
277277
var s UnnamedDefault
278278
err := conf.New().Bind(&s)
279-
assert.Nil(t, err)
279+
assert.That(t, err).Nil()
280280
assert.That(t, s).Equal(UnnamedDefault{
281281
Strs: []string{"1", "2", "3"},
282282
Ints: []int{},
@@ -440,7 +440,7 @@ func TestProperties_Bind(t *testing.T) {
440440
err := conf.Map(map[string]any{
441441
"v": "123",
442442
}).Bind(&s)
443-
assert.Nil(t, err)
443+
assert.That(t, err).Nil()
444444
assert.That(t, s.int).Equal(0)
445445
})
446446

@@ -457,14 +457,14 @@ func TestProperties_Bind(t *testing.T) {
457457
io.Reader
458458
}
459459
err := conf.New().Bind(&s)
460-
assert.Nil(t, err)
460+
assert.That(t, err).Nil()
461461
})
462462

463463
t.Run("reflect.Value", func(t *testing.T) {
464464
var i int
465465
v := reflect.ValueOf(&i).Elem()
466466
err := conf.New().Bind(v, "${:=3}")
467-
assert.Nil(t, err)
467+
assert.That(t, err).Nil()
468468
assert.That(t, i).Equal(3)
469469
})
470470

@@ -535,38 +535,38 @@ func TestProperties_Bind(t *testing.T) {
535535
}
536536

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

540540
err = p.Set("extra.intsV0", "")
541-
assert.Nil(t, err)
541+
assert.That(t, err).Nil()
542542
err = p.Set("extra.intsV2", "1,2,3")
543-
assert.Nil(t, err)
543+
assert.That(t, err).Nil()
544544
err = p.Set("prefix.extra.intsV2", "1,2,3")
545-
assert.Nil(t, err)
545+
assert.That(t, err).Nil()
546546

547547
err = p.Set("extra.mapV2.a", "1")
548-
assert.Nil(t, err)
548+
assert.That(t, err).Nil()
549549
err = p.Set("extra.mapV2.b", "2")
550-
assert.Nil(t, err)
550+
assert.That(t, err).Nil()
551551
err = p.Set("prefix.extra.mapV2.a", "1")
552-
assert.Nil(t, err)
552+
assert.That(t, err).Nil()
553553
err = p.Set("prefix.extra.mapV2.b", "2")
554-
assert.Nil(t, err)
554+
assert.That(t, err).Nil()
555555

556556
var c DBConfig
557557
err = p.Bind(&c)
558-
assert.Nil(t, err)
558+
assert.That(t, err).Nil()
559559
assert.That(t, c).Equal(expect)
560560

561561
err = p.Bind(&c, "${prefix}")
562-
assert.Nil(t, err)
562+
assert.That(t, err).Nil()
563563
assert.That(t, c).Equal(expect)
564564
})
565565

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

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

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

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

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

607607
var s struct {
608608
Value int `value:"${v:=3}"`

‎conf/conf_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ import (
2121
"strings"
2222
"testing"
2323

24+
"github.com/go-spring/gs-assert/assert"
2425
"github.com/go-spring/spring-core/conf"
25-
"github.com/lvan100/go-assert"
2626
)
2727

2828
func TestProperties_Load(t *testing.T) {
2929

3030
t.Run("success", func(t *testing.T) {
3131
p, err := conf.Load("./testdata/config/app.properties")
32-
assert.Nil(t, err)
32+
assert.That(t, err).Nil()
3333
assert.That(t, p.Data()).Equal(map[string]string{
3434
"properties.list[0]": "1",
3535
"properties.list[1]": "2",
@@ -63,7 +63,7 @@ func TestProperties_Resolve(t *testing.T) {
6363
"a.b.c": []string{"3"},
6464
})
6565
s, err := p.Resolve("${a.b.c[0]}")
66-
assert.Nil(t, err)
66+
assert.That(t, err).Nil()
6767
assert.That(t, s).Equal("3")
6868
})
6969

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

7979
t.Run("default", func(t *testing.T) {
8080
p := conf.New()
8181
s, err := p.Resolve("${a.b.c:=123}")
82-
assert.Nil(t, err)
82+
assert.That(t, err).Nil()
8383
assert.That(t, s).Equal("123")
8484
})
8585

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

127-
assert.True(t, p.Has("a.b.c"))
128-
assert.True(t, p.Has("a.b.c[0]"))
127+
assert.That(t, p.Has("a.b.c")).True()
128+
assert.That(t, p.Has("a.b.c[0]")).True()
129129
assert.That(t, p.Get("a.b.c[0]")).Equal("3")
130130
assert.That(t, p.Data()).Equal(map[string]string{
131131
"a.b.c[0]": "3",
@@ -139,16 +139,16 @@ func TestProperties_CopyTo(t *testing.T) {
139139
"a.b.c[1]",
140140
})
141141

142-
assert.True(t, s.Has("a.b.c"))
143-
assert.True(t, s.Has("a.b.c[0]"))
144-
assert.True(t, s.Has("a.b.c[1]"))
142+
assert.That(t, s.Has("a.b.c")).True()
143+
assert.That(t, s.Has("a.b.c[0]")).True()
144+
assert.That(t, s.Has("a.b.c[1]")).True()
145145
assert.That(t, s.Data()).Equal(map[string]string{
146146
"a.b.c[0]": "4",
147147
"a.b.c[1]": "5",
148148
})
149149

150150
err := p.CopyTo(s)
151-
assert.Nil(t, err)
151+
assert.That(t, err).Nil()
152152
assert.That(t, s.Data()).Equal(map[string]string{
153153
"a.b.c[0]": "3",
154154
"a.b.c[1]": "5",

‎conf/expr_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package conf_test
1919
import (
2020
"testing"
2121

22+
"github.com/go-spring/gs-assert/assert"
2223
"github.com/go-spring/spring-core/conf"
23-
"github.com/lvan100/go-assert"
2424
)
2525

2626
func TestExpr(t *testing.T) {
@@ -36,7 +36,7 @@ func TestExpr(t *testing.T) {
3636
"a": 4,
3737
})
3838
err := p.Bind(&v)
39-
assert.Nil(t, err)
39+
assert.That(t, err).Nil()
4040
assert.That(t, 4).Equal(v.A)
4141
})
4242

‎conf/reader/json/json_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package json
1919
import (
2020
"testing"
2121

22-
"github.com/lvan100/go-assert"
22+
"github.com/go-spring/gs-assert/assert"
2323
)
2424

2525
func TestRead(t *testing.T) {
@@ -39,7 +39,7 @@ func TestRead(t *testing.T) {
3939
"date": "2018-02-17",
4040
"time": "2018-02-17T15:02:31+08:00"
4141
}`))
42-
assert.Nil(t, err)
42+
assert.That(t, err).Nil()
4343
assert.That(t, r).Equal(map[string]any{
4444
"empty": "",
4545
"bool": false,

‎conf/reader/prop/prop_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package prop
1919
import (
2020
"testing"
2121

22-
"github.com/lvan100/go-assert"
22+
"github.com/go-spring/gs-assert/assert"
2323
)
2424

2525
func TestRead(t *testing.T) {
@@ -34,7 +34,7 @@ func TestRead(t *testing.T) {
3434
date=2018-02-17
3535
time=2018-02-17T15:02:31+08:00
3636
`))
37-
assert.Nil(t, err)
37+
assert.That(t, err).Nil()
3838
assert.That(t, r).Equal(map[string]any{
3939
"empty": "",
4040
"bool": "false",
@@ -53,7 +53,7 @@ func TestRead(t *testing.T) {
5353
map.float=3.0
5454
map.string=hello
5555
`))
56-
assert.Nil(t, err)
56+
assert.That(t, err).Nil()
5757
assert.That(t, r).Equal(map[string]any{
5858
"map.bool": "false",
5959
"map.int": "3",
@@ -73,7 +73,7 @@ func TestRead(t *testing.T) {
7373
array[1].float=0.2
7474
array[1].string=hello
7575
`))
76-
assert.Nil(t, err)
76+
assert.That(t, err).Nil()
7777
assert.That(t, r).Equal(map[string]any{
7878
"array[0].bool": "false",
7979
"array[0].int": "3",
@@ -98,7 +98,7 @@ func TestRead(t *testing.T) {
9898
map.k2.float=0.2
9999
map.k2.string=hello
100100
`))
101-
assert.Nil(t, err)
101+
assert.That(t, err).Nil()
102102
assert.That(t, r).Equal(map[string]any{
103103
"map.k1.bool": "false",
104104
"map.k1.int": "3",

0 commit comments

Comments
 (0)