@@ -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
110110func 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
256265func 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
268276func TestNilReaper_Release (t * testing.T ) {
0 commit comments