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

[Fixup] Fixing closest arg error message

devslives-master
Ernesto Jiménez 2018-03-03 12:05:06 +00:00
parent 7538ed3e89
commit aa1c55e027
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mock/mock.go
View File

@ -250,23 +250,24 @@ func (m *Mock) findExpectedCall(method string, arguments ...interface{}) (int, *
} }
func (m *Mock) findClosestCall(method string, arguments ...interface{}) (*Call, string) { func (m *Mock) findClosestCall(method string, arguments ...interface{}) (*Call, string) {
var diffCount, tempDiffCount int var diffCount int
var closestCall *Call var closestCall *Call
var errInfo string var err string
for _, call := range m.expectedCalls() { for _, call := range m.expectedCalls() {
if call.Method == method { if call.Method == method {
errInfo, tempDiffCount = call.Arguments.Diff(arguments) errInfo, tempDiffCount := call.Arguments.Diff(arguments)
if tempDiffCount < diffCount || diffCount == 0 { if tempDiffCount < diffCount || diffCount == 0 {
diffCount = tempDiffCount diffCount = tempDiffCount
closestCall = call closestCall = call
err = errInfo
} }
} }
} }
return closestCall, errInfo return closestCall, err
} }
func callString(method string, arguments Arguments, includeArgumentValues bool) string { func callString(method string, arguments Arguments, includeArgumentValues bool) string {

21
mock/mock_test.go
View File

@ -1402,10 +1402,25 @@ func TestArgumentMatcherToPrintMismatch(t *testing.T) {
m.AssertExpectations(t) m.AssertExpectations(t)
} }
func TestClosestCallMismatchedArgumentInformationShowsTheClosest(t *testing.T) {
defer func() {
if r := recover(); r != nil {
matchingExp := regexp.MustCompile(unexpectedCallRegex(`TheExampleMethod(int,int,int)`, `0: 1\s+1: 1\s+2: 2`, `0: 1\s+1: 1\s+2: 1`, `0: PASS: %!s\(int=1\) == %!s\(int=1\)\s+1: PASS: %!s\(int=1\) == %!s\(int=1\)\s+2: FAIL: %!s\(int=2\) != %!s\(int=1\)`))
assert.Regexp(t, matchingExp, r)
}
}()
m := new(TestExampleImplementation)
m.On("TheExampleMethod", 1, 1, 1).Return(1, nil).Once()
m.On("TheExampleMethod", 2, 2, 2).Return(2, nil).Once()
m.TheExampleMethod(1, 1, 2)
}
func TestClosestCallMismatchedArgumentValueInformation(t *testing.T) { func TestClosestCallMismatchedArgumentValueInformation(t *testing.T) {
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
matchingExp := regexp.MustCompile(unexpectedCallRegex(`GetTime(int)`, "1", "999", `0: FAIL: %!s(int=1) != %!s(int=999)`)) matchingExp := regexp.MustCompile(unexpectedCallRegex(`GetTime(int)`, "0: 1", "0: 999", `0: FAIL: %!s\(int=1\) != %!s\(int=999\)`))
assert.Regexp(t, matchingExp, r) assert.Regexp(t, matchingExp, r)
} }
}() }()
@ -1418,8 +1433,8 @@ func TestClosestCallMismatchedArgumentValueInformation(t *testing.T) {
func unexpectedCallRegex(method, calledArg, expectedArg, diff string) string { func unexpectedCallRegex(method, calledArg, expectedArg, diff string) string {
rMethod := regexp.QuoteMeta(method) rMethod := regexp.QuoteMeta(method)
return fmt.Sprintf(`\s+mock: Unexpected Method Call\s+-*\s+%s\s+0: %s\s+The closest call I have is:\s+%s\s+0: %s\s+Diff: %s`, return fmt.Sprintf(`\s+mock: Unexpected Method Call\s+-*\s+%s\s+%s\s+The closest call I have is:\s+%s\s+%s\s+Diff: %s`,
rMethod, regexp.QuoteMeta(calledArg), rMethod, regexp.QuoteMeta(expectedArg), regexp.QuoteMeta(diff)) rMethod, calledArg, rMethod, expectedArg, diff)
} }
func ConcurrencyTestMethod(m *Mock) { func ConcurrencyTestMethod(m *Mock) {