X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=testutil%2Ftestutil.go;h=efea1a7e982b0ae940e603101b31b5269f9cb7f7;hb=a975ad977fa48ac38a1955041cc559e77aa4d968;hp=8d2e86b1521a345cf45afb365fc470eed776674e;hpb=3473766d8afb07cb0685694656947883cbbd1138;p=safcm%2Fsafcm.git

diff --git a/testutil/testutil.go b/testutil/testutil.go
index 8d2e86b..efea1a7 100644
--- a/testutil/testutil.go
+++ b/testutil/testutil.go
@@ -1,19 +1,7 @@
 // Utility functions useful for tests
 
-// Copyright (C) 2021  Simon Ruderich
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright (C) 2021-2024  Simon Ruderich
 
 package testutil
 
@@ -26,15 +14,19 @@ import (
 )
 
 func AssertEqual(t *testing.T, name string, act, exp interface{}) {
+	t.Helper()
+
 	if !reflect.DeepEqual(act, exp) {
 		t.Errorf("%s: %s", name, cmp.Diff(exp, act))
 	}
 }
 
 func AssertErrorEqual(t *testing.T, name string, act, exp error) {
+	t.Helper()
+
 	// Ugly but the simplest way to compare errors (including nil)
-	actStr := fmt.Sprintf("%s", act)
-	expStr := fmt.Sprintf("%s", exp)
+	actStr := fmt.Sprintf("%v", act)
+	expStr := fmt.Sprintf("%v", exp)
 	if actStr != expStr {
 		t.Errorf("err = %s (%#v), want %s (%#v)",
 			actStr, act, expStr, exp)