tests: add and use testutil package to reduce duplication

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

diff --git a/cmd/safcm/config/groups_test.go b/cmd/safcm/config/groups_test.go
index b2bf5ec41d9027ecf39ebc6783dec321a936d885..9c0acda892585577510a26d3eab5640694fecfb3 100644 (file)
--- a/cmd/safcm/config/groups_test.go
+++ b/cmd/safcm/config/groups_test.go
@@ -18,10 +18,10 @@ package config
 import (
        "fmt"
        "os"
-       "reflect"
+       "path/filepath"
        "testing"
 
-       "github.com/google/go-cmp/cmp"
+       "ruderich.org/simon/safcm/testutil"
 )
 
 func TestLoadGroups(t *testing.T) {
@@ -186,26 +186,14 @@ func TestLoadGroups(t *testing.T) {
 
        for _, tc := range tests {
                t.Run(tc.path, func(t *testing.T) {
-                       err := os.Chdir(tc.path)
+                       err := os.Chdir(filepath.Join(cwd, tc.path))
                        if err != nil {
                                t.Fatal(err)
                        }
 
                        res, err := LoadGroups(tc.cfg, tc.hosts)
-
-                       if !reflect.DeepEqual(tc.exp, res) {
-                               t.Errorf("res: %s", 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("err = %#v, want %#v",
-                                       err, tc.expErr)
-                       }
-
-                       err = os.Chdir(cwd)
-                       if err != nil {
-                               t.Fatal(err)
-                       }
+                       testutil.AssertEqual(t, "res", res, tc.exp)
+                       testutil.AssertErrorEqual(t, "err", err, tc.expErr)
                })
        }
 }
@@ -319,14 +307,8 @@ func TestResolveHostGroups(t *testing.T) {
                t.Run(tc.name, func(t *testing.T) {
                        res, err := ResolveHostGroups(tc.host, allGroups,
                                tc.detected)
-                       if !reflect.DeepEqual(tc.exp, res) {
-                               t.Errorf("res: %s", 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("err = %#v, want %#v",
-                                       err, tc.expErr)
-                       }
+                       testutil.AssertEqual(t, "res", res, tc.exp)
+                       testutil.AssertErrorEqual(t, "err", err, tc.expErr)
                })
        }
 }