Skip to content

Commit 56f5fa9

Browse files
committed
relinting pass
Signed-off-by: Frederic BIDON <[email protected]>
1 parent e7e9c23 commit 56f5fa9

19 files changed

+1033
-1016
lines changed

_codegen/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ func (f *testFunc) ParamsFormat() string {
277277
}
278278

279279
func (f *testFunc) ForwardedParamsFormat() string {
280-
return strings.Replace(f.ForwardedParams(), "msgAndArgs", "append([]interface{}{msg}, args...)", 1)
280+
return strings.Replace(f.ForwardedParams(), "msgAndArgs", "append([]any{msg}, args...)", 1)
281281
}
282282

283283
func (f *testFunc) Comment() string {
@@ -299,7 +299,7 @@ func (f *testFunc) CommentWithoutT(receiver string) string {
299299
}
300300

301301
// Standard header https://go.dev/s/generatedcode.
302-
var headerTemplate = `// Code generated with github.com/go-openapi/testify/_codegen; DO NOT EDIT.
302+
var headerTemplate = `// Code generated with github.com/go-openapi/testify/v2/_codegen; DO NOT EDIT.
303303
304304
package {{.Name}}
305305

assert/assertion_compare.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var (
4242
bytesType = reflect.TypeOf([]byte{})
4343
)
4444

45-
func compare(obj1, obj2 interface{}, kind reflect.Kind) (compareResult, bool) {
45+
func compare(obj1, obj2 any, kind reflect.Kind) (compareResult, bool) {
4646
obj1Value := reflect.ValueOf(obj1)
4747
obj2Value := reflect.ValueOf(obj2)
4848

@@ -386,7 +386,7 @@ func compare(obj1, obj2 interface{}, kind reflect.Kind) (compareResult, bool) {
386386
// assert.Greater(t, 2, 1)
387387
// assert.Greater(t, float64(2), float64(1))
388388
// assert.Greater(t, "b", "a")
389-
func Greater(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
389+
func Greater(t TestingT, e1 any, e2 any, msgAndArgs ...any) bool {
390390
if h, ok := t.(tHelper); ok {
391391
h.Helper()
392392
}
@@ -400,7 +400,7 @@ func Greater(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface
400400
// assert.GreaterOrEqual(t, 2, 2)
401401
// assert.GreaterOrEqual(t, "b", "a")
402402
// assert.GreaterOrEqual(t, "b", "b")
403-
func GreaterOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
403+
func GreaterOrEqual(t TestingT, e1 any, e2 any, msgAndArgs ...any) bool {
404404
if h, ok := t.(tHelper); ok {
405405
h.Helper()
406406
}
@@ -413,7 +413,7 @@ func GreaterOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...in
413413
// assert.Less(t, 1, 2)
414414
// assert.Less(t, float64(1), float64(2))
415415
// assert.Less(t, "a", "b")
416-
func Less(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
416+
func Less(t TestingT, e1 any, e2 any, msgAndArgs ...any) bool {
417417
if h, ok := t.(tHelper); ok {
418418
h.Helper()
419419
}
@@ -427,7 +427,7 @@ func Less(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{})
427427
// assert.LessOrEqual(t, 2, 2)
428428
// assert.LessOrEqual(t, "a", "b")
429429
// assert.LessOrEqual(t, "b", "b")
430-
func LessOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...interface{}) bool {
430+
func LessOrEqual(t TestingT, e1 any, e2 any, msgAndArgs ...any) bool {
431431
if h, ok := t.(tHelper); ok {
432432
h.Helper()
433433
}
@@ -439,7 +439,7 @@ func LessOrEqual(t TestingT, e1 interface{}, e2 interface{}, msgAndArgs ...inter
439439
//
440440
// assert.Positive(t, 1)
441441
// assert.Positive(t, 1.23)
442-
func Positive(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
442+
func Positive(t TestingT, e any, msgAndArgs ...any) bool {
443443
if h, ok := t.(tHelper); ok {
444444
h.Helper()
445445
}
@@ -452,7 +452,7 @@ func Positive(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
452452
//
453453
// assert.Negative(t, -1)
454454
// assert.Negative(t, -1.23)
455-
func Negative(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
455+
func Negative(t TestingT, e any, msgAndArgs ...any) bool {
456456
if h, ok := t.(tHelper); ok {
457457
h.Helper()
458458
}
@@ -461,7 +461,7 @@ func Negative(t TestingT, e interface{}, msgAndArgs ...interface{}) bool {
461461
return compareTwoValues(t, e, zero.Interface(), []compareResult{compareLess}, failMessage, msgAndArgs...)
462462
}
463463

464-
func compareTwoValues(t TestingT, e1 interface{}, e2 interface{}, allowedComparesResults []compareResult, failMessage string, msgAndArgs ...interface{}) bool {
464+
func compareTwoValues(t TestingT, e1 any, e2 any, allowedComparesResults []compareResult, failMessage string, msgAndArgs ...any) bool {
465465
if h, ok := t.(tHelper); ok {
466466
h.Helper()
467467
}

0 commit comments

Comments
 (0)