Merge pull request #37 from ovechkin-dm/36-argument-matchers-are-bein…

…g-reused-across-mocks

Invalid matcher declaration

registry/handler.go

@@ -130,6 +130,9 @@ func (h *invocationHandler) VerifyMethod(verifier matchers.MethodVerifier) {
 	defer h.lock.Unlock()
 	h.ctx.getState().verifyState = true
 	h.ctx.getState().methodVerifier = verifier
+	if len(h.ctx.getState().matchers) != 0 {
+		h.ctx.reporter.ReportUnexpectedMatcherDeclaration(h.ctx.getState().matchers)
+	}
 }
 
 func (h *invocationHandler) DoVerifyMethod(call *MethodCall) []reflect.Value {

registry/reporter.go

@@ -207,3 +207,13 @@ func (e *EnrichedReporter) ReportNoMoreInteractionsExpected(instanceType reflect
 	methodSig := prettyPrintMethodSignature(instanceType, call.Method.Type)
 	e.Errorf("no more interactions expected on %v", methodSig)
 }
+
+func (e *EnrichedReporter) ReportUnexpectedMatcherDeclaration(m []*matcherWrapper) {
+	sb := strings.Builder{}
+	sb.WriteString("Unexpected matchers declaration:\n")
+	for _, v := range m {
+		sb.WriteString(fmt.Sprintf("\t%s\n", v.matcher.Description()))
+	}
+	sb.WriteString("Matchers can only be used within When() call")
+	e.Errorf(sb.String())
+}

tests/check/check_test.go

@@ -15,3 +15,5 @@ func TestNonInterfaceNotAllowed(t *testing.T) {
 	_ = Mock[St]()
 	r.AssertError()
 }
+
+

tests/common/common.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"errors"
 	"fmt"
 	"reflect"
 	"strings"
@@ -29,6 +30,10 @@ func (m *MockReporter) GetErrorString() string {
 	return m.reported
 }
 
+func (m *MockReporter) GetError() error {
+	return errors.New(m.reported)
+}
+
 func (m *MockReporter) AssertNoError() {
 	if m.IsError() {
 		m.t.Fatalf("Expected no error, got: %s", m.reported)

tests/match/match_test.go

@@ -139,3 +139,12 @@ func TestDeepEqual(t *testing.T) {
 	result := m.Test(&s2)
 	r.AssertEqual(result, 9)
 }
+
+func TestUnexpectedUseOfMatchers(t *testing.T) {
+	r := common.NewMockReporter(t)
+	SetUp(r)
+	m := Mock[Iface]()
+	m.Test(AnyString())
+	Verify(m, Once()).Test("test")
+	r.AssertErrorContains(r.GetError(), "Unexpected matchers declaration")
+}