tests: add and use testutil package to reduce duplication

[safcm/safcm.git] / cmd / safcm / config / files_test.go

diff --git a/cmd/safcm/config/files_test.go b/cmd/safcm/config/files_test.go
index 398394c8f43d3fc0c28027500e4605db9f2625ee..1313fdfed18548947a6cda319b1db862d8de8dbb 100644 (file)
--- a/cmd/safcm/config/files_test.go
+++ b/cmd/safcm/config/files_test.go
@@ -19,13 +19,11 @@ import (
        "fmt"
        "io/fs"
        "os"
-       "reflect"
        "syscall"
        "testing"
 
-       "github.com/google/go-cmp/cmp"
-
        "ruderich.org/simon/safcm"
+       "ruderich.org/simon/safcm/testutil"
 )
 
 func chmod(name string, perm int) {
@@ -188,16 +186,10 @@ This is FreeBSD host
        }
 
        for _, tc := range tests {
-               res, err := LoadFiles(tc.group)
-
-               if !reflect.DeepEqual(tc.exp, res) {
-                       t.Errorf("%s: res: %s", tc.group,
-                               cmp.Diff(tc.exp, res))
-               }
-               // Ugly but the simplest way to compare errors (including nil)
-               if fmt.Sprintf("%s", err) != fmt.Sprintf("%s", tc.expErr) {
-                       t.Errorf("%s: err = %#v, want %#v",
-                               tc.group, err, tc.expErr)
-               }
+               t.Run(tc.group, func(t *testing.T) {
+                       res, err := LoadFiles(tc.group)
+                       testutil.AssertEqual(t, "res", res, tc.exp)
+                       testutil.AssertErrorEqual(t, "err", err, tc.expErr)
+               })
        }
 }