tests: add and use testutil package to reduce duplication

[safcm/safcm.git] / cmd / safcm / sync_test.go

diff --git a/cmd/safcm/sync_test.go b/cmd/safcm/sync_test.go
index dba1d7e054bd7e4b8e99238b7d0692c6aa2ef8b4..4616f716a28d75f5967e3654b02f2ede81331c84 100644 (file)
--- a/cmd/safcm/sync_test.go
+++ b/cmd/safcm/sync_test.go
@@ -18,12 +18,10 @@ package main
 import (
        "fmt"
        "os"
-       "reflect"
        "testing"
 
-       "github.com/google/go-cmp/cmp"
-
        "ruderich.org/simon/safcm/cmd/safcm/config"
+       "ruderich.org/simon/safcm/testutil"
 )
 
 func TestHostsToSync(t *testing.T) {
@@ -166,15 +164,10 @@ func TestHostsToSync(t *testing.T) {
        }
 
        for _, tc := range tests {
-               res, err := hostsToSync(tc.names, allHosts, allGroups)
-               if !reflect.DeepEqual(tc.exp, res) {
-                       t.Errorf("%s: res: %s", tc.name,
-                               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.name, err, tc.expErr)
-               }
+               t.Run(tc.name, func(t *testing.T) {
+                       res, err := hostsToSync(tc.names, allHosts, allGroups)
+                       testutil.AssertEqual(t, "res", res, tc.exp)
+                       testutil.AssertErrorEqual(t, "err", err, tc.expErr)
+               })
        }
 }