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

better fmt

pull/1626/head
Arjun Dhawan 2024-10-27 08:02:53 +01:00
parent be992afabf
commit ea7129e006
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mock/mock.go
View File

@ -1205,21 +1205,31 @@ 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 expectedFuncs []*runtime.Func
var expectedNames []string
for i := 0; i < expectedOpts.Len(); i++ {
f := runtimeFunc(expectedOpts.Index(i).Interface())
expectedFuncs = append(expectedFuncs, f)
expectedNames = append(expectedNames, funcName(f))
}
var actualFuncs []*runtime.Func
var actualNames []string
for i := 0; i < actualOpts.Len(); i++ {
f := runtimeFunc(actualOpts.Index(i).Interface())
actualFuncs = append(actualFuncs, f)
actualNames = append(actualNames, funcName(f))
}
if expectedOpts.Len() != actualOpts.Len() { if expectedOpts.Len() != actualOpts.Len() {
expectedFmt = fmt.Sprintf("%v", expected) expectedFmt = fmt.Sprintf("%v", expectedNames)
actualFmt = fmt.Sprintf("%v", actual) actualFmt = fmt.Sprintf("%v", actualNames)
return return
} }
var funcNames []string
for i := 0; i < expectedOpts.Len(); i++ { for i := 0; i < expectedOpts.Len(); i++ {
expectedFunc := getRuntimeFunc(expectedOpts.Index(i).Interface()) if !isFuncSame(expectedFuncs[i], actualFuncs[i]) {
funcNames = append(funcNames, funcName(getRuntimeFunc(expectedFunc))) expectedFmt = expectedNames[i]
actualFmt = actualNames[i]
if actualFunc := getRuntimeFunc(actualOpts.Index(i).Interface()); !isFuncSame(expectedFunc, actualFunc) {
expectedFmt = funcName(expectedFunc)
actualFmt = funcName(actualFunc)
return return
} }
} }
@ -1246,8 +1256,8 @@ func assertOpts(expected, actual interface{}) (expectedFmt, actualFmt string) {
for i := 0; i < ot.NumIn(); i++ { for i := 0; i < ot.NumIn(); i++ {
if expectedArg, actualArg := expectedValues[i].Interface(), actualValues[i].Interface(); !assert.ObjectsAreEqual(expectedArg, actualArg) { if expectedArg, actualArg := expectedValues[i].Interface(), actualValues[i].Interface(); !assert.ObjectsAreEqual(expectedArg, actualArg) {
expectedFmt = fmt.Sprintf("%s(%T) -> %#v", funcNames[i], expectedArg, expectedArg) expectedFmt = fmt.Sprintf("%s(%T) -> %#v", expectedNames[i], expectedArg, expectedArg)
actualFmt = fmt.Sprintf("%s(%T) -> %#v", funcNames[i], actualArg, actualArg) actualFmt = fmt.Sprintf("%s(%T) -> %#v", expectedNames[i], actualArg, actualArg)
return return
} }
} }
@ -1256,7 +1266,7 @@ func assertOpts(expected, actual interface{}) (expectedFmt, actualFmt string) {
return "", "" return "", ""
} }
func getRuntimeFunc(opt interface{}) *runtime.Func { func runtimeFunc(opt interface{}) *runtime.Func {
return runtime.FuncForPC(reflect.ValueOf(opt).Pointer()) return runtime.FuncForPC(reflect.ValueOf(opt).Pointer())
} }