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 golang#239
david-l-riley · Dec 8, 2018 · 51421b9 · 51421b9
1 parent b2f8551
commit 51421b9
Show file tree

Hide file tree

Showing 17 changed files with 192 additions and 0 deletions.
diff --git a/gomock/internal/mock_matcher/mock_matcher.go b/gomock/internal/mock_matcher/mock_matcher.go
diff --git a/mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go b/mockgen/internal/tests/aux_imports_embedded_interface/bugreport_mock.go
diff --git a/mockgen/internal/tests/custom_package_name/greeter/greeter_mock_test.go b/mockgen/internal/tests/custom_package_name/greeter/greeter_mock_test.go
diff --git a/mockgen/internal/tests/dot_imports/mock.go b/mockgen/internal/tests/dot_imports/mock.go
diff --git a/mockgen/internal/tests/generated_identifier_conflict/bugreport_mock.go b/mockgen/internal/tests/generated_identifier_conflict/bugreport_mock.go
diff --git a/mockgen/internal/tests/import_source/definition/source_mock.go b/mockgen/internal/tests/import_source/definition/source_mock.go
diff --git a/mockgen/internal/tests/import_source/source_mock.go b/mockgen/internal/tests/import_source/source_mock.go
diff --git a/mockgen/internal/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go b/mockgen/internal/tests/internal_pkg/subdir/internal/pkg/reflect_output/mock.go
diff --git a/mockgen/internal/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go b/mockgen/internal/tests/internal_pkg/subdir/internal/pkg/source_output/mock.go
diff --git a/mockgen/internal/tests/unexported_method/bugreport_mock.go b/mockgen/internal/tests/unexported_method/bugreport_mock.go
diff --git a/mockgen/internal/tests/vendor_dep/mock.go b/mockgen/internal/tests/vendor_dep/mock.go
diff --git a/mockgen/internal/tests/vendor_dep/source_mock_package/mock.go b/mockgen/internal/tests/vendor_dep/source_mock_package/mock.go
diff --git a/mockgen/internal/tests/vendor_pkg/mock.go b/mockgen/internal/tests/vendor_pkg/mock.go
diff --git a/mockgen/mockgen.go b/mockgen/mockgen.go
@@ -407,6 +407,7 @@ func (g *generator) GenerateMockMethod(mockType string, m *model.Method, pkgOver
 	g.p("// %v mocks base method", m.Name)
 	g.p("func (%v *%v) %v(%v)%v {", idRecv, mockType, m.Name, argString, retString)
 	g.in()
+	g.p("%s.ctrl.T.Helper()", idRecv)
 
 	var callArgs string
 	if m.Variadic == nil {
@@ -474,6 +475,7 @@ func (g *generator) GenerateMockRecorderMethod(mockType string, m *model.Method)
 	g.p("// %v indicates an expected call of %v", m.Name, m.Name)
 	g.p("func (%s *%vMockRecorder) %v(%v) *gomock.Call {", idRecv, mockType, m.Name, argString)
 	g.in()
+	g.p("%s.mock.ctrl.T.Helper()", idRecv)
 
 	var callArgs string
 	if m.Variadic == nil {