From 22e496f7ab2c10f3f249d503196334f9f51978ce Mon Sep 17 00:00:00 2001 From: nikitafrolov Date: Fri, 27 Mar 2026 16:32:17 +0400 Subject: [PATCH 1/2] use controller instead initialize it for each field --- internal/generator/fixture/template.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/generator/fixture/template.go b/internal/generator/fixture/template.go index 836fde5..f95815c 100644 --- a/internal/generator/fixture/template.go +++ b/internal/generator/fixture/template.go @@ -37,7 +37,7 @@ func setUp(t *testing.T) *fixture { ctx: context.Background(), {{ range .Fields }} - {{ .FieldName }}: {{ mockAlias .PkgPath }}.New{{ typeShort .TypeName }}(ctrl_mock.NewController(t)), + {{ .FieldName }}: {{ mockAlias .PkgPath }}.New{{ typeShort .TypeName }}(f.ctrl), {{- end }} } From f0b5d392dbea32d3573e150a49f31733b145246e Mon Sep 17 00:00:00 2001 From: nikitafrolov Date: Fri, 27 Mar 2026 16:45:39 +0400 Subject: [PATCH 2/2] gen by new template --- internal/generator/fixture/template.go | 4 ++-- internal/generator/fixture/testdata/gen.golden | 6 +++--- testdata/without_external/mypackage2/mock/mock_gen.go | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/internal/generator/fixture/template.go b/internal/generator/fixture/template.go index f95815c..dc3427b 100644 --- a/internal/generator/fixture/template.go +++ b/internal/generator/fixture/template.go @@ -35,11 +35,11 @@ func setUp(t *testing.T) *fixture { f := &fixture{ ctrl: ctrl_mock.NewController(t), ctx: context.Background(), + } {{ range .Fields }} - {{ .FieldName }}: {{ mockAlias .PkgPath }}.New{{ typeShort .TypeName }}(f.ctrl), + f.{{ .FieldName }} = {{ mockAlias .PkgPath }}.New{{ typeShort .TypeName }}(f.ctrl) {{- end }} - } f.{{ .ImplAlias }} = &{{ .StructName }}{ {{- range .Fields }} diff --git a/internal/generator/fixture/testdata/gen.golden b/internal/generator/fixture/testdata/gen.golden index 117e095..24021eb 100644 --- a/internal/generator/fixture/testdata/gen.golden +++ b/internal/generator/fixture/testdata/gen.golden @@ -23,11 +23,11 @@ func setUp(t *testing.T) *fixture { f := &fixture{ ctrl: ctrl_mock.NewController(t), ctx: context.Background(), - - myType1: mypackage1_mock.NewMockMyType1(ctrl_mock.NewController(t)), - myType2: mypackage2_mock.NewMockMyType2(ctrl_mock.NewController(t)), } + f.myType1 = mypackage1_mock.NewMockMyType1(f.ctrl) + f.myType2 = mypackage2_mock.NewMockMyType2(f.ctrl) + f.toGen = &ToGen{ myType1: f.myType1, myType2: f.myType2, diff --git a/testdata/without_external/mypackage2/mock/mock_gen.go b/testdata/without_external/mypackage2/mock/mock_gen.go index d469df6..357e9c4 100644 --- a/testdata/without_external/mypackage2/mock/mock_gen.go +++ b/testdata/without_external/mypackage2/mock/mock_gen.go @@ -19,6 +19,7 @@ import ( type MockMyType2 struct { ctrl *gomock.Controller recorder *MockMyType2MockRecorder + isgomock struct{} } // MockMyType2MockRecorder is the mock recorder for MockMyType2.