make assertion methods 'Helper' to display correct lines on test failures

Co-authored-by: eoh <[email protected]>

Author: golanglibs

assert_containment.go

@@ -3,12 +3,16 @@ package goassert
 import "testing"
 
 func SliceContains[K comparable](t *testing.T, s []K, element K) {
+	t.Helper()
+
 	if !sliceContains(s, element) {
 		t.Errorf("Element %v could not be found in the slice %v", element, s)
 	}
 }
 
 func SliceNotContains[K comparable](t *testing.T, s []K, element K) {
+	t.Helper()
+
 	if sliceContains(s, element) {
 		t.Errorf("Element %v was not expected to be found in the slice %v", element, s)
 	}
@@ -25,6 +29,8 @@ func sliceContains[K comparable](s []K, element K) bool {
 }
 
 func MapContains[K, V comparable](t *testing.T, m map[K]V, k K, v V) {
+	t.Helper()
+
 	actualValue, found := m[k]
 
 	if !found {
@@ -38,6 +44,8 @@ func MapContains[K, V comparable](t *testing.T, m map[K]V, k K, v V) {
 }
 
 func MapNotContains[K, V comparable](t *testing.T, m map[K]V, k K, v V) {
+	t.Helper()
+
 	value, found := m[k]
 
 	if found && v == value {

assert_equality.go

@@ -6,24 +6,32 @@ import (
 )
 
 func Equal[K comparable](t testing.TB, expected K, actual K) {
+	t.Helper()
+
 	if actual != expected {
 		t.Error(inequalityMsg(expected, actual))
 	}
 }
 
 func NotEqual[K comparable](t testing.TB, expected K, actual K) {
+	t.Helper()
+
 	if actual == expected {
 		t.Error(equalityMsg(expected))
 	}
 }
 
 func Nil(t testing.TB, actual interface{}) {
+	t.Helper()
+
 	if !isNil(actual) {
 		t.Error(inequalityMsg(nil, actual))
 	}
 }
 
 func NotNil(t testing.TB, actual interface{}) {
+	t.Helper()
+
 	if isNil(actual) {
 		t.Error(equalityMsg("nil"))
 	}
@@ -43,12 +51,16 @@ func isNil(value interface{}) bool {
 }
 
 func EqualSlice[K comparable](t testing.TB, expected []K, actual []K) {
+	t.Helper()
+
 	if !areEqualSlices(expected, actual) {
 		t.Error(inequalityMsg(expected, actual))
 	}
 }
 
 func NotEqualSlice[K comparable](t testing.TB, expected []K, actual []K) {
+	t.Helper()
+
 	if areEqualSlices(expected, actual) {
 		t.Error(equalityMsg(expected))
 	}
@@ -71,12 +83,16 @@ func areEqualSlices[K comparable](expected []K, actual []K) bool {
 }
 
 func SimilarSlice[K comparable](t testing.TB, expected []K, actual []K) {
+	t.Helper()
+
 	if !areSimilarSlices(expected, actual) {
 		t.Error(inequalityMsg(expected, actual))
 	}
 }
 
 func NotSimilarSlice[K comparable](t testing.TB, expected []K, actual []K) {
+	t.Helper()
+
 	if areSimilarSlices(expected, actual) {
 		t.Error(equalityMsg(expected))
 	}
@@ -103,12 +119,16 @@ func areSimilarSlices[K comparable](expected []K, actual []K) bool {
 }
 
 func EqualMap[K, V comparable](t testing.TB, expected map[K]V, actual map[K]V) {
+	t.Helper()
+
 	if !isEqualMap(expected, actual) {
 		t.Error(inequalityMsg(expected, actual))
 	}
 }
 
 func NotEqualMap[K, V comparable](t testing.TB, expected map[K]V, actual map[K]V) {
+	t.Helper()
+
 	if isEqualMap(expected, actual) {
 		t.Error(equalityMsg(expected))
 	}

assert_panic.go

@@ -5,6 +5,8 @@ import (
 )
 
 func Panic(t *testing.T, underTest func()) {
+	t.Helper()
+
 	defer func() {
 		if r := recover(); r == nil {
 			t.Error("Expected panic but there was no panic")
@@ -15,6 +17,8 @@ func Panic(t *testing.T, underTest func()) {
 }
 
 func NotPanic(t *testing.T, underTest func()) {
+	t.Helper()
+
 	defer func() {
 		if r := recover(); r != nil {
 			t.Errorf("Expected no panic but there was panic: %v", r)
@@ -25,6 +29,8 @@ func NotPanic(t *testing.T, underTest func()) {
 }
 
 func PanicWithError[K comparable](t *testing.T, expectedError K, underTest func()) {
+	t.Helper()
+
 	defer func() {
 		r := recover()
 		if r == nil {
@@ -48,6 +54,8 @@ func PanicWithError[K comparable](t *testing.T, expectedError K, underTest func(
 }
 
 func NotPanicWithError[K comparable](t *testing.T, expectedError K, underTest func()) {
+	t.Helper()
+
 	defer func() {
 		r := recover()
 		if r == nil {

assert_true.go

@@ -3,12 +3,16 @@ package goassert
 import "testing"
 
 func True(t testing.TB, assertion bool) {
+	t.Helper()
+
 	if !assertion {
 		t.Error(inequalityMsg(true, false))
 	}
 }
 
 func False(t testing.TB, assertion bool) {
+	t.Helper()
+
 	if assertion {
 		t.Error(inequalityMsg(false, true))
 	}