Add flag to enable mock reset methods (#181)

The optional with-resets flag adds methods to reset method calls. Calls
can be reset individually or all at once with these.

Author: cbaker

README.md

@@ -43,6 +43,8 @@ moq [flags] source-dir interface [interface2 [interface3 [...]]]
 	-skip-ensure
 		suppress mock implementation check, avoid import cycle if mocks
 		generated outside of the tested package
+	-with-resets
+		generate functions to facilitate resetting calls made to a mock
 
 Specifying an alias for the mock is also supported with the format 'interface:alias'
 
@@ -120,6 +122,7 @@ The mocked structure implements the interface, where each method calls the assoc
 * Name arguments in the interface for a better experience
 * Use closured variables inside your test function to capture details about the calls to the methods
 * Use `.MethodCalls()` to track the calls
+* Use `.ResetCalls()` to reset calls within an invidual mock's context
 * Use `go:generate` to invoke the `moq` command
 * If Moq fails with a `go/format` error, it indicates the generated code was not valid.
   You can run the same command with `-fmt noop` to print the generated source code without attempting to format it.

internal/template/template.go

@@ -182,8 +182,27 @@ func (mock *{{$mock.MockName}}
 	mock.lock{{.Name}}.RUnlock()
 	return calls
 }
+{{- if $.WithResets}}
+// Reset{{.Name}}Calls reset all the calls that were made to {{.Name}}.
+func (mock *{{$mock.MockName}}) Reset{{.Name}}Calls() {
+	mock.lock{{.Name}}.Lock()
+	mock.calls.{{.Name}} = nil
+	mock.lock{{.Name}}.Unlock()
+}
+{{end}}
+{{end -}}
+{{- if $.WithResets}}
+// ResetCalls reset all the calls that were made to all mocked methods.
+func (mock *{{$mock.MockName}}) ResetCalls() {
+	{{- range .Methods}}
+	mock.lock{{.Name}}.Lock()
+	mock.calls.{{.Name}} = nil
+	mock.lock{{.Name}}.Unlock()
+	{{end -}}
+}
+{{end -}}
 {{end -}}
-{{end -}}`
+`
 
 // This list comes from the golint codebase. Golint will complain about any of
 // these being mixed-case, like "Id" instead of "ID".

internal/template/template_data.go

@@ -16,6 +16,7 @@ type Data struct {
 	Mocks           []MockData
 	StubImpl        bool
 	SkipEnsure      bool
+	WithResets      bool
 }
 
 // MocksSomeMethod returns true of any one of the Mocks has at least 1

main.go

@@ -22,6 +22,7 @@ type userFlags struct {
 	formatter  string
 	stubImpl   bool
 	skipEnsure bool
+	withResets bool
 	remove     bool
 	args       []string
 }
@@ -37,6 +38,8 @@ func main() {
 	flag.BoolVar(&flags.skipEnsure, "skip-ensure", false,
 		"suppress mock implementation check, avoid import cycle if mocks generated outside of the tested package")
 	flag.BoolVar(&flags.remove, "rm", false, "first remove output file, if it exists")
+	flag.BoolVar(&flags.withResets, "with-resets", false,
+		"generate functions to facilitate resetting calls made to a mock")
 
 	flag.Usage = func() {
 		fmt.Println(`moq [flags] source-dir interface [interface2 [interface3 [...]]]`)
@@ -86,6 +89,7 @@ func run(flags userFlags) error {
 		Formatter:  flags.formatter,
 		StubImpl:   flags.stubImpl,
 		SkipEnsure: flags.skipEnsure,
+		WithResets: flags.withResets,
 	})
 	if err != nil {
 		return err
@@ -100,10 +104,10 @@ func run(flags userFlags) error {
 	}
 
 	// create the file
-	err = os.MkdirAll(filepath.Dir(flags.outFile), 0750)
+	err = os.MkdirAll(filepath.Dir(flags.outFile), 0o750)
 	if err != nil {
 		return err
 	}
 
-	return ioutil.WriteFile(flags.outFile, buf.Bytes(), 0600)
+	return ioutil.WriteFile(flags.outFile, buf.Bytes(), 0o600)
 }

pkg/moq/moq.go

@@ -28,6 +28,7 @@ type Config struct {
 	Formatter  string
 	StubImpl   bool
 	SkipEnsure bool
+	WithResets bool
 }
 
 // New makes a new Mocker for the specified package directory.
@@ -81,6 +82,7 @@ func (m *Mocker) Mock(w io.Writer, namePairs ...string) error {
 		Mocks:      mocks,
 		StubImpl:   m.cfg.StubImpl,
 		SkipEnsure: m.cfg.SkipEnsure,
+		WithResets: m.cfg.WithResets,
 	}
 
 	if data.MocksSomeMethod() {

pkg/moq/moq_test.go

@@ -29,7 +29,7 @@ func TestMoq(t *testing.T) {
 	}
 	s := buf.String()
 	// assertions of things that should be mentioned
-	var strs = []string{
+	strs := []string{
 		"package example",
 		"type PersonStoreMock struct",
 		"CreateFunc func(ctx context.Context, person *Person, confirm bool) error",
@@ -62,7 +62,7 @@ func TestMoqWithStaticCheck(t *testing.T) {
 	}
 	s := buf.String()
 	// assertions of things that should be mentioned
-	var strs = []string{
+	strs := []string{
 		"package example",
 		"var _ PersonStore = &PersonStoreMock{}",
 		"type PersonStoreMock struct",
@@ -96,7 +96,7 @@ func TestMoqWithAlias(t *testing.T) {
 	}
 	s := buf.String()
 	// assertions of things that should be mentioned
-	var strs = []string{
+	strs := []string{
 		"package example",
 		"type AnotherPersonStoreMock struct",
 		"CreateFunc func(ctx context.Context, person *Person, confirm bool) error",
@@ -129,7 +129,7 @@ func TestMoqExplicitPackage(t *testing.T) {
 	}
 	s := buf.String()
 	// assertions of things that should be mentioned
-	var strs = []string{
+	strs := []string{
 		"package different",
 		"type PersonStoreMock struct",
 		"CreateFunc func(ctx context.Context, person *example.Person, confirm bool) error",
@@ -156,7 +156,7 @@ func TestMoqExplicitPackageWithStaticCheck(t *testing.T) {
 	}
 	s := buf.String()
 	// assertions of things that should be mentioned
-	var strs = []string{
+	strs := []string{
 		"package different",
 		"var _ example.PersonStore = &PersonStoreMock{}",
 		"type PersonStoreMock struct",
@@ -184,7 +184,7 @@ func TestMoqSkipEnsure(t *testing.T) {
 	}
 	s := buf.String()
 	// assertions of things that should be mentioned
-	var strs = []string{
+	strs := []string{
 		"package different",
 		"type PersonStoreMock struct",
 		"CreateFunc func(ctx context.Context, person *example.Person, confirm bool) error",
@@ -233,7 +233,7 @@ func TestVariadicArguments(t *testing.T) {
 	}
 	s := buf.String()
 	// assertions of things that should be mentioned
-	var strs = []string{
+	strs := []string{
 		"package variadic",
 		"type GreeterMock struct",
 		"GreetFunc func(ctx context.Context, names ...string) string",
@@ -261,7 +261,7 @@ func TestNothingToReturn(t *testing.T) {
 		t.Errorf("should not have return for items that have no return arguments")
 	}
 	// assertions of things that should be mentioned
-	var strs = []string{
+	strs := []string{
 		"mock.ClearCacheFunc(id)",
 	}
 	for _, str := range strs {
@@ -282,7 +282,7 @@ func TestImports(t *testing.T) {
 		t.Errorf("m.Mock: %s", err)
 	}
 	s := buf.String()
-	var strs = []string{
+	strs := []string{
 		`	"sync"`,
 		`	"github.com/matryer/moq/pkg/moq/testpackages/imports/one"`,
 	}
@@ -395,6 +395,12 @@ func TestMockGolden(t *testing.T) {
 			interfaces: []string{"Transient"},
 			goldenFile: filepath.Join("testpackages/transientimport", "transient_moq.golden.go"),
 		},
+		{
+			name:       "WithResets",
+			cfg:        Config{SrcDir: "testpackages/withresets", WithResets: true},
+			interfaces: []string{"ResetStore"},
+			goldenFile: filepath.Join("testpackages/withresets", "withresets_moq.golden.go"),
+		},
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -449,10 +455,10 @@ func matchGoldenFile(goldenFile string, actual []byte) error {
 	// To update golden files, run the following:
 	// go test -v -run '^<Test-Name>$' github.com/matryer/moq/pkg/moq -update
 	if *update {
-		if err := os.MkdirAll(filepath.Dir(goldenFile), 0750); err != nil {
+		if err := os.MkdirAll(filepath.Dir(goldenFile), 0o750); err != nil {
 			return fmt.Errorf("create dir: %s", err)
 		}
-		if err := ioutil.WriteFile(goldenFile, actual, 0600); err != nil {
+		if err := ioutil.WriteFile(goldenFile, actual, 0o600); err != nil {
 			return fmt.Errorf("write: %s", err)
 		}
 
@@ -495,7 +501,7 @@ func TestVendoredPackages(t *testing.T) {
 	}
 	s := buf.String()
 	// assertions of things that should be mentioned
-	var strs = []string{
+	strs := []string{
 		`"github.com/sudo-suhas/moq-test-pkgs/somerepo"`,
 	}
 	for _, str := range strs {
@@ -520,7 +526,7 @@ func TestVendoredInterface(t *testing.T) {
 	}
 	s := buf.String()
 	// assertions of things that should be mentioned
-	var strs = []string{
+	strs := []string{
 		`"github.com/sudo-suhas/moq-test-pkgs/somerepo"`,
 	}
 	for _, str := range strs {
@@ -546,7 +552,7 @@ func TestVendoredBuildConstraints(t *testing.T) {
 	}
 	s := buf.String()
 	// assertions of things that should be mentioned
-	var strs = []string{
+	strs := []string{
 		`"github.com/sudo-suhas/moq-test-pkgs/buildconstraints"`,
 	}
 	for _, str := range strs {

pkg/moq/testpackages/dotimport/service_moq_test.go

@@ -0,0 +1,18 @@
+package withresets
+
+import "context"
+
+// Reset is a reset.
+type Reset struct {
+	ID      string
+	Name    string
+	Company string
+	Website string
+}
+
+// ResetStore stores resets.
+type ResetStore interface {
+	Get(ctx context.Context, id string) (*Reset, error)
+	Create(ctx context.Context, person *Reset, confirm bool) error
+	ClearCache(id string)
+}