Skip to content

Commit 4a86f6f

Browse files
ghosindghosind
committed
feat: error message accept format and values.
1 parent e539d85 commit 4a86f6f

File tree

7 files changed

+84
-72
lines changed

7 files changed

+84
-72
lines changed

‎builtin.go‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
// DeepEqual(t, "ABC", "ABC") // success
1313
// DeepEqual(t, 1, 0) // fail
1414
// DeepEqual(t, 1, int64(1)) // fail
15-
func DeepEqual(t *testing.T, actual, expect any, message ...string) error {
15+
func DeepEqual(t *testing.T, actual, expect any, message ...any) error {
1616
t.Helper()
1717

1818
return tryDeepEqual(t, false, actual, expect, message...)
@@ -25,7 +25,7 @@ func DeepEqual(t *testing.T, actual, expect any, message ...string) error {
2525
// DeepEqualNow(t, "ABC", "ABC") // success
2626
// DeepEqualNow(t, 1, int64(1)) // fail and terminate
2727
// // never run
28-
func DeepEqualNow(t *testing.T, actual, expect any, message ...string) error {
28+
func DeepEqualNow(t *testing.T, actual, expect any, message ...any) error {
2929
t.Helper()
3030

3131
return tryDeepEqual(t, true, actual, expect, message...)
@@ -38,7 +38,7 @@ func DeepEqualNow(t *testing.T, actual, expect any, message ...string) error {
3838
// NotDeepEqual(t, 1, int64(1)) // success
3939
// NotDeepEqual(t, 1, 1) // fail
4040
// NotDeepEqual(t, "ABC", "ABC") // fail
41-
func NotDeepEqual(t *testing.T, actual, expect any, message ...string) error {
41+
func NotDeepEqual(t *testing.T, actual, expect any, message ...any) error {
4242
t.Helper()
4343

4444
return tryNotDeepEqual(t, false, actual, expect, message...)
@@ -51,7 +51,7 @@ func NotDeepEqual(t *testing.T, actual, expect any, message ...string) error {
5151
// NotDeepEqual(t, 1, int64(1)) // success
5252
// NotDeepEqual(t, "ABC", "ABC") // fail and terminate
5353
// // never run
54-
func NotDeepEqualNow(t *testing.T, actual, expect any, message ...string) error {
54+
func NotDeepEqualNow(t *testing.T, actual, expect any, message ...any) error {
5555
t.Helper()
5656

5757
return tryNotDeepEqual(t, true, actual, expect, message...)
@@ -65,7 +65,7 @@ func NotDeepEqualNow(t *testing.T, actual, expect any, message ...string) error
6565
// Equal(t, 1, int64(1)) // success
6666
// Equal(t, 1, uint64(1)) // success
6767
// Equal(t, 1, 0) // fail
68-
func Equal(t *testing.T, actual, expect any, message ...string) error {
68+
func Equal(t *testing.T, actual, expect any, message ...any) error {
6969
t.Helper()
7070

7171
return tryEqual(t, false, actual, expect, message...)
@@ -80,7 +80,7 @@ func Equal(t *testing.T, actual, expect any, message ...string) error {
8080
// EqualNow(t, 1, uint64(1)) // success
8181
// EqualNow(t, 1, 0) // fail and terminate
8282
// never run
83-
func EqualNow(t *testing.T, actual, expect any, message ...string) error {
83+
func EqualNow(t *testing.T, actual, expect any, message ...any) error {
8484
t.Helper()
8585

8686
return tryEqual(t, true, actual, expect, message...)
@@ -95,7 +95,7 @@ func EqualNow(t *testing.T, actual, expect any, message ...string) error {
9595
// NotEqual(t, "ABC", "ABC") // fail
9696
// NotEqual(t, 1, int64(1)) // fail
9797
// NotEqual(t, 1, uint64(1)) // fail
98-
func NotEqual(t *testing.T, actual, expect any, message ...string) error {
98+
func NotEqual(t *testing.T, actual, expect any, message ...any) error {
9999
t.Helper()
100100

101101
return tryNotEqual(t, false, actual, expect, message...)
@@ -108,7 +108,7 @@ func NotEqual(t *testing.T, actual, expect any, message ...string) error {
108108
// NotEqualNow(t, "ABC", "CBA") // success
109109
// NotEqualNow(t, 1, 1) // fail and terminate
110110
// // never run
111-
func NotEqualNow(t *testing.T, actual, expect any, message ...string) error {
111+
func NotEqualNow(t *testing.T, actual, expect any, message ...any) error {
112112
t.Helper()
113113

114114
return tryNotEqual(t, true, actual, expect, message...)
@@ -119,7 +119,7 @@ func NotEqualNow(t *testing.T, actual, expect any, message ...string) error {
119119
// pattern := regexp.MustCompile(`^https?:\/\/`)
120120
// Match(t, "http://example.com", pattern) // success
121121
// Match(t, "example.com", pattern) // fail
122-
func Match(t *testing.T, val string, pattern *regexp.Regexp, message ...string) error {
122+
func Match(t *testing.T, val string, pattern *regexp.Regexp, message ...any) error {
123123
t.Helper()
124124

125125
return tryMatchRegexp(t, false, val, pattern, "", message...)
@@ -132,7 +132,7 @@ func Match(t *testing.T, val string, pattern *regexp.Regexp, message ...string)
132132
// MatchNow(t, "http://example.com", pattern) // success
133133
// MatchNow(t, "example.com", pattern) // fail and terminate
134134
// // never run
135-
func MatchNow(t *testing.T, val string, pattern *regexp.Regexp, message ...string) error {
135+
func MatchNow(t *testing.T, val string, pattern *regexp.Regexp, message ...any) error {
136136
t.Helper()
137137

138138
return tryMatchRegexp(t, true, val, pattern, "", message...)
@@ -143,7 +143,7 @@ func MatchNow(t *testing.T, val string, pattern *regexp.Regexp, message ...strin
143143
//
144144
// MatchString(t, "http://example.com", `^https?:\/\/`) // success
145145
// MatchString(t, "example.com", `^https?:\/\/`) // fail
146-
func MatchString(t *testing.T, val, pattern string, message ...string) error {
146+
func MatchString(t *testing.T, val, pattern string, message ...any) error {
147147
t.Helper()
148148

149149
return tryMatchRegexp(t, false, val, nil, pattern, message...)
@@ -156,7 +156,7 @@ func MatchString(t *testing.T, val, pattern string, message ...string) error {
156156
// MatchStringNow(t, "http://example.com", `^https?:\/\/`) // success
157157
// MatchStringNow(t, "example.com", `^https?:\/\/`) // fail and terminate
158158
// // never run
159-
func MatchStringNow(t *testing.T, val, pattern string, message ...string) error {
159+
func MatchStringNow(t *testing.T, val, pattern string, message ...any) error {
160160
t.Helper()
161161

162162
return tryMatchRegexp(t, true, val, nil, pattern, message...)
@@ -168,7 +168,7 @@ func MatchStringNow(t *testing.T, val, pattern string, message ...string) error
168168
// pattern := regexp.MustCompile(`^https?:\/\/`)
169169
// NotMatch(t, "example.com", pattern) // success
170170
// NotMatch(t, "http://example.com", pattern) // fail
171-
func NotMatch(t *testing.T, val string, pattern *regexp.Regexp, message ...string) error {
171+
func NotMatch(t *testing.T, val string, pattern *regexp.Regexp, message ...any) error {
172172
t.Helper()
173173

174174
return tryNotMatchRegexp(t, false, val, pattern, "", message...)
@@ -181,7 +181,7 @@ func NotMatch(t *testing.T, val string, pattern *regexp.Regexp, message ...strin
181181
// NotMatchNow(t, "example.com", pattern) // success
182182
// NotMatchNow(t, "http://example.com", pattern) // fail and terminate
183183
// // never run
184-
func NotMatchNow(t *testing.T, val string, pattern *regexp.Regexp, message ...string) error {
184+
func NotMatchNow(t *testing.T, val string, pattern *regexp.Regexp, message ...any) error {
185185
t.Helper()
186186

187187
return tryNotMatchRegexp(t, true, val, pattern, "", message...)
@@ -193,7 +193,7 @@ func NotMatchNow(t *testing.T, val string, pattern *regexp.Regexp, message ...st
193193
//
194194
// NotMatchString(t, "example.com", `^https?:\/\/`) // success
195195
// NotMatchString(t, "http://example.com", `^https?:\/\/`) // fail
196-
func NotMatchString(t *testing.T, val, pattern string, message ...string) error {
196+
func NotMatchString(t *testing.T, val, pattern string, message ...any) error {
197197
t.Helper()
198198

199199
return tryNotMatchRegexp(t, false, val, nil, pattern, message...)
@@ -207,7 +207,7 @@ func NotMatchString(t *testing.T, val, pattern string, message ...string) error
207207
// NotMatchStringNow(t, "example.com", `^https?:\/\/`) // success
208208
// NotMatchStringNow(t, "http://example.com", `^https?:\/\/`) // fail and terminate
209209
// // never run
210-
func NotMatchStringNow(t *testing.T, val, pattern string, message ...string) error {
210+
func NotMatchStringNow(t *testing.T, val, pattern string, message ...any) error {
211211
t.Helper()
212212

213213
return tryNotMatchRegexp(t, true, val, nil, pattern, message...)
@@ -222,7 +222,7 @@ func NotMatchStringNow(t *testing.T, val, pattern string, message ...string) err
222222
//
223223
// err = errors.New("some error")
224224
// Nil(t, err) // fail
225-
func Nil(t *testing.T, val any, message ...string) error {
225+
func Nil(t *testing.T, val any, message ...any) error {
226226
t.Helper()
227227

228228
return tryNil(t, false, val, message...)
@@ -240,7 +240,7 @@ func Nil(t *testing.T, val any, message ...string) error {
240240
// err = errors.New("some error")
241241
// NilNow(t, err) // fail and terminate
242242
// // never run
243-
func NilNow(t *testing.T, val any, message ...string) error {
243+
func NilNow(t *testing.T, val any, message ...any) error {
244244
t.Helper()
245245

246246
return tryNil(t, true, val, message...)
@@ -255,7 +255,7 @@ func NilNow(t *testing.T, val any, message ...string) error {
255255
//
256256
// err = errors.New("some error")
257257
// NotNil(t, err) // success
258-
func NotNil(t *testing.T, val any, message ...string) error {
258+
func NotNil(t *testing.T, val any, message ...any) error {
259259
t.Helper()
260260

261261
return tryNotNil(t, false, val, message...)
@@ -273,7 +273,7 @@ func NotNil(t *testing.T, val any, message ...string) error {
273273
// err = nil
274274
// NotNilNow(t, err) // fail and terminate
275275
// // never run
276-
func NotNilNow(t *testing.T, val any, message ...string) error {
276+
func NotNilNow(t *testing.T, val any, message ...any) error {
277277
t.Helper()
278278

279279
return tryNotNil(t, true, val, message...)
@@ -289,7 +289,7 @@ func NotNilNow(t *testing.T, val any, message ...string) error {
289289
// Panic(t, func() {
290290
// // no panic
291291
// }) // fail
292-
func Panic(t *testing.T, fn func(), message ...string) error {
292+
func Panic(t *testing.T, fn func(), message ...any) error {
293293
t.Helper()
294294

295295
return tryPanic(t, false, fn, message...)
@@ -306,7 +306,7 @@ func Panic(t *testing.T, fn func(), message ...string) error {
306306
// // no panic
307307
// }) // fail
308308
// // never run
309-
func PanicNow(t *testing.T, fn func(), message ...string) error {
309+
func PanicNow(t *testing.T, fn func(), message ...any) error {
310310
t.Helper()
311311

312312
return tryPanic(t, true, fn, message...)
@@ -322,7 +322,7 @@ func PanicNow(t *testing.T, fn func(), message ...string) error {
322322
// NotPanic(t, func() {
323323
// panic("some error")
324324
// }) // fail
325-
func NotPanic(t *testing.T, fn func(), message ...string) error {
325+
func NotPanic(t *testing.T, fn func(), message ...any) error {
326326
t.Helper()
327327

328328
return tryNotPanic(t, false, fn, message...)
@@ -339,7 +339,7 @@ func NotPanic(t *testing.T, fn func(), message ...string) error {
339339
// panic("some error")
340340
// }) // fail and terminate
341341
// // never run
342-
func NotPanicNow(t *testing.T, fn func(), message ...string) error {
342+
func NotPanicNow(t *testing.T, fn func(), message ...any) error {
343343
t.Helper()
344344

345345
return tryNotPanic(t, true, fn, message...)
@@ -354,7 +354,7 @@ func NotPanicNow(t *testing.T, fn func(), message ...string) error {
354354
// True(t, "test") // success
355355
// True(t, 0) // fail
356356
// True(t, "") // fail
357-
func True(t *testing.T, val any, message ...string) error {
357+
func True(t *testing.T, val any, message ...any) error {
358358
t.Helper()
359359

360360
return tryTrue(t, false, val, message...)
@@ -371,7 +371,7 @@ func True(t *testing.T, val any, message ...string) error {
371371
// TrueNow(t, "test") // success
372372
// TrueNow(t, "") // fail and terminate
373373
// // never run
374-
func TrueNow(t *testing.T, val any, message ...string) error {
374+
func TrueNow(t *testing.T, val any, message ...any) error {
375375
t.Helper()
376376

377377
return tryTrue(t, true, val, message...)
@@ -386,7 +386,7 @@ func TrueNow(t *testing.T, val any, message ...string) error {
386386
// NotTrue(t, "") // success
387387
// NotTrue(t, 1) // fail
388388
// NotTrue(t, "test") // fail
389-
func NotTrue(t *testing.T, val any, message ...string) error {
389+
func NotTrue(t *testing.T, val any, message ...any) error {
390390
t.Helper()
391391

392392
return tryNotTrue(t, false, val, message...)
@@ -403,7 +403,7 @@ func NotTrue(t *testing.T, val any, message ...string) error {
403403
// NotTrueNow(t, "") // success
404404
// NotTrueNow(t, "test") // fail and terminate
405405
// // never run
406-
func NotTrueNow(t *testing.T, val any, message ...string) error {
406+
func NotTrueNow(t *testing.T, val any, message ...any) error {
407407
t.Helper()
408408

409409
return tryNotTrue(t, true, val, message...)

0 commit comments

Comments
 (0)