X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=testutil%2Ftestutil.go;h=42e19cf39a9d1fcb1ec844774d109d1e1d31238b;hb=791f34212ebd19a9c79c9bd1157f590f4b24f5c2;hp=8d2e86b1521a345cf45afb365fc470eed776674e;hpb=3473766d8afb07cb0685694656947883cbbd1138;p=safcm%2Fsafcm.git diff --git a/testutil/testutil.go b/testutil/testutil.go index 8d2e86b..42e19cf 100644 --- a/testutil/testutil.go +++ b/testutil/testutil.go @@ -1,6 +1,6 @@ // Utility functions useful for tests -// Copyright (C) 2021 Simon Ruderich +// Copyright (C) 2021-2022 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 @@ -26,15 +26,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)