☎️ all: improve mustPanic to print correct caller

We could simply call t.Helper() inside the deferred function, but moving the t.Errorf call out of the deferred function seems to result in cleaner code.

Author: database64128

bitset/bitset_test.go

@@ -5,22 +5,19 @@ import (
 	"testing"
 )
 
-func assertPanic(t *testing.T, f func()) {
+func mustPanic(t *testing.T, f func(), name string) {
 	t.Helper()
-	defer func() {
-		if r := recover(); r == nil {
-			t.Error("expected panic, got none")
-		}
-	}()
+	defer func() { _ = recover() }()
 	f()
+	t.Errorf("%s did not panic", name)
 }
 
 func testBitSetIndexOutOfRange(t *testing.T, s BitSet) {
 	index := s.Capacity()
-	assertPanic(t, func() { s.IsSet(index) })
-	assertPanic(t, func() { s.Set(index) })
-	assertPanic(t, func() { s.Unset(index) })
-	assertPanic(t, func() { s.Flip(index) })
+	mustPanic(t, func() { _ = s.IsSet(index) }, "s.IsSet(index)")
+	mustPanic(t, func() { s.Set(index) }, "s.Set(index)")
+	mustPanic(t, func() { s.Unset(index) }, "s.Unset(index)")
+	mustPanic(t, func() { s.Flip(index) }, "s.Flip(index)")
 }
 
 func assertEmptyBitSet(t *testing.T, s BitSet) {

conn/addr_test.go

@@ -119,32 +119,29 @@ func TestAddrIsDomain(t *testing.T) {
 	}
 }
 
-func assertPanic(t *testing.T, f func()) {
+func mustPanic(t *testing.T, f func(), name string) {
 	t.Helper()
-	defer func() {
-		if r := recover(); r == nil {
-			t.Error("Expected panic, got none.")
-		}
-	}()
+	defer func() { _ = recover() }()
 	f()
+	t.Errorf("%s did not panic", name)
 }
 
 func TestAddrIP(t *testing.T) {
 	if ip := addrIP.IP(); ip != addrIPAddr {
 		t.Errorf("%q.IP() = %q, want %q", addrIP, ip, addrIPAddr)
 	}
 
-	assertPanic(t, func() { addrZero.IP() })
-	assertPanic(t, func() { addrDomain.IP() })
+	mustPanic(t, func() { _ = addrZero.IP() }, "addrZero.IP()")
+	mustPanic(t, func() { _ = addrDomain.IP() }, "addrDomain.IP()")
 }
 
 func TestAddrDomain(t *testing.T) {
 	if domain := addrDomain.Domain(); domain != addrDomainHost {
 		t.Errorf("%q.Domain() = %q, want %q", addrDomain, domain, addrDomainHost)
 	}
 
-	assertPanic(t, func() { addrZero.Domain() })
-	assertPanic(t, func() { addrIP.Domain() })
+	mustPanic(t, func() { _ = addrZero.Domain() }, "addrZero.Domain()")
+	mustPanic(t, func() { _ = addrIP.Domain() }, "addrIP.Domain()")
 }
 
 func TestAddrPort(t *testing.T) {
@@ -167,8 +164,8 @@ func TestAddrIPPort(t *testing.T) {
 		t.Errorf("%q.IPPort() = %q, want %q", addrIP, ap, addrIPAddrPort)
 	}
 
-	assertPanic(t, func() { addrZero.IPPort() })
-	assertPanic(t, func() { addrDomain.IPPort() })
+	mustPanic(t, func() { _ = addrZero.IPPort() }, "addrZero.IPPort()")
+	mustPanic(t, func() { _ = addrDomain.IPPort() }, "addrDomain.IPPort()")
 }
 
 func TestAddrResolveIP(t *testing.T) {
@@ -190,7 +187,7 @@ func TestAddrResolveIP(t *testing.T) {
 		t.Errorf("%q.ResolveIP().IsValid() = false, want true", addrDomain)
 	}
 
-	assertPanic(t, func() { addrZero.ResolveIP(ctx, "ip") })
+	mustPanic(t, func() { _, _ = addrZero.ResolveIP(ctx, "ip") }, "addrZero.ResolveIP()")
 }
 
 func TestAddrResolveIPPort(t *testing.T) {
@@ -215,7 +212,7 @@ func TestAddrResolveIPPort(t *testing.T) {
 		t.Errorf("%q.ResolveIPPort() = %q, want port %d", addrDomain, ipPort, addrDomainPort)
 	}
 
-	assertPanic(t, func() { addrZero.ResolveIPPort(ctx, "ip") })
+	mustPanic(t, func() { _, _ = addrZero.ResolveIPPort(ctx, "ip") }, "addrZero.ResolveIPPort()")
 }
 
 func TestAddrHost(t *testing.T) {
@@ -227,7 +224,7 @@ func TestAddrHost(t *testing.T) {
 		t.Errorf("%q.Host() = %q, want %q", addrDomain, host, addrDomainHost)
 	}
 
-	assertPanic(t, func() { addrZero.Host() })
+	mustPanic(t, func() { _ = addrZero.Host() }, "addrZero.Host()")
 }
 
 func TestAddrString(t *testing.T) {

portset/portset_test.go

@@ -6,23 +6,20 @@ import (
 	"testing"
 )
 
-func assertPanic(t *testing.T, f func()) {
+func mustPanic(t *testing.T, f func(), name string) {
 	t.Helper()
-	defer func() {
-		if r := recover(); r == nil {
-			t.Error("expected panic, got none")
-		}
-	}()
+	defer func() { _ = recover() }()
 	f()
+	t.Errorf("%s did not panic", name)
 }
 
 func TestPortSetBadPort(t *testing.T) {
 	var s PortSet
-	assertPanic(t, func() { s.Contains(0) })
-	assertPanic(t, func() { s.Add(0) })
-	assertPanic(t, func() { s.AddRange(0, 1) })
-	assertPanic(t, func() { s.AddRange(1, 0) })
-	assertPanic(t, func() { s.AddRange(1, 1) })
+	mustPanic(t, func() { _ = s.Contains(0) }, "s.Contains(0)")
+	mustPanic(t, func() { s.Add(0) }, "s.Add(0)")
+	mustPanic(t, func() { s.AddRange(0, 1) }, "s.AddRange(0, 1)")
+	mustPanic(t, func() { s.AddRange(1, 0) }, "s.AddRange(1, 0)")
+	mustPanic(t, func() { s.AddRange(1, 1) }, "s.AddRange(1, 1)")
 }
 
 func assertPortSetFirst(t *testing.T, s *PortSet, from uint16) {