tests: add and use testutil package to reduce duplication

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

diff --git a/cmd/safcm/config/permissions_test.go b/cmd/safcm/config/permissions_test.go
index 4efefafd2deb9af727d9b08894211ed41c3231f6..98b82b6ba877d0aaae02959384404a4f863815a6 100644 (file)
--- a/cmd/safcm/config/permissions_test.go
+++ b/cmd/safcm/config/permissions_test.go
@@ -19,12 +19,10 @@ import (
        "fmt"
        "io/fs"
        "os"
-       "reflect"
        "testing"
 
-       "github.com/google/go-cmp/cmp"
-
        "ruderich.org/simon/safcm"
+       "ruderich.org/simon/safcm/testutil"
 )
 
 func TestLoadPermissions(t *testing.T) {
@@ -227,23 +225,16 @@ This is FreeBSD host
 
        for _, tc := range tests {
                t.Run(tc.group, func(t *testing.T) {
-               // Use LoadFiles() so we work on real data and don't make any
-               // mistakes generating it
-               files, err := LoadFiles(tc.group)
-               if err != nil {
-                       t.Fatalf("err = %#v, want nil", err)
-               }
-               err = LoadPermissions(tc.group, files)
+                       // Use LoadFiles() so we work on real data and don't
+                       // make any mistakes generating it
+                       files, err := LoadFiles(tc.group)
+                       if err != nil {
+                               t.Fatalf("err = %#v, want nil", err)
+                       }
+                       err = LoadPermissions(tc.group, files)
 
-               if !reflect.DeepEqual(tc.exp, files) {
-                       t.Errorf("res: %s",
-                               cmp.Diff(tc.exp, files))
-               }
-               // Ugly but the simplest way to compare errors (including nil)
-               if fmt.Sprintf("%s", err) != fmt.Sprintf("%s", tc.expErr) {
-                       t.Errorf("err = %#v, want %#v",
-                               err, tc.expErr)
-               }
+                       testutil.AssertEqual(t, "res", files, tc.exp)
+                       testutil.AssertErrorEqual(t, "err", err, tc.expErr)
                })
        }
 }