container/stub: mark test overrides as helper

This fixes line information in test reporting messages.

Signed-off-by: Ophestra <cat@gensokyo.uk>

2 files changed, 15 insertions, 10 deletions

diff --git a/container/stub/stub.go b/container/stub/stub.go
index a5368920..a945fc0a 100644
--- a/container/stub/stub.go
+++ b/container/stub/stub.go
@@ -45,12 +45,17 @@ func New[K any](tb testing.TB, makeK func(s *Stub[K]) K, want Expect) *Stub[K] {
 	return &Stub[K]{TB: tb, makeK: makeK, want: want, wg: new(sync.WaitGroup)}
 }
 
-func (s *Stub[K]) FailNow()                          { panic(panicFailNow) }
-func (s *Stub[K]) Fatal(args ...any)                 { s.Error(args...); panic(panicFatal) }
-func (s *Stub[K]) Fatalf(format string, args ...any) { s.Errorf(format, args...); panic(panicFatalf) }
-func (s *Stub[K]) SkipNow()                          { panic("invalid call to SkipNow") }
-func (s *Stub[K]) Skip(...any)                       { panic("invalid call to Skip") }
-func (s *Stub[K]) Skipf(string, ...any)              { panic("invalid call to Skipf") }
+func (s *Stub[K]) FailNow()          { s.Helper(); panic(panicFailNow) }
+func (s *Stub[K]) Fatal(args ...any) { s.Helper(); s.Error(args...); panic(panicFatal) }
+func (s *Stub[K]) Fatalf(format string, args ...any) {
+	s.Helper()
+	s.Errorf(format, args...)
+	panic(panicFatalf)
+}
+
+func (s *Stub[K]) SkipNow()             { s.Helper(); panic("invalid call to SkipNow") }
+func (s *Stub[K]) Skip(...any)          { s.Helper(); panic("invalid call to Skip") }
+func (s *Stub[K]) Skipf(string, ...any) { s.Helper(); panic("invalid call to Skipf") }
 
 // New calls f in a new goroutine
 func (s *Stub[K]) New(f func(k K)) {
diff --git a/container/stub/stub_test.go b/container/stub/stub_test.go
index c3d79a4e..de9971f3 100644
--- a/container/stub/stub_test.go
+++ b/container/stub/stub_test.go
@@ -43,7 +43,7 @@ func TestStub(t *testing.T) {
 					t.Errorf("recover: %v", r)
 				}
 			}()
-			new(stubHolder).FailNow()
+			stubHolder{&Stub[stubHolder]{TB: t}}.FailNow()
 		})
 
 		t.Run("SkipNow", func(t *testing.T) {
@@ -53,7 +53,7 @@ func TestStub(t *testing.T) {
 					t.Errorf("recover: %v, want %v", r, want)
 				}
 			}()
-			new(stubHolder).SkipNow()
+			stubHolder{&Stub[stubHolder]{TB: t}}.SkipNow()
 		})
 
 		t.Run("Skip", func(t *testing.T) {
@@ -63,7 +63,7 @@ func TestStub(t *testing.T) {
 					t.Errorf("recover: %v, want %v", r, want)
 				}
 			}()
-			new(stubHolder).Skip()
+			stubHolder{&Stub[stubHolder]{TB: t}}.Skip()
 		})
 
 		t.Run("Skipf", func(t *testing.T) {
@@ -73,7 +73,7 @@ func TestStub(t *testing.T) {
 					t.Errorf("recover: %v, want %v", r, want)
 				}
 			}()
-			new(stubHolder).Skipf("")
+			stubHolder{&Stub[stubHolder]{TB: t}}.Skipf("")
 		})
 	})