tests: add and use testutil package to reduce duplication

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

diff --git a/cmd/safcm/config/hosts_test.go b/cmd/safcm/config/hosts_test.go
index 49f4d5692da40bc96afeedc760fb53b84dfc0bad..ecbc37e45314b7453864eb9d9d1cac22a57b4a53 100644 (file)
--- a/cmd/safcm/config/hosts_test.go
+++ b/cmd/safcm/config/hosts_test.go
@@ -19,10 +19,9 @@ import (
        "fmt"
        "os"
        "path/filepath"
-       "reflect"
        "testing"
 
-       "github.com/google/go-cmp/cmp"
+       "ruderich.org/simon/safcm/testutil"
 )
 
 func TestLoadHosts(t *testing.T) {
@@ -83,21 +82,15 @@ func TestLoadHosts(t *testing.T) {
        }
 
        for _, tc := range tests {
-               err := os.Chdir(filepath.Join(cwd, tc.path))
-               if err != nil {
-                       t.Fatal(err)
-               }
-
-               res, err := LoadHosts()
+               t.Run(tc.path, func(t *testing.T) {
+                       err := os.Chdir(filepath.Join(cwd, tc.path))
+                       if err != nil {
+                               t.Fatal(err)
+                       }
 
-               if !reflect.DeepEqual(tc.exp, res) {
-                       t.Errorf("%s: res: %s", tc.path,
-                               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.path, err, tc.expErr)
-               }
+                       res, err := LoadHosts()
+                       testutil.AssertEqual(t, "res", res, tc.exp)
+                       testutil.AssertErrorEqual(t, "err", err, tc.expErr)
+               })
        }
 }