From 0bd9b9e8fe61a96d7c63ec85c190cd32636fa659 Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Sun, 2 Mar 2025 23:23:04 +0900
Subject: [PATCH] test/sandbox: assert filesystem json

Signed-off-by: Ophestra <cat@gensokyo.uk>
---
 test/sandbox/assert.go      | 31 ++++++++++++++++++++++++-------
 test/sandbox/assert_test.go | 26 ++++++++++++++++++++++++++
 test/sandbox/fs_test.go     |  6 ++++++
 test/sandbox/mount_test.go  | 17 +----------------
 4 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/test/sandbox/assert.go b/test/sandbox/assert.go
index 2decde8..4df2774 100644
--- a/test/sandbox/assert.go
+++ b/test/sandbox/assert.go
@@ -2,6 +2,7 @@ package sandbox
 
 import (
 	"encoding/json"
+	"io/fs"
 	"log"
 	"os"
 )
@@ -15,6 +16,16 @@ var (
 func printf(format string, v ...any) { printfFunc(format, v...) }
 func fatalf(format string, v ...any) { fatalfFunc(format, v...) }
 
+func mustDecode(wantFile string, v any) {
+	if f, err := os.Open(wantFile); err != nil {
+		fatalf("cannot open %q: %v", wantFile, err)
+	} else if err = json.NewDecoder(f).Decode(v); err != nil {
+		fatalf("cannot decode %q: %v", wantFile, err)
+	} else if err = f.Close(); err != nil {
+		fatalf("cannot close %q: %v", wantFile, err)
+	}
+}
+
 func MustAssertMounts(name, hostMountsFile, wantFile string) {
 	hostMounts := make([]*Mntent, 0, 128)
 	if err := IterMounts(hostMountsFile, func(e *Mntent) {
@@ -24,13 +35,7 @@ func MustAssertMounts(name, hostMountsFile, wantFile string) {
 	}
 
 	var want []Mntent
-	if f, err := os.Open(wantFile); err != nil {
-		fatalf("cannot open %q: %v", wantFile, err)
-	} else if err = json.NewDecoder(f).Decode(&want); err != nil {
-		fatalf("cannot decode %q: %v", wantFile, err)
-	} else if err = f.Close(); err != nil {
-		fatalf("cannot close %q: %v", wantFile, err)
-	}
+	mustDecode(wantFile, &want)
 
 	for i := range want {
 		if want[i].Opts == "host_passthrough" {
@@ -61,3 +66,15 @@ func MustAssertMounts(name, hostMountsFile, wantFile string) {
 		fatalf("cannot iterate mounts: %v", err)
 	}
 }
+
+func MustAssertFS(e fs.FS, wantFile string) {
+	var want *FS
+	mustDecode(wantFile, &want)
+	if want == nil {
+		fatalf("invalid payload")
+	}
+
+	if err := want.Compare(".", e); err != nil {
+		fatalf("%v", err)
+	}
+}
diff --git a/test/sandbox/assert_test.go b/test/sandbox/assert_test.go
index 3727f57..c3fb580 100644
--- a/test/sandbox/assert_test.go
+++ b/test/sandbox/assert_test.go
@@ -1,6 +1,32 @@
 package sandbox
 
+import (
+	"encoding/json"
+	"os"
+	"path"
+	"testing"
+)
+
 type F func(format string, v ...any)
 
 func SwapPrint(f F) (old F) { old = printfFunc; printfFunc = f; return }
 func SwapFatal(f F) (old F) { old = fatalfFunc; fatalfFunc = f; return }
+
+func MustWantFile(t *testing.T, v any) (wantFile string) {
+	wantFile = path.Join(t.TempDir(), "want.json")
+	if f, err := os.OpenFile(wantFile, os.O_CREATE|os.O_WRONLY, 0400); err != nil {
+		t.Fatalf("cannot create %q: %v", wantFile, err)
+	} else if err = json.NewEncoder(f).Encode(v); err != nil {
+		t.Fatalf("cannot encode to %q: %v", wantFile, err)
+	} else if err = f.Close(); err != nil {
+		t.Fatalf("cannot close %q: %v", wantFile, err)
+	}
+
+	t.Cleanup(func() {
+		if err := os.Remove(wantFile); err != nil {
+			t.Fatalf("cannot remove %q: %v", wantFile, err)
+		}
+	})
+
+	return
+}
diff --git a/test/sandbox/fs_test.go b/test/sandbox/fs_test.go
index 1262dda..5ac31df 100644
--- a/test/sandbox/fs_test.go
+++ b/test/sandbox/fs_test.go
@@ -75,4 +75,10 @@ func TestCompare(t *testing.T) {
 			}
 		})
 	}
+
+	t.Run("assert", func(t *testing.T) {
+		oldFatal := sandbox.SwapFatal(t.Fatalf)
+		t.Cleanup(func() { sandbox.SwapFatal(oldFatal) })
+		sandbox.MustAssertFS(make(fstest.MapFS), sandbox.MustWantFile(t, &sandbox.FS{Mode: 0xDEADBEEF}))
+	})
 }
diff --git a/test/sandbox/mount_test.go b/test/sandbox/mount_test.go
index 7407412..47df210 100644
--- a/test/sandbox/mount_test.go
+++ b/test/sandbox/mount_test.go
@@ -1,7 +1,6 @@
 package sandbox_test
 
 import (
-	"encoding/json"
 	"os"
 	"path"
 	"testing"
@@ -113,21 +112,7 @@ overlay /.fortify/sbin/fortify overlay ro,nosuid,nodev,relatime,lowerdir=/mnt-ro
 		t.Run(tc.name+" assert", func(t *testing.T) {
 			oldFatal := sandbox.SwapFatal(t.Fatalf)
 			t.Cleanup(func() { sandbox.SwapFatal(oldFatal) })
-
-			wantFile := path.Join(t.TempDir(), "want.json")
-			if f, err := os.OpenFile(wantFile, os.O_CREATE|os.O_WRONLY, 0400); err != nil {
-				t.Fatalf("cannot create %q: %v", wantFile, err)
-			} else if err = json.NewEncoder(f).Encode(tc.want); err != nil {
-				t.Fatalf("cannot encode to %q: %v", wantFile, err)
-			} else if err = f.Close(); err != nil {
-				t.Fatalf("cannot close %q: %v", wantFile, err)
-			}
-
-			sandbox.MustAssertMounts(name, name, wantFile)
-
-			if err := os.Remove(wantFile); err != nil {
-				t.Fatalf("cannot remove %q: %v", wantFile, err)
-			}
+			sandbox.MustAssertMounts(name, name, sandbox.MustWantFile(t, tc.want))
 		})
 
 		if err := os.Remove(name); err != nil {