Skip to content

mock: treat Anything as a matcher only in expectations #1944

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
justadityaraj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

mock: treat Anything as a matcher only in expectations #1944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion mock/mock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,7 +1064,7 @@ func (args Arguments) Diff(objects []interface{}) (string, int) {
}

default:
if assert.ObjectsAreEqual(expected, Anything) || assert.ObjectsAreEqual(actual, Anything) || assert.ObjectsAreEqual(actual, expected) {
if assert.ObjectsAreEqual(expected, Anything) || assert.ObjectsAreEqual(actual, expected) {
// match
output = fmt.Sprintf("%s\t%d: PASS: %s == %s\n", output, i, actualFmt, expectedFmt)
} else {
Expand Down
19 changes: 14 additions & 5 deletions mock/mock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,18 +2015,18 @@ func Test_Arguments_Diff_MissingArgument_StillMatchesWhenPresent(t *testing.T) {
assert.Equal(t, 0, count)
}

func Test_Arguments_Diff_WithAnythingArgument(t *testing.T) {
func Test_Arguments_Diff_WithAnythingAsActualArgument(t *testing.T) {
t.Parallel()

var args = Arguments([]interface{}{"string", 123, true})
var count int
_, count = args.Diff([]interface{}{"string", Anything, true})
diff, count := args.Diff([]interface{}{"string", Anything, true})

assert.Equal(t, 0, count)
assert.Equal(t, 1, count)
assert.Contains(t, diff, `(string=mock.Anything) != (int=123)`)

}

func Test_Arguments_Diff_WithAnythingArgument_InActualToo(t *testing.T) {
func Test_Arguments_Diff_WithAnythingAsExpectedArgument(t *testing.T) {
t.Parallel()

var args = Arguments([]interface{}{"string", Anything, true})
Expand Down Expand Up @@ -2224,6 +2224,15 @@ func Test_MockMethodCalled(t *testing.T) {
m.AssertExpectations(t)
}

func Test_MockMethodCalled_AnythingAsActualArgument(t *testing.T) {
t.Parallel()

m := new(Mock)
m.On("foo", "hello").Return("world")

require.Panics(t, func() { m.MethodCalled("foo", Anything) })
}

func Test_MockMethodCalled_Panic(t *testing.T) {
t.Parallel()

Expand Down