Skip to content
This repository was archived by the owner on Jun 27, 2023. It is now read-only.

Commit 51421b9

Browse files
committed
mockgen: use Controller.Helper() in generated mocks
Using T.Helper() better directs the callstack to point at the offending line in the production code. fixes #239
1 parent b2f8551 commit 51421b9

File tree

17 files changed

+192
-0
lines changed

17 files changed

+192
-0
lines changed

gomock/internal/mock_matcher/mock_matcher.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/custom_package_name/greeter/greeter_mock_test.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/dot_imports/mock.go

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/generated_identifier_conflict/bugreport_mock.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/import_source/definition/source_mock.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/import_source/source_mock.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/unexported_method/bugreport_mock.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/vendor_dep/mock.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/vendor_dep/source_mock_package/mock.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/internal/tests/vendor_pkg/mock.go

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mockgen/mockgen.go

+2
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ func (g *generator) GenerateMockMethod(mockType string, m *model.Method, pkgOver
407407
g.p("// %v mocks base method", m.Name)
408408
g.p("func (%v *%v) %v(%v)%v {", idRecv, mockType, m.Name, argString, retString)
409409
g.in()
410+
g.p("%s.ctrl.T.Helper()", idRecv)
410411

411412
var callArgs string
412413
if m.Variadic == nil {
@@ -474,6 +475,7 @@ func (g *generator) GenerateMockRecorderMethod(mockType string, m *model.Method)
474475
g.p("// %v indicates an expected call of %v", m.Name, m.Name)
475476
g.p("func (%s *%vMockRecorder) %v(%v) *gomock.Call {", idRecv, mockType, m.Name, argString)
476477
g.in()
478+
g.p("%s.mock.ctrl.T.Helper()", idRecv)
477479

478480
var callArgs string
479481
if m.Variadic == nil {

0 commit comments

Comments
 (0)