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

Introduce unexported match method to report errors matching 

Changes to the method signature for argumentMatcher.Matches may lead to breaking existing
external uses of that function. Introducing a  new method used internally allows presenting
the error information out for internal testify functionality while not breaking other
existing uses of Matches.
pull/639/head
Brandon Bodnar 2018-09-17 07:37:43 -05:00
parent b59ea01145
commit 42afde47af
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mock/mock.go
View File

@ -580,7 +580,11 @@ type argumentMatcher struct {
fn reflect.Value
}
func (f argumentMatcher) Matches(argument interface{}) error {
func (f argumentMatcher) Matches(argument interface{}) bool {
return f.match(argument) == nil
}
func (f argumentMatcher) match(argument interface{}) error {
expectType := f.fn.Type().In(0)
expectTypeNilSupported := false
switch expectType.Kind() {
@ -718,7 +722,7 @@ func (args Arguments) Diff(objects []interface{}) (string, int) {
}
if matcher, ok := expected.(argumentMatcher); ok {
if matchError := matcher.Matches(actual); matchError == nil {
if matchError := matcher.match(actual); matchError == nil {
output = fmt.Sprintf("%s\t%d: PASS: %s matched by %s\n", output, i, actualFmt, matcher)
} else {
differences++