tests: add and use testutil package to reduce duplication

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

diff --git a/cmd/safcm/sync_changes_test.go b/cmd/safcm/sync_changes_test.go
index dda48738063a1307efbb8260bb1151e557a6a2c3..e5efe1d26bb38b44bc5de84bacc517b9b3877062 100644 (file)
--- a/cmd/safcm/sync_changes_test.go
+++ b/cmd/safcm/sync_changes_test.go
@@ -19,10 +19,9 @@ import (
        "io/fs"
        "testing"
 
-       "github.com/google/go-cmp/cmp"
-
        "ruderich.org/simon/safcm"
        "ruderich.org/simon/safcm/cmd/safcm/config"
+       "ruderich.org/simon/safcm/testutil"
 )
 
 func TestFormatFileChanges(t *testing.T) {
@@ -291,9 +290,7 @@ func TestFormatFileChanges(t *testing.T) {
                        }
 
                        res := s.formatFileChanges(tc.changes)
-                       if tc.exp != res {
-                               t.Errorf("res: %s", cmp.Diff(tc.exp, res))
-                       }
+                       testutil.AssertEqual(t, "res", res, tc.exp)
                })
        }
 }
@@ -363,9 +360,7 @@ func TestFormatPackageChanges(t *testing.T) {
                        }
 
                        res := s.formatPackageChanges(tc.changes)
-                       if tc.exp != res {
-                               t.Errorf("res: %s", cmp.Diff(tc.exp, res))
-                       }
+                       testutil.AssertEqual(t, "res", res, tc.exp)
                })
        }
 }
@@ -457,9 +452,7 @@ func TestFormatServiceChanges(t *testing.T) {
                        }
 
                        res := s.formatServiceChanges(tc.changes)
-                       if tc.exp != res {
-                               t.Errorf("res: %s", cmp.Diff(tc.exp, res))
-                       }
+                       testutil.AssertEqual(t, "res", res, tc.exp)
                })
        }
 }
@@ -669,9 +662,7 @@ func TestFormatCommandChanges(t *testing.T) {
                        }
 
                        res := s.formatCommandChanges(tc.changes)
-                       if tc.exp != res {
-                               t.Errorf("res: %s", cmp.Diff(tc.exp, res))
-                       }
+                       testutil.AssertEqual(t, "res", res, tc.exp)
                })
        }
 }