GOMODULES
/
testify
mirror of https://github.com/stretchr/testify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

in order to remain compatible with go1..19, don't compare function names (but do include them in the diff output)

pull/1626/head
Arjun Dhawan 2024-07-23 16:53:06 +02:00
parent 9c174eb41c
commit 22d3bd5def
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mock/mock.go
View File

@ -1204,17 +1204,10 @@ type tHelper interface {
func assertOpts(expected, actual interface{}) (expectedFmt, actualFmt string) { func assertOpts(expected, actual interface{}) (expectedFmt, actualFmt string) {
expectedOpts := reflect.ValueOf(expected) expectedOpts := reflect.ValueOf(expected)
actualOpts := reflect.ValueOf(actual) actualOpts := reflect.ValueOf(actual)
var expectedNames []string
for i := 0; i < expectedOpts.Len(); i++ { if expectedOpts.Len() != actualOpts.Len() {
expectedNames = append(expectedNames, funcName(expectedOpts.Index(i).Interface())) expectedFmt = fmt.Sprintf("%v", expectedOpts)
} actualFmt = fmt.Sprintf("%v", actualOpts)
var actualNames []string
for i := 0; i < actualOpts.Len(); i++ {
actualNames = append(actualNames, funcName(actualOpts.Index(i).Interface()))
}
if !assert.ObjectsAreEqual(expectedNames, actualNames) {
expectedFmt = fmt.Sprintf("%v", expectedNames)
actualFmt = fmt.Sprintf("%v", actualNames)
return return
} }
@ -1222,14 +1215,6 @@ func assertOpts(expected, actual interface{}) (expectedFmt, actualFmt string) {
expectedOpt := expectedOpts.Index(i).Interface() expectedOpt := expectedOpts.Index(i).Interface()
actualOpt := actualOpts.Index(i).Interface() actualOpt := actualOpts.Index(i).Interface()
expectedFunc := expectedNames[i]
actualFunc := actualNames[i]
if expectedFunc != actualFunc {
expectedFmt = expectedFunc
actualFmt = actualFunc
return
}
ot := reflect.TypeOf(expectedOpt) ot := reflect.TypeOf(expectedOpt)
var expectedValues []reflect.Value var expectedValues []reflect.Value
var actualValues []reflect.Value var actualValues []reflect.Value
@ -1248,8 +1233,8 @@ func assertOpts(expected, actual interface{}) (expectedFmt, actualFmt string) {
for i := 0; i < ot.NumIn(); i++ { for i := 0; i < ot.NumIn(); i++ {
if !assert.ObjectsAreEqual(expectedValues[i].Interface(), actualValues[i].Interface()) { if !assert.ObjectsAreEqual(expectedValues[i].Interface(), actualValues[i].Interface()) {
expectedFmt = fmt.Sprintf("%s %+v", expectedNames[i], expectedValues[i].Interface()) expectedFmt = fmt.Sprintf("%s %+v", funcName(expectedOpts.Index(i).Interface()), expectedValues[i].Interface())
actualFmt = fmt.Sprintf("%s %+v", expectedNames[i], actualValues[i].Interface()) actualFmt = fmt.Sprintf("%s %+v", funcName(actualOpts.Index(i).Interface()), actualValues[i].Interface())
return return
} }
} }