Skip to content

Commit 114a49f

Browse files
committed
Update dependencies
1 parent cd8f4f6 commit 114a49f

5 files changed

Lines changed: 38 additions & 26 deletions

File tree

destructor_test.go

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,19 @@ func TestDestructorFunc_DestroyWithError(t *testing.T) {
3434
}
3535

3636
func TestDestructorFunc_MustDestroyWithError(t *testing.T) {
37-
defer func() {
38-
v := recover()
39-
t.Logf("%+v", v)
40-
if v == nil {
41-
t.Fail()
42-
return
43-
}
44-
}()
45-
DestructorFunc(func() error {
46-
return kerror.New(nil, "test error")
47-
}).MustDestroy()
37+
const class = kerror.ECustom
38+
const message = "test error"
39+
err := kerror.Try(func() error {
40+
DestructorFunc(func() error {
41+
return kerror.New(class, message)
42+
}).MustDestroy()
43+
return nil
44+
})
45+
t.Logf("%+v", err)
46+
if kerror.ClassOf(err) != class || kerror.MessageOf(err) != message {
47+
t.Fail()
48+
return
49+
}
4850
}
4951

5052
func TestNoop(t *testing.T) {

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ module github.com/go-kata/kdone
33
go 1.14
44

55
require (
6-
github.com/go-kata/kerror v0.2.0
6+
github.com/go-kata/kerror v0.2.1
77
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ github.com/go-kata/kerror v0.1.4 h1:IQ18UqnrSOjG+dfbNLYkeiKsQHdsVP0BQLEkv/QoyQU=
1010
github.com/go-kata/kerror v0.1.4/go.mod h1:TtwtjetJ75COpTfrJBL9y2q4MEbDWt1r/FeF5M+5xlw=
1111
github.com/go-kata/kerror v0.2.0 h1:UlwoVTG5m8C+1k3znFd93G45joyJGdxTTGNYK7cdriU=
1212
github.com/go-kata/kerror v0.2.0/go.mod h1:TtwtjetJ75COpTfrJBL9y2q4MEbDWt1r/FeF5M+5xlw=
13+
github.com/go-kata/kerror v0.2.1 h1:fE5KsH5Dntrhmv1hWdc7/BActYUHkCPl7CjQI5kBfjA=
14+
github.com/go-kata/kerror v0.2.1/go.mod h1:TtwtjetJ75COpTfrJBL9y2q4MEbDWt1r/FeF5M+5xlw=

reaper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func NewReaper() *Reaper {
2121
// Assume passes the responsibility for calling the given destructor to this reaper.
2222
func (r *Reaper) Assume(dtor Destructor) error {
2323
if r == nil {
24-
kerror.NPE()
24+
kerror.Nil()
2525
return nil
2626
}
2727
if r.released {

reaper_test.go

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func newTestObjectWithPanic(t *testing.T, c *int, value int) (int, Destructor, e
3131
kerror.Panic("keep calm, this is a test panic")
3232
return value, DestructorFunc(func() error {
3333
*c -= value
34-
t.Logf("test object (%d) was finalized (and panic now, boo!)", value)
34+
t.Logf("test object (%d) was finalized", value)
3535
return nil
3636
}), nil
3737
}
@@ -104,7 +104,7 @@ func TestReaperWithError(t *testing.T) {
104104
t.Fail()
105105
return
106106
}
107-
t.Logf("\n%+v\n", err)
107+
t.Logf("%+v", err)
108108
}
109109

110110
func TestReaperWithPanic(t *testing.T) {
@@ -115,11 +115,20 @@ func TestReaperWithPanic(t *testing.T) {
115115
return
116116
}
117117
v := recover()
118+
t.Logf("%+v", v)
118119
if v == nil {
119120
t.Fail()
120121
return
121122
}
122-
t.Logf("\n%+v\n", v)
123+
err, ok := v.(error)
124+
if !ok {
125+
t.Fail()
126+
return
127+
}
128+
if kerror.ClassOf(err) != kerror.EPanic || kerror.MessageOf(err) != "keep calm, this is a test panic" {
129+
t.Fail()
130+
return
131+
}
123132
}()
124133
_, _, _ = newTestCompositeObject(t, newTestObjectWithPanic, &c, 1, 2, 3)
125134
}
@@ -139,11 +148,11 @@ func TestReaperWithPanicInDestructor(t *testing.T) {
139148
}
140149
defer func() {
141150
dtorErr := dtor.Destroy()
151+
t.Logf("%+v", dtorErr)
142152
if dtorErr == nil {
143153
t.Fail()
144154
return
145155
}
146-
t.Logf("\n%+v\n", dtorErr)
147156
}()
148157
if c != 0 {
149158
t.Fail()
@@ -254,15 +263,14 @@ func TestReaper_Finalized(t *testing.T) {
254263
}
255264

256265
func TestNilReaper_Assume(t *testing.T) {
257-
defer func() {
258-
v := recover()
259-
t.Logf("%+v", v)
260-
if v == nil {
261-
t.Fail()
262-
return
263-
}
264-
}()
265-
_ = (*Reaper)(nil).Assume(Noop)
266+
err := kerror.Try(func() error {
267+
return (*Reaper)(nil).Assume(Noop)
268+
})
269+
t.Logf("%+v", err)
270+
if kerror.ClassOf(err) != kerror.ENil {
271+
t.Fail()
272+
return
273+
}
266274
}
267275

268276
func TestNilReaper_Release(t *testing.T) {

0 commit comments

Comments
 (0)