Use Repeatability as tie-breaker for closest match

stretchr · Jan 13, 2021 · 1962448 · 1962448
1 parent 92707c0
commit 1962448
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/mock/mock.go b/mock/mock.go
@@ -299,15 +299,17 @@ func (m *Mock) findExpectedCall(method string, arguments ...interface{}) (int, *
 
 func (m *Mock) findClosestCall(method string, arguments ...interface{}) (*Call, string) {
 	var diffCount int
+	var repeatability int
 	var closestCall *Call
 	var err string
 
 	for _, call := range m.expectedCalls() {
 		if call.Method == method {
 
 			errInfo, tempDiffCount := call.Arguments.Diff(arguments)
-			if tempDiffCount < diffCount || diffCount == 0 {
+			if tempDiffCount < diffCount || diffCount == 0 || (tempDiffCount == diffCount && call.Repeatability > repeatability) {
 				diffCount = tempDiffCount
+				repeatability = call.Repeatability
 				closestCall = call
 				err = errInfo
 			}