@@ -10,35 +10,45 @@ import (
1010
1111func TestJoin (t * testing.T ) {
1212 for _ , tt := range []struct {
13- err * joinError
14- iss []error
15- ass []interface {}
16- s string
13+ join error
14+ iss []error
15+ ass []interface {}
16+ s string
1717 }{
1818 {
19- err : Join (context .Canceled ),
20- iss : []error {context .Canceled },
21- ass : nil ,
22- s : "[ \" context canceled\" ] " ,
19+ join : Join (context .Canceled ),
20+ iss : []error {context .Canceled },
21+ ass : nil ,
22+ s : " context canceled" ,
2323 },
2424 {
25- err : Join (context .Canceled , context .DeadlineExceeded , Operation ()),
26- iss : []error {context .Canceled , context .DeadlineExceeded },
25+ join : Join (context .Canceled , context .DeadlineExceeded , Operation ()),
26+ iss : []error {context .Canceled , context .DeadlineExceeded },
2727 ass : []interface {}{func () interface {} {
2828 var i isYdbError
2929
3030 return & i
3131 }()},
3232 s : "[\" context canceled\" ,\" context deadline exceeded\" ,\" operation/STATUS_CODE_UNSPECIFIED (code = 0)\" ]" ,
3333 },
34+ {
35+ join : Join (context .Canceled , context .DeadlineExceeded , nil ),
36+ iss : []error {context .Canceled , context .DeadlineExceeded },
37+ s : "[\" context canceled\" ,\" context deadline exceeded\" ]" ,
38+ },
39+ {
40+ join : Join (nil , context .DeadlineExceeded , nil ),
41+ iss : []error {context .DeadlineExceeded },
42+ s : "context deadline exceeded" ,
43+ },
3444 } {
3545 t .Run ("" , func (t * testing.T ) {
36- require .Equal (t , tt .s , tt .err .Error ())
46+ require .Equal (t , tt .s , tt .join .Error ())
3747 if len (tt .iss ) > 0 {
38- require .True (t , Is (tt .err , tt .iss ... ))
48+ require .True (t , Is (tt .join , tt .iss ... ))
3949 }
4050 if len (tt .ass ) > 0 {
41- require .True (t , As (tt .err , tt .ass ... ))
51+ require .True (t , As (tt .join , tt .ass ... ))
4252 }
4353 })
4454 }
0 commit comments