-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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.
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
Added support for getting the arguments of mock function call for a specific call count #1558
Open
mahigadamsetty
wants to merge
4
commits into
stretchr:master
Choose a base branch
from
mahigadamsetty:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -282,7 +282,7 @@ type Mock struct { | |
ExpectedCalls []*Call | ||
|
||
// Holds the calls that were made to this mocked object. | ||
Calls []Call | ||
Calls map[string][]Call | ||
|
||
// test is An optional variable that holds the test struct, to be used when an | ||
// invalid mock call was made. | ||
|
@@ -528,8 +528,21 @@ func (m *Mock) MethodCalled(methodName string, arguments ...interface{}) Argumen | |
} | ||
call.totalCalls++ | ||
|
||
fmt.Println(m.Calls) | ||
|
||
// add the call | ||
m.Calls = append(m.Calls, *newCall(m, methodName, assert.CallerInfo(), arguments...)) | ||
if m.Calls == nil { | ||
fmt.Printf("hello") | ||
m.Calls = make(map[string][]Call) | ||
} | ||
|
||
calls, ok := m.Calls[methodName] | ||
if !ok { | ||
m.Calls[methodName] = []Call{*newCall(m, methodName, assert.CallerInfo(), arguments...)} | ||
} else { | ||
calls = append(calls, *newCall(m, methodName, assert.CallerInfo(), arguments...)) | ||
m.Calls[methodName] = calls | ||
} | ||
m.mutex.Unlock() | ||
|
||
// block if specified | ||
|
@@ -640,11 +653,11 @@ func (m *Mock) AssertNumberOfCalls(t TestingT, methodName string, expectedCalls | |
m.mutex.Lock() | ||
defer m.mutex.Unlock() | ||
var actualCalls int | ||
for _, call := range m.calls() { | ||
if call.Method == methodName { | ||
actualCalls++ | ||
} | ||
calls, ok := m.Calls[methodName] | ||
if ok { | ||
actualCalls = len(calls) | ||
} | ||
|
||
return assert.Equal(t, expectedCalls, actualCalls, fmt.Sprintf("Expected number of calls (%d) does not match the actual number of calls (%d).", expectedCalls, actualCalls)) | ||
} | ||
|
||
|
@@ -658,8 +671,10 @@ func (m *Mock) AssertCalled(t TestingT, methodName string, arguments ...interfac | |
defer m.mutex.Unlock() | ||
if !m.methodWasCalled(methodName, arguments) { | ||
var calledWithArgs []string | ||
for _, call := range m.calls() { | ||
calledWithArgs = append(calledWithArgs, fmt.Sprintf("%v", call.Arguments)) | ||
for _, calls := range m.Calls { | ||
for _, call := range calls { | ||
calledWithArgs = append(calledWithArgs, fmt.Sprintf("%v", call.Arguments)) | ||
} | ||
} | ||
if len(calledWithArgs) == 0 { | ||
return assert.Fail(t, "Should have called with given arguments", | ||
|
@@ -712,6 +727,24 @@ func (m *Mock) IsMethodCallable(t TestingT, methodName string, arguments ...inte | |
return false | ||
} | ||
|
||
// ArgsForCallCount returns the arguments of a function for a specific call count(0 based index) | ||
func (m *Mock) ArgsForCallCount(t TestingT, methodName string, count int) Arguments { | ||
fmt.Println("ArgsForCallCount") | ||
fmt.Println(m.Calls) | ||
Comment on lines
+732
to
+733
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do not print. |
||
calls, ok := m.Calls[methodName] | ||
if !ok { | ||
assert.Fail(t, "ArgsForCallCount", | ||
fmt.Sprintf("Expected %q to have been called with:\nbut no actual calls happened", methodName)) | ||
} | ||
|
||
if len(calls) < count+1 { | ||
assert.Fail(t, "ArgsForCallCount", | ||
fmt.Sprintf("Expected %q to have been called with count:%d:\nbut no actual calls happened", methodName, count)) | ||
} | ||
|
||
return calls[count].Arguments | ||
} | ||
|
||
// isArgsEqual compares arguments | ||
func isArgsEqual(expected Arguments, args []interface{}) bool { | ||
if len(expected) != len(args) { | ||
|
@@ -726,16 +759,16 @@ func isArgsEqual(expected Arguments, args []interface{}) bool { | |
} | ||
|
||
func (m *Mock) methodWasCalled(methodName string, expected []interface{}) bool { | ||
for _, call := range m.calls() { | ||
if call.Method == methodName { | ||
calls, ok := m.Calls[methodName] | ||
if ok { | ||
for _, call := range calls { | ||
|
||
_, differences := Arguments(expected).Diff(call.Arguments) | ||
|
||
if differences == 0 { | ||
// found the expected call | ||
return true | ||
} | ||
|
||
} | ||
} | ||
// we didn't find the expected call | ||
|
@@ -746,10 +779,6 @@ func (m *Mock) expectedCalls() []*Call { | |
return append([]*Call{}, m.ExpectedCalls...) | ||
} | ||
|
||
func (m *Mock) calls() []Call { | ||
return append([]Call{}, m.Calls...) | ||
} | ||
|
||
/* | ||
Arguments | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a breaking change.