Skip to content

Disallow mock.Anything from satisfying missing function parameter #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dnathe4th wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Disallow mock.Anything from satisfying missing function parameter #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd8d775
Disallow mock.Anything from satisfying missing function parameter
Apr 4, 2018
596ca26
Remove missing argument string, explicit diff fail for arity inconsis…
Apr 6, 2018
546639c
Iterate to shortest args list, check arity after loop
Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 10 additions & 23 deletions mock/mock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,30 +661,12 @@ func (args Arguments) Diff(objects []interface{}) (string, int) {
var output = "\n"
var differences int

var maxArgCount = len(args)
if len(objects) > maxArgCount {
maxArgCount = len(objects)
}
for i := 0; i < len(args) && i < len(objects); i++ {
actual := objects[i]
actualFmt := fmt.Sprintf("(%[1]T=%[1]v)", actual)

for i := 0; i < maxArgCount; i++ {
var actual, expected interface{}
var actualFmt, expectedFmt string

if len(objects) <= i {
actual = "(Missing)"
actualFmt = "(Missing)"
} else {
actual = objects[i]
actualFmt = fmt.Sprintf("(%[1]T=%[1]v)", actual)
}

if len(args) <= i {
expected = "(Missing)"
expectedFmt = "(Missing)"
} else {
expected = args[i]
expectedFmt = fmt.Sprintf("(%[1]T=%[1]v)", expected)
}
expected := args[i]
expectedFmt := fmt.Sprintf("(%[1]T=%[1]v)", expected)

if matcher, ok := expected.(argumentMatcher); ok {
if matcher.Matches(actual) {
Expand Down Expand Up @@ -718,6 +700,11 @@ func (args Arguments) Diff(objects []interface{}) (string, int) {

}

if len(args) != len(objects) {
differences++
output = fmt.Sprintf("%s\t FAIL: inconsistent function arity, mocked argument count (%d) != call argument count (%d)\n", output, len(args), len(objects))
}

if differences == 0 {
return "No differences.", differences
}
Expand Down
26 changes: 25 additions & 1 deletion mock/mock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,31 @@ func Test_Arguments_Diff_DifferentNumberOfArgs(t *testing.T) {
diff, count = args.Diff([]interface{}{"string", 456, "false", "extra"})

assert.Equal(t, 3, count)
assert.Contains(t, diff, `(string=extra) != (Missing)`)
assert.Contains(t, diff, `inconsistent function arity`)

}

func Test_Arguments_Diff_DifferentNumberOfArgsWithAnything(t *testing.T) {

var args = Arguments([]interface{}{Anything})
var diff string
var count int
diff, count = args.Diff([]interface{}{})

assert.Equal(t, 1, count)
assert.Contains(t, diff, `inconsistent function arity`)

}

func Test_Arguments_Diff_DifferentNumberOfArgsWithActualAnything(t *testing.T) {

var args = Arguments([]interface{}{})
var diff string
var count int
diff, count = args.Diff([]interface{}{Anything})

assert.Equal(t, 1, count)
assert.Contains(t, diff, `inconsistent function arity`)

}

Expand Down